Fix random moves when time < 10ms

[stockfish] / src / book.h

diff --git a/src/book.h b/src/book.h
index 24fa9f2daf45b2e1c087bf644ecf053f1cdcf449..4ce74f471fddddfdef74b710e6de15153ac89d93 100644 (file)
--- 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-2012 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,7 +17,7 @@
   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>
@@ -26,33 +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 : private std::ifstream {
+class PolyglotBook : private std::ifstream {
 public:
-  Book();
-  ~Book();
+  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);
 
   bool open(const char* fName);
-  void binary_search(uint64_t key);
+  size_t find_first(Key key);
 
-  RKISS RKiss;
+  RKISS rkiss;
   std::string fileName;
-  size_t size;
 };
 
-#endif // !defined(BOOK_H_INCLUDED)
+#endif // #ifndef BOOK_H_INCLUDED