X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbook.h;h=bfc82d931f044e573c9570bdce460c3dff6d196f;hp=b6cee8080ca02205ace5be669059e5e9740b447d;hb=6b49d509a1824a09c21d1d9f5e7e991ef2638db5;hpb=539051b1e0fb099c0d0da69d20d6a4c2b98a2cb6

diff --git a/src/book.h b/src/book.h
index b6cee808..bfc82d93 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-2010 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
@@ -38,6 +38,7 @@
 
 #include "move.h"
 #include "position.h"
+#include "rkiss.h"
 
 
 ////
@@ -52,40 +53,29 @@ struct BookEntry {
   uint16_t sum;
 };
 
-class Book {
-
+class Book : private std::ifstream {
+  Book(const Book&); // just decleared..
+  Book& operator=(const Book&); // ..to avoid a warning
 public:
-  // Constructors
   Book();
-
-  // Open and close book files
-  void open(const std::string &fName);
+  ~Book();
+  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;
+  const std::string file_name();
+  Move get_move(const Position& pos, bool findBestMove);
 
 private:
-  int find_key(uint64_t key) const;
-  void read_entry(BookEntry &entry, int n) const;
+  Book& operator>>(uint64_t& n) { n = read_integer(8); return *this; }
+  Book& operator>>(uint16_t& n) { n = (uint16_t)read_integer(2); return *this; }
+  void operator>>(BookEntry& e) { *this >> e.key >> e.move >> e.count >> e.n >> e.sum; }
+
+  uint64_t read_integer(int size);
+  void read_entry(BookEntry& e, int n);
+  int find_key(uint64_t key);
 
   std::string fileName;
-  mutable std::ifstream bookFile;
   int bookSize;
+  RKISS RKiss;
 };
 
-
-////
-//// Global variables
-////
-
-extern Book OpeningBook;
-
-
 #endif // !defined(BOOK_H_INCLUDED)