X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.h;h=a7cac4ba85ba64c03ceb29f64a0aa2eca7d5a939;hp=a7140846ee615756c583d1f703a4fc95718fe978;hb=1781439fc2bfb12f8a4e89b2a75fdeac6cd58672;hpb=a273b6ef8c899f546cf585ace584a1b498c04144 diff --git a/src/movepick.h b/src/movepick.h index a7140846..a7cac4ba 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-2016 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad + Copyright (C) 2015-2017 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,54 +21,70 @@ #ifndef MOVEPICK_H_INCLUDED #define MOVEPICK_H_INCLUDED -#include // For std::max -#include // For std::memset +#include #include "movegen.h" #include "position.h" -#include "search.h" #include "types.h" +/// StatBoards is a generic 2-dimensional array used to store various statistics +template +struct StatBoards : public std::array, Size1> { -/// The Stats struct stores moves statistics. According to the template parameter -/// the class can store History 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. -/// Countermoves store the move that refute a previous one. 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 { + void fill(const T& v) { + T* p = &(*this)[0][0]; + std::fill(p, p + sizeof(*this) / sizeof(*p), v); + } +}; - static const Value Max = Value(1 << 28); +/// 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; - const T* operator[](Piece pc) const { return table[pc]; } - T* operator[](Piece pc) { return table[pc]; } - void clear() { std::memset(table, 0, sizeof(table)); } +/// PieceToBoards are addressed by a move's [piece][to] information +typedef StatBoards PieceToBoards; - void update(Piece pc, Square to, Move m) { +/// 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 { - if (m != table[pc][to]) - table[pc][to] = m; - } + void update(Color c, Move m, int v) { + + const int D = 324; + auto& entry = (*this)[c][from_to(m)]; - void update(Piece pc, Square to, Value v) { + assert(abs(v) <= D); // Consistency check for below formula - if (abs(int(v)) >= 324) - return; + entry += v * 32 - entry * abs(v) / D; - table[pc][to] -= table[pc][to] * abs(int(v)) / (CM ? 936 : 324); - table[pc][to] += int(v) * 32; + assert(abs(entry) <= 32 * D); } +}; -private: - T table[PIECE_NB][SQUARE_NB]; +/// PieceToHistory is like ButterflyHistory, but is based on PieceToBoards +struct PieceToHistory : public PieceToBoards { + + void update(Piece pc, Square to, int v) { + + const int D = 936; + auto& entry = (*this)[pc][to]; + + assert(abs(v) <= D); // Consistency check for below formula + + entry += v * 32 - entry * abs(v) / D; + + assert(abs(entry) <= 32 * D); + } }; -typedef Stats MoveStats; -typedef Stats HistoryStats; -typedef Stats CounterMoveStats; -typedef Stats CounterMoveHistoryStats; +/// CounterMoveStat stores counter moves indexed by [piece][to] of the previous +/// move, see chessprogramming.wikispaces.com/Countermove+Heuristic +typedef StatBoards CounterMoveStat; + +/// CounterMoveHistoryStat is like CounterMoveStat but instead of a move it +/// stores a full history (based on PieceTo boards instead of ButterflyBoards). +typedef StatBoards CounterMoveHistoryStat; /// MovePicker class is used to pick one pseudo legal move at a time from the @@ -77,38 +93,35 @@ 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 { public: MovePicker(const MovePicker&) = delete; MovePicker& operator=(const MovePicker&) = delete; - MovePicker(const Position&, Move, Depth, const HistoryStats&, Square); - MovePicker(const Position&, Move, const HistoryStats&, Value); - MovePicker(const Position&, Move, Depth, const HistoryStats&, const CounterMoveStats&, const CounterMoveStats&, Move, Search::Stack*); + MovePicker(const Position&, Move, Value); + MovePicker(const Position&, Move, Depth, Square); + MovePicker(const Position&, Move, Depth, Search::Stack*); - Move next_move(); + Move next_move(bool skipQuiets = false); private: template void score(); - void generate_next_stage(); - ExtMove* begin() { return moves; } + ExtMove* begin() { return cur; } ExtMove* end() { return endMoves; } const Position& pos; - const HistoryStats& history; - const CounterMoveStats* counterMoveHistory; - const CounterMoveStats* followupMoveHistory; - Search::Stack* ss; + const Search::Stack* ss; + Move killers[2]; Move countermove; Depth depth; Move ttMove; - ExtMove killers[3]; Square recaptureSquare; Value threshold; int stage; - ExtMove *endQuiets, *endBadCaptures = moves + MAX_MOVES - 1; - ExtMove moves[MAX_MOVES], *cur = moves, *endMoves = moves; + ExtMove *cur, *endMoves, *endBadCaptures; + ExtMove moves[MAX_MOVES]; }; #endif // #ifndef MOVEPICK_H_INCLUDED