Ticket #145: surround.c.patch

gnugo/engine/surround.c

@@ -131 +131 @@
 
   /* descend markings from stones lying on the 2nd and third lines */
 
-  for (dpos = BOARDMIN; dpos < BOARDMAX; dpos++)
-    if (ON_BOARD(dpos) && mn[dpos]) {
+  scan_board(dpos,
+    if (mn[dpos]) {
       for (k = 0; k < 4; k++) {
         int d = delta[k];
         if (!ON_BOARD(dpos + d))
@@ -147 +147 @@
             mn[dpos + 2*d] = 1;
         }
       }
-    }
+        }
+  )
 
   /* compute minimum distances to the goal */
 
-  for (dpos = BOARDMIN; dpos < BOARDMAX; dpos++)
-    if (ON_BOARD(dpos) && mn[dpos]) 
+  scan_board(dpos,
+    if (mn[dpos])
       sd[dpos] = goal_dist(dpos, mf);
+  )
 
   /* revise markings */
 
   do {
     found_some = 0;
-    for (dpos = BOARDMIN; dpos < BOARDMAX; dpos++)
-      if (ON_BOARD(dpos) && mn[dpos] && sd[dpos] > 8) {
+    scan_board(dpos,
+      if (mn[dpos] && sd[dpos] > 8) {
         /* discard markings if we can find 2 stones
          * that verify :
          * - it is closer to the goal than we are
          * - it is closer to us than the goal is
          * - they are closer to each other than we are to the goal
          */
-        for (i = BOARDMIN; i < BOARDMAX; i++)
-          if (ON_BOARD(i) && mn[i] && i != dpos
+        scan_board(i,
+          if (mn[i] && i != dpos
               && sd[i] < sd[dpos]
               && square_dist(i, dpos) < sd[dpos]) {
             for (j = i + 1; j < BOARDMAX; j++)
@@ -182 +184 @@
               }
             if (mn[dpos] == 0)
               break;
-          }
-      }
+                          }
+            )
+          }
+        )
   } while (found_some);
 
   /* prepare corner array */
 
-  for (dpos = BOARDMIN; dpos < BOARDMAX; dpos++)
-    if (ON_BOARD(dpos) && mn[dpos])
+  scan_board(dpos,
+    if (mn[dpos])
       corner[corners++] = dpos;
+  )
 
   /* compute gravity center of the goal */
 
-  for (dpos = BOARDMIN; dpos < BOARDMAX; dpos++)
-    if (ON_BOARD(dpos) && mf[dpos]) {
+  scan_board(dpos,
+    if (mf[dpos]) {
       gi += I(dpos);
       gj += J(dpos);
       stones++;
     }
+  )
   gi /= stones;
   gj /= stones;
   gg = POS(gi, gj);
@@ -363 +369 @@
   
   /* mark the expanded region */
 
-  for (dpos = BOARDMIN; dpos < BOARDMAX; dpos++)
-    if (ON_BOARD(dpos) && mn[dpos] == 1)
+  scan_board(dpos,
+    if (mn[dpos] == 1)
       for (k = 0; k < 4; k++)
         if (ON_BOARD(dpos + delta[k]) && !mn[dpos + delta[k]])
           mn[dpos + delta[k]] = 2;
+  )
       
   /* Mark allied dragons that intersect the (unexpanded) hull.
    * These must all lie entirely within the hull for the
@@ -377 +384 @@
    * are not neighbors are less likely to be helpful.
    */
 
-  for (dpos = BOARDMIN; dpos < BOARDMAX; dpos++) {
+  scan_board(dpos,
     int mpos;
-    if (ON_BOARD(dpos) 
-        && mn[dpos] == 1
+    if (mn[dpos] == 1
         && board[dpos] == color
         && are_neighbor_dragons(pos, dpos)
         && !mf[dpos]) {
 
-      for (mpos = BOARDMIN; mpos < BOARDMAX; mpos++)
-        if (ON_BOARD(mpos) && is_same_dragon(mpos, dpos))
-          mf[mpos] = 2;
-    }
+      scan_board(mpos,
+            if (is_same_dragon(mpos, dpos))
+              mf[mpos] = 2;
+          )
+        }
     /* A special case
      *
      *  . X X .
@@ -402 +409 @@
      * Consequently, we allow inclusion of the stones at kosumi distance
      * in the mf (friendly) array.
      */
-    if (ON_BOARD(dpos) 
-        && mn[dpos] == 2
+    if (mn[dpos] == 2
         && board[dpos] == color
         && are_neighbor_dragons(pos, dpos)
         && !mf[dpos]) {
@@ -412 +418 @@
             && mn[dpos + delta[k]] == 1
             && board[dpos + delta[k-4]] == EMPTY
             && board[dpos + delta[(k-3)%4]] == EMPTY) {
-          for (mpos = BOARDMIN; mpos < BOARDMAX; mpos++)
-            if (ON_BOARD(mpos) && is_same_dragon(mpos, dpos))
+          scan_board(mpos,
+            if (is_same_dragon(mpos, dpos))
               mf[mpos] = 2;
+          )
         }
     }
-  }
+  )
 
   /* determine the surround status of the dragon */
 
@@ -451 +458 @@
   }
 
   if (surrounded)
-    for (dpos = BOARDMIN; dpos < BOARDMAX; dpos++)
+    scan_board(dpos,
       if (mf[dpos]) {
         if (mn[dpos] == 0) {
           surrounded = 0;
@@ -459 +466 @@
         }
         else if (mn[dpos] == 2)
           surrounded = WEAKLY_SURROUNDED;
-      }
+          }
+        )
 
   /* revise the status for single stone dragons. */
 
@@ -471 +479 @@
   /* revise the status if an ikken tobi jumps out. */
 
   if (surrounded) {
-    for (dpos = BOARDMIN; dpos < BOARDMAX && surrounded; dpos++) {
-      if (!ON_BOARD(dpos) || !mf[dpos])
+        scan_board(dpos,
+          if (!surrounded)
+            break;
+
+      if (!mf[dpos])
         continue;
 
       for (k = 0; k < 4; k++) {
@@ -489 +500 @@
           break;
         }
       }
-    }
+        )
   }
 
   if (showboard == 1 || (showboard == 2 && surrounded)) {
@@ -506 +517 @@
     int pos;
 
     *surround_size = 0;
-    for (pos = BOARDMIN; pos < BOARDMAX; pos++)
-      if (ON_BOARD(pos) && mn[pos] == 1)
-        (*surround_size)++;
+    scan_board(pos,
+      if (mn[pos] == 1)
+            ++(*surround_size);
+        )
   }
 
   return surrounded;
@@ -524 +536 @@
   int dist = 10000;
   int ii;
 
-  for (ii = BOARDMIN; ii < BOARDMAX; ii++)
-    if (ON_BOARD(ii) && goal[ii])
+  scan_board(ii,
+    if (goal[ii])
       dist = gg_min(dist, square_dist(ii, pos));
+  )
 
   return dist;
 }