X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fbook.h;h=fc84e091f2d8f16d8bcb095542a2879d7ccba0f4;hb=f811a5693e5c65637923f5f72e6d95d9d7b4f858;hp=e70bd0f1dabd2a31efe88783c76c377f4d7d88e8;hpb=a03b8074c884086d13b80e1d291b3800a4512a3c;p=stockfish
diff --git a/src/book.h b/src/book.h
index e70bd0f1..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,68 +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 : private std::ifstream {
-
+class PolyglotBook : private std::ifstream {
public:
- void open(const std::string& fName);
- void close();
- const std::string file_name() const;
- Move get_move(const Position& pos);
+ PolyglotBook();
+ ~PolyglotBook();
+ Move probe(const Position& pos, const std::string& fName, bool pickBest);
private:
- 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; }
+ template PolyglotBook& operator>>(T& n);
- uint64_t read_integer(int size);
- void read_entry(BookEntry& e, int n);
- int find_key(uint64_t key);
+ bool open(const char* fName);
+ size_t find_first(Key key);
+ RKISS rkiss;
std::string fileName;
- int bookSize;
};
-
-////
-//// Global variables
-////
-
-extern Book OpeningBook;
-
-
-#endif // !defined(BOOK_H_INCLUDED)
+#endif // #ifndef BOOK_H_INCLUDED