Ticket #145: clock.c.patch

gnugo/engine/clock.c

@@ -68 +68 @@
 };
 
 struct timer_data {
-  struct remaining_time_data official;
-  struct remaining_time_data estimated;
+  struct remaining_time_data official; // time received from external source
+  struct remaining_time_data estimated; // time counted by GnuGO
   int time_out;
 };
 
@@ -127 +127 @@
  *
  *  byo_time > 0 and byo_stones == 0 means no time settings.
  */
-void
+inline void
 clock_settings(int time, int byo_time, int byo_stones)
 {
   if (time >= 0)
@@ -142 +142 @@
 /* Get time settings. Returns 1 if any time settings have been made,
  * 0 otherwise.
  */
-int
+inline int
 have_time_settings(void)
 {
   /* According to the semantics of the GTP command 'time_settings', the
@@ -220 +220 @@
   static int last_movenum = -1;
   struct timer_data* const td
     = (color == BLACK) ? &black_time_data : &white_time_data;
-  double now = gg_gettimeofday();
+  double now;
 
   if (!have_time_settings())
     return;
 
+  now = gg_gettimeofday();
+
   if (last_movenum >= 0
-      && movenum == last_movenum + 1
-      && movenum > td->estimated.movenum) {
+      && movenum == last_movenum + 1) {
     double time_used = now - last_time;
     td->estimated.time_left -= time_used;
     td->estimated.movenum = movenum;
     td->estimated.time_for_last_move = time_used;
     if (td->estimated.time_left < 0) {
       if (td->estimated.in_byoyomi || byoyomi_stones == 0) {
+
+#ifndef GG_TURN_OFF_DEBUGS
         DEBUG(DEBUG_TIME, "%s ran out of time.\n", color_to_string(color));
         if (debug & DEBUG_TIME)
           clock_print(color);
+#endif
+
         td->time_out = 1;
       }
       else {
@@ -251 +256 @@
     }
     else if (td->estimated.stones > 0) {
       gg_assert(td->estimated.in_byoyomi);
-      td->estimated.stones = td->estimated.stones - 1;
+      --td->estimated.stones;
       if (td->estimated.stones == 0) {
         td->estimated.time_left = byoyomi_time;
         td->estimated.stones = byoyomi_stones;
@@ -262 +267 @@
   last_movenum = movenum;
   last_time = now;
 
+#ifndef GG_TURN_OFF_DEBUGS
   /* Update main timer. */
   if (debug & DEBUG_TIME)
     clock_print(color);
+#endif
 }
 
 
@@ -297 +304 @@
 
   if (timer->stones == 0) {
     /* Main time running. */
-    *time_left = timer->time_left + byoyomi_time;
+    *time_left = timer->time_left;
     if (byoyomi_time > 0)
+        {
+          *time_left += byoyomi_time;
       *stones_left = byoyomi_stones;
+        }
     else {
       /* Absolute time. Here we aim to be able to play at least X more
        * moves or a total of Y moves. We choose Y as a third of the
@@ -331 +341 @@
 adjust_level_offset(int color)
 {
   double time_for_last_move;
-  double time_left;
-  int stones_left;
+  double time_left, estimated_time;
+  int stones_left, new_level;
 
   if (!analyze_time_data(color, &time_for_last_move, &time_left, &stones_left))
     return;
@@ -342 +352 @@
    *
    * FIXME: Use rules with at least some theoretical basis.
    */
-  if (time_left < time_for_last_move * (stones_left + 3))
-    level_offset--;
-  if (time_left < time_for_last_move * stones_left)
-    level_offset--;
-  if (3 * time_left < 2 * time_for_last_move * stones_left)
-    level_offset--;
-  if (2 * time_left < time_for_last_move * stones_left)
-    level_offset--;
-  if (3 * time_left < time_for_last_move * stones_left)
-    level_offset--;
-
-  if (time_for_last_move == 0)
-    time_for_last_move = 1;
-  if (time_left > time_for_last_move * (stones_left + 6))
-    level_offset++;
-  if (time_left > 2 * time_for_last_move * (stones_left + 6))
-    level_offset++;
+  if (time_for_last_move < 0.1)
+    time_for_last_move = 0.1;
 
-  if (level + level_offset < min_level)
-    level_offset = min_level - level;
+  estimated_time = time_for_last_move * stones_left;
+
+  if (time_left < estimated_time)
+  {
+    --level_offset;
+
+    if (1.33 * time_left < estimated_time)
+        {
+          --level_offset;
+
+          if (2 * time_left < estimated_time)
+          {
+        level_offset -= 2;
+
+        if (4 * time_left < estimated_time)
+          level_offset -= 2;
+          }
+        }
+  }
+  else if (0.8 * time_left > estimated_time)
+  {
+    ++level_offset;
 
-  if (level + level_offset > max_level)
+    if (0.5 * time_left > estimated_time)
+      level_offset += 2;
+  }
+
+  new_level = level + level_offset;
+
+  if (new_level < min_level)
+    level_offset = min_level - level;
+  else if (new_level > max_level)
     level_offset = max_level - level;
 
   DEBUG(DEBUG_TIME, "New level %d (%d %C %f %f %d)\n", level + level_offset,
@@ -375 +398 @@
 /* Interface to level settings. */
 /********************************/
 
-int
+inline int
 get_level()
 {
   return level + level_offset;
 }
 
-void
+inline void
 set_level(int new_level)
 {
   level = new_level;
@@ -392 +415 @@
     min_level = level;
 }
 
-void
+inline void
 set_max_level(int new_max)
 {
   max_level = new_max;
 }
 
-void
+inline void
 set_min_level(int new_min)
 {
   min_level = new_min;