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

TimeManager API rename

Browse source 
We can now set member data as private because is no more
directly accessed.

Should be more clear now.

No functional change.

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

14
src/search.cpp
View file

@ -472,7 +472,7 @@ bool think(const Position& pos, bool infinite, bool ponder, int time[], int incr
int myTime = time[pos.side_to_move()]; int myTime = time[pos.side_to_move()];
int myIncrement = increment[pos.side_to_move()]; int myIncrement = increment[pos.side_to_move()];
if (UseTimeManagement) if (UseTimeManagement)
TimeMgr.update(myTime, myIncrement, movesToGo, pos.startpos_ply_counter()); TimeMgr.init(myTime, myIncrement, movesToGo, pos.startpos_ply_counter());
// Set best NodesBetweenPolls interval to avoid lagging under // Set best NodesBetweenPolls interval to avoid lagging under
// heavy time pressure. // heavy time pressure.
@ -616,15 +616,15 @@ namespace {
if ( Iteration >= 8 if ( Iteration >= 8
&& EasyMove == pv[0] && EasyMove == pv[0]
&& ( ( rml.get_move_cumulative_nodes(0) > (nodes * 85) / 100 && ( ( rml.get_move_cumulative_nodes(0) > (nodes * 85) / 100
&& current_search_time() > TimeMgr.optimumSearchTime / 16) && current_search_time() > TimeMgr.available_time() / 16)
||( rml.get_move_cumulative_nodes(0) > (nodes * 98) / 100 ||( rml.get_move_cumulative_nodes(0) > (nodes * 98) / 100
&& current_search_time() > TimeMgr.optimumSearchTime / 32))) && current_search_time() > TimeMgr.available_time() / 32)))
stopSearch = true; stopSearch = true;
// Add some extra time if the best move has changed during the last two iterations // Add some extra time if the best move has changed during the last two iterations
if (Iteration > 5 && Iteration <= 50) if (Iteration > 5 && Iteration <= 50)
TimeMgr.best_move_changes(BestMoveChangesByIteration[Iteration], TimeMgr.pv_unstability(BestMoveChangesByIteration[Iteration],
BestMoveChangesByIteration[Iteration-1]); BestMoveChangesByIteration[Iteration-1]);
// Stop search if most of MaxSearchTime is consumed at the end of the // 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 // iteration. We probably don't have enough time to search the first
@ -2137,7 +2137,7 @@ namespace {
&& !AspirationFailLow && !AspirationFailLow
&& t > TimeMgr.available_time(); && t > TimeMgr.available_time();
bool noMoreTime = t > TimeMgr.maximumSearchTime bool noMoreTime = t > TimeMgr.maximum_time()
|| stillAtFirstMove; || stillAtFirstMove;
if ( (Iteration >= 3 && UseTimeManagement && noMoreTime) if ( (Iteration >= 3 && UseTimeManagement && noMoreTime)
@ -2160,7 +2160,7 @@ namespace {
&& !AspirationFailLow && !AspirationFailLow
&& t > TimeMgr.available_time(); && t > TimeMgr.available_time();
bool noMoreTime = t > TimeMgr.maximumSearchTime bool noMoreTime = t > TimeMgr.maximum_time()
|| stillAtFirstMove; || stillAtFirstMove;
if (Iteration >= 3 && UseTimeManagement && (noMoreTime || StopOnPonderhit)) if (Iteration >= 3 && UseTimeManagement && (noMoreTime || StopOnPonderhit))

11
src/timeman.cpp
View file

@ -88,13 +88,13 @@ namespace {
//// Functions //// Functions
//// ////
void TimeManager::best_move_changes(int curIter, int prevIter) { void TimeManager::pv_unstability(int curChanges, int prevChanges) {
extraSearchTime = curIter * (optimumSearchTime / 2) unstablePVExtraTime = curChanges * (optimumSearchTime / 2)
+ prevIter * (optimumSearchTime / 3); + prevChanges * (optimumSearchTime / 3);
} }
void TimeManager::update(int myTime, int myInc, int movesToGo, int currentPly) void TimeManager::init(int myTime, int myInc, int movesToGo, int currentPly)
{ {
/* We support four different kind of time controls: /* We support four different kind of time controls:
@ -119,7 +119,8 @@ void TimeManager::update(int myTime, int myInc, int movesToGo, int currentPly)
int emergencyMoveTime = get_option_value_int("Emergency Move Time"); int emergencyMoveTime = get_option_value_int("Emergency Move Time");
int minThinkingTime = get_option_value_int("Minimum Thinking Time"); int minThinkingTime = get_option_value_int("Minimum Thinking Time");
// Initialize variables to maximum values // Initialize to maximum values but unstablePVExtraTime that is reset
unstablePVExtraTime = 0;
optimumSearchTime = maximumSearchTime = myTime; optimumSearchTime = maximumSearchTime = myTime;
// We calculate optimum time usage for different hypothetic "moves to go"-values and choose the // We calculate optimum time usage for different hypothetic "moves to go"-values and choose the

10
src/timeman.h
View file

@ -28,13 +28,15 @@
class TimeManager { class TimeManager {
public: public:
void update(int myTime, int myInc, int movesToGo, int currentPly); void init(int myTime, int myInc, int movesToGo, int currentPly);
void best_move_changes(int curIter, int prevIter); void pv_unstability(int curChanges, int prevChanges);
int available_time() { return optimumSearchTime + extraSearchTime; } int available_time() const { return optimumSearchTime + unstablePVExtraTime; }
int maximum_time() const { return maximumSearchTime; }
private:
int optimumSearchTime; int optimumSearchTime;
int maximumSearchTime; int maximumSearchTime;
int extraSearchTime; int unstablePVExtraTime;
}; };
#endif // !defined(TIMEMAN_H_INCLUDED) #endif // !defined(TIMEMAN_H_INCLUDED)