X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fbook.h;h=55d212a88634b03e00ebad286ad2f5a3aa868b4f;hb=c9d7e99de682516c560009b550c41da9ae2008b8;hp=33f72fb517333f0fb511d1d74c1a0fe409742bd6;hpb=5c81602d14539f8259a715477315e28b5de7cb54;p=stockfish
diff --git a/src/book.h b/src/book.h
index 33f72fb5..55d212a8 100644
--- a/src/book.h
+++ b/src/book.h
@@ -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-2009 Marco Costalba
+ Copyright (C) 2008-2010 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,68 +17,56 @@
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
- Public License, and can be downloaded from http://wbec-ridderkerk.nl
-*/
-
-
#if !defined(BOOK_H_INCLUDED)
#define BOOK_H_INCLUDED
-
-////
-//// Includes
-////
-
#include
#include
#include "move.h"
#include "position.h"
+#include "rkiss.h"
-////
-//// Types
-////
-
+// A Polyglot book is a series of "entries" of 16 bytes. All integers are
+// stored highest byte first (regardless of size). The entries are ordered
+// according to key. Lowest key first.
struct BookEntry {
uint64_t key;
uint16_t move;
uint16_t count;
- uint16_t n;
- uint16_t sum;
+ uint32_t learn;
};
-class Book : private std::ifstream {
+class Book {
public:
+ Book();
~Book();
- void open(const std::string& fName);
+ void open(const std::string& fileName);
void close();
- const std::string file_name() const;
- Move get_move(const Position& pos);
+ Move get_move(const Position& pos, bool findBestMove);
+ const std::string name() const { return bookName; }
private:
- Book& operator>>(uint64_t& n) { n = read_integer(8); return *this; }
- Book& operator>>(uint16_t& n) { n = (uint16_t)read_integer(2); return *this; }
- void operator>>(BookEntry& e) { *this >> e.key >> e.move >> e.count >> e.n >> e.sum; }
+ // read n chars from the file stream and converts them in an
+ // integer number. Integers are stored with highest byte first.
+ template uint64_t get_int();
+
+ template
+ Book& operator>>(T& n) { n = (T)get_int(); return *this; }
- uint64_t read_integer(int size);
- void read_entry(BookEntry& e, int n);
- int find_key(uint64_t key);
+ BookEntry read_entry(int idx);
+ int find_entry(uint64_t key);
- std::string fileName;
+ std::ifstream bookFile;
+ std::string bookName;
int bookSize;
+ RKISS RKiss;
};
-
-////
-//// Global variables
-////
-
-extern Book OpeningBook;
+// Yes, we indulge a bit here ;-)
+template inline uint64_t Book::get_int() { return 256 * get_int() + bookFile.get(); }
+template<> inline uint64_t Book::get_int<1>() { return bookFile.get(); }
#endif // !defined(BOOK_H_INCLUDED)