X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fsearch.cpp;h=fce0409bf17023e89ad61665b4afcb5bc885df14;hb=ce619b3b6ceb96bbf1e90f8281fdc89b9e64ec5e;hp=33e170acb8364fca92117ee63e881b1bcaf1ad98;hpb=969ad8001c12adfeb55b494e2bc3981364c8bf5e;p=stockfish diff --git a/src/search.cpp b/src/search.cpp index 33e170ac..fce0409b 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -40,6 +41,7 @@ using std::cout; using std::endl; +using std::string; namespace { @@ -210,10 +212,11 @@ namespace { void do_skill_level(Move* best, Move* ponder); int current_search_time(int set = 0); - std::string score_to_uci(Value v, Value alpha, Value beta); - std::string speed_to_uci(int64_t nodes); - std::string pv_to_uci(Move pv[], int pvNum); - std::string depth_to_uci(Depth depth); + string score_to_uci(Value v, Value alpha, Value beta); + string speed_to_uci(int64_t nodes); + string pv_to_uci(Move pv[], int pvNum, bool chess960); + string pretty_pv(Position& pos, int depth, Value score, int time, Move pv[]); + string depth_to_uci(Depth depth); void poll(const Position& pos); void wait_for_stop_or_ponderhit(); @@ -411,8 +414,8 @@ bool think(Position& pos, const SearchLimits& limits, Move searchMoves[]) { // Look for a book move if (Options["OwnBook"].value()) { - if (Options["Book File"].value() != book.name()) - book.open(Options["Book File"].value()); + if (Options["Book File"].value() != book.name()) + book.open(Options["Book File"].value()); Move bookMove = book.get_move(pos, Options["Best Book Move"].value()); if (bookMove != MOVE_NONE) @@ -457,7 +460,7 @@ bool think(Position& pos, const SearchLimits& limits, Move searchMoves[]) { // Write to log file and keep it open to be accessed during the search if (Options["Use Search Log"].value()) { - std::string name = Options["Search Log Filename"].value(); + string name = Options["Search Log Filename"].value(); LogFile.open(name.c_str(), std::ios::out | std::ios::app); if (LogFile.is_open()) @@ -589,7 +592,7 @@ namespace { << depth_to_uci(depth * ONE_PLY) << score_to_uci(Rml[i].pv_score, alpha, beta) << speed_to_uci(pos.nodes_searched()) - << pv_to_uci(Rml[i].pv, i + 1) << endl; + << pv_to_uci(Rml[i].pv, i + 1, pos.is_chess960()) << endl; // In case of failing high/low increase aspiration window and research, // otherwise exit the fail high/low loop. @@ -633,12 +636,6 @@ namespace { // Check for some early stop condition if (!StopRequest && Limits.useTimeManagement()) { - // Stop search early when the last two iterations returned a mate score - if ( depth >= 5 - && abs(bestValues[depth]) >= VALUE_MATE_IN_PLY_MAX - && abs(bestValues[depth - 1]) >= VALUE_MATE_IN_PLY_MAX) - StopRequest = true; - // Stop search early if one move seems to be much better than the // others or if there is only a single legal move. Also in the latter // case we search up to some depth anyway to get a proper score. @@ -726,7 +723,7 @@ namespace { if (PvNode && thread.maxPly < ss->ply) thread.maxPly = ss->ply; - // Step 1. Initialize node. + // Step 1. Initialize node and poll. Polling can abort search if (!SpNode) { ss->currentMove = ss->bestMove = threatMove = (ss+1)->excludedMove = MOVE_NONE; @@ -742,6 +739,18 @@ namespace { goto split_point_start; } + if (pos.thread() == 0 && ++NodesSincePoll > NodesBetweenPolls) + { + NodesSincePoll = 0; + poll(pos); + } + + // Step 2. Check for aborted search and immediate draw + if (( StopRequest + || pos.is_draw() + || ss->ply > PLY_MAX) && !RootNode) + return VALUE_DRAW; + // Step 3. Mate distance pruning if (!RootNode) { @@ -761,9 +770,10 @@ namespace { // At PV nodes we check for exact scores, while at non-PV nodes we check for // a fail high/low. Biggest advantage at probing at PV nodes is to have a - // smooth experience in analysis mode. - if (tte && (PvNode ? tte->depth() >= depth && tte->type() == VALUE_TYPE_EXACT - : ok_to_use_TT(tte, depth, beta, ss->ply))) + // smooth experience in analysis mode. We don't probe at Root nodes otherwise + // we should also update RootMoveList to avoid bogus output. + if (!RootNode && tte && (PvNode ? tte->depth() >= depth && tte->type() == VALUE_TYPE_EXACT + : ok_to_use_TT(tte, depth, beta, ss->ply))) { TT.refresh(tte); ss->bestMove = ttMove; // Can be MOVE_NONE @@ -902,12 +912,7 @@ namespace { if (pos.pl_move_is_legal(move, ci.pinned)) { pos.do_move(move, st, ci, pos.move_gives_check(move, ci)); - - if (pos.is_draw() || ss->ply + 1 > PLY_MAX) - value = VALUE_DRAW; - else - value = -search(pos, ss+1, -rbeta, -rbeta+1, rdepth); - + value = -search(pos, ss+1, -rbeta, -rbeta+1, rdepth); pos.undo_move(move); if (value >= rbeta) return value; @@ -1097,22 +1102,6 @@ split_point_start: // At split points actual search starts from here // Step 14. Make the move pos.do_move(move, st, ci, givesCheck); - // Step XX. Poll. Check if search should be aborted. - if (pos.thread() == 0 && ++NodesSincePoll > NodesBetweenPolls) - { - NodesSincePoll = 0; - poll(pos); - } - - // Step XX. Check for aborted search and immediate draw - if ( StopRequest - || pos.is_draw() - || ss->ply + 1 > PLY_MAX) - { - value = VALUE_DRAW; - goto undo; - } - // Step extra. pv search (only in PV nodes) // The first move in list is the expected PV if (isPvMove) @@ -1159,7 +1148,6 @@ split_point_start: // At split points actual search starts from here } // Step 17. Undo move -undo: pos.undo_move(move); assert(value > -VALUE_INFINITE && value < VALUE_INFINITE); @@ -1761,7 +1749,7 @@ undo: // mate Mate in y moves, not plies. If the engine is getting mated // use negative values for y. - std::string score_to_uci(Value v, Value alpha, Value beta) { + string score_to_uci(Value v, Value alpha, Value beta) { std::stringstream s; @@ -1779,7 +1767,7 @@ undo: // speed_to_uci() returns a string with time stats of current search suitable // to be sent to UCI gui. - std::string speed_to_uci(int64_t nodes) { + string speed_to_uci(int64_t nodes) { std::stringstream s; int t = current_search_time(); @@ -1794,11 +1782,11 @@ undo: // pv_to_uci() returns a string with information on the current PV line // formatted according to UCI specification. - std::string pv_to_uci(Move pv[], int pvNum) { + string pv_to_uci(Move pv[], int pvNum, bool chess960) { std::stringstream s; - s << " multipv " << pvNum << " pv "; + s << " multipv " << pvNum << " pv " << set960(chess960); for ( ; *pv != MOVE_NONE; pv++) s << *pv << " "; @@ -1809,7 +1797,7 @@ undo: // depth_to_uci() returns a string with information on the current depth and // seldepth formatted according to UCI specification. - std::string depth_to_uci(Depth depth) { + string depth_to_uci(Depth depth) { std::stringstream s; @@ -1824,6 +1812,89 @@ undo: return s.str(); } + string time_to_string(int millisecs) { + + const int MSecMinute = 1000 * 60; + const int MSecHour = 1000 * 60 * 60; + + int hours = millisecs / MSecHour; + int minutes = (millisecs % MSecHour) / MSecMinute; + int seconds = ((millisecs % MSecHour) % MSecMinute) / 1000; + + std::stringstream s; + + if (hours) + s << hours << ':'; + + s << std::setfill('0') << std::setw(2) << minutes << ':' << std::setw(2) << seconds; + return s.str(); + } + + string score_to_string(Value v) { + + std::stringstream s; + + if (v >= VALUE_MATE_IN_PLY_MAX) + s << "#" << (VALUE_MATE - v + 1) / 2; + else if (v <= VALUE_MATED_IN_PLY_MAX) + s << "-#" << (VALUE_MATE + v) / 2; + else + s << std::setprecision(2) << std::fixed << std::showpos << float(v) / PawnValueMidgame; + + return s.str(); + } + + // pretty_pv() creates a human-readable string from a position and a PV. + // It is used to write search information to the log file (which is created + // when the UCI parameter "Use Search Log" is "true"). + + string pretty_pv(Position& pos, int depth, Value value, int time, Move pv[]) { + + const int64_t K = 1000; + const int64_t M = 1000000; + const int startColumn = 28; + const size_t maxLength = 80 - startColumn; + + StateInfo state[PLY_MAX_PLUS_2], *st = state; + Move* m = pv; + string san; + std::stringstream s; + size_t length = 0; + + // First print depth, score, time and searched nodes... + s << set960(pos.is_chess960()) + << std::setw(2) << depth + << std::setw(8) << score_to_string(value) + << std::setw(8) << time_to_string(time); + + if (pos.nodes_searched() < M) + s << std::setw(8) << pos.nodes_searched() / 1 << " "; + else if (pos.nodes_searched() < K * M) + s << std::setw(7) << pos.nodes_searched() / K << "K "; + else + s << std::setw(7) << pos.nodes_searched() / M << "M "; + + // ...then print the full PV line in short algebraic notation + while (*m != MOVE_NONE) + { + san = move_to_san(pos, *m); + length += san.length() + 1; + + if (length > maxLength) + { + length = san.length() + 1; + s << "\n" + string(startColumn, ' '); + } + s << san << ' '; + + pos.do_move(*m++, *st++); + } + + // Restore original position before to leave + while (m != pv) pos.undo_move(*--m); + + return s.str(); + } // poll() performs two different functions: It polls for user input, and it // looks at the time consumed so far and decides if it's time to abort the @@ -1838,7 +1909,7 @@ undo: if (input_available()) { // We are line oriented, don't read single chars - std::string command; + string command; if (!std::getline(std::cin, command) || command == "quit") { @@ -1913,7 +1984,7 @@ undo: void wait_for_stop_or_ponderhit() { - std::string command; + string command; // Wait for a command from stdin while ( std::getline(std::cin, command)