/// 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<typename T>
+template<typename T, bool CM = false>
struct Stats {
static const Value Max = Value(1 << 28);
void update(Piece pc, Square to, Value v) {
- table[pc][to] -= table[pc][to] * std::min(abs(v), 512) / 512;
- table[pc][to] += v * 64;
+ if (abs(int(v)) >= 324)
+ return;
+
+ table[pc][to] -= table[pc][to] * abs(int(v)) / (CM ? 512 : 324);
+ table[pc][to] += int(v) * (CM ? 64 : 32);
}
private:
T table[PIECE_NB][SQUARE_NB];
};
-typedef Stats<Value> HistoryStats;
typedef Stats<Move> MovesStats;
-typedef Stats<HistoryStats> CounterMovesHistoryStats;
+typedef Stats<Value, false> HistoryStats;
+typedef Stats<Value, true> CounterMovesStats;
+typedef Stats<CounterMovesStats> CounterMovesHistoryStats;
/// MovePicker class is used to pick one pseudo legal move at a time from the
MovePicker(const MovePicker&) = delete;
MovePicker& operator=(const MovePicker&) = delete;
- MovePicker(const Position&, Move, Depth, const HistoryStats&, const CounterMovesHistoryStats&, Square);
- MovePicker(const Position&, Move, const HistoryStats&, const CounterMovesHistoryStats&, Value);
- MovePicker(const Position&, Move, Depth, const HistoryStats&, const CounterMovesHistoryStats&, Move, Search::Stack*);
+ MovePicker(const Position&, Move, Depth, const HistoryStats&, Square);
+ MovePicker(const Position&, Move, const HistoryStats&, Value);
+ MovePicker(const Position&, Move, Depth, const HistoryStats&, const CounterMovesStats&, Move, Search::Stack*);
- template<bool SpNode> Move next_move();
+ Move next_move();
private:
template<GenType> void score();
const Position& pos;
const HistoryStats& history;
- const CounterMovesHistoryStats& counterMovesHistory;
+ const CounterMovesStats* counterMovesHistory;
Search::Stack* ss;
Move countermove;
Depth depth;