X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbook.h;h=ed446636c8a45359489b61c345fe00aeb9b9fec2;hb=06b9140e5ccd9e3579315ea2abb2ba93126c48fa;hp=2c17527348e6cc534217735b88e5d77477af9bb1;hpb=d3600c39a745179ed6b094b305d0645e83a1ee86;p=stockfish
diff --git a/src/book.h b/src/book.h
index 2c175273..ed446636 100644
--- a/src/book.h
+++ b/src/book.h
@@ -1,91 +1,45 @@
/*
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-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
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
-
+
Stockfish 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, 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
-////
-
-struct BookEntry {
- uint64_t key;
- uint16_t move;
- uint16_t count;
- uint16_t n;
- uint16_t sum;
-};
-
-class Book {
-
+class PolyglotBook : private std::ifstream {
public:
- // Constructors
- Book();
-
- // Open and close book files
- void open(const std::string &fName);
- void close();
-
- // Testing if a book is opened
- bool is_open() const;
-
- // The file name of the currently active book
- const std::string file_name() const;
-
- // Get a book move for a given position
- Move get_move(const Position &pos) const;
+ PolyglotBook();
+ ~PolyglotBook();
+ Move probe(const Position& pos, const std::string& fName, bool pickBest);
private:
- int find_key(uint64_t key) const;
- void read_entry(BookEntry &entry, int n) const;
+ template PolyglotBook& operator>>(T& n);
+ bool open(const char* fName);
+ size_t find_first(Key key);
+
+ RKISS rkiss;
std::string fileName;
- mutable std::ifstream bookFile;
- int bookSize;
};
-
-////
-//// Global variables
-////
-
-extern Book OpeningBook;
-
-
#endif // !defined(BOOK_H_INCLUDED)