X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fsearch.cpp;h=4cf8f47122e5143bed143abbf9c1e876a38844d7;hp=64a19daa6bebe1af02530018c51006b39f85c537;hb=c2d42ea8339b49e52a116e488214a14fda09d413;hpb=4e59c5c2746741e7aedd451ea16b792d1568e5c4 diff --git a/src/search.cpp b/src/search.cpp index 64a19daa..4cf8f471 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -46,9 +46,9 @@ namespace Search { Position RootPosition; } +using std::string; using std::cout; using std::endl; -using std::string; using namespace Search; namespace { @@ -145,24 +145,23 @@ namespace { /// Namespace variables std::vector RootMoves; - size_t MultiPV, UCIMultiPV, MultiPVIdx; + size_t MultiPV, UCIMultiPV, PVIdx; TimeManager TimeMgr; int BestMoveChanges; int SkillLevel; - bool SkillLevelEnabled; + bool SkillLevelEnabled, Chess960; History H; /// Local functions - Move id_loop(Position& pos, Move* ponderMove); - template Value search(Position& pos, Stack* ss, Value alpha, Value beta, Depth depth); template Value qsearch(Position& pos, Stack* ss, Value alpha, Value beta, Depth depth); + void id_loop(Position& pos); bool check_is_dangerous(Position &pos, Move move, Value futilityBase, Value beta, Value *bValue); bool connected_moves(const Position& pos, Move m1, Move m2); Value value_to_tt(Value v, int ply); @@ -170,14 +169,11 @@ namespace { bool can_return_tt(const TTEntry* tte, Depth depth, Value beta, int ply); bool connected_threat(const Position& pos, Move m, Move threat); Value refine_eval(const TTEntry* tte, Value defaultEval, int ply); - void update_history(const Position& pos, Move move, Depth depth, Move movesSearched[], int moveCount); - void do_skill_level(Move* best, Move* ponder); + Move do_skill_level(); int elapsed_time(bool reset = false); string score_to_uci(Value v, Value alpha = -VALUE_INFINITE, Value beta = VALUE_INFINITE); - string speed_to_uci(int64_t nodes); - string pv_to_uci(const 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 pv_info_to_log(Position& pos, int depth, Value score, int time, Move pv[]); + void pv_info_to_uci(const Position& pos, int depth, Value alpha, Value beta); // MovePickerExt class template extends MovePicker and allows to choose at // compile time the proper moves source according to the type of node. In the @@ -194,32 +190,10 @@ 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; }; - // Overload operator<<() to make it easier to print moves in a coordinate - // notation compatible with UCI protocol. - std::ostream& operator<<(std::ostream& os, Move m) { - - bool chess960 = (os.iword(0) != 0); // See set960() - return os << move_to_uci(m, chess960); - } - - // When formatting a move for std::cout we must know if we are in Chess960 or - // not. To keep using the handy operator<<() on the move the trick is to embed - // this flag in the stream itself. Function-like named enum set960 is used as - // a custom manipulator and the stream internal general-purpose array, accessed - // through ios_base::iword(), is used to pass the flag to the move's operator<< - // that will read it to properly format castling moves. - enum set960 {}; - - std::ostream& operator<<(std::ostream& os, const set960& f) { - - os.iword(0) = f; - return os; - } - // is_dangerous() checks whether a move belongs to some classes of known // 'dangerous' moves so that we avoid to prune it. FORCE_INLINE bool is_dangerous(const Position& pos, Move m, bool captureOrPromotion) { @@ -247,7 +221,7 @@ namespace { } // namespace -/// init_search() is called during startup to initialize various lookup tables +/// Search::init() is called during startup to initialize various lookup tables void Search::init() { @@ -274,8 +248,8 @@ void Search::init() { } -/// perft() is our utility to verify move generation. All the leaf nodes up to -/// the given depth are generated and counted and the sum returned. +/// Search::perft() is our utility to verify move generation. All the leaf nodes +/// up to the given depth are generated and counted and the sum returned. int64_t Search::perft(Position& pos, Depth depth) { @@ -299,20 +273,28 @@ int64_t Search::perft(Position& pos, Depth depth) { } -/// think() is the external interface to Stockfish's search, and is called by the -/// main thread when the program receives the UCI 'go' command. It searches from -/// RootPosition and at the end prints the "bestmove" to output. +/// Search::think() is the external interface to Stockfish's search, and is +/// called by the main thread when the program receives the UCI 'go' command. It +/// searches from RootPosition and at the end prints the "bestmove" to output. void Search::think() { static Book book; // Defined static to initialize the PRNG only once Position& pos = RootPosition; + Chess960 = pos.is_chess960(); elapsed_time(true); TimeMgr.init(Limits, pos.startpos_ply_counter()); + TT.new_search(); + H.clear(); + RootMoves.clear(); - // Set output stream mode: normal or chess960. Castling notation is different - cout << set960(pos.is_chess960()); + // Populate RootMoves with all the legal moves (default) or, if a SearchMoves + // is given, with the subset of legal moves to search. + for (MoveList ml(pos); !ml.end(); ++ml) + if ( SearchMoves.empty() + || count(SearchMoves.begin(), SearchMoves.end(), ml.move())) + RootMoves.push_back(RootMove(ml.move())); if (Options["OwnBook"].value()) { @@ -320,13 +302,12 @@ void Search::think() { book.open(Options["Book File"].value()); Move bookMove = book.probe(pos, Options["Best Book Move"].value()); - if (bookMove != MOVE_NONE) - { - if (!Signals.stop && (Limits.ponder || Limits.infinite)) - Threads.wait_for_stop_or_ponderhit(); - cout << "bestmove " << bookMove << endl; - return; + if ( bookMove != MOVE_NONE + && count(RootMoves.begin(), RootMoves.end(), bookMove)) + { + std::swap(RootMoves[0], *find(RootMoves.begin(), RootMoves.end(), bookMove)); + goto finish; } } @@ -361,7 +342,6 @@ void Search::think() { << endl; } - // Wake up needed threads and reset maxPly counter for (int i = 0; i < Threads.size(); i++) { Threads[i].maxPly = 0; @@ -375,9 +355,8 @@ void Search::think() { else Threads.set_timer(100); - // We're ready to start thinking. Call the iterative deepening loop function - Move ponderMove = MOVE_NONE; - Move bestMove = id_loop(pos, &ponderMove); + // We're ready to start searching. Call the iterative deepening loop function + id_loop(pos); // Stop timer and send all the slaves to sleep, if not already sleeping Threads.set_timer(0); @@ -390,29 +369,25 @@ void Search::think() { Log log(Options["Search Log Filename"].value()); log << "Nodes: " << pos.nodes_searched() << "\nNodes/second: " << (e > 0 ? pos.nodes_searched() * 1000 / e : 0) - << "\nBest move: " << move_to_san(pos, bestMove); + << "\nBest move: " << move_to_san(pos, RootMoves[0].pv[0]); StateInfo st; - pos.do_move(bestMove, st); - log << "\nPonder move: " << move_to_san(pos, ponderMove) << endl; - pos.undo_move(bestMove); // Return from think() with unchanged position + pos.do_move(RootMoves[0].pv[0], st); + log << "\nPonder move: " << move_to_san(pos, RootMoves[0].pv[1]) << endl; + pos.undo_move(RootMoves[0].pv[0]); } +finish: + // When we reach max depth we arrive here even without a StopRequest, but if // we are pondering or in infinite search, we shouldn't print the best move // before we are told to do so. if (!Signals.stop && (Limits.ponder || Limits.infinite)) Threads.wait_for_stop_or_ponderhit(); - // Could be MOVE_NONE when searching on a stalemate position - cout << "bestmove " << bestMove; - - // UCI protol is not clear on allowing sending an empty ponder move, instead - // it is clear that ponder move is optional. So skip it if empty. - if (ponderMove != MOVE_NONE) - cout << " ponder " << ponderMove; - - cout << endl; + // Best move could be MOVE_NONE when searching on a stalemate position + cout << "bestmove " << move_to_uci(RootMoves[0].pv[0], Chess960) + << " ponder " << move_to_uci(RootMoves[0].pv[1], Chess960) << endl; } @@ -422,62 +397,49 @@ namespace { // with increasing depth until the allocated thinking time has been consumed, // user stops the search, or the maximum search depth is reached. - Move id_loop(Position& pos, Move* ponderMove) { + void id_loop(Position& pos) { Stack ss[PLY_MAX_PLUS_2]; - Value bestValues[PLY_MAX_PLUS_2]; - int bestMoveChanges[PLY_MAX_PLUS_2]; - int depth, aspirationDelta; - Value bestValue, alpha, beta; - Move bestMove, skillBest, skillPonder; + int depth, prevBestMoveChanges; + Value bestValue, alpha, beta, delta; bool bestMoveNeverChanged = true; + Move skillBest = MOVE_NONE; memset(ss, 0, 4 * sizeof(Stack)); - TT.new_search(); - H.clear(); - RootMoves.clear(); - *ponderMove = bestMove = skillBest = skillPonder = MOVE_NONE; - depth = aspirationDelta = 0; - bestValue = alpha = -VALUE_INFINITE, beta = VALUE_INFINITE; + depth = BestMoveChanges = 0; + bestValue = delta = -VALUE_INFINITE; ss->currentMove = MOVE_NULL; // Hack to skip update gains - for (MoveList ml(pos); !ml.end(); ++ml) - if ( SearchMoves.empty() - || std::count(SearchMoves.begin(), SearchMoves.end(), ml.move())) - RootMoves.push_back(RootMove(ml.move())); - - // Handle special case of searching on a mate/stalemate position + // Handle the special case of a mate/stalemate position if (RootMoves.empty()) { - cout << "info" << depth_to_uci(DEPTH_ZERO) - << score_to_uci(pos.in_check() ? -VALUE_MATE : VALUE_DRAW, alpha, beta) << endl; + cout << "info depth 0" + << score_to_uci(pos.in_check() ? -VALUE_MATE : VALUE_DRAW) << endl; - return MOVE_NONE; + RootMoves.push_back(MOVE_NONE); + return; } // Iterative deepening loop until requested to stop or target depth reached while (!Signals.stop && ++depth <= PLY_MAX && (!Limits.maxDepth || depth <= Limits.maxDepth)) { - // Save now last iteration's scores, before Rml moves are reordered + // Save last iteration's scores before first PV line is searched and all + // the move scores but the (new) PV are set to -VALUE_INFINITE. for (size_t i = 0; i < RootMoves.size(); i++) RootMoves[i].prevScore = RootMoves[i].score; + prevBestMoveChanges = BestMoveChanges; BestMoveChanges = 0; // MultiPV loop. We perform a full root search for each PV line - for (MultiPVIdx = 0; MultiPVIdx < std::min(MultiPV, RootMoves.size()); MultiPVIdx++) + for (PVIdx = 0; PVIdx < std::min(MultiPV, RootMoves.size()); PVIdx++) { - // Calculate dynamic aspiration window based on previous iterations - if (depth >= 5 && abs(RootMoves[MultiPVIdx].prevScore) < VALUE_KNOWN_WIN) + // Set aspiration window default width + if (depth >= 5 && abs(RootMoves[PVIdx].prevScore) < VALUE_KNOWN_WIN) { - int prevDelta1 = bestValues[depth - 1] - bestValues[depth - 2]; - int prevDelta2 = bestValues[depth - 2] - bestValues[depth - 3]; - - aspirationDelta = std::min(std::max(abs(prevDelta1) + abs(prevDelta2) / 2, 16), 24); - aspirationDelta = (aspirationDelta + 7) / 8 * 8; // Round to match grainSize - - alpha = std::max(RootMoves[MultiPVIdx].prevScore - aspirationDelta, -VALUE_INFINITE); - beta = std::min(RootMoves[MultiPVIdx].prevScore + aspirationDelta, VALUE_INFINITE); + delta = Value(16); + alpha = RootMoves[PVIdx].prevScore - delta; + beta = RootMoves[PVIdx].prevScore + delta; } else { @@ -498,100 +460,77 @@ namespace { // we want to keep the same order for all the moves but the new // PV that goes to the front. Note that in case of MultiPV search // the already searched PV lines are preserved. - sort(RootMoves.begin() + MultiPVIdx, RootMoves.end()); + sort(RootMoves.begin() + PVIdx, RootMoves.end()); // In case we have found an exact score and we are going to leave // the fail high/low loop then reorder the PV moves, otherwise // leave the last PV move in its position so to be searched again. // Of course this is needed only in MultiPV search. - if (MultiPVIdx && bestValue > alpha && bestValue < beta) - sort(RootMoves.begin(), RootMoves.begin() + MultiPVIdx); + if (PVIdx && bestValue > alpha && bestValue < beta) + sort(RootMoves.begin(), RootMoves.begin() + PVIdx); - // Write PV back to transposition table in case the relevant entries - // have been overwritten during the search. - for (size_t i = 0; i <= MultiPVIdx; i++) + // Write PV back to transposition table in case the relevant + // entries have been overwritten during the search. + for (size_t i = 0; i <= PVIdx; i++) RootMoves[i].insert_pv_in_tt(pos); - // If search has been stopped exit the aspiration window loop, - // note that sorting and writing PV back to TT is safe becuase - // Rml is still valid, although refers to the previous iteration. + // 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. if (Signals.stop) break; // Send full PV info to GUI if we are going to leave the loop or - // if we have a fail high/low and we are deep in the search. UCI - // protocol requires to send all the PV lines also if are still - // to be searched and so refer to the previous search's score. + // if we have a fail high/low and we are deep in the search. if ((bestValue > alpha && bestValue < beta) || elapsed_time() > 2000) - for (size_t i = 0; i < std::min(UCIMultiPV, RootMoves.size()); i++) - { - bool updated = (i <= MultiPVIdx); - - if (depth == 1 && !updated) - continue; - - Depth d = (updated ? depth : depth - 1) * ONE_PLY; - Value s = (updated ? RootMoves[i].score : RootMoves[i].prevScore); - - cout << "info" - << depth_to_uci(d) - << (i == MultiPVIdx ? score_to_uci(s, alpha, beta) : score_to_uci(s)) - << speed_to_uci(pos.nodes_searched()) - << pv_to_uci(&RootMoves[i].pv[0], i + 1, pos.is_chess960()) - << endl; - } + pv_info_to_uci(pos, depth, alpha, beta); // In case of failing high/low increase aspiration window and // research, otherwise exit the fail high/low loop. if (bestValue >= beta) { - beta = std::min(beta + aspirationDelta, VALUE_INFINITE); - aspirationDelta += aspirationDelta / 2; + beta += delta; + delta += delta / 2; } else if (bestValue <= alpha) { Signals.failedLowAtRoot = true; Signals.stopOnPonderhit = false; - alpha = std::max(alpha - aspirationDelta, -VALUE_INFINITE); - aspirationDelta += aspirationDelta / 2; + alpha -= delta; + delta += delta / 2; } else break; + assert(alpha >= -VALUE_INFINITE && beta <= VALUE_INFINITE); + } while (abs(bestValue) < VALUE_KNOWN_WIN); } - bestMove = RootMoves[0].pv[0]; - *ponderMove = RootMoves[0].pv[1]; - bestValues[depth] = bestValue; - bestMoveChanges[depth] = BestMoveChanges; - - // Skills: Do we need to pick now the best and the ponder moves ? + // Skills: Do we need to pick now the best move ? if (SkillLevelEnabled && depth == 1 + SkillLevel) - do_skill_level(&skillBest, &skillPonder); + skillBest = do_skill_level(); if (Options["Use Search Log"].value()) - { - Log log(Options["Search Log Filename"].value()); - log << pretty_pv(pos, depth, bestValue, elapsed_time(), &RootMoves[0].pv[0]) << endl; - } + pv_info_to_log(pos, depth, bestValue, elapsed_time(), &RootMoves[0].pv[0]); // Filter out startup noise when monitoring best move stability - if (depth > 2 && bestMoveChanges[depth]) + if (depth > 2 && BestMoveChanges) bestMoveNeverChanged = false; // Do we have time for the next iteration? Can we stop searching now? if (!Signals.stop && !Signals.stopOnPonderhit && Limits.useTimeManagement()) { - bool stop = false; // Local variable instead of the volatile Signals.stop + bool stop = false; // Local variable, not the volatile Signals.stop // Take in account some extra time if the best move has changed if (depth > 4 && depth < 50) - TimeMgr.pv_instability(bestMoveChanges[depth], bestMoveChanges[depth - 1]); + TimeMgr.pv_instability(BestMoveChanges, prevBestMoveChanges); - // Stop search if most of available time is already consumed. We probably don't - // have enough time to search the first move at the next iteration anyway. + // Stop search if most of available time is already consumed. We + // probably don't have enough time to search the first move at the + // next iteration anyway. if (elapsed_time() > (TimeMgr.available_time() * 62) / 100) stop = true; @@ -602,7 +541,7 @@ namespace { || elapsed_time() > (TimeMgr.available_time() * 40) / 100)) { Value rBeta = bestValue - EasyMoveMargin; - (ss+1)->excludedMove = bestMove; + (ss+1)->excludedMove = RootMoves[0].pv[0]; (ss+1)->skipNullMove = true; Value v = search(pos, ss+1, rBeta - 1, rBeta, (depth * ONE_PLY) / 2); (ss+1)->skipNullMove = false; @@ -624,17 +563,14 @@ namespace { } } - // When using skills overwrite best and ponder moves with the sub-optimal ones + // When using skills swap best PV line with the sub-optimal one if (SkillLevelEnabled) { if (skillBest == MOVE_NONE) // Still unassigned ? - do_skill_level(&skillBest, &skillPonder); + skillBest = do_skill_level(); - bestMove = skillBest; - *ponderMove = skillPonder; + std::swap(RootMoves[0], *find(RootMoves.begin(), RootMoves.end(), skillBest)); } - - return bestMove; } @@ -717,9 +653,9 @@ 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[MultiPVIdx].pv[0] : tte ? tte->move() : MOVE_NONE; + ttMove = RootNode ? RootMoves[PVIdx].pv[0] : tte ? tte->move() : MOVE_NONE; // 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 @@ -880,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)); @@ -931,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)); @@ -942,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() + MultiPVIdx, 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 @@ -959,15 +895,13 @@ split_point_start: // At split points actual search starts from here if (RootNode) { - // This is used by time management Signals.firstRootMove = (moveCount == 1); - nodes = pos.nodes_searched(); if (pos.thread() == 0 && elapsed_time() > 2000) - cout << "info" << depth_to_uci(depth) - << " currmove " << move - << " currmovenumber " << moveCount + MultiPVIdx << endl; + cout << "info depth " << depth / ONE_PLY + << " currmove " << move_to_uci(move, Chess960) + << " currmovenumber " << moveCount + PVIdx << endl; } isPvMove = (PvNode && moveCount <= 1); @@ -1128,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 ? @@ -1199,7 +1133,7 @@ split_point_start: // At split points actual search starts from here } // Step 21. Update tables - // Update transposition table entry, history and killers + // Update transposition table entry, killers and history if (!SpNode && !Signals.stop && !thread.cutoff_occurred()) { move = bestValue <= oldAlpha ? MOVE_NONE : ss->bestMove; @@ -1208,16 +1142,27 @@ 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 only for non capture moves that fails high + // Update killers and history for non capture cut-off moves if ( bestValue >= beta - && !pos.is_capture_or_promotion(move)) + && !pos.is_capture_or_promotion(move) + && !inCheck) { if (move != ss->killers[0]) { ss->killers[1] = ss->killers[0]; ss->killers[0] = move; } - update_history(pos, move, depth, movesSearched, playedMoveCount); + + // Increase history value of the cut-off move + Value bonus = Value(int(depth) * int(depth)); + H.add(pos.piece_on(move_from(move)), move_to(move), bonus); + + // Decrease history of all the other played non-capture moves + for (int i = 0; i < playedMoveCount - 1; i++) + { + Move m = movesSearched[i]; + H.add(pos.piece_on(move_from(m)), move_to(m), -bonus); + } } } @@ -1275,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)) @@ -1307,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; } @@ -1328,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)); @@ -1428,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); @@ -1546,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) { @@ -1649,27 +1594,6 @@ split_point_start: // At split points actual search starts from here } - // update_history() registers a good move that produced a beta-cutoff in - // history and marks as failures all the other moves of that ply. - - void update_history(const Position& pos, Move move, Depth depth, - Move movesSearched[], int moveCount) { - Move m; - Value bonus = Value(int(depth) * int(depth)); - - H.update(pos.piece_on(move_from(move)), move_to(move), bonus); - - for (int i = 0; i < moveCount - 1; i++) - { - m = movesSearched[i]; - - assert(m != move); - - H.update(pos.piece_on(move_from(m)), move_to(m), -bonus); - } - } - - // current_search_time() returns the number of milliseconds which have passed // since the beginning of the current search. @@ -1678,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; } @@ -1706,61 +1630,48 @@ split_point_start: // At split points actual search starts from here } - // speed_to_uci() returns a string with time stats of current search suitable - // to be sent to UCI gui. + // pv_info_to_uci() sends search info to GUI. UCI protocol requires to send all + // the PV lines also if are still to be searched and so refer to the previous + // search score. - string speed_to_uci(int64_t nodes) { + void pv_info_to_uci(const Position& pos, int depth, Value alpha, Value beta) { - std::stringstream s; int t = elapsed_time(); - - s << " nodes " << nodes - << " nps " << (t > 0 ? int(nodes * 1000 / t) : 0) - << " time " << t; - - return s.str(); - } - - - // pv_to_uci() returns a string with information on the current PV line - // formatted according to UCI specification. - - string pv_to_uci(const Move pv[], int pvNum, bool chess960) { - - std::stringstream s; - - s << " multipv " << pvNum << " pv " << set960(chess960); - - for ( ; *pv != MOVE_NONE; pv++) - s << *pv << " "; - - return s.str(); - } - - - // depth_to_uci() returns a string with information on the current depth and - // seldepth formatted according to UCI specification. - - string depth_to_uci(Depth depth) { - - std::stringstream s; int selDepth = 0; - // Retrieve max searched depth among threads for (int i = 0; i < Threads.size(); i++) if (Threads[i].maxPly > selDepth) selDepth = Threads[i].maxPly; - s << " depth " << depth / ONE_PLY << " seldepth " << selDepth; - - return s.str(); + for (size_t i = 0; i < std::min(UCIMultiPV, RootMoves.size()); i++) + { + bool updated = (i <= PVIdx); + + if (depth == 1 && !updated) + continue; + + int d = (updated ? depth : depth - 1); + Value v = (updated ? RootMoves[i].score : RootMoves[i].prevScore); + std::stringstream s; + + for (int j = 0; RootMoves[i].pv[j] != MOVE_NONE; j++) + s << " " << move_to_uci(RootMoves[i].pv[j], Chess960); + + 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; + } } - // 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"). It uses the two below helper to - // pretty format time and score respectively. + // pv_info_to_log() writes human-readable search information to the log file + // (which is created when the UCI parameter "Use Search Log" is "true"). It + // uses the two below helpers to pretty format time and score respectively. string time_to_string(int millisecs) { @@ -1796,7 +1707,7 @@ split_point_start: // At split points actual search starts from here return s.str(); } - string pretty_pv(Position& pos, int depth, Value value, int time, Move pv[]) { + void pv_info_to_log(Position& pos, int depth, Value value, int time, Move pv[]) { const int64_t K = 1000; const int64_t M = 1000000; @@ -1807,15 +1718,16 @@ split_point_start: // At split points actual search starts from here size_t length; std::stringstream s; - s << set960(pos.is_chess960()) - << std::setw(2) << depth + s << 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 "; @@ -1838,32 +1750,33 @@ split_point_start: // At split points actual search starts from here pos.do_move(*m++, *st++); } - // Restore original position before to leave while (m != pv) pos.undo_move(*--m); - return s.str(); + Log l(Options["Search Log Filename"].value()); + l << s.str() << endl; } // When playing with strength handicap choose best move among the MultiPV set // using a statistical rule dependent on SkillLevel. Idea by Heinz van Saanen. - void do_skill_level(Move* best, Move* ponder) { + Move do_skill_level() { assert(MultiPV > 1); 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(); - // Rml list is already sorted by score in descending order + // RootMoves are already sorted by score in descending order size_t size = std::min(MultiPV, RootMoves.size()); int variance = std::min(RootMoves[0].score - RootMoves[size - 1].score, PawnValueMidgame); int weakness = 120 - 2 * SkillLevel; int max_s = -VALUE_INFINITE; + Move best = MOVE_NONE; // Choose best move. For each move score we add two terms both dependent on // weakness, one deterministic and bigger for weaker moves, and one random, @@ -1883,10 +1796,10 @@ split_point_start: // At split points actual search starts from here if (s > max_s) { max_s = s; - *best = RootMoves[i].pv[0]; - *ponder = RootMoves[i].pv[1]; + best = RootMoves[i].pv[0]; } } + return best; } @@ -1908,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()) @@ -1937,10 +1850,10 @@ split_point_start: // At split points actual search starts from here Value v, m = VALUE_NONE; int ply = 0; - assert(pv[0] != MOVE_NONE && pos.is_pseudo_legal(pv[0])); + 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 @@ -2058,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();