X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.h;h=3d4614cde0018a793f417a17470e0c655f88f468;hp=acb57b2e7a4d9fa2260cda3bde57ac8959a7747c;hb=917944e9c5324cc9659e630570e1852270b22bd4;hpb=19dd0de4ff83e682bafa56d27f302d8f00d3040d diff --git a/src/movepick.h b/src/movepick.h index acb57b2e..3d4614cd 100644 --- a/src/movepick.h +++ b/src/movepick.h @@ -17,11 +17,11 @@ along with this program. If not, see . */ -#if !defined MOVEPICK_H_INCLUDED +#ifndef MOVEPICK_H_INCLUDED #define MOVEPICK_H_INCLUDED #include // For std::max -#include // For memset +#include // For std::memset #include "movegen.h" #include "position.h" @@ -30,23 +30,30 @@ /// The Stats struct stores moves statistics. According to the template parameter -/// 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. 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. +/// the class can store History, Gains and Countermoves. 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. +/// Countermoves store the move that refute a previous one. Entries are stored +/// according only to moving piece and destination square, hence two moves with +/// different origin but same destination and piece will be considered identical. template struct Stats { static const Value Max = Value(2000); - const T* operator[](Piece p) const { return &table[p][0]; } - void clear() { memset(table, 0, sizeof(table)); } + const T* operator[](Piece p) const { return table[p]; } + void clear() { std::memset(table, 0, sizeof(table)); } + + void update(Piece p, Square to, Move m) { + + if (m == table[p][to].first) + return; + + table[p][to].second = table[p][to].first; + table[p][to].first = m; + } - void update(Piece p, Square to, Move m) { table[p][to] = m; } void update(Piece p, Square to, Value v) { if (Gain) @@ -60,9 +67,9 @@ private: T table[PIECE_NB][SQUARE_NB]; }; -typedef Stats Gains; -typedef Stats History; -typedef Stats Refutations; +typedef Stats< true, Value> GainsStats; +typedef Stats HistoryStats; +typedef Stats > CountermovesStats; /// MovePicker class is used to pick one pseudo legal move at a time from the @@ -77,9 +84,11 @@ class MovePicker { MovePicker& operator=(const MovePicker&); // Silence a warning under MSVC public: - 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); + MovePicker(const Position&, Move, Depth, const HistoryStats&, Square); + MovePicker(const Position&, Move, const HistoryStats&, PieceType); + MovePicker(const Position&, Move, Depth, const HistoryStats&, Move*, Search::Stack*); + + const ExtMove* quiet_moves() const; template Move next_move(); private: @@ -87,15 +96,16 @@ private: void generate_next(); const Position& pos; - const History& Hist; + const HistoryStats& history; Search::Stack* ss; + Move* countermoves; Depth depth; Move ttMove; - MoveStack killers[3]; + ExtMove killers[4]; Square recaptureSquare; - int captureThreshold, phase; - MoveStack *cur, *end, *endQuiets, *endBadCaptures; - MoveStack moves[MAX_MOVES]; + int captureThreshold, stage; + ExtMove *cur, *end, *endQuiets, *endBadCaptures; + ExtMove moves[MAX_MOVES]; }; -#endif // !defined(MOVEPICK_H_INCLUDED) +#endif // #ifndef MOVEPICK_H_INCLUDED