Ticket #145: influence.c.patch

gnugo/engine/influence.c

@@ -446 +446 @@
   memcpy(q->safe, safe_stones, BOARDMAX * sizeof(*safe_stones));
   q->captured = black_captured - white_captured;
   
-  for (ii = BOARDMIN; ii < BOARDMAX; ii++)
-    if (ON_BOARD(ii)) {
+  scan_board(ii,
       /* Initialize. */
       q->white_influence[ii] = 0.0;
       q->black_influence[ii] = 0.0;
@@ -490 +489 @@
          * in our private copy here.
          */
         q->safe[ii] = 0;
-    }
+  )
 }
 
 
@@ -555 +554 @@
 reset_unblocked_blocks(struct influence_data *q)
 {
   int pos;
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++)
-    if (ON_BOARD(pos)) {
+  scan_board(pos,
       if (!q->safe[pos] && q->white_strength[pos] > 0.0
           && q->white_permeability[pos] != 1.0) {
         DEBUG(DEBUG_INFLUENCE, "  black block removed from %1m\n", pos);
@@ -567 +565 @@
         DEBUG(DEBUG_INFLUENCE, "  white block removed from %1m\n", pos);
         q->black_permeability[pos] = 1.0;
       }
-    }
+  )
 }
 
 
@@ -974 +972 @@
   /* Additionally, we introduce a weaker kind of barriers around living
    * stones.
    */
-  for (ii = BOARDMIN; ii < BOARDMAX; ii++)
-    if (ON_BOARD(ii) && !q->safe[ii]) {
+  scan_board(ii,
+    if (!q->safe[ii]) {
       int k;
       float black_reduction = 1.0;
       float white_reduction = 1.0;
@@ -1000 +998 @@
         q->black_permeability[ii] *= black_reduction;
       if (white_reduction > 0.0)
         q->white_permeability[ii] *= white_reduction;
-    }
+        }
+  )
 
   reset_unblocked_blocks(q);
 }
@@ -1073 +1072 @@
                                                    q->black_strength);
   int double_blocks[MAX_DOUBLE_BLOCKS];
   int num_blocks = 0;
-  for (ii = BOARDMIN; ii < BOARDMAX; ii++)
+  scan_board(ii,
     if (board[ii] == EMPTY
         && !(inhibited_sources && inhibited_sources[ii])
         && strength[ii] > 0.0) {
@@ -1083 +1082 @@
         if (num_blocks == MAX_DOUBLE_BLOCKS)
           break;
       }
-    }
+        }
+  )
+
   {
     int k;
     float *permeability = ((q->color_to_move == BLACK)
@@ -1116 +1117 @@
   find_influence_patterns(q);
   modify_depth_values(1 - stackp);
   
-  for (ii = BOARDMIN; ii < BOARDMAX; ii++)
-    if (ON_BOARD(ii) && !(inhibited_sources && inhibited_sources[ii])) {
+  scan_board(ii,
+    if (!(inhibited_sources && inhibited_sources[ii])) {
       if (q->white_strength[ii] > 0.0)
         accumulate_influence(q, ii, WHITE);
       if (q->black_strength[ii] > 0.0)
         accumulate_influence(q, ii, BLACK);
-    }
+        }
+  )
 
   value_territory(q);
   remove_double_blocks(q, inhibited_sources);
@@ -1299 +1301 @@
   memset(first_guess, 0, BOARDMAX*sizeof(float));
   memset(q->territory_value, 0, BOARDMAX*sizeof(float));
   /* First loop: guess territory directly from influence. */
-  for (ii = BOARDMIN; ii < BOARDMAX; ii++)
-    if (ON_BOARD(ii)
-        && !q->safe[ii]) {
+  scan_board(ii,
+    if (!q->safe[ii]) {
       float diff = 0.0;
       if (q->white_influence[ii] + q->black_influence[ii] > 0)
         diff = (q->white_influence[ii] - q->black_influence[ii])
@@ -1356 +1357 @@
       else if (board[ii] == WHITE)
         first_guess[ii] = -1.0;
       q->territory_value[ii] = first_guess[ii];
-    }
+        }
+  )
 
   /* Second loop: Correct according to neighbour vertices. Each territory
    * value is degraded to the minimum value of its neighbors (unless this
    * neighbor has reduced permeability for the opponent's influence).
    */
-  for (ii = BOARDMIN; ii < BOARDMAX; ii++)
-    if (ON_BOARD(ii)
+  scan_board(ii,
+    if (
         /* Do not overrule dead stone territory above.
          * FIXME: This does not do what it claims to do. Correcting it
          * seems to break some tests, though.
          */
-        && !q->safe[ii]) {
+          !q->safe[ii]) {
       /* Loop over all neighbors. */
       for (k = 0; k < 4; k++) {
         if (!ON_BOARD(ii + delta[k]))
@@ -1398 +1400 @@
           }
         }
       }
-    }
+        }
+  )
 
   /* Third loop: Nonterritory patterns, points for prisoners. */
-  for (ii = BOARDMIN; ii < BOARDMAX; ii++)
-    if (ON_BOARD(ii)
-        && !q->safe[ii]) {
+  scan_board(ii,
+    if (!q->safe[ii]) {
       /* If marked as non-territory for the color currently owning
        * it, reset the territory value.
        */
@@ -1420 +1422 @@
         q->territory_value[ii] += 1.0;
       else if (board[ii] == WHITE)
         q->territory_value[ii] -= 1.0;
-    }
+        }
+  )
 }
 
 
@@ -1440 +1443 @@
   regions->number = 0;
 
   /* Reset the markings. */
-  for (ii = BOARDMIN; ii < BOARDMAX; ii++) {
+  scan_board(ii,
     marked[ii] = 0;
     regions->segmentation[ii] = 0;
-  }
+  )
 
-  for (ii = BOARDMIN; ii < BOARDMAX; ii++)
-    if (ON_BOARD(ii)
-        && !marked[ii]
+  scan_board(ii,
+    if (!marked[ii]
         && region_owner(q, ii) != EMPTY) {
       /* Found an unlabelled intersection. Use flood filling to find
        * the rest of the region.
@@ -1484 +1486 @@
       regions->size[regions->number] = size;
       regions->territorial_value[regions->number] = terr_val;
       regions->owner[regions->number] = color;
-    }
+        }
+  )
 }
 
 
@@ -1542 +1545 @@
  
   /* We mark the saved stones and their neighbors in the goal array.
    */
-  for (ii = BOARDMIN; ii < BOARDMAX; ii++)
-    if (ON_BOARD(ii)) {
+  scan_board(ii,
       if (q->safe[ii] == INFLUENCE_SAVED_STONE)
         goal[ii] = 1;
       else
         goal[ii] = 0;
-    }
+  )
 
 
   /* Turn off DEBUG_INFLUENCE for influence computations we are not
@@ -1573 +1575 @@
   reset_unblocked_blocks(q);
   
   /* Spread influence for new influence sources. */
-  for (ii = BOARDMIN; ii < BOARDMAX; ii++)
-    if (ON_BOARD(ii))
+  scan_board(ii,
       if ((color == BLACK
             && q->black_strength[ii] > base->black_strength[ii])
           || (color == WHITE
               && q->white_strength[ii] > base->white_strength[ii]))
         accumulate_influence(q, ii, color);
+  )
 
   value_territory(q);
 
@@ -1623 +1625 @@
     /* Notice that we compare the out of board markers as well, in
      * case the board size should have changed between calls.
      */
-    for (ii = BOARDMIN; ii < BOARDMAX; ii++) {
+    scan_board(ii,
       if (cached_board[ii] != board[ii]) {
         cached_board[ii] = board[ii];
         board_was_cached = 0;
       }
-    }
+        )
 
     if (!board_was_cached)
       for (k = 0; k < 2; k++)
         active_caches[k] = 0;
 
     if (active_caches[cache_number]) {
-      for (ii = BOARDMIN; ii < BOARDMAX; ii++)
-        if (ON_BOARD(ii))
-          escape_value[ii] = escape_values[ii][cache_number];
+      scan_board(ii,
+            escape_value[ii] = escape_values[ii][cache_number];
+          )
 
       return;
     }
@@ -1658 +1660 @@
 
   debug = save_debug;
   
-  for (ii = BOARDMIN; ii < BOARDMAX; ii++)
-    if (ON_BOARD(ii)) {
+  scan_board(ii,
       if (whose_moyo(&escape_influence, ii) == color)
         escape_value[ii] = 4;
       else if (whose_area(&escape_influence, ii) == color)
@@ -1690 +1691 @@
       }
       else
         escape_value[ii] = 0;
-    }
+  )
 
   if (0 && (debug & DEBUG_ESCAPE) && verbose > 0)
     print_influence(&escape_influence, "escape influence");
 
   if (!goal) {
     /* Save the computed values in the cache. */
-    for (ii = BOARDMIN; ii < BOARDMAX; ii++)
-      if (ON_BOARD(ii))
-        escape_values[ii][cache_number] = escape_value[ii];
+    scan_board(ii,
+          escape_values[ii][cache_number] = escape_value[ii];
+        )
+
     active_caches[cache_number] = 1;
   }
 }
@@ -1797 +1799 @@
   ASSERT_ON_BOARD1(move);
   ASSERT1(IS_STONE(color), move);
 
-  for (ii = BOARDMIN; ii < BOARDMAX; ii++)
-    if (ON_BOARD(ii)) {
+  scan_board(ii,
       float new_value = q->territory_value[ii];
       float old_value = base->territory_value[ii];
       this_delta = new_value - old_value;
@@ -1815 +1816 @@
               "  %1m:   - %1m territory change %f (%f -> %f)\n",
               move, ii, this_delta, old_value, new_value);
       total_delta += this_delta;
-    }
+  )
 
   /* Finally, captured stones: */
   this_delta = q->captured - base->captured;
@@ -1841 +1842 @@
   float score = 0.0;
   int ii;
 
-  for (ii = BOARDMIN; ii < BOARDMAX; ii++)
-    if (ON_BOARD(ii))
-      score += q->territory_value[ii];
+  scan_board(ii,
+    score += q->territory_value[ii];
+  )
   
   if (use_chinese_rules)
     score += stones_on_board(WHITE) - stones_on_board(BLACK) + komi + handicap;
@@ -1866 +1867 @@
   int count = 0;
   int ii;
 
-  for (ii = BOARDMIN; ii < BOARDMAX; ii++)
-    if (ON_BOARD(ii)) {
+  scan_board(ii,
       if (iq->safe[ii])
         count += WEIGHT_TERRITORY;
       else if (whose_territory(iq, ii) != EMPTY
@@ -1877 +1877 @@
         count += WEIGHT_MOYO;
       else if (whose_area(oq, ii) != EMPTY)
         count += WEIGHT_AREA;
-    }
+  )
 
   return (float) count / (WEIGHT_TERRITORY * board_size * board_size);
 }
@@ -1912 +1912 @@
 {
   int ii;
   
-  for (ii = BOARDMIN; ii < BOARDMAX; ii++) {
+  scan_board(ii,
     white_influence[ii] = q->white_influence[ii];
     black_influence[ii] = q->black_influence[ii];
     white_strength[ii] = q->white_strength[ii];
@@ -1944 +1944 @@
       influence_regions[ii] = 4;
     else if (board[ii] == BLACK)
       influence_regions[ii] = -4;
-  }
+  )
 }
   
 
@@ -2071 +2071 @@
 {
   int ii;
   start_draw_board();
-  for (ii = BOARDMIN; ii < BOARDMAX; ii++)
-    if (ON_BOARD(ii)) {
+  scan_board(ii,
       int c = EMPTY;
       int color = GG_COLOR_BLACK;
       if (q->safe[ii]) {
@@ -2107 +2106 @@
         color = GG_COLOR_RED;
       }
       draw_color_char(I(ii), J(ii), c, color);
-    }
+  )
   end_draw_board();
 }