Re-tuned time control

matthewlai · matthewlai · commit 3552345d6eeb · 2015-11-13T19:24:03.000-08:00
diff --git a/timeallocator.cpp b/timeallocator.cpp
@@ -24,13 +24,13 @@
 namespace
 {
 
-static const int32_t SUDDEN_DEATH_DIVISOR = 80;
+static const int32_t SUDDEN_DEATH_DIVISOR = 25;
 static const double DIVISOR_MAX_RATIO = 2.0;
 static const double MIN_TIME_PER_MOVE = 0.0;
 
 // this number controls how much more time it uses in the beginning vs the end
 // higher number means more time in the beginning
-static const double TIME_SCALE = 2.0f;
+static const double DIVISOR_SCALE = 0.5f;
 
 }
 
@@ -49,23 +49,17 @@ Search::TimeAllocation AllocateTime(const ChessClock &cc)
 
 		if (divisor == 0)
 		{
-			// sudden death mode
+			// sudden death mode (with or without increments)
 			divisor = SUDDEN_DEATH_DIVISOR;
 		}
+		else if ((divisor * DIVISOR_SCALE) > 2) // period mode (with or without increments)
+		{
+			divisor *= DIVISOR_SCALE;
+		}
 
 		tAlloc.normalTime = (cc.GetInc() + cc.GetReading() / divisor);
 		tAlloc.maxTime = cc.GetInc() + cc.GetReading() / divisor * DIVISOR_MAX_RATIO;
 
-		if ((tAlloc.normalTime * TIME_SCALE) < (cc.GetReading() / 3.0f))
-		{
-			tAlloc.normalTime *= TIME_SCALE;
-
-			if ((tAlloc.maxTime * TIME_SCALE) < (cc.GetReading() / 3.0f))
-			{
-				tAlloc.maxTime *= TIME_SCALE;
-			}
-		}
-
 		tAlloc.normalTime = std::max(tAlloc.normalTime, MIN_TIME_PER_MOVE);
 		tAlloc.maxTime = std::max(tAlloc.maxTime, MIN_TIME_PER_MOVE);
 
