X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=book.c;h=3650b0192fa5491b9fed5db4f69001feecea381b;hb=6432014c48da91b241816d8d97c1ec76bee305c8;hp=e5a6030bb67b533e2ef3247b075dc42e0456d5f6;hpb=9b980cf4a3a0e555c16f50b7b198773a3fd2d8f2;p=xboard.git

diff --git a/book.c b/book.c
index e5a6030..3650b01 100644
--- a/book.c
+++ b/book.c
@@ -36,6 +36,7 @@
 
 #include "common.h"
 #include "backend.h"
+#include "moves.h"
 
 #ifdef _MSC_VER
   typedef unsigned __int64 uint64;
@@ -276,17 +277,21 @@ uint64 *RandomTurn      =Random64+780;
 uint64 hash(int moveNr)
 {
     int r, f, p_enc, squareNr, pieceGroup;
-    uint64 key=0, Zobrist;
+    uint64 key=0, holdingsKey=0, Zobrist;
 
-    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];
+	    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);
+		    // 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
@@ -306,11 +311,13 @@ uint64 hash(int moveNr)
 				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;
             }
         }
     }
-    // Holdings not implemented yet!
 
     if(boards[moveNr][CASTLING][2] != NoRights) {
 	if(boards[moveNr][CASTLING][0] != NoRights) key^=RandomCastle[0];
@@ -341,7 +348,7 @@ uint64 hash(int moveNr)
     if(WhiteOnMove(moveNr)){
         key^=RandomTurn[0];
     }
-    return key;
+    return key + holdingsKey;
 }
 
 #define MOVE_BUF 100
@@ -573,13 +580,14 @@ int TextToMoves(char *text, int moveNum, entry_t *entries)
 	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;
-	    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;
@@ -644,11 +652,11 @@ void SaveToBook(char *text)
     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+");
     if(!f){	DisplayError("Polyglot book not valid", 0); return; }
     offset=find_key(f, entries[0].key, &entry);
-    if(entries[0].key != entry.key) {
+    if(entries[0].key != entry.key && currentCount) {
 	  DisplayError("Hash keys are different", 0);
 	  fclose(f);
 	  return;
@@ -673,3 +681,4 @@ void SaveToBook(char *text)
     }
     fclose(f);
 }
+