/// search captures, promotions and some checks) and how important good move
/// ordering is at the current node.
-MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& h,
- Move* cm, Move* fm, Search::Stack* s) : pos(p), history(h), depth(d) {
+MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& h, const CounterMovesHistoryStats& cmh,
+ Move* cm, Move* fm, Search::Stack* s) : pos(p), history(h), counterMovesHistory(cmh), depth(d) {
assert(d > DEPTH_ZERO);
endMoves += (ttMove != MOVE_NONE);
}
-MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& h,
- Square s) : pos(p), history(h) {
+MovePicker::MovePicker(const Position& p, Move ttm, Depth d, const HistoryStats& h, const CounterMovesHistoryStats& cmh,
+ Square s) : pos(p), history(h), counterMovesHistory(cmh) {
assert(d <= DEPTH_ZERO);
endMoves += (ttMove != MOVE_NONE);
}
-MovePicker::MovePicker(const Position& p, Move ttm, const HistoryStats& h, PieceType pt)
- : pos(p), history(h) {
+MovePicker::MovePicker(const Position& p, Move ttm, const HistoryStats& h, const CounterMovesHistoryStats& cmh, PieceType pt)
+ : pos(p), history(h), counterMovesHistory(cmh) {
assert(!pos.checkers());
template<>
void MovePicker::score<QUIETS>() {
+ Square prevMoveSq = to_sq((ss-1)->currentMove);
+ Piece prevMovePiece = pos.piece_on(prevMoveSq);
+ const HistoryStats &cmh = counterMovesHistory[prevMovePiece][prevMoveSq];
+
for (auto& m : *this)
- m.value = history[pos.moved_piece(m)][to_sq(m)];
+ m.value = history[pos.moved_piece(m)][to_sq(m)]
+ + cmh[pos.moved_piece(m)][to_sq(m)];
}
template<>
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) {
typedef Stats< true, Value> GainsStats;
typedef Stats<false, Value> HistoryStats;
typedef Stats<false, std::pair<Move, Move> > MovesStats;
+typedef Stats<false, HistoryStats> 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&, Square);
- MovePicker(const Position&, Move, const HistoryStats&, PieceType);
- MovePicker(const Position&, Move, Depth, const HistoryStats&, Move*, Move*, Search::Stack*);
+ 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*, Move*, Search::Stack*);
template<bool SpNode> Move next_move();
const Position& pos;
const HistoryStats& history;
+ const CounterMovesHistoryStats& counterMovesHistory;
Search::Stack* ss;
Move* countermoves;
Move* followupmoves;
double BestMoveChanges;
Value DrawValue[COLOR_NB];
HistoryStats History;
+ CounterMovesHistoryStats CounterMovesHistory;
GainsStats Gains;
MovesStats Countermoves, Followupmoves;
TT.new_search();
History.clear();
+ CounterMovesHistory.clear();
Gains.clear();
Countermoves.clear();
Followupmoves.clear();
assert((ss-1)->currentMove != MOVE_NONE);
assert((ss-1)->currentMove != MOVE_NULL);
- MovePicker mp(pos, ttMove, History, pos.captured_piece_type());
+ MovePicker mp(pos, ttMove, History, CounterMovesHistory, pos.captured_piece_type());
CheckInfo ci(pos);
while ((move = mp.next_move<false>()) != MOVE_NONE)
Move followupmoves[] = { Followupmoves[pos.piece_on(prevOwnMoveSq)][prevOwnMoveSq].first,
Followupmoves[pos.piece_on(prevOwnMoveSq)][prevOwnMoveSq].second };
- MovePicker mp(pos, ttMove, depth, History, countermoves, followupmoves, ss);
+ MovePicker mp(pos, ttMove, depth, History, CounterMovesHistory, countermoves, followupmoves, ss);
CheckInfo ci(pos);
value = bestValue; // Workaround a bogus 'uninitialized' warning under gcc
improving = ss->staticEval >= (ss-2)->staticEval
// to search the moves. Because the depth is <= 0 here, only captures,
// queen promotions and checks (only if depth >= DEPTH_QS_CHECKS) will
// be generated.
- MovePicker mp(pos, ttMove, depth, History, to_sq((ss-1)->currentMove));
+ MovePicker mp(pos, ttMove, depth, History, CounterMovesHistory, to_sq((ss-1)->currentMove));
CheckInfo ci(pos);
// Loop through the moves until no moves remain or a beta cutoff occurs
if (is_ok((ss-1)->currentMove))
{
Square prevMoveSq = to_sq((ss-1)->currentMove);
- Countermoves.update(pos.piece_on(prevMoveSq), prevMoveSq, move);
+ Piece prevMovePiece = pos.piece_on(prevMoveSq);
+ Countermoves.update(prevMovePiece, prevMoveSq, move);
+
+ HistoryStats& cmh = CounterMovesHistory[prevMovePiece][prevMoveSq];
+ cmh.update(pos.moved_piece(move), to_sq(move), bonus);
+ for (int i = 0; i < quietsCnt; ++i)
+ {
+ Move m = quiets[i];
+ cmh.update(pos.moved_piece(m), to_sq(m), -bonus);
+ }
}
if (is_ok((ss-2)->currentMove) && (ss-1)->currentMove == (ss-1)->ttMove)