Greatly simplify move_from_uci()

[stockfish] / src / book.h

diff --git a/src/book.h b/src/book.h
index 1b7b72c4d90c0f9b326c1657a9db891cc7e1337b..bfc82d931f044e573c9570bdce460c3dff6d196f 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-2009 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"
 
 
 ////
@@ -56,12 +57,12 @@ class Book : private std::ifstream {
   Book(const Book&); // just decleared..
   Book& operator=(const Book&); // ..to avoid a warning
 public:
-  Book() {}
+  Book();
   ~Book();
   void open(const std::string& fName);
   void close();
   const std::string file_name();
-  Move get_move(const Position& pos);
+  Move get_move(const Position& pos, bool findBestMove);
 
 private:
   Book& operator>>(uint64_t& n) { n = read_integer(8); return *this; }
@@ -74,14 +75,7 @@ private:
 
   std::string fileName;
   int bookSize;
+  RKISS RKiss;
 };
 
-
-////
-//// Global variables
-////
-
-extern Book OpeningBook;
-
-
 #endif // !defined(BOOK_H_INCLUDED)