X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.h;h=acb57b2e7a4d9fa2260cda3bde57ac8959a7747c;hp=90475b3512e15dba6939a4fde9fd130305b15eb1;hb=19dd0de4ff83e682bafa56d27f302d8f00d3040d;hpb=8a61b030a6cbfa70b7a473e31ae2662f1b8f39b9 diff --git a/src/movepick.h b/src/movepick.h index 90475b35..acb57b2e 100644 --- a/src/movepick.h +++ b/src/movepick.h @@ -30,21 +30,23 @@ /// The Stats struct stores moves statistics. According to the template parameter -/// the class can store both History and Gains type statistics. History records +/// the class can store History, Gains and Refutations statistics. History records /// how often different moves have been successful or unsuccessful during the /// current search and is used for reduction and move ordering decisions. Gains /// records the move's best evaluation gain from one ply to the next and is used -/// for pruning decisions. Entries are stored according only to moving piece and -/// destination square, in particular two moves with different origin but same -/// destination and same piece will be considered identical. -template +/// for pruning decisions. Refutations store the move that refute a previous one. +/// Entries are stored according only to moving piece and destination square, in +/// particular two moves with different origin but same destination and same piece +/// will be considered identical. +template struct Stats { static const Value Max = Value(2000); - const Value* operator[](Piece p) const { return &table[p][0]; } + const T* operator[](Piece p) const { return &table[p][0]; } void clear() { memset(table, 0, sizeof(table)); } + void update(Piece p, Square to, Move m) { table[p][to] = m; } void update(Piece p, Square to, Value v) { if (Gain) @@ -55,23 +57,13 @@ struct Stats { } private: - Value table[PIECE_NB][SQUARE_NB]; + T table[PIECE_NB][SQUARE_NB]; }; -typedef Stats History; -typedef Stats Gains; - -// FIXME: Document me -struct RefutationTable { - - void clear() { memset(table, 0, sizeof(table)); } - void update(Piece p, Square to, Move m) { table[p][to] = m; } - Move get(Piece p, Square to) const { return table[p][to]; } - -private: - Move table[PIECE_NB][SQUARE_NB]; // Mapping: "move A" -> "move B which refutes move A" +typedef Stats Gains; +typedef Stats History; +typedef Stats Refutations; -}; /// MovePicker class is used to pick one pseudo legal move at a time from the /// current position. The most important method is next_move(), which returns a @@ -85,7 +77,7 @@ class MovePicker { MovePicker& operator=(const MovePicker&); // Silence a warning under MSVC public: - MovePicker(const Position&, Move, Depth, const History&, Search::Stack*, Move, Value); + MovePicker(const Position&, Move, Depth, const History&, const Refutations&, Search::Stack*, Value); MovePicker(const Position&, Move, Depth, const History&, Square); MovePicker(const Position&, Move, const History&, PieceType); template Move next_move();