X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=book.c;h=893dee88ac84f2214549756623e47357af1478c4;hb=55bcdf9838f790e70d828225a2c008ea7eb2a662;hp=9b0293689c4dcd1c03b701537bf7e4b75c543aaa;hpb=9a4dfcc5cc870b1f5dd88fa91ad0644d842e84b4;p=xboard.git diff --git a/book.c b/book.c index 9b02936..893dee8 100644 --- a/book.c +++ b/book.c @@ -36,6 +36,16 @@ #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; @@ -43,7 +53,6 @@ typedef unsigned long long int uint64; #endif - #ifdef _MSC_VER # define U64(u) (u##ui64) #else @@ -276,17 +285,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= (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 +336,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 +373,7 @@ uint64 hash(int moveNr) if(WhiteOnMove(moveNr)){ key^=RandomTurn[0]; } - return key; + return key + holdingsKey; } #define MOVE_BUF 100 @@ -461,7 +493,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; @@ -470,9 +503,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 - 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); + DisplayError(_("Polyglot book not valid"), 0); appData.usePolyglotBook = FALSE; return -1; } @@ -482,7 +519,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; @@ -499,7 +535,6 @@ int GetBookMoves(int moveNr, char *book, entry_t entries[]) if(count == MOVE_BUF) break; entries[count++] = entry; } - fclose(f); return count; } @@ -527,13 +562,14 @@ char *ProbeBook(int moveNr, char *book) for(i=0; i> 12; // create random < total_weight total_weight = 0; for(i=0; i 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); @@ -573,13 +609,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; @@ -587,8 +624,10 @@ int TextToMoves(char *text, int moveNum, entry_t *entries) } 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; count++; @@ -642,12 +681,12 @@ 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; } + if(!f){ DisplayError(_("Polyglot book not valid"), 0); return; } 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; } @@ -662,8 +701,10 @@ void SaveToBook(char *text) if(count != currentCount) { do { for(i=0; i 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; @@ -671,3 +712,4 @@ void SaveToBook(char *text) } fclose(f); } +