X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.h;fp=src%2Fmovepick.h;h=d9f0457a122fad9a6c9206cf79f371371d107594;hp=0aba61d027c42b63be40581212c55f89ec1b0d94;hb=f35e52f030af837ed8a89eecd67a6f746ee2e897;hpb=94b3cdd908f68e20a09f67dba40103fd671f5f17 diff --git a/src/movepick.h b/src/movepick.h index 0aba61d0..d9f0457a 100644 --- a/src/movepick.h +++ b/src/movepick.h @@ -23,44 +23,33 @@ #include #include +#include #include "movegen.h" #include "position.h" #include "types.h" -/// StatBoards is a generic 2-dimensional array used to store various statistics -template -struct StatBoards : public std::array, Size1> { +/// StatsEntry stores the stat table value. It is usually a number but could +/// be a move or even a nested history. We use a class instead of naked value +/// to directly call history update operator<<() on the entry so to use stats +/// tables at caller sites as simple multi-dim arrays. +template +class StatsEntry { - void fill(const T& v) { - T* p = &(*this)[0][0]; - std::fill(p, p + sizeof(*this) / sizeof(*p), v); - } - - void update(T& entry, int bonus, const int D) { - - assert(abs(bonus) <= D); // Ensure range is [-32 * D, 32 * D] - assert(abs(32 * D) < (std::numeric_limits::max)()); // Ensure we don't overflow - - entry += bonus * 32 - entry * abs(bonus) / D; - - assert(abs(entry) <= 32 * D); - } -}; + static const bool IsInt = std::is_integral::value; + typedef typename std::conditional::type TT; -/// StatCubes is a generic 3-dimensional array used to store various statistics -template -struct StatCubes : public std::array, Size2>, Size1> { + T entry; - void fill(const T& v) { - T* p = &(*this)[0][0][0]; - std::fill(p, p + sizeof(*this) / sizeof(*p), v); - } +public: + T* get() { return &entry; } + void operator=(const T& v) { entry = v; } + operator TT() const { return entry; } - void update(T& entry, int bonus, const int D, const int W) { + void operator<<(int bonus) { assert(abs(bonus) <= D); // Ensure range is [-W * D, W * D] - assert(abs(W * D) < (std::numeric_limits::max)()); // Ensure we don't overflow + assert(abs(W * D) < std::numeric_limits::max()); // Ensure we don't overflow entry += bonus * W - entry * abs(bonus) / D; @@ -68,50 +57,50 @@ struct StatCubes : public std::array, Size2>, Si } }; -/// ButterflyBoards are 2 tables (one for each color) indexed by the move's from -/// and to squares, see chessprogramming.wikispaces.com/Butterfly+Boards -typedef StatBoards ButterflyBoards; - -/// PieceToBoards are addressed by a move's [piece][to] information -typedef StatBoards PieceToBoards; +/// Stats is a generic N-dimensional array used to store various statistics. +/// The first template T parameter is the base type of the array, the W parameter +/// is the weight applied to the bonuses when we update values with the << operator, +/// the D parameter limits the range of updates (range is [-W * D, W * D]), and +/// the last parameters (Size and Sizes) encode the dimensions of the array. +template +struct Stats : public std::array, Size> +{ + T* get() { return this->at(0).get(); } -/// CapturePieceToBoards are addressed by a move's [piece][to][captured piece type] information -typedef StatCubes CapturePieceToBoards; - -/// ButterflyHistory records how often quiet moves have been successful or -/// unsuccessful during the current search, and is used for reduction and move -/// ordering decisions. It uses ButterflyBoards as backing store. -struct ButterflyHistory : public ButterflyBoards { - - void update(Color c, Move m, int bonus) { - StatBoards::update((*this)[c][from_to(m)], bonus, 324); + void fill(const T& v) { + T* p = get(); + std::fill(p, p + sizeof(*this) / sizeof(*p), v); } }; -/// PieceToHistory is like ButterflyHistory, but is based on PieceToBoards -struct PieceToHistory : public PieceToBoards { - - void update(Piece pc, Square to, int bonus) { - StatBoards::update((*this)[pc][to], bonus, 936); - } +template +struct Stats : public std::array, Size> { + T* get() { return this->at(0).get(); } }; -/// CapturePieceToHistory is like PieceToHistory, but is based on CapturePieceToBoards -struct CapturePieceToHistory : public CapturePieceToBoards { +/// Different tables use different W/D parameter, name them to ease readibility +enum StatsParams { W2 = 2, W32 = 32, D324 = 324, D936 = 936, NOT_USED = 0 }; - void update(Piece pc, Square to, PieceType captured, int bonus) { - StatCubes::update((*this)[pc][to][captured], bonus, 324, 2); - } -}; +/// ButterflyHistory records how often quiet moves have been successful or +/// unsuccessful during the current search, and is used for reduction and move +/// ordering decisions. It uses 2 tables (one for each color) indexed by +/// the move's from and to squares, see chessprogramming.wikispaces.com/Butterfly+Boards +typedef Stats ButterflyHistory; /// CounterMoveHistory stores counter moves indexed by [piece][to] of the previous /// move, see chessprogramming.wikispaces.com/Countermove+Heuristic -typedef StatBoards CounterMoveHistory; +typedef Stats CounterMoveHistory; + +/// CapturePieceToHistory is addressed by a move's [piece][to][captured piece type] +typedef Stats CapturePieceToHistory; + +/// PieceToHistory is like ButterflyHistory but is addressed by a move's [piece][to] +typedef Stats PieceToHistory; -/// ContinuationHistory is the history of a given pair of moves, usually the -/// current one given a previous one. History table is based on PieceToBoards -/// instead of ButterflyBoards. -typedef StatBoards ContinuationHistory; +/// ContinuationHistory is the combined history of a given pair of moves, usually +/// the current one given a previous one. The nested history table is based on +/// PieceToHistory instead of ButterflyBoards. +typedef Stats ContinuationHistory; /// MovePicker class is used to pick one pseudo legal move at a time from the