size_t cnt = 0;
CheckInfo ci(pos);
- for (MoveList<LEGAL> it(pos); !it.end(); ++it)
+ for (MoveList<LEGAL> it(pos); *it; ++it)
{
pos.do_move(*it, st, ci, pos.move_gives_check(*it, ci));
cnt += perft(pos, depth - ONE_PLY);
if (Options["Use Search Log"])
{
+ RootMove& rm = RootMoves[0];
+ if (skill.best != MOVE_NONE)
+ rm = *std::find(RootMoves.begin(), RootMoves.end(), skill.best);
+
Log log(Options["Search Log Filename"]);
- log << pretty_pv(pos, depth, bestValue, Time::now() - SearchTime, &RootMoves[0].pv[0])
+ log << pretty_pv(pos, depth, rm.score, Time::now() - SearchTime, rm.pv.data())
<< std::endl;
}
|| Time::now() - SearchTime > (TimeMgr.available_time() * 20) / 100))
{
Value rBeta = bestValue - 2 * PawnValueMg;
- (ss+1)->excludedMove = RootMoves[0].pv[0];
- (ss+1)->skipNullMove = true;
- Value v = search<NonPV>(pos, ss+1, rBeta - 1, rBeta, (depth - 3) * ONE_PLY);
- (ss+1)->skipNullMove = false;
- (ss+1)->excludedMove = MOVE_NONE;
+ ss->excludedMove = RootMoves[0].pv[0];
+ ss->skipNullMove = true;
+ Value v = search<NonPV>(pos, ss, rBeta - 1, rBeta, (depth - 3) * ONE_PLY);
+ ss->skipNullMove = false;
+ ss->excludedMove = MOVE_NONE;
if (v < rBeta)
stop = true;
&& (ss-1)->reduction
&& threatMove != MOVE_NONE
&& allows(pos, (ss-1)->currentMove, threatMove))
- return beta - 1;
+ return alpha;
}
}
split_point_start: // At split points actual search starts from here
- MovePicker mp(pos, ttMove, depth, History, Countermoves, ss, PvNode ? -VALUE_INFINITE : beta);
+ Square prevMoveSq = to_sq((ss-1)->currentMove);
+ Move countermoves[] = { Countermoves[pos.piece_on(prevMoveSq)][prevMoveSq].first,
+ Countermoves[pos.piece_on(prevMoveSq)][prevMoveSq].second };
+
+ MovePicker mp(pos, ttMove, depth, History, countermoves, ss, PvNode ? -VALUE_INFINITE : beta);
CheckInfo ci(pos);
value = bestValue; // Workaround a bogus 'uninitialized' warning under gcc
singularExtensionNode = !RootNode
&& move != ss->killers[1])
{
ss->reduction = reduction<PvNode>(depth, moveCount);
+ if (move == countermoves[0] || move == countermoves[1])
+ ss->reduction = std::max(DEPTH_ZERO, ss->reduction-ONE_PLY);
+
Depth d = std::max(newDepth - ss->reduction, ONE_PLY);
if (SpNode)
alpha = splitPoint->alpha;
Value bonus = Value(int(depth) * int(depth));
History.update(pos.piece_moved(bestMove), to_sq(bestMove), bonus);
if (is_ok((ss-1)->currentMove))
- {
- Square prevSq = to_sq((ss-1)->currentMove);
- Countermoves.update(pos.piece_on(prevSq), prevSq, bestMove);
- }
+ Countermoves.update(pos.piece_on(prevMoveSq), prevMoveSq, bestMove);
// Decrease history of all the other played non-capture moves
for (int i = 0; i < playedMoveCount - 1; i++)
// Prune moves with negative or equal SEE and also moves with positive
// SEE where capturing piece loses a tempo and SEE < beta - futilityBase.
if ( futilityBase < beta
- && depth < DEPTH_ZERO
&& pos.see(move, beta - futilityBase) <= 0)
{
bestValue = std::max(bestValue, futilityBase);
{
// Update occupancy as if the piece and the threat are moving
Bitboard occ = pos.pieces() ^ m1from ^ m1to ^ m2from;
- Piece piece = pos.piece_on(m1from);
+ Piece pc = pos.piece_on(m1from);
// The moved piece attacks the square 'tto' ?
- if (pos.attacks_from(piece, m1to, occ) & m2to)
+ if (pos.attacks_from(pc, m1to, occ) & m2to)
return true;
// Scan for possible X-ray attackers behind the moved piece
- Bitboard xray = (attacks_bb< ROOK>(m2to, occ) & pos.pieces(color_of(piece), QUEEN, ROOK))
- | (attacks_bb<BISHOP>(m2to, occ) & pos.pieces(color_of(piece), QUEEN, BISHOP));
+ Bitboard xray = (attacks_bb< ROOK>(m2to, occ) & pos.pieces(color_of(pc), QUEEN, ROOK))
+ | (attacks_bb<BISHOP>(m2to, occ) & pos.pieces(color_of(pc), QUEEN, BISHOP));
// Verify attackers are triggered by our move and not already existing
if (xray && (xray ^ (xray & pos.attacks_from<QUEEN>(m2to))))
string uci_pv(const Position& pos, int depth, Value alpha, Value beta) {
std::stringstream s;
- Time::point elaspsed = Time::now() - SearchTime + 1;
+ Time::point elapsed = Time::now() - SearchTime + 1;
size_t uciPVSize = std::min((size_t)Options["MultiPV"], RootMoves.size());
int selDepth = 0;
<< " seldepth " << selDepth
<< " score " << (i == PVIdx ? score_to_uci(v, alpha, beta) : score_to_uci(v))
<< " nodes " << pos.nodes_searched()
- << " nps " << pos.nodes_searched() * 1000 / elaspsed
- << " time " << elaspsed
+ << " nps " << pos.nodes_searched() * 1000 / elapsed
+ << " time " << elapsed
<< " multipv " << i + 1
<< " pv";