X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.h;h=e64ebfade18308a55046c7b61e396e1800bb7f75;hp=5010ee627f41ef8b94464dd07c15a24c2ee79325;hb=ca3835857435590865fd41aac9bf4c1cda76dfc3;hpb=1d5eaba5735e24c3afdeb07a5108d7ebf9e3ff57 diff --git a/src/movepick.h b/src/movepick.h index 5010ee62..e64ebfad 100644 --- a/src/movepick.h +++ b/src/movepick.h @@ -30,17 +30,16 @@ /// The Stats struct stores moves statistics. According to the template parameter -/// the class can store History, Gains and Countermoves. History records how often +/// 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. Gains records the move's -/// best evaluation gain from one ply to the next and is used for pruning decisions. +/// 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 +template struct Stats { - static const Value Max = Value(250); + static const Value Max = Value(1 << 28); const T* operator[](Piece pc) const { return table[pc]; } T* operator[](Piece pc) { return table[pc]; } @@ -48,30 +47,23 @@ struct Stats { void update(Piece pc, Square to, Move m) { - if (m == table[pc][to].first) - return; - - table[pc][to].second = table[pc][to].first; - table[pc][to].first = m; + if (m != table[pc][to]) + table[pc][to] = m; } void update(Piece pc, Square to, Value v) { - if (Gain) - table[pc][to] = std::max(v, table[pc][to] - 1); - - else if (abs(table[pc][to] + v) < Max) - table[pc][to] += v; + table[pc][to] -= table[pc][to] * std::min(abs(v), 512) / 512; + table[pc][to] += v * 64; } private: T table[PIECE_NB][SQUARE_NB]; }; -typedef Stats< true, Value> GainsStats; -typedef Stats HistoryStats; -typedef Stats > MovesStats; -typedef Stats CounterMovesHistoryStats; +typedef Stats HistoryStats; +typedef Stats MovesStats; +typedef Stats CounterMovesHistoryStats; /// MovePicker class is used to pick one pseudo legal move at a time from the @@ -87,8 +79,8 @@ public: MovePicker& operator=(const MovePicker&) = delete; MovePicker(const Position&, Move, Depth, const HistoryStats&, const CounterMovesHistoryStats&, Square); - MovePicker(const Position&, Move, const HistoryStats&, const CounterMovesHistoryStats&, PieceType); - MovePicker(const Position&, Move, Depth, const HistoryStats&, const CounterMovesHistoryStats&, Move*, Search::Stack*); + MovePicker(const Position&, Move, const HistoryStats&, const CounterMovesHistoryStats&, Value); + MovePicker(const Position&, Move, Depth, const HistoryStats&, const CounterMovesHistoryStats&, Move, Search::Stack*); template Move next_move(); @@ -102,14 +94,14 @@ private: const HistoryStats& history; const CounterMovesHistoryStats& counterMovesHistory; Search::Stack* ss; - Move* countermoves; + Move countermove; Depth depth; Move ttMove; - ExtMove killers[4]; + ExtMove killers[3]; Square recaptureSquare; - Value captureThreshold; + Value threshold; int stage; - ExtMove *endQuiets, *endBadCaptures; + ExtMove *endQuiets, *endBadCaptures = moves + MAX_MOVES - 1; ExtMove moves[MAX_MOVES], *cur = moves, *endMoves = moves; };