X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbook.cpp;h=b8bce9e1d07ba3e6630ee9e8746f5294187bc46a;hb=f7c013edd08a0e2d26491eb087c145e103e0f708;hp=85a88fcb801e3499376d3038a8087bebbc2bdc4f;hpb=d9b96f0e492583bfb461e7e3c9510ddeae1e3fce;p=stockfish
diff --git a/src/book.cpp b/src/book.cpp
index 85a88fcb..b8bce9e1 100644
--- a/src/book.cpp
+++ b/src/book.cpp
@@ -1,7 +1,7 @@
/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -17,37 +17,44 @@
along with this program. If not, see .
*/
-
/*
The code in this file is based on the opening book code in PolyGlot
- by Fabien Letouzey. PolyGlot is available under the GNU General
+ by Fabien Letouzey. PolyGlot is available under the GNU General
Public License, and can be downloaded from http://wbec-ridderkerk.nl
*/
-
-////
-//// Includes
-////
-
+#include
#include
#include
#include "book.h"
+#include "misc.h"
#include "movegen.h"
using namespace std;
-////
-//// Local definitions
-////
-
namespace {
- // Book entry size in bytes
- const int EntrySize = 16;
+ // A Polyglot book is a series of "entries" of 16 bytes. All integers are
+ // stored in big-endian format, with highest byte first (regardless of size).
+ // The entries are ordered according to the key in ascending order.
+ struct Entry {
+ uint64_t key;
+ uint16_t move;
+ uint16_t count;
+ uint32_t learn;
+ };
// Random numbers from PolyGlot, used to compute book hash keys
- const uint64_t Random64[781] = {
+ const union {
+ Key PolyGlotRandoms[781];
+ struct {
+ Key psq[12][64]; // [piece][square]
+ Key castle[4]; // [castle right]
+ Key enpassant[8]; // [file]
+ Key turn;
+ } Zobrist;
+ } PG = {{
0x9D39247E33776D41ULL, 0x2AF7398005AAA5C7ULL, 0x44DB015024623547ULL,
0x9C15F73E62A76AE2ULL, 0x75834465489C0C89ULL, 0x3290AC3A203001BFULL,
0x0FBBAD1F61042279ULL, 0xE83A908FF2FB60CAULL, 0x0D7E765D58755C10ULL,
@@ -309,296 +316,163 @@ namespace {
0x003A93D8B2806962ULL, 0x1C99DED33CB890A1ULL, 0xCF3145DE0ADD4289ULL,
0xD0E4427A5514FB72ULL, 0x77C621CC9FB3A483ULL, 0x67A34DAC4356550BULL,
0xF8D626AAAF278509ULL
- };
-
- // Indices to the Random64[] array
- const int PieceIdx = 0;
- const int CastleIdx = 768;
- const int EnPassantIdx = 772;
- const int TurnIdx = 780;
-
- // Local functions
- uint64_t book_key(const Position& pos);
- uint64_t book_piece_key(Piece p, Square s);
- uint64_t book_castle_key(const Position& pos);
- uint64_t book_ep_key(const Position& pos);
- uint64_t book_color_key(const Position& pos);
-}
+ }};
+ // polyglot_key() returns the PolyGlot hash key of the given position
+ Key polyglot_key(const Position& pos) {
-////
-//// Functions
-////
+ Key key = 0;
+ Bitboard b = pos.pieces();
-// C'tor. Make random number generation less deterministic, for book moves
-Book::Book() {
+ while (b)
+ {
+ Square s = pop_lsb(&b);
+ Piece p = pos.piece_on(s);
- for (int i = abs(get_system_time() % 10000); i > 0; i--)
- RKiss.rand();
-}
+ // PolyGlot pieces are: BP = 0, WP = 1, BN = 2, ... BK = 10, WK = 11
+ key ^= PG.Zobrist.psq[2 * (type_of(p) - 1) + (color_of(p) == WHITE)][s];
+ }
+ b = pos.can_castle(ALL_CASTLES);
-/// Destructor. Be sure file is closed before we leave.
+ while (b)
+ key ^= PG.Zobrist.castle[pop_lsb(&b)];
-Book::~Book() {
+ if (pos.ep_square() != SQ_NONE)
+ key ^= PG.Zobrist.enpassant[file_of(pos.ep_square())];
- close();
-}
+ if (pos.side_to_move() == WHITE)
+ key ^= PG.Zobrist.turn;
+ return key;
+ }
-/// Book::close() closes the file only if it is open, otherwise
-/// we can end up in a little mess due to how std::ifstream works.
+} // namespace
-void Book::close() {
+PolyglotBook::PolyglotBook() : rkiss(Time::now() % 10000) {}
- if (is_open())
- ifstream::close();
-}
+PolyglotBook::~PolyglotBook() { if (is_open()) close(); }
-/// Book::open() opens a book file with a given file name
+/// operator>>() reads sizeof(T) chars from the file's binary byte stream and
+/// converts them in a number of type T. A Polyglot book stores numbers in
+/// big-endian format.
-void Book::open(const string& fName) {
+template PolyglotBook& PolyglotBook::operator>>(T& n) {
- // Close old file before opening the new
- close();
+ n = 0;
+ for (size_t i = 0; i < sizeof(T); i++)
+ n = T((n << 8) + ifstream::get());
- fileName = fName;
- ifstream::open(fileName.c_str(), ifstream::in | ifstream::binary);
+ return *this;
+}
- // Silently return when asked to open a non-exsistent file
- if (!is_open())
- return;
+template<> PolyglotBook& PolyglotBook::operator>>(Entry& e) {
+ return *this >> e.key >> e.move >> e.count >> e.learn;
+}
- // Get the book size in number of entries
- seekg(0, ios::end);
- bookSize = long(tellg()) / EntrySize;
- seekg(0, ios::beg);
- if (!good())
- {
- cerr << "Failed to open book file " << fileName << endl;
- exit(EXIT_FAILURE);
- }
-}
+/// open() tries to open a book file with the given name after closing any
+/// exsisting one.
+bool PolyglotBook::open(const char* fName) {
-/// Book::file_name() returns the file name of the currently active book,
-/// or the empty string if no book is open.
+ if (is_open()) // Cannot close an already closed file
+ close();
-const string Book::file_name() { // Not const to compile on HP-UX 11.X
+ ifstream::open(fName, ifstream::in | ifstream::binary);
- return is_open() ? fileName : "";
+ fileName = is_open() ? fName : "";
+ ifstream::clear(); // Reset any error flag to allow retry ifstream::open()
+ return !fileName.empty();
}
-/// Book::get_move() gets a book move for a given position. Returns
-/// MOVE_NONE if no book move is found.
+/// probe() tries to find a book move for the given position. If no move is
+/// found returns MOVE_NONE. If pickBest is true returns always the highest
+/// rated move, otherwise randomly chooses one, based on the move score.
-Move Book::get_move(const Position& pos, bool findBestMove) {
+Move PolyglotBook::probe(const Position& pos, const string& fName, bool pickBest) {
- if (!is_open() || bookSize == 0)
+ if (fileName != fName && !open(fName.c_str()))
return MOVE_NONE;
- BookEntry entry;
- int bookMove = MOVE_NONE;
- unsigned scoresSum = 0, bestScore = 0;
- uint64_t key = book_key(pos);
+ Entry e;
+ uint16_t best = 0;
+ unsigned sum = 0;
+ Move move = MOVE_NONE;
+ Key key = polyglot_key(pos);
+
+ seekg(find_first(key) * sizeof(Entry), ios_base::beg);
- // Choose a book move among the possible moves for the given position
- for (int idx = find_key(key); idx < bookSize; idx++)
+ while (*this >> e, e.key == key && good())
{
- read_entry(entry, idx);
- if (entry.key != key)
- break;
-
- unsigned score = entry.count;
-
- // If findBestMove is true choose highest rated book move
- if (findBestMove)
- {
- if (score > bestScore)
- {
- bestScore = score;
- bookMove = entry.move;
- }
- continue;
- }
+ best = max(best, e.count);
+ sum += e.count;
// Choose book move according to its score. If a move has a very
- // high score it has more probability to be choosen then a one with
- // lower score. Note that first entry is always chosen.
- scoresSum += score;
- if (RKiss.rand() % scoresSum < score)
- bookMove = entry.move;
+ // high score it has higher probability to be choosen than a move
+ // with lower score. Note that first entry is always chosen.
+ if ( (sum && rkiss.rand() % sum < e.count)
+ || (pickBest && e.count == best))
+ move = Move(e.move);
}
- if (!bookMove)
+
+ if (!move)
return MOVE_NONE;
// A PolyGlot book move is encoded as follows:
//
// bit 0- 5: destination square (from 0 to 63)
// bit 6-11: origin square (from 0 to 63)
- // bit 12-13-14: promotion piece (from KNIGHT == 1 to QUEEN == 4)
+ // bit 12-14: promotion piece (from KNIGHT == 1 to QUEEN == 4)
//
- // Castling moves follow "king captures rook" representation. So in case
- // book move is a promotion we have to convert to our representation, in
- // all other cases we can directly compare with a Move after having
- // masked out special Move's flags that are not supported by PolyGlot.
- int p = (bookMove >> 12) & 7;
-
- if (p)
- bookMove = int(make_promotion_move(move_from(Move(bookMove)),
- move_to(Move(bookMove)), PieceType(p + 1)));
-
- // Verify the book move is legal
- MoveStack mlist[MOVES_MAX];
- MoveStack* last = generate(pos, mlist);
- for (MoveStack* cur = mlist; cur != last; cur++)
- if ((int(cur->move) & ~(3 << 14)) == bookMove) // Mask out special flags
- return cur->move;
+ // Castling moves follow "king captures rook" representation. So in case book
+ // move is a promotion we have to convert to our representation, in all the
+ // other cases we can directly compare with a Move after having masked out
+ // the special Move's flags (bit 14-15) that are not supported by PolyGlot.
+ int pt = (move >> 12) & 7;
+ if (pt)
+ move = make(from_sq(move), to_sq(move), PieceType(pt + 1));
+
+ // Add 'special move' flags and verify it is legal
+ for (MoveList ml(pos); !ml.end(); ++ml)
+ if (move == (ml.move() ^ type_of(ml.move())))
+ return ml.move();
return MOVE_NONE;
}
-/// Book::find_key() takes a book key as input, and does a binary search
-/// through the book file for the given key. The index to the first book
-/// entry with the same key as the input is returned. When the key is not
-/// found in the book file, bookSize is returned.
+/// find_first() takes a book key as input, and does a binary search through
+/// the book file for the given key. Returns the index of the leftmost book
+/// entry with the same key as the input.
-int Book::find_key(uint64_t key) {
+size_t PolyglotBook::find_first(Key key) {
- int left, right, mid;
- BookEntry entry;
+ seekg(0, ios::end); // Move pointer to end, so tellg() gets file's size
- // Binary search (finds the leftmost entry)
- left = 0;
- right = bookSize - 1;
+ size_t low = 0, mid, high = (size_t)tellg() / sizeof(Entry) - 1;
+ Entry e;
- assert(left <= right);
+ assert(low <= high);
- while (left < right)
+ while (low < high && good())
{
- mid = (left + right) / 2;
+ mid = (low + high) / 2;
- assert(mid >= left && mid < right);
+ assert(mid >= low && mid < high);
- read_entry(entry, mid);
+ seekg(mid * sizeof(Entry), ios_base::beg);
+ *this >> e;
- if (key <= entry.key)
- right = mid;
+ if (key <= e.key)
+ high = mid;
else
- left = mid + 1;
- }
-
- assert(left == right);
-
- read_entry(entry, left);
- return entry.key == key ? left : bookSize;
-}
-
-
-/// Book::read_entry() takes a BookEntry reference and an integer index as
-/// input, and looks up the opening book entry at the given index in the book
-/// file. The book entry is copied to the first input parameter.
-
-void Book::read_entry(BookEntry& entry, int idx) {
-
- assert(idx >= 0 && idx < bookSize);
- assert(is_open());
-
- seekg(idx * EntrySize, ios_base::beg);
-
- *this >> entry;
-
- if (!good())
- {
- cerr << "Failed to read book entry at index " << idx << endl;
- exit(EXIT_FAILURE);
- }
-}
-
-
-/// Book::read_integer() reads size chars from the file stream
-/// and converts them in an integer number.
-
-uint64_t Book::read_integer(int size) {
-
- char buf[8];
- uint64_t n = 0;
-
- read(buf, size);
-
- // Numbers are stored on disk as a binary byte stream
- for (int i = 0; i < size; i++)
- n = (n << 8) + (unsigned char)buf[i];
-
- return n;
-}
-
-
-////
-//// Local definitions
-////
-
-namespace {
-
- uint64_t book_key(const Position& pos) {
-
- uint64_t result = 0;
- Bitboard b = pos.occupied_squares();
-
- while (b)
- {
- Square s = pop_1st_bit(&b);
- result ^= book_piece_key(pos.piece_on(s), s);
- }
-
- result ^= book_castle_key(pos);
- result ^= book_ep_key(pos);
- result ^= book_color_key(pos);
- return result;
- }
-
-
- uint64_t book_piece_key(Piece p, Square s) {
-
- // Convert pieces to the range 0..11
- static const int PieceTo12[] = { 0, 0, 2, 4, 6, 8, 10, 0, 0, 1, 3, 5, 7, 9, 11 };
-
- return Random64[PieceIdx + (PieceTo12[int(p)]^1) * 64 + int(s)];
+ low = mid + 1;
}
+ assert(low == high);
- uint64_t book_castle_key(const Position& pos) {
-
- uint64_t result = 0;
-
- if (pos.can_castle_kingside(WHITE))
- result ^= Random64[CastleIdx + 0];
-
- if (pos.can_castle_queenside(WHITE))
- result ^= Random64[CastleIdx + 1];
-
- if (pos.can_castle_kingside(BLACK))
- result ^= Random64[CastleIdx + 2];
-
- if (pos.can_castle_queenside(BLACK))
- result ^= Random64[CastleIdx + 3];
-
- return result;
- }
-
-
- uint64_t book_ep_key(const Position& pos) {
-
- return pos.ep_square() == SQ_NONE ? 0 : Random64[EnPassantIdx + square_file(pos.ep_square())];
- }
-
-
- uint64_t book_color_key(const Position& pos) {
-
- return pos.side_to_move() == WHITE ? Random64[TurnIdx] : 0;
- }
+ return low;
}