X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbook.h;h=4ce74f471fddddfdef74b710e6de15153ac89d93;hp=516ea5cc6c077627f6a564da04503e116127e4a6;hb=49e110c52b19f5c99954d4797b8e991b0b60007c;hpb=afadc33fb430abd2ba2783a62180cf971b13652f

diff --git a/src/book.h b/src/book.h
index 516ea5cc..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 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
@@ -17,75 +17,29 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
-/*
-  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)
+#ifndef BOOK_H_INCLUDED
 #define BOOK_H_INCLUDED
 
-
-////
-//// Includes
-////
-
 #include <fstream>
 #include <string>
 
-#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<typename T> 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)
+#endif // #ifndef BOOK_H_INCLUDED