From fe23c70cf163514620deba3c4ef9a3b8f4ceabb1 Mon Sep 17 00:00:00 2001 From: Marco Costalba Date: Mon, 2 Aug 2010 18:41:25 +0100 Subject: [PATCH] Rename MaxSearchTime and AbsoluteMaxSearchTime Renamed in OptimumSearchTime and MaximumSearchTime, should be more clear now. Suggested by Joona. No functional change. Signed-off-by: Marco Costalba --- src/search.cpp | 30 +++++++++++++++--------------- src/timeman.cpp | 20 ++++++++++---------- src/timeman.h | 2 +- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/search.cpp b/src/search.cpp index 4424fe2f..b1f64536 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -251,8 +251,8 @@ namespace { 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; @@ -401,7 +401,7 @@ bool think(const Position& pos, bool infinite, bool ponder, int time[], int incr // 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(); @@ -475,12 +475,12 @@ bool think(const Position& pos, bool infinite, bool ponder, int time[], int incr 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); } } @@ -626,20 +626,20 @@ namespace { 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) @@ -2142,9 +2142,9 @@ namespace { bool stillAtFirstMove = FirstRootMove && !AspirationFailLow - && t > MaxSearchTime + ExtraSearchTime; + && t > OptimumSearchTime + ExtraSearchTime; - bool noMoreTime = t > AbsoluteMaxSearchTime + bool noMoreTime = t > MaximumSearchTime || stillAtFirstMove; if ( (Iteration >= 3 && UseTimeManagement && noMoreTime) @@ -2165,9 +2165,9 @@ namespace { 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)) diff --git a/src/timeman.cpp b/src/timeman.cpp index c3d27dee..3798a96f 100644 --- a/src/timeman.cpp +++ b/src/timeman.cpp @@ -76,7 +76,7 @@ namespace { /// Function Prototypes - enum TimeType { MaxTime, AbsTime }; + enum TimeType { OptimumTime, MaxTime }; template int remaining(int myTime, int movesToGo, int currentPly); @@ -88,7 +88,7 @@ namespace { //// 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: @@ -114,7 +114,7 @@ void get_search_times(int myTime, int myInc, int movesToGo, int currentPly, 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. @@ -123,15 +123,15 @@ void get_search_times(int myTime, int myInc, int movesToGo, int currentPly, // Calculate thinking time for hypothetic "moves to go"-value hypMyTime = Max(myTime + (hypMTG - 1) * myInc - emergencyBaseTime - Min(hypMTG, emergencyMoveHorizon) * emergencyMoveTime, 0); - mTime = minThinkingTime + remaining(hypMyTime, hypMTG, currentPly); - aTime = minThinkingTime + remaining(hypMyTime, hypMTG, currentPly); + mTime = minThinkingTime + remaining(hypMyTime, hypMTG, currentPly); + aTime = minThinkingTime + remaining(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); } //// @@ -143,8 +143,8 @@ namespace { template 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; diff --git a/src/timeman.h b/src/timeman.h index 35bcbee7..46bc94e1 100644 --- a/src/timeman.h +++ b/src/timeman.h @@ -26,6 +26,6 @@ //// void get_search_times(int myTime, int myInc, int movesToGo, int currentPly, - int* maxSearchTime, int* absoluteMaxSearchTime); + int* optimumSearchTime, int* maximumSearchTime); #endif // !defined(TIMEMAN_H_INCLUDED) -- 2.39.2