Add "Best Book Move" UCI option

[stockfish] / src / book.h

diff --git a/src/book.h b/src/book.h
index 516ea5cc6c077627f6a564da04503e116127e4a6..32b6e607ebba5bf1eaf510ce66ac3456ec4c869c 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)
 /*
   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
 
   Stockfish is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by


@@ -52,31 +52,27 @@ struct BookEntry {
   uint16_t sum;
 };
 
   uint16_t sum;
 };
 

-class Book {
-
+class Book : private std::ifstream {
+  Book(const Book&); // just decleared..
+  Book& operator=(const Book&); // ..to avoid a warning

 public:
 public:

-  // Constructors
-  Book();
-
-  // Open and close book files
+  Book() {}
+  ~Book();

   void open(const std::string& fName);
   void close();
   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:
 
 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;
 
   std::string fileName;

-  mutable std::ifstream bookFile;

   int bookSize;
 };
 
   int bookSize;
 };