static const Value Max = Value(250);
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 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) {
typedef Stats< true, Value> GainsStats;
typedef Stats<false, Value> HistoryStats;
-typedef Stats<false, std::pair<Move, Move> > MovesStats;
+typedef Stats<false, Move> MovesStats;
+typedef Stats<false, HistoryStats> CounterMovesHistoryStats;
/// MovePicker class is used to pick one pseudo legal move at a time from the
/// to get a cut-off first.
class MovePicker {
-
- MovePicker& operator=(const MovePicker&); // Silence a warning under MSVC
-
public:
- MovePicker(const Position&, Move, Depth, const HistoryStats&, Square);
- MovePicker(const Position&, Move, const HistoryStats&, PieceType);
- MovePicker(const Position&, Move, Depth, const HistoryStats&, Move*, Move*, Search::Stack*);
+ 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&, PieceType);
+ MovePicker(const Position&, Move, Depth, const HistoryStats&, const CounterMovesHistoryStats&, Move, Search::Stack*);
template<bool SpNode> Move next_move();
private:
template<GenType> void score();
void generate_next_stage();
+ ExtMove* begin() { return moves; }
+ ExtMove* end() { return endMoves; }
const Position& pos;
const HistoryStats& history;
+ const CounterMovesHistoryStats& counterMovesHistory;
Search::Stack* ss;
- Move* countermoves;
- Move* followupmoves;
+ Move countermove;
Depth depth;
Move ttMove;
- ExtMove killers[6];
+ ExtMove killers[3];
Square recaptureSquare;
Value captureThreshold;
int stage;
- ExtMove *cur, *end, *endQuiets, *endBadCaptures;
- ExtMove moves[MAX_MOVES];
+ ExtMove *endQuiets, *endBadCaptures;
+ ExtMove moves[MAX_MOVES], *cur = moves, *endMoves = moves;
};
#endif // #ifndef MOVEPICK_H_INCLUDED