X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=book.c;h=bd3a49ff14521f327b200f04a672c68a5d1e4d0f;hb=d0da14dee09f66a509dac5467e9f1af2cfc8f969;hp=314019f3018100905cb3d21cf71e05693b1f1350;hpb=fcd47eab73ab2998ab3709f8f3cd444058cb20c9;p=xboard.git diff --git a/book.c b/book.c index 314019f..bd3a49f 100644 --- a/book.c +++ b/book.c @@ -11,24 +11,28 @@ * The following terms apply to the enhanced version of XBoard distributed * by the Free Software Foundation: * ------------------------------------------------------------------------ - * This program is free software; you can redistribute it and/or modify + * + * GNU XBoard is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * the Free Software Foundation, either version 3 of the License, or (at + * your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * GNU XBoard is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see http://www.gnu.org/licenses/. * + * * ------------------------------------------------------------------------ */ #include #include +#include +#include +#include #include "common.h" #include "backend.h" @@ -62,8 +66,6 @@ entry_t entry_none = { }; char *promote_pieces=" nbrqac="; -extern char castlingRights[][BOARD_SIZE]; -extern char epStatus[]; uint64 Random64[781] = { U64(0x9D39247E33776D41), U64(0x2AF7398005AAA5C7), U64(0x44DB015024623547), U64(0x9C15F73E62A76AE2), @@ -272,8 +274,7 @@ uint64 *RandomTurn =Random64+780; uint64 hash(int moveNr) { - char c; - int p, r, f, i, p_enc, squareNr, pieceGroup; + int r, f, p_enc, squareNr, pieceGroup; uint64 key=0, Zobrist; for(f=BOARD_LEFT; f= 0) { - if(castlingRights[moveNr][0] >= 0) key^=RandomCastle[0]; - if(castlingRights[moveNr][1] >= 0) key^=RandomCastle[1]; + if(boards[moveNr][CASTLING][2] != NoRights) { + if(boards[moveNr][CASTLING][0] != NoRights) key^=RandomCastle[0]; + if(boards[moveNr][CASTLING][1] != NoRights) key^=RandomCastle[1]; } - if(castlingRights[moveNr][5] >= 0) { - if(castlingRights[moveNr][3] >= 0) key^=RandomCastle[2]; - if(castlingRights[moveNr][4] >= 0) key^=RandomCastle[3]; + if(boards[moveNr][CASTLING][5] != NoRights) { + if(boards[moveNr][CASTLING][3] != NoRights) key^=RandomCastle[2]; + if(boards[moveNr][CASTLING][4] != NoRights) key^=RandomCastle[3]; } - f = epStatus[moveNr]; + f = boards[moveNr][EP_STATUS]; if(f >= 0 && f < 8){ if(!WhiteOnMove(moveNr)){ // the test for neighboring Pawns might not be needed, @@ -444,13 +445,13 @@ 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); } } @@ -466,7 +467,7 @@ char *ProbeBook(int moveNr, char *book) static char move_s[6]; int total_weight; - if(book == NULL) return NULL; + 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(!f){ @@ -479,7 +480,10 @@ char *ProbeBook(int moveNr, char *book) if(appData.debugMode) fprintf(debugFP, "book key = %08x%08x\n", (unsigned int)(key>>32), (unsigned int)key); offset=find_key(f, key, &entry); - if(entry.key != key) return NULL; + if(entry.key != key) { + fclose(f); + return NULL; + } entries[0] = entry; count=1; fseek(f, 16*(offset+1), SEEK_SET); @@ -494,12 +498,21 @@ char *ProbeBook(int moveNr, char *book) if(count == MOVE_BUF) break; entries[count++] = entry; } + if(appData.bookStrength != 50) { // transform weights + double power = 0, maxWeight = 0.0; + if(appData.bookStrength) power = (100.-appData.bookStrength)/appData.bookStrength; + for(i=0; i maxWeight) maxWeight = entries[i].weight; + for(i=0; i 0) + entries[i].weight = appData.bookStrength || weight == 1.0 ? 1e4*exp(power * log(weight)) + 0.5 : 0.0; + } + } total_weight = 0; for(i=0; i> 15; // create random < total_weight + j = (random() & 0xFFF) * total_weight >> 12; // create random < total_weight total_weight = 0; for(i=0; i