X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fsearch.cpp;h=4cf8f47122e5143bed143abbf9c1e876a38844d7;hp=ae247c0476ba700367dbddd61cc259ca6a257787;hb=c2d42ea8339b49e52a116e488214a14fda09d413;hpb=87f7e99bc4ddeee7ca6b098d73620e2de2b1287e diff --git a/src/search.cpp b/src/search.cpp index ae247c04..4cf8f471 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -20,9 +20,9 @@ #include #include #include -#include #include #include +#include #include #include @@ -47,6 +47,8 @@ namespace Search { } using std::string; +using std::cout; +using std::endl; using namespace Search; namespace { @@ -188,7 +190,7 @@ namespace { MovePickerExt(const Position& p, Move ttm, Depth d, const History& h, Stack* ss, Value b) : MovePicker(p, ttm, d, h, ss, b), mp(ss->sp->mp) {} - Move get_next_move() { return mp->get_next_move(); } + Move next_move() { return mp->next_move(); } MovePicker* mp; }; @@ -291,7 +293,7 @@ void Search::think() { // is given, with the subset of legal moves to search. for (MoveList ml(pos); !ml.end(); ++ml) if ( SearchMoves.empty() - || std::count(SearchMoves.begin(), SearchMoves.end(), ml.move())) + || count(SearchMoves.begin(), SearchMoves.end(), ml.move())) RootMoves.push_back(RootMove(ml.move())); if (Options["OwnBook"].value()) @@ -302,9 +304,9 @@ void Search::think() { Move bookMove = book.probe(pos, Options["Best Book Move"].value()); if ( bookMove != MOVE_NONE - && std::count(RootMoves.begin(), RootMoves.end(), bookMove)) + && count(RootMoves.begin(), RootMoves.end(), bookMove)) { - std::swap(RootMoves[0], *std::find(RootMoves.begin(), RootMoves.end(), bookMove)); + std::swap(RootMoves[0], *find(RootMoves.begin(), RootMoves.end(), bookMove)); goto finish; } } @@ -337,7 +339,7 @@ void Search::think() { << " time: " << Limits.time << " increment: " << Limits.increment << " moves to go: " << Limits.movesToGo - << std::endl; + << endl; } for (int i = 0; i < Threads.size(); i++) @@ -371,7 +373,7 @@ void Search::think() { StateInfo st; pos.do_move(RootMoves[0].pv[0], st); - log << "\nPonder move: " << move_to_san(pos, RootMoves[0].pv[1]) << std::endl; + log << "\nPonder move: " << move_to_san(pos, RootMoves[0].pv[1]) << endl; pos.undo_move(RootMoves[0].pv[0]); } @@ -384,9 +386,8 @@ finish: Threads.wait_for_stop_or_ponderhit(); // Best move could be MOVE_NONE when searching on a stalemate position - printf("bestmove %s ponder %s\n", - move_to_uci(RootMoves[0].pv[0], Chess960).c_str(), - move_to_uci(RootMoves[0].pv[1], Chess960).c_str()); + cout << "bestmove " << move_to_uci(RootMoves[0].pv[0], Chess960) + << " ponder " << move_to_uci(RootMoves[0].pv[1], Chess960) << endl; } @@ -412,8 +413,8 @@ namespace { // Handle the special case of a mate/stalemate position if (RootMoves.empty()) { - printf("info depth 0%s\n", - score_to_uci(pos.in_check() ? -VALUE_MATE : VALUE_DRAW).c_str()); + cout << "info depth 0" + << score_to_uci(pos.in_check() ? -VALUE_MATE : VALUE_DRAW) << endl; RootMoves.push_back(MOVE_NONE); return; @@ -475,7 +476,7 @@ namespace { // If search has been stopped exit the aspiration window loop. // Sorting and writing PV back to TT is safe becuase RootMoves - // is still valid, although refers to previous iteration. + // is still valid, although refers to previous iteration. if (Signals.stop) break; @@ -568,7 +569,7 @@ namespace { if (skillBest == MOVE_NONE) // Still unassigned ? skillBest = do_skill_level(); - std::swap(RootMoves[0], *std::find(RootMoves.begin(), RootMoves.end(), skillBest)); + std::swap(RootMoves[0], *find(RootMoves.begin(), RootMoves.end(), skillBest)); } } @@ -652,7 +653,7 @@ namespace { // We don't want the score of a partial search to overwrite a previous full search // TT value, so we use a different position key in case of an excluded move. excludedMove = ss->excludedMove; - posKey = excludedMove ? pos.get_exclusion_key() : pos.get_key(); + posKey = excludedMove ? pos.exclusion_key() : pos.key(); tte = TT.probe(posKey); ttMove = RootNode ? RootMoves[PVIdx].pv[0] : tte ? tte->move() : MOVE_NONE; @@ -815,7 +816,7 @@ namespace { MovePicker mp(pos, ttMove, H, pos.captured_piece_type()); CheckInfo ci(pos); - while ((move = mp.get_next_move()) != MOVE_NONE) + while ((move = mp.next_move()) != MOVE_NONE) if (pos.pl_move_is_legal(move, ci.pinned)) { pos.do_move(move, st, ci, pos.move_gives_check(move, ci)); @@ -866,7 +867,7 @@ split_point_start: // At split points actual search starts from here // Step 11. Loop through moves // Loop through all pseudo-legal moves until no moves remain or a beta cutoff occurs while ( bestValue < beta - && (move = mp.get_next_move()) != MOVE_NONE + && (move = mp.next_move()) != MOVE_NONE && !thread.cutoff_occurred()) { assert(is_ok(move)); @@ -877,7 +878,7 @@ split_point_start: // At split points actual search starts from here // At root obey the "searchmoves" option and skip moves not listed in Root // Move List, as a consequence any illegal move is also skipped. In MultiPV // mode we also skip PV moves which have been already searched. - if (RootNode && !std::count(RootMoves.begin() + PVIdx, RootMoves.end(), move)) + if (RootNode && !count(RootMoves.begin() + PVIdx, RootMoves.end(), move)) continue; // At PV and SpNode nodes we want all moves to be legal since the beginning @@ -898,8 +899,9 @@ split_point_start: // At split points actual search starts from here nodes = pos.nodes_searched(); if (pos.thread() == 0 && elapsed_time() > 2000) - printf("info depth %i currmove %s currmovenumber %i\n", depth / ONE_PLY, - move_to_uci(move, Chess960).c_str(), moveCount + PVIdx); + cout << "info depth " << depth / ONE_PLY + << " currmove " << move_to_uci(move, Chess960) + << " currmovenumber " << moveCount + PVIdx << endl; } isPvMove = (PvNode && moveCount <= 1); @@ -1060,7 +1062,7 @@ split_point_start: // At split points actual search starts from here // be trusted, and we don't update the best move and/or PV. if (RootNode && !Signals.stop) { - RootMove& rm = *std::find(RootMoves.begin(), RootMoves.end(), move); + RootMove& rm = *find(RootMoves.begin(), RootMoves.end(), move); rm.nodes += pos.nodes_searched() - nodes; // PV move or new best move ? @@ -1141,7 +1143,9 @@ split_point_start: // At split points actual search starts from here TT.store(posKey, value_to_tt(bestValue, ss->ply), vt, depth, move, ss->eval, ss->evalMargin); // Update killers and history for non capture cut-off moves - if (bestValue >= beta && !pos.is_capture_or_promotion(move)) + if ( bestValue >= beta + && !pos.is_capture_or_promotion(move) + && !inCheck) { if (move != ss->killers[0]) { @@ -1216,7 +1220,7 @@ split_point_start: // At split points actual search starts from here // Transposition table lookup. At PV nodes, we don't use the TT for // pruning, but only for move ordering. - tte = TT.probe(pos.get_key()); + tte = TT.probe(pos.key()); ttMove = (tte ? tte->move() : MOVE_NONE); if (!PvNode && tte && can_return_tt(tte, ttDepth, beta, ss->ply)) @@ -1248,7 +1252,7 @@ split_point_start: // At split points actual search starts from here if (bestValue >= beta) { if (!tte) - TT.store(pos.get_key(), value_to_tt(bestValue, ss->ply), VALUE_TYPE_LOWER, DEPTH_NONE, MOVE_NONE, ss->eval, evalMargin); + TT.store(pos.key(), value_to_tt(bestValue, ss->ply), VALUE_TYPE_LOWER, DEPTH_NONE, MOVE_NONE, ss->eval, evalMargin); return bestValue; } @@ -1269,7 +1273,7 @@ split_point_start: // At split points actual search starts from here // Loop through the moves until no moves remain or a beta cutoff occurs while ( bestValue < beta - && (move = mp.get_next_move()) != MOVE_NONE) + && (move = mp.next_move()) != MOVE_NONE) { assert(is_ok(move)); @@ -1369,7 +1373,7 @@ split_point_start: // At split points actual search starts from here vt = bestValue <= oldAlpha ? VALUE_TYPE_UPPER : bestValue >= beta ? VALUE_TYPE_LOWER : VALUE_TYPE_EXACT; - TT.store(pos.get_key(), value_to_tt(bestValue, ss->ply), vt, ttDepth, move, ss->eval, evalMargin); + TT.store(pos.key(), value_to_tt(bestValue, ss->ply), vt, ttDepth, move, ss->eval, evalMargin); assert(bestValue > -VALUE_INFINITE && bestValue < VALUE_INFINITE); @@ -1487,8 +1491,8 @@ split_point_start: // At split points actual search starts from here // value_to_tt() adjusts a mate score from "plies to mate from the root" to - // "plies to mate from the current ply". Non-mate scores are unchanged. - // The function is called before storing a value to the transposition table. + // "plies to mate from the current ply". Non-mate scores are unchanged. The + // function is called before storing a value to the transposition table. Value value_to_tt(Value v, int ply) { @@ -1598,9 +1602,9 @@ split_point_start: // At split points actual search starts from here static int searchStartTime; if (reset) - searchStartTime = get_system_time(); + searchStartTime = system_time(); - return get_system_time() - searchStartTime; + return system_time() - searchStartTime; } @@ -1634,7 +1638,6 @@ split_point_start: // At split points actual search starts from here int t = elapsed_time(); int selDepth = 0; - std::stringstream s; for (int i = 0; i < Threads.size(); i++) if (Threads[i].maxPly > selDepth) @@ -1649,19 +1652,19 @@ split_point_start: // At split points actual search starts from here int d = (updated ? depth : depth - 1); Value v = (updated ? RootMoves[i].score : RootMoves[i].prevScore); - - s << "info depth " << d - << " seldepth " << selDepth - << (i == PVIdx ? score_to_uci(v, alpha, beta) : score_to_uci(v)) - << " nodes " << pos.nodes_searched() - << " nps " << (t > 0 ? pos.nodes_searched() * 1000 / t : 0) - << " time " << t - << " multipv " << i + 1 << " pv"; + std::stringstream s; for (int j = 0; RootMoves[i].pv[j] != MOVE_NONE; j++) s << " " << move_to_uci(RootMoves[i].pv[j], Chess960); - printf("%s\n", s.str().c_str()); // Much faster than std::cout + cout << "info depth " << d + << " seldepth " << selDepth + << (i == PVIdx ? score_to_uci(v, alpha, beta) : score_to_uci(v)) + << " nodes " << pos.nodes_searched() + << " nps " << (t > 0 ? pos.nodes_searched() * 1000 / t : 0) + << " time " << t + << " multipv " << i + 1 + << " pv" << s.str() << endl; } } @@ -1751,7 +1754,7 @@ split_point_start: // At split points actual search starts from here pos.undo_move(*--m); Log l(Options["Search Log Filename"].value()); - l << s.str() << std::endl; + l << s.str() << endl; } @@ -1765,7 +1768,7 @@ split_point_start: // At split points actual search starts from here static RKISS rk; // PRNG sequence should be not deterministic - for (int i = abs(get_system_time() % 50); i > 0; i--) + for (int i = abs(system_time() % 50); i > 0; i--) rk.rand(); // RootMoves are already sorted by score in descending order @@ -1818,7 +1821,7 @@ split_point_start: // At split points actual search starts from here pv.push_back(m); pos.do_move(m, *st++); - while ( (tte = TT.probe(pos.get_key())) != NULL + while ( (tte = TT.probe(pos.key())) != NULL && tte->move() != MOVE_NONE && pos.is_pseudo_legal(tte->move()) && pos.pl_move_is_legal(tte->move(), pos.pinned_pieces()) @@ -1850,7 +1853,7 @@ split_point_start: // At split points actual search starts from here assert(pv[ply] != MOVE_NONE && pos.is_pseudo_legal(pv[ply])); do { - k = pos.get_key(); + k = pos.key(); tte = TT.probe(k); // Don't overwrite existing correct entries @@ -1968,9 +1971,9 @@ void do_timer_event() { static int lastInfoTime; int e = elapsed_time(); - if (get_system_time() - lastInfoTime >= 1000 || !lastInfoTime) + if (system_time() - lastInfoTime >= 1000 || !lastInfoTime) { - lastInfoTime = get_system_time(); + lastInfoTime = system_time(); dbg_print_mean(); dbg_print_hit_rate();