X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fsearch.cpp;h=1b98627e9bf1749e6e5ebb04370fdd09539c0016;hb=3835f49aa10af094642d94b1765183c8bffd561b;hp=0c9102fe140c172a869229b23b2d402b34cbce3d;hpb=f803f33e6383fea1074aca2cf625983e148a6668;p=stockfish diff --git a/src/search.cpp b/src/search.cpp index 0c9102fe..1b98627e 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -129,7 +129,7 @@ namespace { void extract_pv_from_tt(Position& pos); void insert_pv_in_tt(Position& pos); - std::string pv_info_to_uci(const Position& pos, Value alpha, Value beta); + std::string pv_info_to_uci(const Position& pos, Value alpha, Value beta, int pvLine = 0); int64_t nodes; Value pv_score; @@ -275,7 +275,7 @@ namespace { /// Local functions - Value id_loop(Position& pos, Move searchMoves[]); + Move id_loop(Position& pos, Move searchMoves[], Move* ponderMove); Value root_search(Position& pos, SearchStack* ss, Value alpha, Value beta, Depth depth, RootMoveList& rml); template @@ -491,7 +491,32 @@ bool think(Position& pos, bool infinite, bool ponder, int time[], int increment[ << " moves to go: " << movesToGo << endl; // We're ready to start thinking. Call the iterative deepening loop function - id_loop(pos, searchMoves); + Move ponderMove = MOVE_NONE; + Move bestMove = id_loop(pos, searchMoves, &ponderMove); + + // Print final search statistics + cout << "info nodes " << pos.nodes_searched() + << " nps " << nps(pos) + << " time " << current_search_time() << endl; + + if (UseLogFile) + { + if (dbg_show_mean) + dbg_print_mean(LogFile); + + if (dbg_show_hit_rate) + dbg_print_hit_rate(LogFile); + + LogFile << "\nNodes: " << pos.nodes_searched() + << "\nNodes/second: " << nps(pos) + << "\nBest move: " << move_to_san(pos, bestMove); + + StateInfo st; + pos.do_move(bestMove, st); + LogFile << "\nPonder move: " + << move_to_san(pos, ponderMove) // Works also with MOVE_NONE + << endl; + } if (UseLogFile) LogFile.close(); @@ -499,6 +524,14 @@ bool think(Position& pos, bool infinite, bool ponder, int time[], int increment[ // This makes all the threads to go to sleep ThreadsMgr.set_active_threads(1); + // If we are pondering or in infinite search, we shouldn't print the + // best move before we are told to do so. + if (!AbortSearch && (PonderSearch || InfiniteSearch)) + wait_for_stop_or_ponderhit(); + + // Could be both MOVE_NONE when searching on a stalemate position + cout << "bestmove " << bestMove << " ponder " << ponderMove << endl; + return !Quit; } @@ -510,7 +543,7 @@ namespace { // been consumed, the user stops the search, or the maximum search depth is // reached. - Value id_loop(Position& pos, Move searchMoves[]) { + Move id_loop(Position& pos, Move searchMoves[], Move* ponderMove) { SearchStack ss[PLY_MAX_PLUS_2]; Depth depth; @@ -523,10 +556,12 @@ namespace { // Handle special case of searching on a mate/stale position if (rml.size() == 0) { - if (PonderSearch) - wait_for_stop_or_ponderhit(); + Value s = (pos.is_check() ? -VALUE_MATE : VALUE_DRAW); + + cout << "info depth " << 1 + << " score " << value_to_uci(s) << endl; - return pos.is_check() ? -VALUE_MATE : VALUE_DRAW; + return MOVE_NONE; } // Initialize @@ -632,43 +667,8 @@ namespace { break; } - // If we are pondering or in infinite search, we shouldn't print the - // best move before we are told to do so. - if (!AbortSearch && (PonderSearch || InfiniteSearch)) - wait_for_stop_or_ponderhit(); - else - // Print final search statistics - cout << "info nodes " << pos.nodes_searched() - << " nps " << nps(pos) - << " time " << current_search_time() << endl; - - // Print the best move and the ponder move to the standard output - cout << "bestmove " << rml[0].pv[0]; - - if (rml[0].pv[1] != MOVE_NONE) - cout << " ponder " << rml[0].pv[1]; - - cout << endl; - - if (UseLogFile) - { - if (dbg_show_mean) - dbg_print_mean(LogFile); - - if (dbg_show_hit_rate) - dbg_print_hit_rate(LogFile); - - LogFile << "\nNodes: " << pos.nodes_searched() - << "\nNodes/second: " << nps(pos) - << "\nBest move: " << move_to_san(pos, rml[0].pv[0]); - - StateInfo st; - pos.do_move(rml[0].pv[0], st); - LogFile << "\nPonder move: " - << move_to_san(pos, rml[0].pv[1]) // Works also with MOVE_NONE - << endl; - } - return rml[0].pv_score; + *ponderMove = rml[0].pv[1]; + return rml[0].pv[0]; } @@ -849,41 +849,29 @@ namespace { rml[i].pv_score = value; rml[i].extract_pv_from_tt(pos); - if (MultiPV == 1) - { - // We record how often the best move has been changed in each - // iteration. This information is used for time managment: When - // the best move changes frequently, we allocate some more time. - if (i > 0) - BestMoveChangesByIteration[Iteration]++; + // We record how often the best move has been changed in each + // iteration. This information is used for time managment: When + // the best move changes frequently, we allocate some more time. + if (MultiPV == 1 && i > 0) + BestMoveChangesByIteration[Iteration]++; - // Inform GUI that PV has changed - cout << rml[i].pv_info_to_uci(pos, alpha, beta) << endl; + // Inform GUI that PV has changed, in case of multi-pv UCI protocol + // requires we send all the PV lines properly sorted. + rml.sort_multipv(i); + for (int j = 0; j < Min(MultiPV, (int)rml.size()); j++) + cout << rml[j].pv_info_to_uci(pos, alpha, beta, j) << endl; + + // Update alpha. In multi-pv we don't use aspiration window + if (MultiPV == 1) + { // Raise alpha to setup proper non-pv search upper bound if (value > alpha) alpha = value; } - else // MultiPV > 1 - { - rml.sort_multipv(i); - for (int j = 0; j < Min(MultiPV, (int)rml.size()); j++) - { - cout << "info multipv " << j + 1 - << " score " << value_to_uci(rml[j].pv_score) - << " depth " << (j <= i ? Iteration : Iteration - 1) - << " time " << current_search_time() - << " nodes " << pos.nodes_searched() - << " nps " << nps(pos) - << " pv "; - - for (int k = 0; rml[j].pv[k] != MOVE_NONE && k < PLY_MAX; k++) - cout << rml[j].pv[k] << " "; - - cout << endl; - } + else // Set alpha equal to minimum score among the PV lines alpha = rml[Min(i, MultiPV - 1)].pv_score; - } + } // PV move or new best move assert(alpha >= oldAlpha); @@ -892,7 +880,8 @@ namespace { if (AspirationFailLow && StopOnPonderhit) StopOnPonderhit = false; - } + + } // Root moves loop // Can we exit fail low loop ? if (AbortSearch || !AspirationFailLow) @@ -2625,12 +2614,13 @@ split_point_start: // At split points actual search starts from here // formatted according to UCI specification and eventually writes the info // to a log file. It is called at each iteration or after a new pv is found. - std::string RootMove::pv_info_to_uci(const Position& pos, Value alpha, Value beta) { + std::string RootMove::pv_info_to_uci(const Position& pos, Value alpha, Value beta, int pvLine) { std::stringstream s; - s << "info depth " << Iteration - << " score " << value_to_uci(pv_score) + s << "info depth " << Iteration // FIXME + << " multipv " << pvLine + 1 + << " score " << value_to_uci(pv_score) << (pv_score >= beta ? " lowerbound" : pv_score <= alpha ? " upperbound" : "") << " time " << current_search_time() << " nodes " << pos.nodes_searched() @@ -2640,7 +2630,7 @@ split_point_start: // At split points actual search starts from here for (Move* m = pv; *m != MOVE_NONE; m++) s << *m << " "; - if (UseLogFile) + if (UseLogFile && pvLine == 0) { ValueType t = pv_score >= beta ? VALUE_TYPE_LOWER : pv_score <= alpha ? VALUE_TYPE_UPPER : VALUE_TYPE_EXACT;