Ticket #145: persistent.c.patch

gnugo/engine/persistent.c

@@ -224 +224 @@
 verify_stored_board(Intersection p[BOARDMAX])
 {
   int pos;
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
-    if (!ON_BOARD(pos))
+  scan_board(pos,
+    if (p[pos] == GRAY)
       continue;
-    else if (p[pos] == GRAY)
-      continue;
-    else if ((p[pos] & 3) != board[pos])
+    if ((p[pos] & 3) != board[pos])
       return 0;
     else if (!(p[pos] & (HIGH_LIBERTY_BIT | HIGH_LIBERTY_BIT2)))
       continue;
     else if (((p[pos] & HIGH_LIBERTY_BIT) && countlib(pos) <= 4)
              || (p[pos] & HIGH_LIBERTY_BIT2 && countlib(pos) <= 3))
       return 0;
-  }
+  )
   
   return 1;
 }
@@ -645 +643 @@
     active[entry->move] = 1;
 
   /* Add adjacent strings and empty. */
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
-    if (!ON_BOARD(pos))
-      continue;
+  scan_board(pos,
     if (active[pos] != 0) 
       continue;
     if ((ON_BOARD(SOUTH(pos)) && active[SOUTH(pos)] == 1)
@@ -659 +655 @@
       else
         active[pos] = 2;
     }
-  }
+  )
 
   /* Remove invincible strings. No point adding their liberties and
    * neighbors.
    */
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
-    if (!ON_BOARD(pos))
-      continue;
+  scan_board(pos,
     if (IS_STONE(board[pos]) && worm[pos].invincible)
       active[pos] = 0;
-  }
+  )
   
   /* Expand empty to empty. */
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
+  scan_board(pos,
     if (IS_STONE(board[pos]) || active[pos] != 0) 
       continue;
     if ((board[SOUTH(pos)] == EMPTY && active[SOUTH(pos)] == 2)
@@ -680 +674 @@
         || (board[NORTH(pos)] == EMPTY && active[NORTH(pos)] == 2)
         || (board[EAST(pos)] == EMPTY && active[EAST(pos)] == 2))
       active[pos] = 3;
-  }
+  )
   
   /* Add neighbors of active area so far. */
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
-    if (!ON_BOARD(pos))
-      continue;
+  scan_board(pos,
     if (active[pos] != 0) 
       continue;
     if ((ON_BOARD(SOUTH(pos)) && active[SOUTH(pos)] > 0
@@ -697 +689 @@
         || (ON_BOARD(EAST(pos)) && active[EAST(pos)] > 0
             && active[EAST(pos)] < 4))
       active[pos] = 4;
-  }
+  )
 
   /* Also add the previously played stones to the active area. */
   for (r = 0; r < stackp; r++)
     active[entry->stack[r]] = 5;
 
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
-    if (!ON_BOARD(pos))
-      continue;
+  scan_board(pos,
     entry->board[pos] = 
       active[pos] != 0 ? board[pos] : GRAY;
-  }
+  )
 }
 
 
@@ -870 +860 @@
 
   /* Distance two expansion through empty intersections and own stones. */
   for (k = 1; k < 3; k++) {
-    for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
-      if (!ON_BOARD(pos) || board[pos] == other || active[pos] != 0) 
+    scan_board(pos,
+      if (board[pos] == other || active[pos] != 0) 
         continue;
       if ((ON_BOARD(SOUTH(pos)) && active[SOUTH(pos)] == k)
           || (ON_BOARD(WEST(pos)) && active[WEST(pos)] == k)
@@ -882 +872 @@
         else
           mark_string(pos, active, (signed char) (k + 1));
       }
-    }
+        )
   }
   
   /* Adjacent opponent strings. */
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
+  scan_board(pos,
     if (board[pos] != other || active[pos] != 0) 
       continue;
     for (r = 0; r < 4; r++) {
@@ -895 +885 @@
         mark_string(pos, active, 1);
         break;
       }
-    }
-  }
+        }
+  )
   
   /* Liberties of adjacent opponent strings with less than five liberties +
    * liberties of low liberty neighbors of adjacent opponent strings
    * with less than five liberties.
    */
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
+  scan_board(pos,
     if (board[pos] == other && active[pos] > 0 && countlib(pos) < 5) {
       int libs[4];
       int liberties = findlib(pos, 4, libs);
@@ -930 +920 @@
         }
       }
     }
-  }
+  )
   
   /* Also add the previously played stones to the active area. */
   for (r = 0; r < stackp; r++)
     active[entry->stack[r]] = 1;
 
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
+  scan_board(pos,
     int value = board[pos];
-    if (!ON_BOARD(pos))
-      continue;
+
     if (!active[pos])
       value = GRAY;
     else if (IS_STONE(board[pos]) && countlib(pos) > 4 && active[pos] > 0)
       value |= HIGH_LIBERTY_BIT;
     
     entry->board[pos] = value;
-  }
+  )
 
 }
 
@@ -1018 +1007 @@
 
   /* Distance two expansion through empty intersections and own stones. */
   for (k = 1; k < 3; k++) {
-    for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
-      if (!ON_BOARD(pos) || board[pos] == other || active[pos] != 0) 
+    scan_board(pos,
+      if (board[pos] == other || active[pos] != 0) 
         continue;
       if ((ON_BOARD(SOUTH(pos)) && active[SOUTH(pos)] == k)
           || (ON_BOARD(WEST(pos)) && active[WEST(pos)] == k)
@@ -1030 +1019 @@
         else
           mark_string(pos, active, (signed char) (k + 1));
       }
-    }
+        )
   }
   
   /* Adjacent opponent strings. */
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
+  scan_board(pos,
     if (board[pos] != other || active[pos] != 0) 
       continue;
     for (r = 0; r < 4; r++) {
@@ -1046 +1035 @@
         break;
       }
     }
-  }
+  )
   
   /* Liberties of adjacent opponent strings with less than four liberties +
    * liberties of low liberty neighbors of adjacent opponent strings
    * with less than five liberties.
    */
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
+  scan_board(pos,
     if (board[pos] == other && active[pos] > 0 && countlib(pos) < 4) {
       int libs[4];
       int liberties = findlib(pos, 3, libs);
@@ -1080 +1069 @@
         }
       }
     }
-  }
+  )
   
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
+  scan_board(pos,
     Intersection value = board[pos];
-    if (!ON_BOARD(pos))
-      continue;
+
     if (!active[pos])
       value = GRAY;
     else if (IS_STONE(board[pos]) && countlib(pos) > 3 && active[pos] > 0)
       value |= HIGH_LIBERTY_BIT2;
     
     entry->board[pos] = value;
-  }
+  )
 }
 
 
@@ -1146 +1134 @@
    * liberties and neighbors of low liberty neighbors of adjacent opponent
    * strings with less than five liberties.
    */
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++)
-    if (ON_BOARD(pos) && goal[pos])
+  scan_board(pos,
+    if (goal[pos])
       active[pos] = 1;
+  )
 
   /* Distance four expansion through empty intersections and own stones. */
   for (k = 1; k < 5; k++) {
-    for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
-      if (!ON_BOARD(pos) || board[pos] == other || active[pos] > 0) 
+    scan_board(pos,
+      if (board[pos] == other || active[pos] > 0)
         continue;
       if ((ON_BOARD(SOUTH(pos)) && active[SOUTH(pos)] == k)
           || (ON_BOARD(WEST(pos)) && active[WEST(pos)] == k)
@@ -1164 +1153 @@
         else
           mark_string(pos, active, (signed char) (k + 1));
       }
-    }
+        )
   }
   
   /* Adjacent opponent strings. */
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
+  scan_board(pos,
     if (board[pos] != other || active[pos] != 0) 
       continue;
     for (r = 0; r < 4; r++) {
@@ -1178 +1167 @@
         break;
       }
     }
-  }
+  )
   
   /* Liberties of adjacent opponent strings with less than five liberties +
    * liberties of low liberty neighbors of adjacent opponent strings
    * with less than five liberties.
    */
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
+  scan_board(pos,
     if (board[pos] == other && active[pos] > 0 && countlib(pos) < 5) {
       int libs[4];
       int liberties = findlib(pos, 4, libs);
@@ -1212 +1201 @@
         }
       }
     }
-  }
+  )
 }
 
 static void
@@ -1232 +1221 @@
 
   compute_active_owl_type_area(goal, goal_color, active);
 
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
+  scan_board(pos,
     int value = board[pos];
-    if (!ON_BOARD(pos))
-      continue;
+
     if (!active[pos])
       value = GRAY;
     else if (IS_STONE(board[pos]) && countlib(pos) > 4 && active[pos] > 0)
       value |= HIGH_LIBERTY_BIT;
     
     entry->board[pos] = value;
-  }
+  )
 }
 
 
@@ -1279 +1267 @@
   signed char goal[BOARDMAX];
   int pos;
 
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++)
-    if (ON_BOARD(pos))
-      goal[pos] = goala[pos] || goalb[pos];
+  scan_board(pos,
+    goal[pos] = goala[pos] || goalb[pos];
+  )
 
   store_persistent_cache(&semeai_cache, routine,
                          apos, bpos, cpos, color, goal_hash,
@@ -1315 +1303 @@
   compute_active_owl_type_area(goal, BLACK, active_b);
   compute_active_owl_type_area(goal, WHITE, active_w);
 
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
+  scan_board(pos,
     int value = board[pos];
-    if (!ON_BOARD(pos))
-      continue;
+
     if (!active_b[pos] && !active_w[pos])
       value = GRAY;
     else if (IS_STONE(board[pos]) && countlib(pos) > 4
@@ -1326 +1313 @@
       value |= HIGH_LIBERTY_BIT;
     
     entry->board[pos] = value;
-  }
+  )
 }
 
 
@@ -1341 +1328 @@
   int k;
   if (!IS_STONE(board[dr]))
     return;
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
+  scan_board(pos,
     if (board[pos] != EMPTY)
       continue;
     for (k = 0; k < 8; k++) {
@@ -1380 +1367 @@
     if (k == 8 && active_board[pos] == EMPTY) {
       values[pos] -= 0.5 * contribution;
     }
-  }
+  )
 }