Ticket #145: genmove.c.patch

gnugo/engine/genmove.c

@@ -73 +73 @@
 void
 reset_engine()
 {
+  static int last_level = -1;
+  int act_level;
+
   /* To improve the reproducability of games, we restart the random
    * number generator with the same seed for each move. Thus we don't
    * have to know how many previous moves have been played, nor
@@ -98 +101 @@
   clear_break_in_list();
 
   /* Set up depth values (see comments there for details). */
-  set_depth_values(get_level(), 0);
+  act_level = get_level();
+  if (last_level != act_level)
+  {
+        set_depth_values(act_level, 0);
+        last_level = act_level;
+  }
 }
 
 /*
@@ -117 +125 @@
 void
 examine_position(int how_much, int aftermath_play)
 {
+#ifndef GG_TURN_OFF_TRACES
   int save_verbose = verbose;
+#endif
 
   purge_persistent_caches();
   
+#ifndef GG_TURN_OFF_TRACES
   /* Don't print reading traces during make_worms and make_dragons unless 
    * the user really wants it (verbose == 3). 
    */
   if (verbose == 1 || verbose == 2)
     --verbose;
+#endif
 
   if (NEEDS_UPDATE(worms_examined)) {
+
+#ifndef GG_TURN_OFF_TRACES
     start_timer(0);
+#endif
+
     make_worms();
+
+#ifndef GG_TURN_OFF_TRACES
     time_report(0, "  make worms", NO_MOVE, 1.0);
+#endif
   }
 
   if (how_much == EXAMINE_WORMS) {
+
+#ifndef GG_TURN_OFF_TRACES
     verbose = save_verbose;
+#endif
+
     gg_assert(test_gray_border() < 0);
     return;
   }
@@ -142 +165 @@
   if (stones_on_board(BLACK | WHITE) != 0) {
     if (NEEDS_UPDATE(initial_influence_examined))
       compute_worm_influence();
+
     if (how_much == EXAMINE_INITIAL_INFLUENCE) {
+
+#ifndef GG_TURN_OFF_TRACES
       verbose = save_verbose;
+#endif
+
       gg_assert(test_gray_border() < 0);
       return;
     }
@@ -151 +179 @@
     if (how_much == EXAMINE_DRAGONS_WITHOUT_OWL) {
       if (NEEDS_UPDATE(dragons_examined_without_owl))
         make_dragons(1);
+
+#ifndef GG_TURN_OFF_TRACES
       verbose = save_verbose;
+#endif
+
       gg_assert(test_gray_border() < 0);
       return;
     }
@@ -163 +195 @@
       dragons_examined_without_owl = position_number;
     }
     if (how_much == EXAMINE_DRAGONS) {
+
+#ifndef GG_TURN_OFF_TRACES
       verbose = save_verbose;
+#endif
+
       gg_assert(test_gray_border() < 0);
       return;
     }
@@ -173 +209 @@
            || how_much == EXAMINE_ALL) {
     initialize_dragon_data();
     compute_scores(chinese_rules || aftermath_play);
+
+#ifndef GG_TURN_OFF_TRACES
     verbose = save_verbose;
+#endif
+
     gg_assert(test_gray_border() < 0);
     return;
   }
   
+#ifndef GG_TURN_OFF_TRACES
   verbose = save_verbose;
+#endif
 
   if (NEEDS_UPDATE(initial_influence2_examined)) {
     compute_dragon_influence();
@@ -197 +239 @@
     return;
   }
 
+#ifndef GG_TURN_OFF_TRACES
   if (printworms)
     show_dragons();
+#endif
 }
 
 
@@ -283 +327 @@
 /* This function collects move reasons can be generated immediately from
  * the data gathered in the examine_position() phase.
  */
-void
+inline void
 collect_move_reasons(int color)
 {
   worm_reasons(color);
@@ -306 +350 @@
            int allowed_moves[BOARDMAX], float *value, int *resign)
 {
   float average_score, pessimistic_score, optimistic_score;
-  int save_verbose;
-  int save_depth;
   int move;
   float dummy_value;
   int use_thrashing_dragon_heuristics = 0;
 
+#ifndef GG_TURN_OFF_TRACES
+  int save_verbose;
+#endif
+
+#ifndef GG_TURN_OFF_ASSERTS
+  int save_depth;
+#endif
+
   if (!value)
     value = &dummy_value;
 
+#ifndef GG_TURN_OFF_TRACES
   start_timer(0);
+#endif
+
+#ifndef GG_TURN_OFF_STATS
   clearstats();
+#endif
 
   /* Usually we would not recommend resignation. */
   if (resign)
@@ -332 +387 @@
   /* Prepare pattern matcher and reading code. */
   reset_engine();
 
+#ifndef GG_TURN_OFF_ASSERTS
   /* Store the depth value so we can check that it hasn't changed when
    * we leave this function.
    */
   save_depth = depth;
+#endif
 
   /* If in mirror mode, try to find a mirror move. */
   if (play_mirror_go
@@ -348 +405 @@
   }
 
   /* Find out information about the worms and dragons. */
+#ifndef GG_TURN_OFF_TRACES
   start_timer(1);
+#endif
+
   examine_position(EXAMINE_ALL, 0);
+
+#ifndef GG_TURN_OFF_TRACES
   time_report(1, "examine position", NO_MOVE, 1.0);
+#endif
 
 
   /* The score will be used to determine when we are safely
@@ -374 +437 @@
     average_score = -(white_score + black_score)/2.0;
   choose_strategy(color, average_score, game_status(color));
 
+#ifndef GG_TURN_OFF_TRACES
   if (printboard) {
     if (printboard == 1)
       fprintf(stderr, "\n          dragon_status display:\n\n");
@@ -387 +451 @@
       showboard(4);
     }
   }
+#endif
   
   gg_assert(stackp == 0);
   
@@ -396 +461 @@
 
   
   /* Pick up moves that we know of already. */
+#ifndef GG_TURN_OFF_TRACES
   save_verbose = verbose;
   if (verbose > 0)
     verbose--;
+#endif
+
   collect_move_reasons(color);
+
+#ifndef GG_TURN_OFF_TRACES
   verbose = save_verbose;
   time_report(1, "generate move reasons", NO_MOVE, 1.0);
+#endif
   
   /* Try to find empty corner moves. */
   fuseki(color);
@@ -420 +491 @@
   
   /* The general pattern database. */
   shapes(color);
+
+#ifndef GG_TURN_OFF_TRACES
   time_report(1, "shapes", NO_MOVE, 1.0);
+#endif
+
   gg_assert(stackp == 0);
 
   /* Look for combination attacks and defenses against them. */
   combinations(color);
+
+#ifndef GG_TURN_OFF_TRACES
   time_report(1, "combinations", NO_MOVE, 1.0);
+#endif
+
   gg_assert(stackp == 0);
 
   /* Review the move reasons and estimate move values. */
@@ -433 +512 @@
                           pure_threat_value, pessimistic_score, allowed_moves,
                           use_thrashing_dragon_heuristics))
     TRACE("Move generation likes %1m with value %f\n", move, *value);
+
   gg_assert(stackp == 0);
+
+#ifndef GG_TURN_OFF_TRACES
   time_report(1, "review move reasons", NO_MOVE, 1.0);
+#endif
 
 
   /* If the move value is 6 or lower, we look for endgame patterns too. */
@@ -447 +530 @@
                             use_thrashing_dragon_heuristics))
       TRACE("Move generation likes %1m with value %f\n", move, *value);
     gg_assert(stackp == 0);
+
+#ifndef GG_TURN_OFF_TRACES
     time_report(1, "endgame", NO_MOVE, 1.0);
+#endif
   }
   
   /* If no move found yet, revisit any semeai and change the
@@ -465 +551 @@
               move, *value); 
       }
     }
-    time_report(1, "move reasons with revised semeai status",
-                NO_MOVE, 1.0);
+
+#ifndef GG_TURN_OFF_TRACES
+    time_report(1, "move reasons with revised semeai status", NO_MOVE, 1.0);
+#endif
   }
 
   /* If still no move, fill a remaining liberty. This should pick up
@@ -478 +566 @@
       *value = 1.0;
       TRACE("Filling a liberty at %1m\n", move);
       record_top_move(move, *value);
-      move_considered(move, *value);
+
+#ifndef GG_TURN_OFF_TRACES
+          move_considered(move, *value);
       time_report(1, "fill liberty", NO_MOVE, 1.0);
+#endif
     }
     else
       move = PASS_MOVE;
@@ -492 +583 @@
   if (move == PASS_MOVE) {
     if (play_out_aftermath 
         || capture_all_dead 
-        || (!doing_scoring && thrashing_dragon && pessimistic_score > 15.0))
+        || (!doing_scoring && thrashing_dragon && pessimistic_score > 1.0))
       move = aftermath_genmove(color, 0, allowed_moves);
       
     /* If we're instructed to capture all dead opponent stones, generate
@@ -506 +597 @@
       *value = 1.0;
       TRACE("Aftermath move at %1m\n", move);
       record_top_move(move, *value);
-      move_considered(move, *value);
+
+#ifndef GG_TURN_OFF_TRACES
+          move_considered(move, *value);
       time_report(1, "aftermath_genmove", NO_MOVE, 1.0);
+#endif
     }
   }
 
@@ -534 +628 @@
     *resign = 1;
   }
   
+#ifndef GG_TURN_OFF_STATS
   /* If statistics is turned on, this is the place to show it. */
   if (showstatistics)
     showstats();
+#endif
 
+#ifndef GG_TURN_OFF_TRACES
   if (showtime) {
     double spent = time_report(0, "TIME to generate move at ", move, 1.0);
     total_time += spent;
@@ -547 +644 @@
       slowest_movenum = movenum + 1;
     }
   }
+#endif
 
   /* Some consistency checks to verify that things are properly
    * restored and/or have not been corrupted.
    */
   gg_assert(stackp == 0);
   gg_assert(test_gray_border() < 0);
+
+#ifndef GG_TURN_OFF_ASSERTS
   gg_assert(depth == save_depth);
+#endif
 
   return move;
 }
@@ -585 +686 @@
   int found_one = 0;
   int other = OTHER_COLOR(color);
 
-  if (stones_on_board(BLACK | WHITE) == 0)
-    return 0;
-
   if (doing_scoring)
     return 0;
   
   gg_assert(dragon2 != NULL);
 
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
-    if (ON_BOARD(pos)
-        && dragon[pos].color == other
+  scan_board(pos,
+    if (dragon[pos].color == other
         && DRAGON2(pos).semeais
         && dragon[pos].status == DEAD) {
       found_one = 1;
@@ -604 +701 @@
         TRACE("revise_semeai: changed status of dragon %1m from DEAD to UNKNOWN\n",
               pos);
     }
-  }
+  )
   
   return found_one;
 }
@@ -622 +719 @@
   int pos;
   signed char safe_stones[BOARDMAX];
   float strength[BOARDMAX];
+  int other_color;
 
   /* Trust the owl code's opinion if we are behind. */
   if (our_score < advantage)
@@ -632 +730 @@
       || dragon[thrashing_dragon].status != DEAD)
     return 0;
   
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++)
-    if (ON_BOARD(pos) && thrashing_stone[pos]
+  scan_board(pos,
+    if (thrashing_stone[pos]
         && worm[pos].unconditional_status != DEAD) {
       dragon[pos].status = UNKNOWN;
       DRAGON2(pos).safety = ALIVE;
     }
+  )
 
-  set_strength_data(OTHER_COLOR(color), safe_stones, strength);
-  compute_influence(OTHER_COLOR(color), safe_stones, strength,
+  other_color = OTHER_COLOR(color);
+  set_strength_data(other_color, safe_stones, strength);
+  compute_influence(other_color, safe_stones, strength,
                     OPPOSITE_INFLUENCE(color),
                     NO_MOVE, "revised thrashing dragon");
   compute_refined_dragon_weaknesses();
@@ -670 +770 @@
     }
   }
   else {
-    for (mirror_move = BOARDMIN; mirror_move < BOARDMAX; mirror_move++) {
-      if (ON_BOARD(mirror_move)
-          && test_symmetry_after_move(mirror_move, color, 0)) {
+    scan_board(mirror_move,
+      if (test_symmetry_after_move(mirror_move, color, 0)) {
         *move = mirror_move;
         return 1;
       }
-    }
+        )
   }
   
   return 0;
@@ -701 +800 @@
                     NO_MOVE, "White territory estimate");
   black_score = influence_score(&move_influence, use_chinese_rules);
 
+#ifndef GG_TURN_OFF_TRACES
   if (verbose || showscore) {
     if (white_score == black_score)
       gprintf("Score estimate: %s %f\n",
@@ -711 +811 @@
               white_score > 0 ? "W " : "B ", gg_abs(white_score));
     fflush(stderr);
   }
+#endif
 }
 
 
@@ -749 +850 @@
    * it looks like all our dragons are dead and the generated move
    * is a pass.
    */
-  if (board_size > 2 && move == PASS_MOVE && !lively_dragon_exists(color))
+  if (move == PASS_MOVE && !lively_dragon_exists(color))
     return 1;
   
   if (move == PASS_MOVE