Ticket #145: unconditional.c.patch

gnugo/engine/unconditional.c

@@ -57 +57 @@
     string_found = 0;
     
     /* Visit all friendly strings on the board. */
-    for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
+    scan_board(pos,
       if (board[pos] != color || find_origin(pos) != pos)
         continue;
 
@@ -101 +101 @@
           popgo();
           moves_played--;
         }
-    }
+        )
   }
 
   if (none_invincible)
@@ -331 +331 @@
    * kind of seki described in the comments.
    */
   memset(potential_sekis, 0, sizeof(potential_sekis));
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
+  scan_board(pos,
     int isolated = 1;
     int stones[2];
     int pos2;
@@ -356 +356 @@
       potential_sekis[stones[0]] = 1;
       potential_sekis[stones[1]] = 1;
     }
-  }
+  )
   
   moves_played = capture_non_invincible_strings(color, potential_sekis,
                                                 &none_invincible);
@@ -380 +380 @@
    * 1. Play opponent stones on all liberties of the unconditionally
    *    alive strings except where illegal.
    */
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
+  scan_board(pos,
     if (board[pos] != color || potential_sekis[pos] || find_origin(pos) != pos)
       continue;
       
@@ -390 +390 @@
       if (trymove(libs[k], other, "unconditional_life", pos))
         moves_played++;
     }
-  }
+  )
 
   /* 2. Recursively extend opponent strings in atari, except where this
    *    would be suicide.
@@ -400 +400 @@
     /* Nothing found so far in this turn of the loop. */
     found_one = 0;
 
-    for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
+    scan_board(pos,
       if (board[pos] != other || countlib(pos) > 1)
         continue;
         
@@ -410 +410 @@
         moves_played++;
         found_one = 1;
       }
-    }
+        )
   }
 
   /* Now see whether there are any significant sekis on the board. */
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
+  scan_board(pos,
     if (!potential_sekis[pos]
         || board[pos] == EMPTY
         || find_origin(pos) != pos)
@@ -461 +461 @@
       if (countstones(pos) > 2)
         break;
     }
-  }
+  )
 
   /* Capture the strings involved in potential sekis. */
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
+  scan_board(pos,
     if (!potential_sekis[pos] || board[pos] == EMPTY)
       continue;
     /* Play as many liberties as we can. */
@@ -473 +473 @@
       if (trymove(libs[k], other, "unconditional_life", pos))
         moves_played++;
     }
-  }
+  )
     
 
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
+  scan_board(pos,
     int apos;
     int bpos;
-    int aopen, bopen;
-    int alib, blib;
+    int aopen;
+        int bopen;
+    int alib;
+        int blib;
     if (board[pos] != other || countlib(pos) != 2)
       continue;
     findlib(pos, 2, libs);
@@ -515 +517 @@
       trymove(bpos, other, "unconditional_life", pos);
       moves_played++;
     }
-  }
+  )
   
   /* Identify unconditionally alive stones and unconditional territory. */
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
+  scan_board(pos,
     if (board[pos] == color && !potential_sekis[pos]) {
       unconditional_territory[pos] = 1;
       if (find_origin(pos) == pos) {
@@ -532 +534 @@
       findlib(pos, 1, libs);
       unconditional_territory[libs[0]] = 2;
     }
-  }
+  )
   
   /* Take back all moves. */
   while (moves_played > 0) {