int MultiPV;
// Time managment variables
- int SearchStartTime, MaxNodes, MaxDepth, MaxSearchTime;
- int AbsoluteMaxSearchTime, ExtraSearchTime, ExactMaxTime;
+ int SearchStartTime, MaxNodes, MaxDepth, OptimumSearchTime;
+ int MaximumSearchTime, ExtraSearchTime, ExactMaxTime;
bool UseTimeManagement, InfiniteSearch, PonderSearch, StopOnPonderhit;
bool FirstRootMove, AbortSearch, Quit, AspirationFailLow;
// Initialize global search variables
StopOnPonderhit = AbortSearch = Quit = AspirationFailLow = false;
- MaxSearchTime = AbsoluteMaxSearchTime = ExtraSearchTime = 0;
+ OptimumSearchTime = MaximumSearchTime = ExtraSearchTime = 0;
NodesSincePoll = 0;
TM.resetNodeCounters();
SearchStartTime = get_system_time();
if (UseTimeManagement)
{
get_search_times(myTime, myIncrement, movesToGo, pos.startpos_ply_counter(),
- &MaxSearchTime, &AbsoluteMaxSearchTime);
+ &OptimumSearchTime, &MaximumSearchTime);
if (get_option_value_bool("Ponder"))
{
- MaxSearchTime += MaxSearchTime / 4;
- MaxSearchTime = Min(MaxSearchTime, AbsoluteMaxSearchTime);
+ OptimumSearchTime += OptimumSearchTime / 4;
+ OptimumSearchTime = Min(OptimumSearchTime, MaximumSearchTime);
}
}
if ( Iteration >= 8
&& EasyMove == pv[0]
&& ( ( rml.get_move_cumulative_nodes(0) > (nodes * 85) / 100
- && current_search_time() > MaxSearchTime / 16)
+ && current_search_time() > OptimumSearchTime / 16)
||( rml.get_move_cumulative_nodes(0) > (nodes * 98) / 100
- && current_search_time() > MaxSearchTime / 32)))
+ && current_search_time() > OptimumSearchTime / 32)))
stopSearch = true;
// Add some extra time if the best move has changed during the last two iterations
if (Iteration > 5 && Iteration <= 50)
- ExtraSearchTime = BestMoveChangesByIteration[Iteration] * (MaxSearchTime / 2)
- + BestMoveChangesByIteration[Iteration-1] * (MaxSearchTime / 3);
+ ExtraSearchTime = BestMoveChangesByIteration[Iteration] * (OptimumSearchTime / 2)
+ + BestMoveChangesByIteration[Iteration-1] * (OptimumSearchTime / 3);
// Stop search if most of MaxSearchTime is consumed at the end of the
// iteration. We probably don't have enough time to search the first
// move at the next iteration anyway.
- if (current_search_time() > ((MaxSearchTime + ExtraSearchTime) * 80) / 128)
+ if (current_search_time() > ((OptimumSearchTime + ExtraSearchTime) * 80) / 128)
stopSearch = true;
if (stopSearch)
bool stillAtFirstMove = FirstRootMove
&& !AspirationFailLow
- && t > MaxSearchTime + ExtraSearchTime;
+ && t > OptimumSearchTime + ExtraSearchTime;
- bool noMoreTime = t > AbsoluteMaxSearchTime
+ bool noMoreTime = t > MaximumSearchTime
|| stillAtFirstMove;
if ( (Iteration >= 3 && UseTimeManagement && noMoreTime)
bool stillAtFirstMove = FirstRootMove
&& !AspirationFailLow
- && t > MaxSearchTime + ExtraSearchTime;
+ && t > OptimumSearchTime + ExtraSearchTime;
- bool noMoreTime = t > AbsoluteMaxSearchTime
+ bool noMoreTime = t > MaximumSearchTime
|| stillAtFirstMove;
if (Iteration >= 3 && UseTimeManagement && (noMoreTime || StopOnPonderhit))
/// Function Prototypes
- enum TimeType { MaxTime, AbsTime };
+ enum TimeType { OptimumTime, MaxTime };
template<TimeType>
int remaining(int myTime, int movesToGo, int currentPly);
////
void get_search_times(int myTime, int myInc, int movesToGo, int currentPly,
- int* maxSearchTime, int* absoluteMaxSearchTime)
+ int* optimumSearchTime, int* maximumSearchTime)
{
/* We support four different kind of time controls:
int minThinkingTime = get_option_value_int("Minimum Thinking Time");
// Initialize variables to maximum values
- *maxSearchTime = *absoluteMaxSearchTime = myTime;
+ *optimumSearchTime = *maximumSearchTime = myTime;
// 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.
// Calculate thinking time for hypothetic "moves to go"-value
hypMyTime = Max(myTime + (hypMTG - 1) * myInc - emergencyBaseTime - Min(hypMTG, emergencyMoveHorizon) * emergencyMoveTime, 0);
- mTime = minThinkingTime + remaining<MaxTime>(hypMyTime, hypMTG, currentPly);
- aTime = minThinkingTime + remaining<AbsTime>(hypMyTime, hypMTG, currentPly);
+ mTime = minThinkingTime + remaining<OptimumTime>(hypMyTime, hypMTG, currentPly);
+ aTime = minThinkingTime + remaining<MaxTime>(hypMyTime, hypMTG, currentPly);
- *maxSearchTime = Min(*maxSearchTime, mTime);
- *absoluteMaxSearchTime = Min(*absoluteMaxSearchTime, aTime);
+ *optimumSearchTime = Min(*optimumSearchTime, mTime);
+ *maximumSearchTime = Min(*maximumSearchTime, aTime);
}
// Make sure that maxSearchTime is not over absoluteMaxSearchTime
- *maxSearchTime = Min(*maxSearchTime, *absoluteMaxSearchTime);
+ *optimumSearchTime = Min(*optimumSearchTime, *maximumSearchTime);
}
////
template<TimeType T>
int remaining(int myTime, int movesToGo, int currentPly)
{
- const float TMaxRatio = (T == MaxTime ? 1 : MaxRatio);
- const float TStealRatio = (T == MaxTime ? 0 : StealRatio);
+ const float TMaxRatio = (T == OptimumTime ? 1 : MaxRatio);
+ const float TStealRatio = (T == OptimumTime ? 0 : StealRatio);
int thisMoveImportance = move_importance(currentPly);
int otherMovesImportance = 0;