Ticket #145: combination.c.patch

gnugo/engine/combination.c

@@ -76 +76 @@
       gprintf("Combination attack for %C with size %d found at %1m\n",
               other, aa_val, attack_point);
     
-    for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
-      if (ON_BOARD(pos) && defense_points[pos]) {
+    scan_board(pos,
+      if (defense_points[pos]) {
         add_your_atari_atari_move(pos, aa_val);
         if (save_verbose)
           gprintf("- defense at %1m\n", pos);
       }
-    }
+        )
   }
   verbose = save_verbose;
 }
@@ -93 +93 @@
 static void
 find_double_threats(int color)
 {
-  int ii;
   int k;
   int l;
+  int pos;
 
-  for (ii = BOARDMIN; ii < BOARDMAX; ii++) {
+  scan_board(pos,
     int num_a_threatened_groups;
     int a_threatened_groups[MAX_THREATENED_STRINGS];
 #if 0
@@ -105 +105 @@
     int d_threatened_groups[MAX_THREATENED_STRINGS];
 #endif
 
-    if (!ON_BOARD(ii))
-      continue;
-
     /* Generate an EITHER_MOVE move reasons for each pair of the 
      * threatened strings.  We must also remove the threats, because
      * otherwise we would get followup points for them as well.
@@ -118 +115 @@
      *     at the same point.  Still, we should find a better way.
      *   - EITHER_MOVE should be generalized to more than two strings.
      */
-    num_a_threatened_groups = get_attack_threats(ii, MAX_THREATENED_STRINGS,
+    num_a_threatened_groups = get_attack_threats(pos, MAX_THREATENED_STRINGS,
                                                  a_threatened_groups);
     if (num_a_threatened_groups > 1) {
-      if (trymove(ii, color, "find_double_threats-A", ii)) {
+      if (trymove(pos, color, "find_double_threats-A", pos)) {
         for (k = 0; k < num_a_threatened_groups - 1; ++k)
           for (l = k + 1; l < num_a_threatened_groups; ++l) {
             /* Note: If we used attack_either() here instead of trymove()
@@ -131 +128 @@
              * Besides, attack_either is currently (3.1.11) not very good.
              *
              * The call to attack() is intended to detect the case
-             * where the move at ii is a snapback capture.
+             * where the move at pos is a snapback capture.
              */
             if (board[a_threatened_groups[k]] == EMPTY
                 || board[a_threatened_groups[l]] == EMPTY) {
-              if (!attack(ii, NULL)) {
+              if (!attack(pos, NULL)) {
                 TRACE("Double threat at %1m, either %1m or %1m attacked.\n",
-                      ii, a_threatened_groups[k], a_threatened_groups[l]);
-                add_either_move(ii, ATTACK_STRING, a_threatened_groups[k],
+                      pos, a_threatened_groups[k], a_threatened_groups[l]);
+                add_either_move(pos, ATTACK_STRING, a_threatened_groups[k],
                                 ATTACK_STRING, a_threatened_groups[l]);
-                remove_attack_threat_move(ii, a_threatened_groups[k]);
-                remove_attack_threat_move(ii, a_threatened_groups[l]);
+                remove_attack_threat_move(pos, a_threatened_groups[k]);
+                remove_attack_threat_move(pos, a_threatened_groups[l]);
               }
             }
             else if (!defend_both(a_threatened_groups[k],
                                   a_threatened_groups[l])) {
               TRACE("Double threat at %1m, either %1m or %1m attacked.\n",
-                    ii, a_threatened_groups[k], a_threatened_groups[l]);
-              add_either_move(ii, ATTACK_STRING, a_threatened_groups[k],
+                    pos, a_threatened_groups[k], a_threatened_groups[l]);
+              add_either_move(pos, ATTACK_STRING, a_threatened_groups[k],
                               ATTACK_STRING, a_threatened_groups[l]);
-              remove_attack_threat_move(ii, a_threatened_groups[k]);
-              remove_attack_threat_move(ii, a_threatened_groups[l]);
+              remove_attack_threat_move(pos, a_threatened_groups[k]);
+              remove_attack_threat_move(pos, a_threatened_groups[l]);
             }
           }
         popgo();
       }
     }
-  }
+  )
   
   
   /* FIXME:
@@ -312 +309 @@
      * examine which of them really work.
      */
     forbidden[apos] = 0;
-    for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
-      if (!ON_BOARD(pos) || !defense_moves[pos])
+    scan_board(pos,
+      if (!defense_moves[pos])
         continue;
 
       if (!trymove(pos, other, "atari_atari", NO_MOVE)) {
@@ -321 +318 @@
         if (save_verbose)
           gprintf("%1m deleted defense point, illegal\n", pos);
         continue;
-      }
+          }
 
       if (attack(pos, NULL)) {
         defense_moves[pos] = 0;
@@ -329 +326 @@
         if (save_verbose)
           gprintf("%1m deleted defense point, unsafe\n", pos);
         continue;
-      }
+          }
       
       if (do_atari_atari(color, &apos, &dpos, NULL, NO_MOVE,
                          save_verbose, aa_val, NULL) > 0) {
         if (save_verbose)
           gprintf("%1m deleted defense point, didn't work\n", pos);
         defense_moves[pos] = 0;
-      }
+          }
       
       popgo();
-    }
+        )
   }
   return aa_val;
 }
@@ -372 +369 @@
   if (defense) {
     /* Return one arbitrary defense move. */
     *defense = NO_MOVE;
-    for (pos = BOARDMIN; pos < BOARDMAX; pos++)
-      if (ON_BOARD(pos) && defense_moves[pos]) {
+    scan_board(pos,
+      if (defense_moves[pos]) {
         *defense = pos;
         break;
-      }
+          }
+        )
   }
   
   return blunder_size >= minsize;
@@ -473 +471 @@
     compute_aa_values(other);
       
     memcpy(defense_moves, defense_points, sizeof(defense_points));
-    for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
-      if (!ON_BOARD(pos) || !defense_moves[pos] || pos == move)
+    scan_board(pos,
+      if (!defense_moves[pos] || pos == move)
         continue;
 
       if (!trymove(pos, color, "atari_atari", NO_MOVE)) {
@@ -504 +502 @@
       popgo();
       decrease_depth_values();
       popgo();
-    }
+        )
   }
   
   return after_aa_val - aa_val;
@@ -540 +538 @@
    * The worm status of empty points is set to UNKNOWN to signal
    * that stones added along the way need special attention.
    */
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
+  scan_board(pos,
     if (board[pos] == other) {
       if (safe_stones) {
         if (safe_stones[pos])
@@ -565 +563 @@
     }
     else if (ON_BOARD(pos))
       aa_status[pos] = UNKNOWN;
-  }
+  )
   
   /* reclassify a worm with 2 liberties as INSUBSTANTIAL if capturing
    * it does not result in a live group.
    */
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
+  scan_board(pos,
     if (board[pos] == other
         && worm[pos].origin == pos
         && worm[pos].liberties == 2
@@ -586 +584 @@
       
       if (!owl_substantial(pos)) {
         int pos2;
-        for (pos2 = BOARDMIN; pos2 < BOARDMAX; pos2++)
-          if (ON_BOARD(pos2) && is_worm_origin(pos2, pos))
+        scan_board(pos2,
+          if (is_worm_origin(pos2, pos))
             aa_status[pos2] = INSUBSTANTIAL;
-      }
+        )
+          }
     }
-  }
+  )
     
   if (debug & DEBUG_ATARI_ATARI) {
     gprintf("compute_aa_status() for %C\n", color);
     gprintf("aa_status: (ALIVE worms not listed)\n");
-    for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
+    scan_board(pos,
       if (board[pos] == other && is_worm_origin(pos, pos)) {
         const char *status = "UNKNOWN (shouldn't happen)";
         if (aa_status[pos] == DEAD)
@@ -609 +608 @@
         if (aa_status[pos] != ALIVE)
           gprintf("%1M: %s\n", pos, status);
       }
-    }
+        )
   }
 
   sgf_dumptree = save_sgf_dumptree;
@@ -687 +686 @@
     gprintf("%odo_atari_atari: ");
     dump_stack();
     gprintf("%oforbidden moves: ");
-    for (pos = BOARDMIN; pos < BOARDMAX; pos++)
-      if (ON_BOARD(pos) && forbidden[pos])
-        gprintf("%o%1m ", pos);
+    scan_board(pos,
+      if (forbidden[pos])
+            gprintf("%o%1m ", pos);
+        )
     gprintf("\n");
     gprintf("%ogoal: ");
     if (!goal)
       gprintf("none");
     else {
-      for (pos = BOARDMIN; pos < BOARDMAX; pos++)
-        if (ON_BOARD(pos) && goal[pos])
-          gprintf("%o%1m ", pos);
-    }
+      scan_board(pos,
+            if (goal[pos])
+              gprintf("%o%1m ", pos);
+          )
+        }
     gprintf("\n");
   }
 
@@ -870 +871 @@
   int apos;
   int other = OTHER_COLOR(color);
 
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
+  scan_board(pos,
     if (board[pos] != other)
       continue;
     
@@ -921 +922 @@
             get_aa_value(pos), pos);
       return get_aa_value(pos);
     }
-  }
+  )
   
   return 0;
 }
@@ -985 +986 @@
   if (goal != NULL) {
     int pos;
     gprintf("goal:");
-    for (pos = BOARDMIN; pos < BOARDMAX; pos++)
-      if (ON_BOARD(pos) && goal[pos])
-        gprintf("%o %1m", pos);
+    scan_board(pos,
+      if (goal[pos])
+            gprintf("%o %1m", pos);
+        )
     gprintf("%o\n");
   }
 #endif
@@ -1210 +1212 @@
   int mx[BOARDMAX];
   int r, k;
 
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
+  scan_board(pos,
     if (board[pos] != other
         || pos != find_origin(pos)
         || aa_status[pos] != ALIVE) {
@@ -1244 +1246 @@
     aa_values[pos] = value;
     if (1)
       DEBUG(DEBUG_ATARI_ATARI, "aa_value for %1m = %d\n", pos, value);
-  }
+  )
 }
 
 /* The aa_value for a string is the sum of the aa_values for all
@@ -1326 +1328 @@
    * move is strictly equivalent to a played move in terms of goal
    * mapping. I doubt it would be anything worth though...
    */
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
-    if (ON_BOARD(pos) && forbidden[pos]) {
+  scan_board(pos,
+    if (forbidden[pos]) {
       dists[pos] = 1;
       queue[queue_end++] = pos;
     }
-  }
+  )
 #endif
 
   if (queue_end == 0)