X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.h;h=3614439fca05cdb6df7a3bad6833dfdad3d33024;hp=fffd4708b05872d3229428a48d9dadd661ee810f;hb=9da3b44ddc7bc9ea7094b91663cbc0f8319c46be;hpb=969982406ce85e38b88d15768ae2d3ee31fe82bb diff --git a/src/movepick.h b/src/movepick.h index fffd4708..3614439f 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 @@ -26,34 +26,55 @@ #include "movegen.h" #include "position.h" -#include "search.h" #include "types.h" -/// 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 { +/// 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 int Max = 1 << 28; + + 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) { + + Square from = from_sq(m); + Square to = to_sq(m); + + const int denom = 324; + + assert(abs(int(v)) <= denom); // Needed for stability. - static const Value Max = Value(1 << 28); + table[c][from][to] -= table[c][from][to] * abs(int(v)) / denom; + table[c][from][to] += int(v) * 32; + } + +private: + int table[COLOR_NB][SQUARE_NB][SQUARE_NB]; +}; + +/// 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 fill(const int& v) { std::fill(&table[0][0], &table[PIECE_NB-1][SQUARE_NB-1]+1, v); }; void update(Piece pc, Square to, Move m) { table[pc][to] = m; } + void update(Piece pc, Square to, int v) { - void update(Piece pc, Square to, Value v) { + const int denom = 936; - if (abs(int(v)) >= 324) - return; + assert(abs(int(v)) <= denom); // Needed for stability. - table[pc][to] -= table[pc][to] * abs(int(v)) / (CM ? 936 : 324); + table[pc][to] -= table[pc][to] * abs(int(v)) / denom; table[pc][to] += int(v) * 32; } @@ -62,8 +83,7 @@ private: }; typedef Stats MoveStats; -typedef Stats HistoryStats; -typedef Stats CounterMoveStats; +typedef Stats CounterMoveStats; typedef Stats CounterMoveHistoryStats; @@ -73,6 +93,7 @@ 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: @@ -83,12 +104,11 @@ public: 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; @@ -96,12 +116,11 @@ private: Move countermove; Depth depth; Move ttMove; - ExtMove killers[3]; Square recaptureSquare; Value threshold; int stage; - ExtMove* 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