X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fbook.h;h=40a8bad2b71d91f3a19a9ebc696c8a89723379e1;hb=ea6c1f7a17572f1cd291ffd00e28cfbd3b2947d5;hp=947e323ab26820abff41cc266ddc781e71c344f2;hpb=8307da0de77c9c7bbf7c56a7d9c8a688ff4dfb4e;p=stockfish

diff --git a/src/book.h b/src/book.h
index 947e323a..40a8bad2 100644
--- a/src/book.h
+++ b/src/book.h
@@ -26,36 +26,20 @@
 #include "position.h"
 #include "rkiss.h"
 
-
-/// 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;
-  uint32_t learn;
-};
-
-class Book {
+class PolyglotBook : private std::ifstream {
 public:
-  Book();
-  ~Book();
-  void open(const std::string& fileName);
-  void close();
-  Move probe(const Position& pos, bool findBestMove);
-  const std::string name() const { return bookName; }
+  PolyglotBook();
+ ~PolyglotBook();
+  Move probe(const Position& pos, const std::string& fName, bool pickBest);
 
 private:
-  template<typename T> Book& operator>>(T& n);
+  template<typename T> PolyglotBook& operator>>(T& n);
 
-  BookEntry read_entry(int idx);
-  int first_entry(uint64_t key);
+  bool open(const char* fName);
+  size_t find_first(Key key);
 
-  RKISS RKiss;
-  std::ifstream bookFile;
-  std::string bookName;
-  int bookSize;
+  RKISS rkiss;
+  std::string fileName;
 };
 
 #endif // !defined(BOOK_H_INCLUDED)