X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=book.c;h=4bc252194677c4d630fdc3808b608abed8de01b9;hb=56310c5b198bc521e0a715377c68378b7bcf10a5;hp=aecb30df8c9dfa85c1b938cfe76a4543a048bbb6;hpb=6445f59125a3dff0cbb9426a0c0bd300a31075d1;p=xboard.git

diff --git a/book.c b/book.c
index aecb30d..4bc2521 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;
@@ -58,7 +59,8 @@ typedef struct {
     uint64 key;	
     uint16 move;
     uint16 weight;
-    uint32 learn;
+    uint16 learnPoints;
+    uint16 learnCount;
 } entry_t;
 
 entry_t entry_none = {
@@ -275,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
@@ -305,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];
@@ -340,7 +348,7 @@ uint64 hash(int moveNr)
     if(WhiteOnMove(moveNr)){
         key^=RandomTurn[0];
     }
-    return key;
+    return key + holdingsKey;
 }
 
 #define MOVE_BUF 100
@@ -371,9 +379,12 @@ int entry_from_file(FILE *f, entry_t *entry)
     ret=int_from_file(f,2,&r);
     if(ret) return 1;
     entry->weight=r;
-    ret=int_from_file(f,4,&r);
+    ret=int_from_file(f,2,&r);
+    if(ret) return 1;
+    entry->learnCount=r;
+    ret=int_from_file(f,2,&r);
     if(ret) return 1;
-    entry->learn=r;
+    entry->learnPoints=r;
     return 0;
 }
 
@@ -547,8 +558,13 @@ char *MovesToText(int count, entry_t *entries)
 	for(i=0; i<count; i++) totalWeight += entries[i].weight;
 	*p = 0;
 	for(i=0; i<count; i++) {
+	    char buf[MSG_SIZ];
 	    move_to_string(algMove, entries[i].move);
-	    snprintf(p+strlen(p), 30, "%5.1f%% %5d %s\n", 100*entries[i].weight/(totalWeight+0.001), entries[i].weight, algMove);
+	    buf[0] = NULLCHAR;
+	    if(entries[i].learnCount || entries[i].learnPoints)
+		snprintf(buf, MSG_SIZ, " {%d/%d}", entries[i].learnPoints, entries[i].learnCount);
+	    snprintf(p+strlen(p), 30, "%5.1f%% %5d %s%s\n", 100*entries[i].weight/(totalWeight+0.001),
+					entries[i].weight, algMove, buf);
 //lastEntries[i] = entries[i];
 	}
 	return p;
@@ -570,13 +586,20 @@ int TextToMoves(char *text, int moveNum, entry_t *entries)
 	    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, "{%hd/%hd}", &entries[count].learnPoints, &entries[count].learnCount) == 2) {
+		text = strchr(text+1, '}') + 1;
+	    } else {
+		entries[count].learnPoints = 0;
+		entries[count].learnCount  = 0;
+	    }
 	    to = toX + toY * width;
 	    from = fromX + fromY * width;
-	    // TODO: promotions, drops
-	    entries[count].move = to + from * width * BOARD_HEIGHT;
+	    for(i=0; promote_pieces[i]; i++) if(promote_pieces[i] == promoChar) break;
+	    if(!promote_pieces[i]) i = 0;
+	    if(fromY == DROP_RANK) i = 8, from = ToUpper(PieceToChar(fromX)) - '@';
+	    entries[count].move = to + (i * width * BOARD_HEIGHT + from) * width * BOARD_HEIGHT;
 	    entries[count].key  = hashKey;
 	    entries[count].weight = w;
-	    entries[count].learn  = 0; //TODO: learn value?
 	    count++;
 	}
 	return count;
@@ -616,7 +639,8 @@ 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,2,entry->weight);
-    int_to_file(f,4,entry->learn);
+    int_to_file(f,2,entry->learnCount);
+    int_to_file(f,2,entry->learnPoints);
 }
 
 char buf1[4096], buf2[4096];