X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Ftimeman.cpp;h=7c3efb352a7b927fcdbabf45fc36e7340cdfd2b6;hp=6112951cc974499db1878c59954959c0b4478064;hb=c7e7d9217b232eb7d75b083a45f001ef998c9deb;hpb=a0cc15ccbc5dc48ea3c871915c8f96c7a624597d diff --git a/src/timeman.cpp b/src/timeman.cpp index 6112951c..7c3efb35 100644 --- a/src/timeman.cpp +++ b/src/timeman.cpp @@ -78,7 +78,7 @@ namespace { void TimeManager::pv_instability(double bestMoveChanges) { - unstablePVExtraTime = int(bestMoveChanges * optimumSearchTime); + unstablePVExtraTime = int(bestMoveChanges * optimumSearchTime / 1.4); } @@ -108,15 +108,15 @@ void TimeManager::init(const Search::LimitsType& limits, int currentPly, Color u int minThinkingTime = Options["Minimum Thinking Time"]; int slowMover = Options["Slow Mover"]; - // Initialize to maximum values but unstablePVExtraTime that is reset + // Initialize all to maximum values but unstablePVExtraTime that is reset unstablePVExtraTime = 0; optimumSearchTime = maximumSearchTime = limits.time[us]; - // We calculate optimum time usage for different hypothetic "moves to go"-values and choose the + // We calculate optimum time usage for different hypothetical "moves to go"-values and choose the // minimum of calculated search time values. Usually the greatest hypMTG gives the minimum values. for (hypMTG = 1; hypMTG <= (limits.movestogo ? std::min(limits.movestogo, MoveHorizon) : MoveHorizon); ++hypMTG) { - // Calculate thinking time for hypothetic "moves to go"-value + // Calculate thinking time for hypothetical "moves to go"-value hypMyTime = limits.time[us] + limits.inc[us] * (hypMTG - 1) - emergencyBaseTime @@ -147,14 +147,14 @@ namespace { const double TMaxRatio = (T == OptimumTime ? 1 : MaxRatio); const double TStealRatio = (T == OptimumTime ? 0 : StealRatio); - int thisMoveImportance = move_importance(currentPly) * slowMover / 100; + double thisMoveImportance = double(move_importance(currentPly) * slowMover) / 100; int otherMovesImportance = 0; for (int i = 1; i < movesToGo; ++i) otherMovesImportance += move_importance(currentPly + 2 * i); - double ratio1 = (TMaxRatio * thisMoveImportance) / double(TMaxRatio * thisMoveImportance + otherMovesImportance); - double ratio2 = (thisMoveImportance + TStealRatio * otherMovesImportance) / double(thisMoveImportance + otherMovesImportance); + double ratio1 = (TMaxRatio * thisMoveImportance) / (TMaxRatio * thisMoveImportance + otherMovesImportance); + double ratio2 = (thisMoveImportance + TStealRatio * otherMovesImportance) / (thisMoveImportance + otherMovesImportance); return int(floor(myTime * std::min(ratio1, ratio2))); }