Remove unused variable first_entry from function find_key

[xboard.git] / book.c

diff --git a/book.c b/book.c
index e5a6030..ebf242f 100644 (file)
--- a/book.c
+++ b/book.c
@@ -36,6 +36,16 @@
 
 #include "common.h"
 #include "backend.h"
 
 #include "common.h"
 #include "backend.h"

+#include "moves.h"
+#include "gettext.h"
+
+#ifdef ENABLE_NLS
+# define  _(s) gettext (s)
+# define N_(s) gettext_noop (s)
+#else
+# define  _(s) (s)
+# define N_(s)  s
+#endif

 
 #ifdef _MSC_VER
   typedef unsigned __int64 uint64;
 
 #ifdef _MSC_VER
   typedef unsigned __int64 uint64;


@@ -43,7 +53,6 @@
   typedef unsigned long long int uint64;
 #endif
 
   typedef unsigned long long int uint64;
 #endif
 

-

 #ifdef _MSC_VER
 #  define U64(u) (u##ui64)
 #else
 #ifdef _MSC_VER
 #  define U64(u) (u##ui64)
 #else


@@ -273,20 +282,42 @@ uint64 *RandomEnPassant =Random64+772;
 uint64 *RandomTurn      =Random64+780;
 
 
 uint64 *RandomTurn      =Random64+780;
 
 

-uint64 hash(int moveNr)
+uint64
+hash (int moveNr)

 {
     int r, f, p_enc, squareNr, pieceGroup;
 {
     int r, f, p_enc, squareNr, pieceGroup;

-    uint64 key=0, Zobrist;
+    uint64 key=0, holdingsKey=0, Zobrist;
+    VariantClass v = gameInfo.variant;
+
+    switch(v) {
+       case VariantNormal:
+       case VariantFischeRandom: // compatible with normal
+       case VariantNoCastle:
+       case VariantXiangqi: // for historic reasons; does never collide anyway because of other King type
+           break;
+       case VariantGiveaway: // in opening same as suicide
+           key += VariantSuicide;
+           break;
+       case VariantGothic: // these are special cases of CRC, and can share book
+       case VariantCapablanca:
+           v = VariantCapaRandom;
+       default:
+           key += v; // variant type incorporated in key to allow mixed books without collisions
+    }

 
 

-    for(f=BOARD_LEFT; f<BOARD_RGHT; f++){
+    for(f=0; f<BOARD_WIDTH; f++){

         for(r=0; r<BOARD_HEIGHT;r++){
             ChessSquare p = boards[moveNr][r][f];
         for(r=0; r<BOARD_HEIGHT;r++){
             ChessSquare p = boards[moveNr][r][f];

+           if(f == BOARD_LEFT-1 || f == BOARD_RGHT) continue; // between board and holdings

             if(p != EmptySquare){
                    int j = (int)p;
                    j -= (j >= (int)BlackPawn) ? (int)BlackPawn :(int)WhitePawn;
                    if(j > (int)WhiteQueen) j++;  // make space for King
                    if(j > (int) WhiteKing) j = (int)WhiteQueen + 1;
                    p_enc = 2*j + ((int)p < (int)BlackPawn);
             if(p != EmptySquare){
                    int j = (int)p;
                    j -= (j >= (int)BlackPawn) ? (int)BlackPawn :(int)WhitePawn;
                    if(j > (int)WhiteQueen) j++;  // make space for King
                    if(j > (int) WhiteKing) j = (int)WhiteQueen + 1;
                    p_enc = 2*j + ((int)p < (int)BlackPawn);

+                   // holdings squares get nmbers immediately after board; first left, then right holdings
+                   if(f == BOARD_LEFT-2) squareNr = (BOARD_RGHT - BOARD_LEFT)*BOARD_HEIGHT + r; else
+                   if(f == BOARD_RGHT+1) squareNr = (BOARD_RGHT - BOARD_LEFT + 1)*BOARD_HEIGHT + r; else

                    squareNr = (BOARD_RGHT - BOARD_LEFT)*r + (f - BOARD_LEFT);
                    // note that in normal Chess squareNr < 64 and p_enc < 12. The following code
                    // maps other pieces and squares in this range, and then modify the corresponding
                    squareNr = (BOARD_RGHT - BOARD_LEFT)*r + (f - BOARD_LEFT);
                    // note that in normal Chess squareNr < 64 and p_enc < 12. The following code
                    // maps other pieces and squares in this range, and then modify the corresponding


@@ -306,11 +337,13 @@ uint64 hash(int moveNr)
                                break;
                    }
                    if(squareNr >= 64) Zobrist = (Zobrist << 8) ^ (Zobrist >> 56);
                                break;
                    }
                    if(squareNr >= 64) Zobrist = (Zobrist << 8) ^ (Zobrist >> 56);

+                   // holdings have separate (additive) key, to encode presence of multiple pieces on same square
+                   if(f == BOARD_LEFT-2) holdingsKey += Zobrist * boards[moveNr][r][f+1]; else
+                   if(f == BOARD_RGHT+1) holdingsKey += Zobrist * boards[moveNr][r][f-1]; else

                 key ^= Zobrist;
             }
         }
     }
                 key ^= Zobrist;
             }
         }
     }

-    // Holdings not implemented yet!

 
     if(boards[moveNr][CASTLING][2] != NoRights) {
        if(boards[moveNr][CASTLING][0] != NoRights) key^=RandomCastle[0];
 
     if(boards[moveNr][CASTLING][2] != NoRights) {
        if(boards[moveNr][CASTLING][0] != NoRights) key^=RandomCastle[0];


@@ -341,12 +374,13 @@ uint64 hash(int moveNr)
     if(WhiteOnMove(moveNr)){
         key^=RandomTurn[0];
     }
     if(WhiteOnMove(moveNr)){
         key^=RandomTurn[0];
     }

-    return key;
+    return key + holdingsKey;

 }
 
 #define MOVE_BUF 100
 
 }
 
 #define MOVE_BUF 100
 

-int int_from_file(FILE *f, int l, uint64 *r)
+int
+int_from_file (FILE *f, int l, uint64 *r)

 {
     int i,c;
     for(i=0;i<l;i++){
 {
     int i,c;
     for(i=0;i<l;i++){


@@ -359,7 +393,8 @@ int int_from_file(FILE *f, int l, uint64 *r)
     return 0;
 }
 
     return 0;
 }
 

-int entry_from_file(FILE *f, entry_t *entry)
+int
+entry_from_file (FILE *f, entry_t *entry)

 {
     int ret;
     uint64 r;
 {
     int ret;
     uint64 r;


@@ -381,10 +416,11 @@ int entry_from_file(FILE *f, entry_t *entry)
     return 0;
 }
 
     return 0;
 }
 

-int find_key(FILE *f, uint64 key, entry_t *entry)
+int
+find_key (FILE *f, uint64 key, entry_t *entry)

 {
     int first, last, middle;
 {
     int first, last, middle;

-    entry_t first_entry=entry_none, last_entry,middle_entry;
+    entry_t last_entry,middle_entry;

     first=-1;
     if(fseek(f,-16,SEEK_END)){
         *entry=entry_none;
     first=-1;
     if(fseek(f,-16,SEEK_END)){
         *entry=entry_none;


@@ -406,12 +442,12 @@ int find_key(FILE *f, uint64 key, entry_t *entry)
             last_entry=middle_entry;
         }else{
             first=middle;
             last_entry=middle_entry;
         }else{
             first=middle;

-            first_entry=middle_entry;

         }
     }
 }
 
         }
     }
 }
 

-void move_to_string(char move_s[6], uint16 move)
+void
+move_to_string (char move_s[6], uint16 move)

 {
     int f,fr,ff,t,tr,tf,p;
     int width = BOARD_RGHT - BOARD_LEFT, size; // allow for alternative board formats
 {
     int f,fr,ff,t,tr,tf,p;
     int width = BOARD_RGHT - BOARD_LEFT, size; // allow for alternative board formats


@@ -459,9 +495,11 @@ void move_to_string(char move_s[6], uint16 move)
     }
 }
 
     }
 }
 

-int GetBookMoves(int moveNr, char *book, entry_t entries[])
+int
+GetBookMoves (int moveNr, char *book, entry_t entries[])

 {   // retrieve all entries for given position from book in 'entries', return number.
 {   // retrieve all entries for given position from book in 'entries', return number.

-    FILE *f;
+    static FILE *f = NULL;
+    static char curBook[MSG_SIZ];

     entry_t entry;
     int offset;
     uint64 key;
     entry_t entry;
     int offset;
     uint64 key;


@@ -470,9 +508,13 @@ int GetBookMoves(int moveNr, char *book, entry_t entries[])
 
     if(book == NULL || moveNr >= 2*appData.bookDepth) return -1; 
 //    if(gameInfo.variant != VariantNormal) return -1; // Zobrist scheme only works for normal Chess, so far
 
     if(book == NULL || moveNr >= 2*appData.bookDepth) return -1; 
 //    if(gameInfo.variant != VariantNormal) return -1; // Zobrist scheme only works for normal Chess, so far

-    f=fopen(book,"rb");
+    if(!f || strcmp(book, curBook)){ // keep book file open until book changed
+       strncpy(curBook, book, MSG_SIZ);
+       if(f) fclose(f);
+       f = fopen(book,"rb");
+    }

     if(!f){
     if(!f){

-       DisplayError("Polyglot book not valid", 0);
+        DisplayError(_("Polyglot book not valid"), 0);

        appData.usePolyglotBook = FALSE;
        return -1;
     }
        appData.usePolyglotBook = FALSE;
        return -1;
     }


@@ -482,7 +524,6 @@ int GetBookMoves(int moveNr, char *book, entry_t entries[])
 
     offset=find_key(f, key, &entry);
     if(entry.key != key) {
 
     offset=find_key(f, key, &entry);
     if(entry.key != key) {

-         fclose(f);

          return FALSE;
     }
     entries[0] = entry;
          return FALSE;
     }
     entries[0] = entry;


@@ -499,12 +540,12 @@ int GetBookMoves(int moveNr, char *book, entry_t entries[])
         if(count == MOVE_BUF) break;
         entries[count++] = entry;
     }
         if(count == MOVE_BUF) break;
         entries[count++] = entry;
     }

-    fclose(f);

     return count;
 }
 
     return count;
 }
 

-char *ProbeBook(int moveNr, char *book)
-{   // 
+char *
+ProbeBook (int moveNr, char *book)
+{

     entry_t entries[MOVE_BUF];
     int count;
     int i, j;
     entry_t entries[MOVE_BUF];
     int count;
     int i, j;


@@ -527,13 +568,14 @@ char *ProbeBook(int moveNr, char *book)
     for(i=0; i<count; i++){
         total_weight += entries[i].weight;
     }
     for(i=0; i<count; i++){
         total_weight += entries[i].weight;
     }

+    if(total_weight == 0) return NULL; // force book miss rather than playing moves with weight 0.

     j = (random() & 0xFFF) * total_weight >> 12; // create random < total_weight
     total_weight = 0;
     for(i=0; i<count; i++){
         total_weight += entries[i].weight;
        if(total_weight > j) break;
     }
     j = (random() & 0xFFF) * total_weight >> 12; // create random < total_weight
     total_weight = 0;
     for(i=0; i<count; i++){
         total_weight += entries[i].weight;
        if(total_weight > j) break;
     }

-    if(i >= count) DisplayFatalError("Book Fault", 0, 1); // safety catch, cannot happen
+    if(i >= count) DisplayFatalError(_("Book Fault"), 0, 1); // safety catch, cannot happen

     move_to_string(move_s, entries[i].move);
     if(appData.debugMode) fprintf(debugFP, "book move field = %d\n", entries[i].move);
 
     move_to_string(move_s, entries[i].move);
     if(appData.debugMode) fprintf(debugFP, "book move field = %d\n", entries[i].move);
 


@@ -543,7 +585,8 @@ char *ProbeBook(int moveNr, char *book)
 extern char yy_textstr[];
 entry_t lastEntries[MOVE_BUF];
 
 extern char yy_textstr[];
 entry_t lastEntries[MOVE_BUF];
 

-char *MovesToText(int count, entry_t *entries)
+char *
+MovesToText (int count, entry_t *entries)

 {
        int i, totalWeight = 0;
        char algMove[6];
 {
        int i, totalWeight = 0;
        char algMove[6];


@@ -563,7 +606,8 @@ char *MovesToText(int count, entry_t *entries)
        return p;
 }
 
        return p;
 }
 

-int TextToMoves(char *text, int moveNum, entry_t *entries)
+int
+TextToMoves (char *text, int moveNum, entry_t *entries)

 {
        int i, w, count=0;
       uint64 hashKey = hash(moveNum);
 {
        int i, w, count=0;
       uint64 hashKey = hash(moveNum);


@@ -573,13 +617,14 @@ int TextToMoves(char *text, int moveNum, entry_t *entries)
        float dummy;
        int width = BOARD_RGHT - BOARD_LEFT;
 
        float dummy;
        int width = BOARD_RGHT - BOARD_LEFT;
 

+       entries[0].key = hashKey; // make sure key is returned even if no moves

        while((i=sscanf(text, "%f%%%d", &dummy, &w))==2 || (i=sscanf(text, "%d", &w))==1) {
            if(i == 2) text = strchr(text, '%') + 1;  // skip percentage
            if(w == 1) text = strstr(text, "1 ") + 2; // skip weight that could be recognized as move number one
            valid = ParseOneMove(text, moveNum, &moveType, &fromX, &fromY, &toX, &toY, &promoChar);
            text = strstr(text, yy_textstr) + strlen(yy_textstr); // skip what we parsed
            if(!valid || moveType != NormalMove) continue;
        while((i=sscanf(text, "%f%%%d", &dummy, &w))==2 || (i=sscanf(text, "%d", &w))==1) {
            if(i == 2) text = strchr(text, '%') + 1;  // skip percentage
            if(w == 1) text = strstr(text, "1 ") + 2; // skip weight that could be recognized as move number one
            valid = ParseOneMove(text, moveNum, &moveType, &fromX, &fromY, &toX, &toY, &promoChar);
            text = strstr(text, yy_textstr) + strlen(yy_textstr); // skip what we parsed
            if(!valid || moveType != NormalMove) continue;

-           if(*text == ' ' && sscanf(text+1, "{%d/%d}", &entries[count].learnPoints, &entries[count].learnCount) == 2) {
+           if(*text == ' ' && sscanf(text+1, "{%hd/%hd}", &entries[count].learnPoints, &entries[count].learnCount) == 2) {

                text = strchr(text+1, '}') + 1;
            } else {
                entries[count].learnPoints = 0;
                text = strchr(text+1, '}') + 1;
            } else {
                entries[count].learnPoints = 0;


@@ -601,7 +646,8 @@ int TextToMoves(char *text, int moveNum, entry_t *entries)
 Boolean bookUp;
 int currentCount;
 
 Boolean bookUp;
 int currentCount;
 

-Boolean DisplayBook(int moveNr)
+Boolean
+DisplayBook (int moveNr)

 {
     entry_t entries[MOVE_BUF];
     int count;
 {
     entry_t entries[MOVE_BUF];
     int count;


@@ -615,19 +661,22 @@ Boolean DisplayBook(int moveNr)
     return TRUE;
 }
 
     return TRUE;
 }
 

-void EditBookEvent()
+void
+EditBookEvent ()

 {
       bookUp = TRUE;
        bookUp = DisplayBook(currentMove);
 }
 
 {
       bookUp = TRUE;
        bookUp = DisplayBook(currentMove);
 }
 

-void int_to_file(FILE *f, int l, uint64 r)
+void
+int_to_file (FILE *f, int l, uint64 r)

 {
     int i;
     for(i=l-1;i>=0;i--) fputc(r>>8*i & 255, f);
 }
 
 {
     int i;
     for(i=l-1;i>=0;i--) fputc(r>>8*i & 255, f);
 }
 

-void entry_to_file(FILE *f, entry_t *entry)
+void
+entry_to_file (FILE *f, entry_t *entry)

 {
     int_to_file(f,8,entry->key);
     int_to_file(f,2,entry->move);
 {
     int_to_file(f,8,entry->key);
     int_to_file(f,2,entry->move);


@@ -638,18 +687,19 @@ void entry_to_file(FILE *f, entry_t *entry)
 
 char buf1[4096], buf2[4096];
 
 
 char buf1[4096], buf2[4096];
 

-void SaveToBook(char *text)
+void
+SaveToBook (char *text)

 {
     entry_t entries[MOVE_BUF], entry;
     int count = TextToMoves(text, currentMove, entries);
     int offset, i, len1=0, len2, readpos=0, writepos=0;
     FILE *f;
 {
     entry_t entries[MOVE_BUF], entry;
     int count = TextToMoves(text, currentMove, entries);
     int offset, i, len1=0, len2, readpos=0, writepos=0;
     FILE *f;

-    if(!count) return;
+    if(!count && !currentCount) return;

     f=fopen(appData.polyglotBook, "rb+");
     f=fopen(appData.polyglotBook, "rb+");

-    if(!f){    DisplayError("Polyglot book not valid", 0); return; }
+    if(!f){    DisplayError(_("Polyglot book not valid"), 0); return; }

     offset=find_key(f, entries[0].key, &entry);
     offset=find_key(f, entries[0].key, &entry);

-    if(entries[0].key != entry.key) {
-         DisplayError("Hash keys are different", 0);
+    if(entries[0].key != entry.key && currentCount) {
+          DisplayError(_("Hash keys are different"), 0);

          fclose(f);
          return;
     }
          fclose(f);
          return;
     }


@@ -664,8 +714,10 @@ void SaveToBook(char *text)
     if(count != currentCount) {
        do {
            for(i=0; i<len1; i++) buf2[i] = buf1[i]; len2 = len1;
     if(count != currentCount) {
        do {
            for(i=0; i<len1; i++) buf2[i] = buf1[i]; len2 = len1;

-           fseek(f, readpos, SEEK_SET);
-           readpos += len1 = fread(buf1, 1, 4096, f);
+           if(readpos > writepos) {
+               fseek(f, readpos, SEEK_SET);
+               readpos += len1 = fread(buf1, 1, 4096, f);
+           } else len1 = 0; // wrote already past old EOF

            fseek(f, writepos, SEEK_SET);
            fwrite(buf2, 1, len2, f);
            writepos += len2;
            fseek(f, writepos, SEEK_SET);
            fwrite(buf2, 1, len2, f);
            writepos += len2;


@@ -673,3 +725,4 @@ void SaveToBook(char *text)
     }
     fclose(f);
 }
     }
     fclose(f);
 }

+