X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=book.c;h=e42b9c6e5099e0a3560bcd28b384e2d26dca88fc;hb=86473f8c47a82552a7766df71bdd7e99a4830181;hp=2c1a06a50f828ad02b5d9be83244bf00253af103;hpb=1e854f2b4c4aa7ed89e5bf7211487c795812899f;p=xboard.git

diff --git a/book.c b/book.c
index 2c1a06a..e42b9c6 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;
 }
 
@@ -445,35 +456,37 @@ void move_to_string(char move_s[6], uint16 move)
     // correct FRC-style castlings in variant normal. 
     // [HGM] This is buggy code! e1h1 could very well be a normal R or Q move.
     if(!strcmp(move_s,"e1h1")){
-        strcpy(move_s,"e1g1");
+      safeStrCpy(move_s,"e1g1", 6);
     }else  if(!strcmp(move_s,"e1a1")){
-        strcpy(move_s,"e1c1");
+      safeStrCpy(move_s,"e1c1", 6);
     }else  if(!strcmp(move_s,"e8h8")){
-        strcpy(move_s,"e8g8");
+      safeStrCpy(move_s,"e8g8", 6);
     }else  if(!strcmp(move_s,"e8a8")){
-        strcpy(move_s,"e8c8");
+      safeStrCpy(move_s,"e8c8", 6);
     }
 }
 
-char *ProbeBook(int moveNr, char *book)
-{
-    FILE *f;
+int GetBookMoves(int moveNr, char *book, entry_t entries[])
+{   // retrieve all entries for given position from book in 'entries', return number.
+    static FILE *f = NULL;
+    static char curBook[MSG_SIZ];
     entry_t entry;
     int offset;
     uint64 key;
-    entry_t entries[MOVE_BUF];
-    int count=0;
-    int ret, i, j;
-    static char move_s[6];
-    int total_weight;
+    int count;
+    int ret;
 
-    if(book == NULL || moveNr >= 2*appData.bookDepth) return NULL; 
-//    if(gameInfo.variant != VariantNormal) return NULL; // Zobrist scheme only works for normal Chess, so far
-    f=fopen(book,"rb");
+    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(!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);
+	DisplayError("Polyglot book not valid", 0);
 	appData.usePolyglotBook = FALSE;
-        return NULL;
+	return -1;
     }
 
     key = hash(moveNr);
@@ -481,8 +494,7 @@ char *ProbeBook(int moveNr, char *book)
 
     offset=find_key(f, key, &entry);
     if(entry.key != key) {
-	  fclose(f);
-	  return NULL;
+	  return FALSE;
     }
     entries[0] = entry;
     count=1;
@@ -498,8 +510,21 @@ char *ProbeBook(int moveNr, char *book)
         if(count == MOVE_BUF) break;
         entries[count++] = entry;
     }
+    return count;
+}
+
+char *ProbeBook(int moveNr, char *book)
+{   // 
+    entry_t entries[MOVE_BUF];
+    int count;
+    int i, j;
+    static char move_s[6];
+    int total_weight;
+
+    if((count = GetBookMoves(moveNr, book, entries)) <= 0) return NULL; // no book, or no hit
+
     if(appData.bookStrength != 50) { // transform weights
-        double power, maxWeight = 0.0;
+        double power = 0, maxWeight = 0.0;
         if(appData.bookStrength) power = (100.-appData.bookStrength)/appData.bookStrength;
         for(i=0; i<count; i++) if(entries[i].weight > maxWeight) maxWeight = entries[i].weight;
         for(i=0; i<count; i++){
@@ -512,6 +537,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++){
@@ -522,6 +548,141 @@ char *ProbeBook(int moveNr, char *book)
     move_to_string(move_s, entries[i].move);
     if(appData.debugMode) fprintf(debugFP, "book move field = %d\n", entries[i].move);
 
-    fclose(f);
     return move_s;
 }
+
+extern char yy_textstr[];
+entry_t lastEntries[MOVE_BUF];
+
+char *MovesToText(int count, entry_t *entries)
+{
+	int i, totalWeight = 0;
+	char algMove[6];
+	char *p = (char*) malloc(30*count+1);
+	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);
+	    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;
+}
+
+int TextToMoves(char *text, int moveNum, entry_t *entries)
+{
+	int i, w, count=0;
+      uint64 hashKey = hash(moveNum);
+	int  fromX, fromY, toX, toY, to, from;
+	ChessMove  moveType;
+	char promoChar, valid;
+	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;
+	    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;
+	    count++;
+	}
+	return count;
+}
+
+Boolean bookUp;
+int currentCount;
+
+Boolean DisplayBook(int moveNr)
+{
+    entry_t entries[MOVE_BUF];
+    int count;
+    char *p;
+    if(!bookUp) return FALSE;
+    count = currentCount = GetBookMoves(moveNr, appData.polyglotBook, entries);
+    if(count < 0) return FALSE;
+    p = MovesToText(count, entries);
+    EditTagsPopUp(p, NULL);
+    free(p);
+    return TRUE;
+}
+
+void EditBookEvent()
+{
+      bookUp = TRUE;
+	bookUp = DisplayBook(currentMove);
+}
+
+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);
+}
+
+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,2,entry->learnCount);
+    int_to_file(f,2,entry->learnPoints);
+}
+
+char buf1[4096], buf2[4096];
+
+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;
+    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 && currentCount) {
+	  DisplayError("Hash keys are different", 0);
+	  fclose(f);
+	  return;
+    }
+    if(count != currentCount) {
+	readpos = 16*(offset + currentCount);
+	writepos = 16*(offset + count);
+	fseek(f, readpos, SEEK_SET);
+	readpos += len1 = fread(buf1, 1, 4096 - 16*currentCount, f); // salvage some entries immediately behind change
+    }
+    fseek(f, 16*(offset), SEEK_SET);
+    for(i=0; i<count; i++) entry_to_file(f, entries + i); // save the change
+    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);
+	    fseek(f, writepos, SEEK_SET);
+	    fwrite(buf2, 1, len2, f);
+	    writepos += len2;
+	} while(len1);
+    }
+    fclose(f);
+}
+