X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftimeman.cpp;h=8bda4f25abca4b667dbf08cbef6e5832855af632;hb=d3947b2f3e4121db67aef6845b59562b1cec0665;hp=d545269ca31a963a39df29fef6614f707e720a59;hpb=cc2b3ece5c5d8d1183f8526fbb0ee4e1ea7a69fe;p=stockfish
diff --git a/src/timeman.cpp b/src/timeman.cpp
index d545269c..8bda4f25 100644
--- a/src/timeman.cpp
+++ b/src/timeman.cpp
@@ -1,7 +1,7 @@
/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2012 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -17,8 +17,8 @@
along with this program. If not, see .
*/
-#include
#include
+#include
#include "search.h"
#include "timeman.h"
@@ -29,7 +29,7 @@ namespace {
/// Constants
const int MoveHorizon = 50; // Plan time management at most this many moves ahead
- const float MaxRatio = 3.0f; // When in trouble, we can step over reserved time with this ratio
+ const float MaxRatio = 7.0f; // When in trouble, we can step over reserved time with this ratio
const float StealRatio = 0.33f; // However we must not steal time from remaining moves over this ratio
@@ -76,10 +76,9 @@ namespace {
}
-void TimeManager::pv_instability(int curChanges, int prevChanges) {
+void TimeManager::pv_instability(float bestMoveChanges) {
- unstablePVExtraTime = curChanges * (optimumSearchTime / 2)
- + prevChanges * (optimumSearchTime / 3);
+ unstablePVExtraTime = int(bestMoveChanges * optimumSearchTime);
}
@@ -111,15 +110,20 @@ void TimeManager::init(const Search::LimitsType& limits, int currentPly, Color u
// Initialize to maximum values but unstablePVExtraTime that is reset
unstablePVExtraTime = 0;
- optimumSearchTime = maximumSearchTime = limits.times[us];
+ optimumSearchTime = maximumSearchTime = limits.time[us]; // In msec
+
+ // Scale down emergencyBaseTime if we are under very high time pressure to
+ // avoid moving immediately and so blundering.
+ if (maximumSearchTime)
+ emergencyBaseTime /= std::max(emergencyBaseTime * 100 / maximumSearchTime, 1);
// We calculate optimum time usage for different hypothetic "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
- hypMyTime = limits.times[us]
- + limits.incs[us] * (hypMTG - 1)
+ hypMyTime = limits.time[us]
+ + limits.inc[us] * (hypMTG - 1)
- emergencyBaseTime
- emergencyMoveTime * std::min(hypMTG, emergencyMoveHorizon);
@@ -151,7 +155,7 @@ namespace {
int thisMoveImportance = move_importance(currentPly) * slowMover / 100;
int otherMovesImportance = 0;
- for (int i = 1; i < movesToGo; i++)
+ for (int i = 1; i < movesToGo; ++i)
otherMovesImportance += move_importance(currentPly + 2 * i);
float ratio1 = (TMaxRatio * thisMoveImportance) / float(TMaxRatio * thisMoveImportance + otherMovesImportance);