#ifndef MOVEPICK_H_INCLUDED
#define MOVEPICK_H_INCLUDED
-#include <algorithm> // For std::max
#include <cstring> // For std::memset
#include "movegen.h"
/// 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) {
-
- if (abs(int(v)) >= 324)
- return;
+ 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;
- table[c][from][to] += int(v) * 32;
+ const int D = 324;
+
+ assert(abs(v) <= D); // Consistency check for below formula
+
+ table[c][from][to] -= table[c][from][to] * abs(v) / D;
+ table[c][from][to] += v * 32;
}
private:
- Value table[COLOR_NB][SQUARE_NB][SQUARE_NB];
+ int table[COLOR_NB][SQUARE_NB][SQUARE_NB];
};
T* operator[](Piece pc) { return table[pc]; }
void clear() { std::memset(table, 0, sizeof(table)); }
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 D = 936;
- if (abs(int(v)) >= 324)
- return;
+ assert(abs(v) <= D); // Consistency check for below formula
- table[pc][to] -= table[pc][to] * abs(int(v)) / 936;
- table[pc][to] += int(v) * 32;
+ table[pc][to] -= table[pc][to] * abs(v) / D;
+ table[pc][to] += v * 32;
}
private:
};
typedef Stats<Move> MoveStats;
-typedef Stats<Value> CounterMoveStats;
+typedef Stats<int> CounterMoveStats;
typedef Stats<CounterMoveStats> CounterMoveHistoryStats;
MovePicker(const Position&, Move, Depth, Square);
MovePicker(const Position&, Move, Depth, Search::Stack*);
- Move next_move();
+ Move next_move(bool skipQuiets = false);
private:
template<GenType> void score();
const Position& pos;
const Search::Stack* ss;
+ Move killers[2];
Move countermove;
Depth depth;
Move ttMove;