X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.h;h=3614439fca05cdb6df7a3bad6833dfdad3d33024;hp=e1a2e6df18d3386623ddce7ca77d4023f6a081ec;hb=9da3b44ddc7bc9ea7094b91663cbc0f8319c46be;hpb=c80d52c845357db880817d6ed91d02986b5d5384 diff --git a/src/movepick.h b/src/movepick.h index e1a2e6df..3614439f 100644 --- a/src/movepick.h +++ b/src/movepick.h @@ -33,21 +33,25 @@ /// during the current search, and is used for reduction and move ordering decisions. struct HistoryStats { - static const Value Max = Value(1 << 28); + static const int Max = 1 << 28; - Value get(Color c, Move m) const { return table[c][from_sq(m)][to_sq(m)]; } + 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, Value v) { + void update(Color c, Move m, int v) { Square from = from_sq(m); Square to = to_sq(m); - table[c][from][to] -= table[c][from][to] * abs(int(v)) / 324; + const int denom = 324; + + assert(abs(int(v)) <= denom); // Needed for stability. + + table[c][from][to] -= table[c][from][to] * abs(int(v)) / denom; table[c][from][to] += int(v) * 32; } private: - Value table[COLOR_NB][SQUARE_NB][SQUARE_NB]; + int table[COLOR_NB][SQUARE_NB][SQUARE_NB]; }; @@ -62,10 +66,15 @@ 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, Value v) { + void update(Piece pc, Square to, int v) { + + const int denom = 936; + + assert(abs(int(v)) <= denom); // Needed for stability. - table[pc][to] -= table[pc][to] * abs(int(v)) / 936; + table[pc][to] -= table[pc][to] * abs(int(v)) / denom; table[pc][to] += int(v) * 32; } @@ -74,7 +83,7 @@ private: }; typedef Stats MoveStats; -typedef Stats CounterMoveStats; +typedef Stats CounterMoveStats; typedef Stats CounterMoveHistoryStats; @@ -95,7 +104,7 @@ 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();