X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=book.c;h=c40cd925895c6bf42541188e68da96a62aec5c10;hb=7e0222e64da6706bf0dc2468f459b98e4346206b;hp=aecb30df8c9dfa85c1b938cfe76a4543a048bbb6;hpb=6445f59125a3dff0cbb9426a0c0bd300a31075d1;p=xboard.git diff --git a/book.c b/book.c index aecb30d..c40cd92 100644 --- a/book.c +++ b/book.c @@ -35,7 +35,18 @@ #include #include "common.h" +#include "frontend.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 +54,6 @@ typedef unsigned long long int uint64; #endif - #ifdef _MSC_VER # define U64(u) (u##ui64) #else @@ -58,7 +68,8 @@ typedef struct { uint64 key; uint16 move; uint16 weight; - uint32 learn; + uint16 learnPoints; + uint16 learnCount; } entry_t; entry_t entry_none = { @@ -272,20 +283,42 @@ uint64 *RandomEnPassant =Random64+772; uint64 *RandomTurn =Random64+780; -uint64 hash(int moveNr) +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 @@ -305,11 +338,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,12 +375,13 @@ uint64 hash(int moveNr) if(WhiteOnMove(moveNr)){ key^=RandomTurn[0]; } - return key; + return key + holdingsKey; } #define MOVE_BUF 100 -int int_from_file(FILE *f, int l, uint64 *r) +int +int_from_file (FILE *f, int l, uint64 *r) { int i,c; for(i=0;iweight=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; } -int find_key(FILE *f, uint64 key, entry_t *entry) +int +find_key (FILE *f, uint64 key, entry_t *entry) { int first, last, middle; - entry_t first_entry=entry_none, last_entry,middle_entry; + entry_t last_entry,middle_entry; first=-1; if(fseek(f,-16,SEEK_END)){ *entry=entry_none; @@ -402,12 +443,12 @@ int find_key(FILE *f, uint64 key, entry_t *entry) last_entry=middle_entry; }else{ first=middle; - first_entry=middle_entry; } } } -void move_to_string(char move_s[6], uint16 move) +void +move_to_string (char move_s[6], uint16 move) { int f,fr,ff,t,tr,tf,p; int width = BOARD_RGHT - BOARD_LEFT, size; // allow for alternative board formats @@ -455,9 +496,11 @@ void move_to_string(char move_s[6], uint16 move) } } -int GetBookMoves(int moveNr, char *book, entry_t entries[]) +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,9 +509,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; } @@ -478,7 +525,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,12 +541,12 @@ int GetBookMoves(int moveNr, char *book, entry_t entries[]) if(count == MOVE_BUF) break; entries[count++] = entry; } - fclose(f); return count; } -char *ProbeBook(int moveNr, char *book) -{ // +char * +ProbeBook (int moveNr, char *book) +{ entry_t entries[MOVE_BUF]; int count; int i, j; @@ -523,13 +569,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); @@ -539,7 +586,8 @@ char *ProbeBook(int moveNr, char *book) extern char yy_textstr[]; entry_t lastEntries[MOVE_BUF]; -char *MovesToText(int count, entry_t *entries) +char * +MovesToText (int count, entry_t *entries) { int i, totalWeight = 0; char algMove[6]; @@ -547,14 +595,20 @@ char *MovesToText(int count, entry_t *entries) for(i=0; i=0;i--) fputc(r>>8*i & 255, f); } -void entry_to_file(FILE *f, entry_t *entry) +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]; -void SaveToBook(char *text) +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) 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; } @@ -647,8 +715,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; @@ -656,3 +726,4 @@ void SaveToBook(char *text) } fclose(f); } +