X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.h;h=503bfae1d8cc9fd97145abb5d3f014d24235f7a5;hp=1a81dbde7b21a2bc4fe3535dfb7fe2ccbf71a36e;hb=12e79be91039796299187ba1b2f1559552642ea4;hpb=b48439e90643cb6f65f9e34d1421976883c12efc diff --git a/src/movepick.h b/src/movepick.h index 1a81dbde..503bfae1 100644 --- a/src/movepick.h +++ b/src/movepick.h @@ -2,7 +2,7 @@ Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad - Copyright (C) 2015-2017 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad + Copyright (C) 2015-2018 Marco Costalba, Joona Kiiski, Gary Linscott, 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 @@ -21,68 +21,86 @@ #ifndef MOVEPICK_H_INCLUDED #define MOVEPICK_H_INCLUDED -#include // For std::memset +#include +#include +#include #include "movegen.h" #include "position.h" #include "types.h" +/// 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 { -/// HistoryStats records how often quiet moves have been successful or unsuccessful -/// during the current search, and is used for reduction and move ordering decisions. -struct HistoryStats { + static const bool IsInt = std::is_integral::value; + typedef typename std::conditional::type TT; - static const int Max = 1 << 28; + T entry; - int get(Color c, Move m) const { return table[c][from_sq(m)][to_sq(m)]; } - void clear() { std::memset(table, 0, sizeof(table)); } - void update(Color c, Move m, int v) { +public: + T* get() { return &entry; } + void operator=(const T& v) { entry = v; } + operator TT() const { return entry; } - Square from = from_sq(m); - Square to = to_sq(m); + void operator<<(int bonus) { + assert(abs(bonus) <= D); // Ensure range is [-D, D] + static_assert(D <= std::numeric_limits::max(), "D overflows T"); - const int D = 324; + entry += bonus - entry * abs(bonus) / D; - assert(abs(int(v)) <= D); // Consistency check for below formula + assert(abs(entry) <= D); + } +}; - table[c][from][to] -= table[c][from][to] * abs(int(v)) / D; - table[c][from][to] += int(v) * 32; +/// Stats is a generic N-dimensional array used to store various statistics. +/// The first template parameter T is the base type of the array, the second +/// template parameter D limits the range of updates in [-D, D] when we update +/// values with the << operator, while 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(); } + + void fill(const T& v) { + T* p = get(); + std::fill(p, p + sizeof(*this) / sizeof(*p), v); } +}; -private: - int table[COLOR_NB][SQUARE_NB][SQUARE_NB]; +template +struct Stats : public std::array, Size> { + T* get() { return this->at(0).get(); } }; +/// In stats table, D=0 means that the template parameter is not used +enum StatsParams { NOT_USED = 0 }; -/// A template struct, used to generate MoveStats and CounterMoveHistoryStats: -/// MoveStats store the move that refute a previous one. -/// CounterMoveHistoryStats is like HistoryStats, but with two consecutive moves. -/// Entries are stored using only the moving piece and destination square, hence -/// two moves with different origin but same destination and piece will be -/// considered identical. -template -struct Stats { - const T* operator[](Piece pc) const { return table[pc]; } - T* operator[](Piece pc) { return table[pc]; } - void clear() { std::memset(table, 0, sizeof(table)); } - void update(Piece pc, Square to, Move m) { table[pc][to] = m; } - void update(Piece pc, Square to, int v) { - const int D = 936; +/// 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; - assert(abs(int(v)) <= D); // Consistency check for below formula +/// CounterMoveHistory stores counter moves indexed by [piece][to] of the previous +/// move, see chessprogramming.wikispaces.com/Countermove+Heuristic +typedef Stats CounterMoveHistory; - table[pc][to] -= table[pc][to] * abs(int(v)) / D; - table[pc][to] += int(v) * 32; - } +/// CapturePieceToHistory is addressed by a move's [piece][to][captured piece type] +typedef Stats CapturePieceToHistory; -private: - T table[PIECE_NB][SQUARE_NB]; -}; +/// PieceToHistory is like ButterflyHistory but is addressed by a move's [piece][to] +typedef Stats PieceToHistory; -typedef Stats MoveStats; -typedef Stats CounterMoveStats; -typedef Stats CounterMoveHistoryStats; +/// 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 @@ -91,33 +109,42 @@ typedef Stats CounterMoveHistoryStats; /// when MOVE_NONE is returned. In order to improve the efficiency of the alpha /// beta algorithm, MovePicker attempts to return the moves which are most likely /// to get a cut-off first. -namespace Search { struct Stack; } - class MovePicker { + + enum PickType { Next, Best }; + public: MovePicker(const MovePicker&) = delete; MovePicker& operator=(const MovePicker&) = delete; - - MovePicker(const Position&, Move, Value); - MovePicker(const Position&, Move, Depth, Square); - MovePicker(const Position&, Move, Depth, Search::Stack*); - + MovePicker(const Position&, Move, Value, const CapturePieceToHistory*); + MovePicker(const Position&, Move, Depth, const ButterflyHistory*, + const CapturePieceToHistory*, + const PieceToHistory**, + Square); + MovePicker(const Position&, Move, Depth, const ButterflyHistory*, + const CapturePieceToHistory*, + const PieceToHistory**, + Move, + Move*); Move next_move(bool skipQuiets = false); private: + template Move select(Pred); template void score(); ExtMove* begin() { return cur; } ExtMove* end() { return endMoves; } const Position& pos; - const Search::Stack* ss; - Move countermove; - Depth depth; + const ButterflyHistory* mainHistory; + const CapturePieceToHistory* captureHistory; + const PieceToHistory** continuationHistory; Move ttMove; + ExtMove refutations[3], *cur, *endMoves, *endBadCaptures; + int stage; + Move move; Square recaptureSquare; Value threshold; - int stage; - ExtMove *cur, *endMoves, *endBadCaptures; + Depth depth; ExtMove moves[MAX_MOVES]; };