kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-04-29 08:13:08 +00:00
Code Issues Releases Wiki Activity

Move time related global variables under TimeManager

Browse source 
Move OptimumSearchTime, MaximumSearchTime and
ExtraSearchTime in TimeManager.

Note that we remove an useless initialization to 0 because
these variables are used only with time management.

Also introduce and use TimeManager::available_time()

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba 2010-08-03 11:20:06 +02:00
parent dda53e831d
commit c295599e4a
3 changed files with 33 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/search.cpp
View file

@ -251,8 +251,7 @@ namespace {
int MultiPV;
// Time managment variables
int SearchStartTime, MaxNodes, MaxDepth, OptimumSearchTime;
int MaximumSearchTime, ExtraSearchTime, ExactMaxTime;
int SearchStartTime, MaxNodes, MaxDepth, ExactMaxTime;
bool UseTimeManagement, InfiniteSearch, PonderSearch, StopOnPonderhit;
bool FirstRootMove, AbortSearch, Quit, AspirationFailLow;
TimeManager TimeMgr;
@ -402,7 +401,6 @@ bool think(const Position& pos, bool infinite, bool ponder, int time[], int incr
// Initialize global search variables
StopOnPonderhit = AbortSearch = Quit = AspirationFailLow = false;
OptimumSearchTime = MaximumSearchTime = ExtraSearchTime = 0;
NodesSincePoll = 0;
TM.resetNodeCounters();
SearchStartTime = get_system_time();
@ -474,8 +472,7 @@ bool think(const Position& pos, bool infinite, bool ponder, int time[], int incr
int myTime = time[pos.side_to_move()];
int myIncrement = increment[pos.side_to_move()];
if (UseTimeManagement)
TimeMgr.update(myTime, myIncrement, movesToGo, pos.startpos_ply_counter(),
&OptimumSearchTime, &MaximumSearchTime);
TimeMgr.update(myTime, myIncrement, movesToGo, pos.startpos_ply_counter());
// Set best NodesBetweenPolls interval to avoid lagging under
// heavy time pressure.
@ -619,20 +616,20 @@ namespace {
if ( Iteration >= 8
&& EasyMove == pv[0]
&& ( ( rml.get_move_cumulative_nodes(0) > (nodes * 85) / 100
&& current_search_time() > OptimumSearchTime / 16)
&& current_search_time() > TimeMgr.optimumSearchTime / 16)
||( rml.get_move_cumulative_nodes(0) > (nodes * 98) / 100
&& current_search_time() > OptimumSearchTime / 32)))
&& current_search_time() > TimeMgr.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] * (OptimumSearchTime / 2)
+ BestMoveChangesByIteration[Iteration-1] * (OptimumSearchTime / 3);
TimeMgr.best_move_changes(BestMoveChangesByIteration[Iteration],
BestMoveChangesByIteration[Iteration-1]);
// 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() > ((OptimumSearchTime + ExtraSearchTime) * 80) / 128)
if (current_search_time() > (TimeMgr.available_time() * 80) / 128)
stopSearch = true;
if (stopSearch)
@ -2138,9 +2135,9 @@ namespace {
bool stillAtFirstMove = FirstRootMove
&& !AspirationFailLow
&& t > OptimumSearchTime + ExtraSearchTime;
&& t > TimeMgr.available_time();
bool noMoreTime = t > MaximumSearchTime
bool noMoreTime = t > TimeMgr.maximumSearchTime
|| stillAtFirstMove;
if ( (Iteration >= 3 && UseTimeManagement && noMoreTime)
@ -2161,9 +2158,9 @@ namespace {
bool stillAtFirstMove = FirstRootMove
&& !AspirationFailLow
&& t > OptimumSearchTime + ExtraSearchTime;
&& t > TimeMgr.available_time();
bool noMoreTime = t > MaximumSearchTime
bool noMoreTime = t > TimeMgr.maximumSearchTime
|| stillAtFirstMove;
if (Iteration >= 3 && UseTimeManagement && (noMoreTime || StopOnPonderhit))

25
src/timeman.cpp
View file

@ -88,8 +88,13 @@ namespace {
//// Functions
////
void TimeManager::update(int myTime, int myInc, int movesToGo, int currentPly,
int* optimumSearchTime, int* maximumSearchTime)
void TimeManager::best_move_changes(int curIter, int prevIter) {
extraSearchTime = curIter * (optimumSearchTime / 2)
+ prevIter * (optimumSearchTime / 3);
}
void TimeManager::update(int myTime, int myInc, int movesToGo, int currentPly)
{
/* We support four different kind of time controls:
@ -106,7 +111,7 @@ void TimeManager::update(int myTime, int myInc, int movesToGo, int currentPly,
minThinkingTime :No matter what, use at least this much thinking before doing the move
*/
int hypMTG, hypMyTime, mTime, aTime;
int hypMTG, hypMyTime, t1, t2;
// Read uci parameters
int emergencyMoveHorizon = get_option_value_int("Emergency Move Horizon");
@ -115,7 +120,7 @@ void TimeManager::update(int myTime, int myInc, int movesToGo, int currentPly,
int minThinkingTime = get_option_value_int("Minimum Thinking Time");
// Initialize variables to maximum values
*optimumSearchTime = *maximumSearchTime = 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.
@ -124,18 +129,18 @@ void TimeManager::update(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<OptimumTime>(hypMyTime, hypMTG, currentPly);
aTime = minThinkingTime + remaining<MaxTime>(hypMyTime, hypMTG, currentPly);
t1 = minThinkingTime + remaining<OptimumTime>(hypMyTime, hypMTG, currentPly);
t2 = minThinkingTime + remaining<MaxTime>(hypMyTime, hypMTG, currentPly);
*optimumSearchTime = Min(*optimumSearchTime, mTime);
*maximumSearchTime = Min(*maximumSearchTime, aTime);
optimumSearchTime = Min(optimumSearchTime, t1);
maximumSearchTime = Min(maximumSearchTime, t2);
}
if (get_option_value_bool("Ponder"))
*optimumSearchTime += *optimumSearchTime / 4;
optimumSearchTime += optimumSearchTime / 4;
// Make sure that maxSearchTime is not over absoluteMaxSearchTime
*optimumSearchTime = Min(*optimumSearchTime, *maximumSearchTime);
optimumSearchTime = Min(optimumSearchTime, maximumSearchTime);
}
////

9
src/timeman.h
View file

@ -28,8 +28,13 @@
class TimeManager {
public:
void update(int myTime, int myInc, int movesToGo, int currentPly,
int* optimumSearchTime, int* maximumSearchTime);
void update(int myTime, int myInc, int movesToGo, int currentPly);
void best_move_changes(int curIter, int prevIter);
int available_time() { return optimumSearchTime + extraSearchTime; }
int optimumSearchTime;
int maximumSearchTime;
int extraSearchTime;
};
#endif // !defined(TIMEMAN_H_INCLUDED)