Version 10.10.3

Code/ControlPGN.py

@@ -158,10 +158,10 @@ def actual(self):
             rival = self.gestor.libro.nombre
         elif tipoJuego in (kJugFics, kJugFide):
             rival = self.gestor.nombreObj
-        elif self.gestor.xrival:
-            rival = self.gestor.xrival.nombre
-        else:
-            rival = "";
+        elif self.gestor.xrival:  # foncap change
+            rival = self.gestor.xrival.nombre  # foncap change
+        else:  # foncap change
+            rival = ""  # foncap change
 
         jugador = self.gestor.configuracion.jugador
         resultado = self.gestor.resultado

Code/EnginesWindows.py

@@ -65,6 +65,7 @@ def mas(cm):
 
     cm = ConfigMotor("gaia", "Jean-Francois Romang, David Rabel", "3.5", "http://gaiachess.free.fr")
     cm.path = "gaia32.exe"
+    cm.nombre = "Gaïa 3.5".decode("utf-8")
     cm.elo = 2378
     cm.ordenUCI("Ponder", "false")
     mas(cm)
@@ -140,6 +141,8 @@ def mas(cm):
     cm.elo = 2720
     cm.ordenUCI("Hash", "32")
     cm.ordenUCI("Ponder", "false")
+    cm.nombre = "Gödel 3.4.9".decode("utf-8")
+
     mas(cm)
 
     cm = ConfigMotor("rhetoric", "Alberto Sanjuan", "1.4.3", "http://www.chessrhetoric.com/")
@@ -255,7 +258,7 @@ def mas(cm):
     cm.ponMultiPV(20, 64)
     mas(cm)
 
-    cm = ConfigMotor("irina", "Lucas Monge", "0.12", "")
+    cm = ConfigMotor("irina", "Lucas Monge", "0.13", "")
     cm.path = "irina.exe"
     cm.elo = 1200
     mas(cm)

Code/Init.py

@@ -1,5 +1,5 @@
 DEBUG = False
-VERSION = "10.10.2"
+VERSION = "10.10.3"
 
 import os
 import sys

Code/QT/Histogram.py

@@ -337,8 +337,9 @@ def drawBackground(self, painter, rect):
         pen.setWidth(2)
         pen.setColor(QtGui.QColor("#DE5044"))
         painter.setPen(pen)
-        p = self.hserie.liPoints[self.pointActive]
-        painter.drawLine(p.rx, bottom, p.rx, top)
+        if 0 <= self.pointActive < len(self.hserie.liPoints):
+            p = self.hserie.liPoints[self.pointActive]
+            painter.drawLine(p.rx, bottom, p.rx, top)
 
     def mousePressEvent(self, event):
         super(Histogram, self).mousePressEvent(event)
@@ -430,15 +431,9 @@ def genHistograms(partida, sicentipawns):
     alm.lijgW = lijgW
     alm.lijgB = lijgB
 
-    alm.porcT = porcT*1.0/len(lijg)
-    if len(lijgW) != 0:
-        alm.porcW = porcW*1.0/len(lijgW)
-    else:
-        alm.porcW = 0;
-    if len(lijgB) != 0:
-        alm.porcB = porcB*1.0/len(lijgB)
-    else:
-        alm.porcB = 0;
+    alm.porcT = porcT*1.0/len(lijg) if len(lijg) else 0
+    alm.porcW = porcW*1.0/len(lijgW) if len(lijgW) else 0
+    alm.porcB = porcB*1.0/len(lijgB) if len(lijgB) else 0
 
     return alm
 

Code/QT/PantallaManualSave.py

@@ -6,6 +6,7 @@
 from Code import ControlPosicion
 from Code import XVoyager
 from Code import Partida
+
 from Code.QT import Colocacion
 from Code.QT import Controles
 from Code.QT import Iconos

Code/QT/PantallaPGN.py

@@ -193,7 +193,16 @@ def gridDobleClick(self, grid, fila, oColumna):
     def gridDobleClickCabecera(self, grid, oColumna):
         clave = oColumna.clave
         orden = self.dbf.orden
-        if orden.startswith(clave):
+        if clave == "PLIES":
+            siDesc = orden.endswith("DESC")
+            siPrevio = orden.startswith("CAST")
+            orden = "CAST(PLIES AS INTEGER)"
+            if siPrevio:
+                if siDesc:
+                    orden = ""
+                else:
+                    orden += " DESC"
+        elif orden.startswith(clave):
             siDesc = orden.endswith("DESC")
             if siDesc:
                 orden = ""

Engines/Windows/irina/src/Makefile

@@ -1,6 +1,6 @@
 LINK_TARGET = irina.exe
 
-OBJS = main.o loop.o board.o data.o util.o movegen.o makemove.o perft.o eval.o evalst.o search.o person.o hash.o
+OBJS = main.o loop.o board.o data.o util.o movegen.o makemove.o perft.o eval.o evalst.o search.o person.o hash.o book.o
 
 REBUILDABLES = $(OBJS) $(LINK_TARGET)
 

Engines/Windows/irina/src/globals.h

@@ -98,6 +98,8 @@ extern int max_time;
 
 extern bool is_personality;
 
+extern bool use_book;
+
 
 extern int ST_PAWNPOS_W[64];
 extern int ST_KNIGHTPOS_W[64];

Engines/Windows/irina/src/loop.c

@@ -12,7 +12,7 @@
 #include "protos.h"
 #include "globals.h"
 
-#define VERSION    "0.12"
+#define VERSION    "0.13"
 
 
 void begin(void)
@@ -53,6 +53,9 @@ void loop(void)
     char file[256];
     int num;
 
+    set_ownbookfile("irina.bin");
+    set_ownbook(true);
+
     for (;;)
     {
         if (!fgets(s, 2048, stdin))
@@ -72,6 +75,8 @@ void loop(void)
             printf("option name Personality type combo default Irina var Irina var Steven var Monkey var Donkey var Bull var Wolf var Lion var Rat var Snake var Material var Random var Capture var Advance\n");
             printf("option name Min Time type spin default 0 min 0 max 99\n");
             printf("option name Max Time type spin default 0 min 0 max 99\n");
+            printf("option name OwnBook type check default true\n");
+            printf("option name OwnBookFile type string default irina.bin\n");
             printf("uciok\n");
         }
         else if (SCAN("isready"))
@@ -108,6 +113,7 @@ void loop(void)
         }
         else if (SCAN("ucinewgame"))
         {
+            open_book();
             continue;
         }
         else if (SCAN("position"))
@@ -121,9 +127,9 @@ void loop(void)
         else if (SCAN("setoption name"))
         {
             set_option(s);
-
         }
     }
+    close_book();
 }
 
 
@@ -346,6 +352,14 @@ void set_option(char *line)
     {
         set_hash( value );
     }
+    else if(strcmp(name, "OwnBook") == 0)
+    {
+        set_ownbook( strcmp(value, "true") == 0 );
+    }
+    else if(strcmp(name, "OwnBookFile") == 0)
+    {
+        set_ownbookfile( value );
+    }
     /* setoption name <id> [value <x>]
     	this is sent to the engine when the user wants to change the internal parameters
     	of the engine. For the "button" type no value is needed.

Engines/Windows/irina/src/person.c

@@ -26,7 +26,7 @@ int max_time = 0;
 
 bool set_personality(char* value, char* name, int random, int advance,
                      int capture, int material, int sanity,
-                     int queen, int rook, int bishop, int knight)
+                     int queen, int rook, int bishop, int knight, bool ownbook)
 {
     if(strcmp(value, name) == 0)
     {
@@ -40,6 +40,7 @@ bool set_personality(char* value, char* name, int random, int advance,
         person_rook = rook;
         person_bishop = bishop;
         person_knight = knight;
+        set_ownbook(ownbook);
         return true;
     }
     return false;
@@ -49,17 +50,17 @@ void set_personality_name(char * value)
 {
     srand(time(NULL));
     is_personality = false;
-    //                                  Rnd Adv Cap Mat San   Q   R   B   N
-    if(set_personality(value, "Monkey", 100,  0,  0,  0,  0,  0,  0,  0,  0)) return;
-    if(set_personality(value, "Donkey",  50, 30, 10, 10,  0,  1,  1,  1,  1)) return;
-    if(set_personality(value, "Bull",    40, 40,  5, 15,  0,  2,  1,  1,  1)) return;
-    if(set_personality(value, "Wolf",    30, 25, 30, 15,  0,  3,  2,  1,  1)) return;
-    if(set_personality(value, "Lion",    20, 15, 30, 30,  5,  5,  3,  2,  2)) return;
-    if(set_personality(value, "Rat",     15, 10, 25, 35, 15,  8,  4,  3,  3)) return;
-    if(set_personality(value, "Snake",    5, 15, 20, 40, 20, 10,  5,  3,  3)) return;
-    if(set_personality(value, "Random", 100,  0,  0,  0,  0,  0,  0,  0,  0)) return;
-    if(set_personality(value, "Advance",  0,100,  0,  0,  0,  0,  0,  0,  0)) return;
-    if(set_personality(value, "Capture",  0,  0,100,  0,  0,  0,  0,  0,  0)) return;
+    //                                        Rnd Adv  Cap Mat  San   Q    R   B    N    book
+    if(set_personality(value, "Monkey", 100,  0,  0,  0,  0,  0,  0,  0,  0, false)) return;
+    if(set_personality(value, "Donkey",  50, 30, 10, 10,  0,  1,  1,  1,  1, false)) return;
+    if(set_personality(value, "Bull",    40, 40,  5, 15,  0,  2,  1,  1,  1, false)) return;
+    if(set_personality(value, "Wolf",    30, 25, 30, 15,  0,  3,  2,  1,  1, false)) return;
+    if(set_personality(value, "Lion",    20, 15, 30, 30,  5,  5,  3,  2,  2, false)) return;
+    if(set_personality(value, "Rat",     15, 10, 25, 35, 15,  8,  4,  3,  3,  true)) return;
+    if(set_personality(value, "Snake",    5, 15, 20, 40, 20, 10,  5,  3,  3,  true)) return;
+    if(set_personality(value, "Random", 100,  0,  0,  0,  0,  0,  0,  0,  0, false)) return;
+    if(set_personality(value, "Advance",  0,100,  0,  0,  0,  0,  0,  0,  0, false)) return;
+    if(set_personality(value, "Capture",  0,  0,100,  0,  0,  0,  0,  0,  0, false)) return;
 
     if(!strcmp(value, "Material"))
     {

Engines/Windows/irina/src/protos.h

@@ -84,4 +84,12 @@ void time_test( Bitmap mstime );
 void init_data_steven(void);
 int eval_steven(void);
 
+// book.c
+bool using_book(void);
+void set_ownbook( bool ok );
+void set_ownbookfile( char * name );
+void close_book( void );
+void open_book();
+bool check_book( char * fen, char * move );
+
 #endif

Engines/Windows/irina/src/search.c

@@ -68,6 +68,21 @@ void play_irina(int depth, int time)
     char str_move[20];
     char bestmove[6], ponder[6];
     Bitmap ms;
+    char fen[100];
+
+    if( using_book() )
+    {
+        board_fen(fen);
+        if( check_book(fen, bestmove) )
+        {
+            printf("bestmove %s\n", bestmove);
+            return;
+        }
+        else
+        {
+            close_book();
+        }
+    }
 
     ok_time_kb = true;
     time_ini = get_ms();
@@ -165,11 +180,40 @@ int noMovesScore(int ply)
     return DRAWSCORE;
 }
 
+inline void test_time()
+{
+    Bitmap ms;
+    if (--xxx == 0)
+    {
+        ms = get_ms();
+        if ((time_end && (time_end < ms)) || bioskey())
+        {
+            ok_time_kb = false;
+        }
+        xxx = TEST_KEY_TIME;
+
+        if (ms - time_last > MSG_INTERVAL)
+        {
+            time_last = ms;
+            ms -= time_ini;
+            if (ms)
+            {
+                printf("info depth %d time %lu nodes %lu nps %lu\n",
+                       working_depth,
+                       (long unsigned int) ms, (long unsigned int) inodes,
+                       (long unsigned int) (inodes * 1000 / ms));
+            }
+        }
+    }
+}
+
 int quiescence(int alpha, int beta, int ply, int max_ply)
 {
     int k, j;
     int score;
 
+    test_time();
+
     if (inCheck()) {
           return alphaBeta(alpha, beta, 1, ply, max_ply);
     }
@@ -219,32 +263,9 @@ int alphaBeta(int alpha, int beta, int depth, int ply, int max_ply)
     int score, best_score;
     int desde, hasta;
     unsigned k, j;
-    Bitmap ms;
     Move move;
 
-    if (--xxx == 0)
-    {
-        ms = get_ms();
-        if ((time_end && (time_end < ms)) || bioskey())
-        {
-            ok_time_kb = false;
-        }
-        xxx = TEST_KEY_TIME;
-
-        if (ms - time_last > MSG_INTERVAL)
-        {
-            time_last = ms;
-            ms -= time_ini;
-            if (ms)
-            {
-                printf("info depth %d time %lu nodes %lu nps %lu\n",
-                       working_depth,
-                       (long unsigned int) ms, (long unsigned int) inodes,
-                       (long unsigned int) (inodes * 1000 / ms));
-            }
-        }
-    }
-
+    test_time();
 
     if (depth == 0)
     {

Engines/Windows/irina/src/xmk_book.bat

@@ -0,0 +1,5 @@
+@echo off
+call "c:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\vcvarsall.bat"
+PATH=C:\MinGW\bin;C:\MinGW\msys\1.0\bin;D:\Program Files\LLVM\bin;%PATH%
+clang -O2 -DWIN32 -D_CRT_SECURE_NO_WARNINGS book.c -o b.exe
+b

Engines/Windows/irina/src/xmk_clang.bat

@@ -1,4 +1,5 @@
 @echo off
 call "c:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\vcvarsall.bat"
 PATH=C:\MinGW\bin;C:\MinGW\msys\1.0\bin;D:\Program Files\LLVM\bin;%PATH%
-clang -O2 -DWIN32 -D_CRT_SECURE_NO_WARNINGS main.c loop.c board.c data.c util.c movegen.c makemove.c perft.c eval.c evalst.c search.c person.c hash.c -o irina_clang.exe
+clang -O2 -DWIN32 -D_CRT_SECURE_NO_WARNINGS main.c loop.c board.c data.c util.c movegen.c makemove.c perft.c eval.c evalst.c search.c person.c hash.c book.c -o ..\irina.exe
+strip ..\irina.exe

Lucas.py

@@ -14,7 +14,6 @@
 
 
 
-
 reload(sys)
 sys.setdefaultencoding("latin-1")
 sys.path.insert(0, os.curdir)

bug.log

@@ -1 +1 @@
-Version 10.10.2
+Version 10.10.3