Ticket #145: aftermath.c.patch

gnugo/engine/aftermath.c

@@ -159 +159 @@
   reading_hotspots(reading_hotspot);
   
   /* As a preparation we compute a distance map to the invincible strings. */
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
-    if (!ON_BOARD(pos))
-      continue;
-    else if (board[pos] == color && worm[pos].invincible)
+  scan_board(pos,
+    if (board[pos] == color && worm[pos].invincible)
       distance[pos] = 0;
     else if (!do_capture_dead_stones
              && ((board[pos] == other 
@@ -172 +170 @@
       distance[pos] = 0;
     else
       distance[pos] = -1;
-  }
+  )
   
   d = 0;
   do {
     something_found = 0;
-    for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
-      if (ON_BOARD(pos) && distance[pos] == -1) {
+    scan_board(pos,
+      if (distance[pos] == -1) {
         for (k = 0; k < 4; k++) {
           int pos2 = pos + delta[k];
           if (!ON_BOARD(pos2))
@@ -202 +200 @@
             break;
           }
         }
-      }
-    }
+          }
+        )
     d++;
   } while (something_found);
 
   if (under_control) {
-    for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
-      if (!ON_BOARD(pos))
-        continue;
-      else if (distance[pos] == -1)
+    scan_board(pos,
+      if (distance[pos] == -1)
         under_control[pos] = 0;
       else
         under_control[pos] = 1;
-    }
+        )
   }
   
   if (debug & DEBUG_AFTERMATH) {
@@ -272 +268 @@
    */
   best_scoring_move = NO_MOVE;
   best_score = 5;
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
+  scan_board(pos,
     int libs;
     if (board[pos] != EMPTY
         || distance[pos] == 0)
@@ -304 +300 @@
         }
       }
     }
-  }
+  )
   
   if (best_scoring_move != NO_MOVE
       && safe_move(best_scoring_move, color) == WIN) {
@@ -313 +309 @@
   }
 
   /* Case 1. */
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
+  scan_board(pos,
     int lib;
     if (board[pos] == other
         && worm[pos].unconditional_status != DEAD
@@ -328 +324 @@
         return lib;
       }
     }
-  }
+  )
 
   /* Cases 2--4. */
   if (closest_opponent != NO_MOVE || closest_own != NO_MOVE) {
@@ -345 +341 @@
       best_score = 0;
       best_scoring_move = move;
 
-      for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
+      scan_board(pos,
         int score = 0;
         int move_ok = 0;
-        if (!ON_BOARD(pos) || distance[pos] != 1)
+        if (distance[pos] != 1)
           continue;
         mark++;
         for (k = 0; k < 4; k++) {
@@ -397 +393 @@
           best_score = score;
           best_scoring_move = pos;
         }
-      }
+          )
       move = best_scoring_move;
     }
 
@@ -410 +406 @@
           move = pos2;
           break;
         }
-      }
-    }
+          }
+        }
     return move;
   }
   
@@ -423 +419 @@
    * and with at least one alive but not invincible stone adjacent or
    * diagonal.
    */
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
+  scan_board(pos,
     int eyespace_neighbors = 0;
     int own_neighbors = 0;
     int own_diagonals = 0;
@@ -479 +475 @@
             bonus += 3;
         }
         mx[origin] = 1;
-      }
+          }
       else if (board[pos2] == color) {
         dragons[pos] = pos2;
         
@@ -532 +528 @@
         else
           own_diagonals++;
       }
-    }
+        }
     if (safety == DEAD || safety == UNKNOWN
         || eyespace_neighbors == 0
         || (own_neighbors + own_diagonals) == 0)
@@ -573 +569 @@
       if (1 && (debug & DEBUG_AFTERMATH))
         gprintf("Score %1M = %d (hotspot bonus %d + %d)\n", pos, score[pos],
                 owl_hotspot_bonus, reading_hotspot_bonus);
-    }
+        }
     
     /* Avoid taking ko. */
     if (is_ko(pos, color, NULL))
       score[pos] = (score[pos] + 1) / 2;
-  }
+  )
   
   while (1) {
     int bb;
     best_score = 0;
     move = NO_MOVE;
-    for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
-      if (ON_BOARD(pos) && score[pos] > best_score) {
+    scan_board(pos,
+      if (score[pos] > best_score) {
         best_score = score[pos];
         move = pos;
       }
-    }
+        )
 
     if (move == NO_MOVE)
       break;
@@ -659 +655 @@
    * Finally we try to play on liberties of remaining DEAD opponent
    * dragons, carefully checking against mistakes.
    */
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
+  scan_board(pos,
     int target;
     int cc = NO_MOVE;
     int self_atari_ok = 0;
@@ -680 +676 @@
           target = pos2;
           break;
         }
-      }
-    }
+          }
+        }
     if (target == NO_MOVE)
       continue;
     
@@ -722 +718 @@
         self_atari_ok = 0;
         cc = pos + delta[k];
         break;
-      }
-    }
+          }
+        }
     
     /* Copy the potential move to (move). */
     move = pos;
@@ -739 +735 @@
         move = lib;
         if (!trymove(move, color, "aftermath-B", target))
           break;
-      }
+          }
       
       if (countlib(pos) == 1)
         move = NO_MOVE;
-    }
+        }
 
     while (stackp > 0)
       popgo();
@@ -768 +764 @@
        * verify that it remains safe.
        */
       if (cc != NO_MOVE && !owl_does_defend(move, cc, NULL)) {
-        int resulta, resultb;
+        int resulta;
+        int resultb;
         owl_analyze_semeai_after_move(move, color, target, cc,
                                       &resulta, &resultb, NULL, 1, NULL, 1);
         if (resulta != 0)
           continue;
-      }
+          }
 
       /* If we don't allow self atari, also call confirm safety to
        * avoid setting up combination attacks.
@@ -783 +780 @@
           
       DEBUG(DEBUG_AFTERMATH, "Filling opponent liberty at %1m\n", move);
       return move;
-    }
-  }
+        }
+  )
   
   /* Case 7.
    * In very rare cases it turns out we need yet another pass. An
@@ -805 +802 @@
    * The solution is to look for tactically attackable opponent stones
    * that still remain on the board but should be removed.
    */
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
+  scan_board(pos,
     if (board[pos] == other
         && (worm[pos].unconditional_status == UNKNOWN
             || do_capture_dead_stones)
@@ -817 +814 @@
             pos, worm[pos].attack_points[0]);
       return worm[pos].attack_points[0];
     }
-  }
+  )
   
   /* No move found. */
   return PASS_MOVE;
@@ -954 +951 @@
     cached_board = 0;
   }
 
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
-    if (ON_BOARD(pos) && board[pos] != current_board[pos]) {
+  scan_board(pos,
+    if (board[pos] != current_board[pos]) {
       current_board[pos] = board[pos];
       cached_board = 0;
     }
-  }
+  )
 
   /* If this is exactly the same position as the one we analyzed the
    * last time, the content of the aftermath struct is up to date.
@@ -980 +977 @@
   do_play_aftermath(color, a, aftermath_sgftree);
   restore_board(&saved_board);
   
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
-    if (!ON_BOARD(pos))
-      continue;
+  scan_board(pos,
     if (a->black_control[pos]) {
       a->black_area++;
       if (board[pos] == WHITE) {
@@ -1022 +1017 @@
           a->black_area++;
       }
     }
-  }
+  )
 
   if (debug & DEBUG_AFTERMATH) {
     gprintf("White captured: %d\n", a->white_captured);