X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fbook.h;h=fc84e091f2d8f16d8bcb095542a2879d7ccba0f4;hb=77341f67f30456dc456177062309ad5e73e2e1a4;hp=b6cee8080ca02205ace5be669059e5e9740b447d;hpb=539051b1e0fb099c0d0da69d20d6a4c2b98a2cb6;p=stockfish
diff --git a/src/book.h b/src/book.h
index b6cee808..fc84e091 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-2014 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 .
*/
-
-/*
- 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
#include
-#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 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