X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbook.h;h=4ce74f471fddddfdef74b710e6de15153ac89d93;hp=ed68210f8daf83fb14f832b6f0aa709001fe73b2;hb=45b0aea875860e9f0fe2d0435ee6163906639194;hpb=4dc7ba16191bd1ded7c8257afd2a3b9194cebca8

diff --git a/src/book.h b/src/book.h
index ed68210f..4ce74f47 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-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,55 +17,29 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(BOOK_H_INCLUDED)
+#ifndef BOOK_H_INCLUDED
 #define BOOK_H_INCLUDED
 
 #include <fstream>
 #include <string>
 
-#include "move.h"
 #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 get_move(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:
-  // read n chars from the file stream and converts them in an
-  // integer number. Integers are stored with highest byte first.
-  template<int n> uint64_t get_int();
+  template<typename T> PolyglotBook& operator>>(T& n);
 
-  template<typename T>
-  Book& operator>>(T& n) { n = (T)get_int<sizeof(T)>(); return *this; }
+  bool open(const char* fName);
+  size_t find_first(Key key);
 
-  BookEntry read_entry(int idx);
-  int find_entry(uint64_t key);
-
-  std::ifstream bookFile;
-  std::string bookName;
-  int bookSize;
-  RKISS RKiss;
+  RKISS rkiss;
+  std::string fileName;
 };
 
-// Yes, we indulge a bit here ;-)
-template<int n> inline uint64_t Book::get_int() { return 256 * get_int<n-1>() + bookFile.get(); }
-template<> inline uint64_t Book::get_int<1>() { return bookFile.get(); }
-
-#endif // !defined(BOOK_H_INCLUDED)
+#endif // #ifndef BOOK_H_INCLUDED