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

diff --git a/book.c b/book.c
index aecb30d..a5aa6ab 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,38 @@ 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;
+    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];
+	    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 +328,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 +365,7 @@ uint64 hash(int moveNr)
     if(WhiteOnMove(moveNr)){
         key^=RandomTurn[0];
     }
-    return key;
+    return key + holdingsKey;
 }
 
 #define MOVE_BUF 100
@@ -371,9 +396,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->learn=r;
+    entry->learnCount=r;
+    ret=int_from_file(f,2,&r);
+    if(ret) return 1;
+    entry->learnPoints=r;
     return 0;
 }
 
@@ -457,7 +485,8 @@ void move_to_string(char move_s[6], uint16 move)
 
 int GetBookMoves(int moveNr, char *book, entry_t entries[])
 {   // 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;
@@ -466,7 +495,11 @@ 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
-    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){
 	DisplayError("Polyglot book not valid", 0);
 	appData.usePolyglotBook = FALSE;
@@ -478,7 +511,6 @@ int GetBookMoves(int moveNr, char *book, entry_t entries[])
 
     offset=find_key(f, key, &entry);
     if(entry.key != key) {
-	  fclose(f);
 	  return FALSE;
     }
     entries[0] = entry;
@@ -495,7 +527,6 @@ int GetBookMoves(int moveNr, char *book, entry_t entries[])
         if(count == MOVE_BUF) break;
         entries[count++] = entry;
     }
-    fclose(f);
     return count;
 }
 
@@ -523,6 +554,7 @@ char *ProbeBook(int moveNr, char *book)
     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++){
@@ -547,8 +579,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;
@@ -564,19 +601,27 @@ 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, "{%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 +661,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];
@@ -627,11 +673,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;
@@ -647,8 +693,10 @@ void SaveToBook(char *text)
     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;
@@ -656,3 +704,4 @@ void SaveToBook(char *text)
     }
     fclose(f);
 }
+