X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fbook.h;h=53c8a7e1be01b81c6caaa46efbd0ef2365ac2500;hb=0fcda095df1caa860e8e3f3a714d5545ec9dc122;hp=b6cee8080ca02205ace5be669059e5e9740b447d;hpb=539051b1e0fb099c0d0da69d20d6a4c2b98a2cb6;p=stockfish
diff --git a/src/book.h b/src/book.h
index b6cee808..53c8a7e1 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 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,75 +17,57 @@
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 {
-
+class Book : private std::ifstream {
+ Book(const Book&); // just decleared..
+ Book& operator=(const Book&); // ..to avoid a warning
public:
- // Constructors
Book();
-
- // Open and close book files
- void open(const std::string &fName);
+ ~Book();
+ void open(const std::string& fileName);
void close();
+ Move get_move(const Position& pos, bool findBestMove);
+ const std::string name() const { return bookName; }
- // Testing if a book is opened
- bool is_open() const;
+private:
+ // 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();
- // The file name of the currently active book
- const std::string file_name() const;
+ template
+ Book& operator>>(T& n) { n = (T)get_int(); return *this; }
- // Get a book move for a given position
- Move get_move(const Position &pos) const;
+ BookEntry read_entry(int idx);
+ int find_entry(uint64_t key);
-private:
- int find_key(uint64_t key) const;
- void read_entry(BookEntry &entry, int n) const;
-
- std::string fileName;
- mutable 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() + get(); }
+template<> inline uint64_t Book::get_int<1>() { return get(); }
#endif // !defined(BOOK_H_INCLUDED)