Ticket #145: optics.c.patch

gnugo/engine/optics.c

@@ -118 +118 @@
     memset(w_eye, 0, BOARDMAX * sizeof(w_eye[0]));
 
   /* Initialize eye data and compute the lively array. */
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++)
-    if (ON_BOARD(pos))
-      lively[pos] = is_lively(owl_call, pos);
+  scan_board(pos,
+    lively[pos] = is_lively(owl_call, pos);
+  )
 
   /* Compute the domains of influence of each color. */
   compute_primary_domains(BLACK, black_domain, lively, false_margins, 1);
@@ -130 +130 @@
    * each eye shape.
    */
 
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
-    if (!ON_BOARD(pos))
-      continue;
+  scan_board(pos,
     
     if (board[pos] == EMPTY || !lively[pos]) {
       if (black_domain[pos] == 0 && white_domain[pos] == 0) {
@@ -191 +189 @@
         }
       }
     }
-  }
+  )
   
   /* The eye spaces are all found. Now we need to find the origins. */
   partition_eyespaces(b_eye, BLACK);
@@ -207 +205 @@
   if (!eye)
     return;
 
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++)
-    if (ON_BOARD(pos))
-      eye[pos].origin = NO_MOVE;
+  scan_board(pos,
+    eye[pos].origin = NO_MOVE;
+  )
+
+  scan_board(pos,
 
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
-    if (!ON_BOARD(pos))
-      continue;
     if (eye[pos].origin == NO_MOVE && eye[pos].color == color) {
       int esize = 0;
       int msize = 0;
@@ -222 +219 @@
       eye[pos].esize = esize;
       eye[pos].msize = msize;
     }
-  }
+  )
 
   /* Now we count the number of neighbors and marginal neighbors
    * of each vertex.
@@ -302 +299 @@
    *    (Cases (1) and (2) above.)
    * 2. Fill influence[] and threshold[] arrays with initial values.
    */
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
-    if (!ON_BOARD(pos))
-      continue;
+  scan_board(pos,
    
     if (lively[pos]) {
       if (board[pos] == color) {
@@ -356 +351 @@
     }
     else if (is_edge_vertex(pos))
       influence[pos]--;
-  }
+  )
   
   /* Now we loop over the board until no more vertices can be added to
    * the domain through case (3) above.
@@ -410 +405 @@
   int pos;
   int k;
 
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
-    if (!ON_BOARD(pos) || eyedata[pos].origin == NO_MOVE) 
+  scan_board(pos,
+    if (eyedata[pos].origin == NO_MOVE) 
       continue;
 
     eyedata[pos].esize = eyedata[eyedata[pos].origin].esize;
@@ -427 +422 @@
           eyedata[pos].marginal_neighbors++;
       }
     }
-  }
+  )
 }
 
 
@@ -565 +560 @@
 {
   int pos;
 
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++)
-    if (ON_BOARD(pos) && eye[pos].origin == origin) {
+  scan_board(pos,
+    if (eye[pos].origin == origin) {
       eye[pos].color         = eye[origin].color;
       eye[pos].esize         = eye[origin].esize;
       eye[pos].msize         = eye[origin].msize;
       eye[pos].origin        = eye[origin].origin;
       eye[pos].value         = eye[origin].value;
     }
+  )
 }
 
 
@@ -591 +587 @@
 
   memset(mx, 0, sizeof(mx));
   DEBUG(DEBUG_MISCELLANEOUS, "find_eye_dragons: %1m %C\n", origin, eye_color);
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
+  scan_board(pos,
     if (board[pos] == eye_color
         && mx[dragon[pos].origin] == 0
         && ((ON_BOARD(SOUTH(pos))
@@ -613 +609 @@
         dragons[num_dragons] = dragon[pos].origin;
       num_dragons++;
     }
-  }
+  )
   
   return num_dragons;
 }
@@ -634 +630 @@
   gprintf("Eyespace at %1m: color=%C, esize=%d, msize=%d\n",
           pos, eye[pos].color, eye[pos].esize, eye[pos].msize);
   
-  for (pos2 = BOARDMIN; pos2 < BOARDMAX; pos2++) {
-    if (!ON_BOARD(pos2))
-      continue;
+  scan_board(pos2,
     
     if (eye[pos2].origin != pos) 
       continue;
@@ -663 +657 @@
     }
     else
       gprintf("%1m\n", pos2);
-  }
+  )
   gprintf("\n");
   
   /* Determine the size of the eye. */
@@ -789 +783 @@
 
   memset(chainlinks, 0, BOARDMAX);
 
-  for (pos2 = BOARDMIN; pos2 < BOARDMAX; pos2++) {
+  scan_board(pos2,
     int k;
 
-    if (!ON_BOARD(pos2) || eye[pos2].origin != pos)
+    if (eye[pos2].origin != pos)
       continue;
 
     if (eye[pos2].marginal || is_halfeye(heye, pos2)) {
@@ -819 +813 @@
       else if (!ON_BOARD(neighbor))
         bulk_score += 2;
     }
-  }
+  )
 
   /* This is a measure based on the simplified assumption that both
    * players only cares about playing the marginal eye spaces. It is
@@ -891 +885 @@
     int best_defense_point = NO_MOVE;
     float score = 0.0;
     
-    for (pos2 = BOARDMIN; pos2 < BOARDMAX; pos2++) {
-      if (ON_BOARD(pos2) && eye[pos2].origin == pos) {
+    scan_board(pos2,
+      if (eye[pos2].origin == pos) {
         float this_score = 0.0;
         int this_attack_point = NO_MOVE;
         int this_defense_point = NO_MOVE;
@@ -922 +916 @@
           score = this_score;
         }
       }
-    }
+        )
     
     if (score > 0.0) {
       if (defense_point)
         *defense_point = best_defense_point;
       if (attack_point)
         *attack_point = best_attack_point;
-    }
+        }
   }
 
   if (defense_point && *defense_point != NO_MOVE) {
@@ -1048 +1042 @@
     return 0;
 
   /* Find ko half eyes and "combination" half eyes if any. */
-  for (pos2 = BOARDMIN; pos2 < BOARDMAX; pos2++) {
-    if (ON_BOARD(pos2)
-        && eye[pos2].origin == pos
+  scan_board(pos2,
+    if (eye[pos2].origin == pos
         && heye[pos2].type == HALF_EYE) {
       if (combination_halfeye == NO_MOVE) {
         int apos = NO_MOVE;
@@ -1082 +1075 @@
         ko_halfeye = pos2;
       }
     }
-  }
+  )
 
   /* In case we have a "combination" half eye, turn it into a proper eye
    * vertex for a while and see what happens.
@@ -1230 +1223 @@
     return 0;
 
   /* Create list of eye vertices */
-  for (pos2 = BOARDMIN; pos2 < BOARDMAX; pos2++) {
-    if (!ON_BOARD(pos2))
-      continue;
+  scan_board(pos2,
     if (eye[pos2].origin == pos) {
       vpos[eye_size] = pos2;
       marginal[eye_size] = eye[pos2].marginal;
@@ -1271 +1262 @@
       
       eye_size++;
     }
-  }
+  )
   
   /* We attempt to construct a map from the graph to the eyespace
    * preserving the adjacency structure. If this can be done, we've
@@ -1686 +1677 @@
   int pos;
   float sum;
   
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
+  scan_board(pos,
     /* skip eyespaces which owl doesn't want to be searched */
-    if (!ON_BOARD(pos) || (find_mask && find_mask[eye[pos].origin] <= 1))
+    if (find_mask && find_mask[eye[pos].origin] <= 1)
       continue;
     
     /* skip every vertex which can't be a false or half eye */
@@ -1714 +1705 @@
       ASSERT1(heye[pos].num_defenses > 0, pos);
       ASSERT_ON_BOARD1(heye[pos].defense_point[0]);
     }
-  }
+  )
 }
 
 
@@ -2386 +2377 @@
   }
 
   /* Play white stones surrounding the eyespace, including diagonals. */
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
-    if (!ON_BOARD(pos) || mx[pos] == 1)
+  scan_board(pos,
+    if (mx[pos] == 1)
       continue;
     for (k = 0; k < 8; k++) {
       if (ON_BOARD(pos + delta[k]) && mx[pos + delta[k]] == 1) {
@@ -2396 +2387 @@
         break;
       }
     }
-  }
+  )
 
   /* Play black stones surrounding the white group, but leaving all
    * liberties empty.
    */
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
+  scan_board(pos,
     if (mx[pos] == 1 || board[pos] != EMPTY || liberty_of_string(pos, str))
       continue;
     for (k = 0; k < 8; k++) {
@@ -2411 +2402 @@
         break;
       }
     }
-  }
+  )
 
   /* Show the board if verbose is on. Then turn off traces so we don't
    * get any from make_worms(), make_dragons(), or the owl reading.
@@ -3515 +3506 @@
   /* Mark the eyespace in the mx array. We construct the position in
    * the mx array and copy it to the actual board later.
    */
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++)
-    if (ON_BOARD(pos))
-      mx[pos] = WHITE;
+  scan_board(pos,
+    mx[pos] = WHITE;
+  )
 
   /* Find out the size of the eye graph pattern so that we can center
    * it properly.
@@ -3632 +3623 @@
 
   /* Copy the mx array over to the board. */
   clear_board();
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++)
-    if (ON_BOARD(pos)) {
+  scan_board(pos,
       if (mx[pos] == WHITE)
         add_stone(pos, WHITE);
       else if (mx[pos] == BLACK)
         add_stone(pos, BLACK);
-    }
+  )
 
   if (verbose)
     showboard(0);
@@ -3646 +3636 @@
   /* If there are any isolated O stones, those should also be added to
    * the playable vertices.
    */
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++)
+  scan_board(pos,
     if (board[pos] == WHITE && !same_string(pos, POS(1, 0))) {
       vertices[num_vertices] = vertices[num_vertices - 1];
       vertices[num_vertices - 1] = vertices[num_vertices - 2];
       vertices[num_vertices - 2] = vertices[num_vertices - 3];
       vertices[num_vertices - 3] = pos;
       num_vertices++;
-    }
+        }
+  )
 
   if (verbose) {
     int k;