Ticket #145: value_moves.c.patch

gnugo/engine/value_moves.c

@@ -146 +146 @@
   TRACE("\nLooking for additional attack and defense moves. Trying moves ...\n");
   
   /* Identify the unstable worms and store them in a list. */
-  for (ii = BOARDMIN; ii < BOARDMAX; ii++) {
+  scan_board(ii,
     if (IS_STONE(board[ii])
         && worm[ii].origin == ii
         && worm[ii].attack_codes[0] != 0
@@ -154 +154 @@
       unstable_worms[N] = ii;
       N++;
     }
-  }
+  )
   
   /* To avoid horizon effects, we temporarily increase the depth values. */
   increase_depth_values();
   
-  for (ii = BOARDMIN; ii < BOARDMAX; ii++) {
-    if (!ON_BOARD(ii))
-      continue;
+  scan_board(ii,
 
     /* Don't consider send-two-return-one moves here. */
     if (send_two_return_one(ii, color))
@@ -278 +276 @@
       }
       popgo();
     }
-  }
+  )
   
   TRACE("\n");
   decrease_depth_values();
@@ -577 +575 @@
   if (verbose)
     gprintf("\nTrying to upgrade strategical attack and defense moves.\n");
 
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
-    if (!ON_BOARD(pos))
-      continue;
+  scan_board(pos,
       
     for (k = 0; k < MAX_REASONS; k++) {
       int r = move[pos].reason[k];
@@ -590 +586 @@
                                                 move_reasons[r].type,
                                                 move_reasons[r].what);
     }
-  }
+  )
 
   if (verbose)
     gprintf("\nTrying vital eye moves as owl attacks.\n");
@@ -607 +603 @@
     your_vital_points = white_vital_points;
   }
 
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
-    if (!ON_BOARD(pos))
-      continue;
+  scan_board(pos,
     if (our_eyes[pos].origin == pos
         && our_vital_points[pos].defense_points[0] != NO_MOVE) {
-      int k, dr;
+      int k;
+          int dr;
       find_eye_dragons(pos, our_eyes, color, &dr, 1);
       for (k = 0; k < MAX_EYE_ATTACKS; k++) {
         int move = our_vital_points[pos].defense_points[k];
@@ -624 +619 @@
     }
     if (your_eyes[pos].origin == pos
         && your_vital_points[pos].attack_points[0] != NO_MOVE) {
-      int k, dr;
+      int k;
+          int dr;
       find_eye_dragons(pos, your_eyes, OTHER_COLOR(color), &dr, 1);
       for (k = 0; k < MAX_EYE_ATTACKS; k++) {
         int move = your_vital_points[pos].attack_points[k];
@@ -634 +630 @@
                                                   VITAL_EYE_MOVE, dr);
       }
     }
-  }
+  )
 
   save_verbose = verbose;
   if (verbose > 0)
@@ -643 +639 @@
   /* If two critical dragons are adjacent, test whether a move to owl
    * attack or defend one also is effective on the other.
    */
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
+  scan_board(pos,
     if (IS_STONE(board[pos])
         && dragon[pos].origin == pos
         && DRAGON2(pos).owl_status == CRITICAL) {
-      for (pos2 = BOARDMIN; pos2 < BOARDMAX; pos2++) {
+      scan_board(pos2,
         if (board[pos2] != EMPTY)
           continue;
         worth_trying = 0;
@@ -701 +697 @@
             }
           }
         }
-      }
-    }
-  }
+          )
+        }
+  )
 
   verbose = save_verbose;
 }
@@ -760 +756 @@
   if (verbose > 0)
     verbose--;
 
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
-    int k, r;
+  scan_board(pos,
+    int k;
+    int r;
     int potential_semeai_move_found = 0;
     int other_move_reason_found = 0;
 
-    if (!ON_BOARD1(pos))
-      continue;
     for (k = 0; k < MAX_REASONS; k++) {
       r = move[pos].reason[k];
       if (r < 0)
@@ -794 +789 @@
           || move_reasons[r].type == POTENTIAL_SEMEAI_DEFENSE)
         try_potential_semeai_move(pos, color, &(move_reasons[r]));
     }
-  }
+  )
   verbose = save_verbose;
 }
 
@@ -827 +822 @@
   int i, j;
   int aa;
   
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
-    if (!ON_BOARD(pos))
-      continue;
+  scan_board(pos,
     
     for (k = 0; k < MAX_REASONS; k++) {
       int r = move[pos].reason[k];
@@ -841 +834 @@
           || move_reasons[r].type == DEFEND_MOVE) {
         int attack_move;
         int color_to_move;
-        int num_adj, adjs[MAXCHAIN];
+        int num_adj;
+        int adjs[MAXCHAIN];
         
         aa = move_reasons[r].what;
         
@@ -1009 +1003 @@
         int worm1 = conn_worm1[move_reasons[r].what];
         int worm2 = conn_worm2[move_reasons[r].what];
         int pos2;
-        for (pos2 = BOARDMIN; pos2 < BOARDMAX; pos2++) {
-          if (ON_BOARD(pos2) && board[pos2] == EMPTY
+        scan_board(pos2,
+          if (board[pos2] == EMPTY
               && cut_possible(pos2, OTHER_COLOR(color))
               && square_dist(pos, pos2) <= 5) {
             for (j = 0; j < 8; j++) {
@@ -1043 +1037 @@
               }
             }
           }
-        }
+        )
       }
     }
-  }
+  )
 }
 
 
@@ -1063 +1057 @@
   int k;
   
   start_timer(3);
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
+  scan_board(pos,
     int safety = 0;
     int tactical_safety = 0;
-    if (!ON_BOARD(pos))
-      continue;
       
     for (k = 0; k < MAX_REASONS; k++) {
       int r = move[pos].reason[k];
@@ -1170 +1162 @@
              * below if we were certain that the capturable string
              * had not been amalgamated with a living dragon.
              */
-            int num_adj, adjs[MAXCHAIN];
+            int num_adj;
+                int adjs[MAXCHAIN];
             
             num_adj = chainlinks(aa, adjs);
             for (m = 0; m < num_adj; m++) {
@@ -1322 +1315 @@
       move[pos].move_safety = 0;
     
     time_report(3, "    examine_move_safety: ", pos, 1.0);
-  }
+  )
 }
 
 
@@ -2933 +2926 @@
     }
   }
   
-  for (aa = BOARDMIN; aa < BOARDMAX; aa++) {
+  scan_board(aa,
     if (dragon_value[aa] == 0.0)
       continue;
 
@@ -2996 +2989 @@
     TRACE("  %1m: %f - strategic effect on %1m\n",
           pos, dragon_value[aa], aa);
     tot_value += dragon_value[aa];
-  }
+  )
 
   /* Finally, subtract penalty for invasion type moves. */
   this_value = strategic_penalty(pos, color);
@@ -3332 +3325 @@
 {
   int pos;
   
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
-    if (!ON_BOARD(pos) || move[pos].final_value <= 0.0)
+  scan_board(pos,
+    if (move[pos].final_value <= 0.0)
       continue;
       
     gfprintf(output, "%1M %f\n", pos, move[pos].final_value);
-  }
+  )
 }
 
 /* Search through all board positions for the 10 highest valued
@@ -3355 +3348 @@
     best_moves[k] = NO_MOVE;
     best_move_values[k] = 0.0;
   }
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
-    if (!ON_BOARD(pos) || move[pos].final_value <= 0.0)
+  scan_board(pos,
+    if (move[pos].final_value <= 0.0)
       continue;
       
     tval = move[pos].final_value;
     record_top_move(pos, tval);
-  }
+  )
   
   if (verbose > 0 || (debug & DEBUG_TOP_MOVES)) {
     gprintf("\nTop moves:\n");
@@ -3442 +3435 @@
   }
   
   TRACE("Reevaluating ko threats.\n");
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
+  scan_board(pos,
     int threat_quality = 0;
 
-    if (!ON_BOARD(pos) || pos == ko_move)
+    if (pos == ko_move)
       continue;
     if (move[pos].additional_ko_value <= 0.0) 
       continue;
@@ -3601 +3594 @@
         DEBUG(DEBUG_MOVE_REASONS,
               "%1m: no additional ko value (threat does not work as ko threat)\n", pos);
     }
-  }
+  )
 
   for (k = 0; k < num_good_threats; k++) {
     pos = good_threats[k];
@@ -3635 +3628 @@
   int source;
   int target;
 
-  for (target = BOARDMIN; target < BOARDMAX; target++)
-    if (ON_BOARD(target))
-      move[target].final_value = move[target].value;
+  scan_board(target,
+    move[target].final_value = move[target].value;
+  )
   
-  for (source = BOARDMIN; source < BOARDMAX; source++) {
-    if (!ON_BOARD(source))
-      continue;
+  scan_board(source,
     target = replacement_map[source];
     if (target == NO_MOVE)
       continue;
@@ -3653 +3644 @@
     }
     TRACE("%1m is now valued 0.\n", source);
     move[source].final_value = 0.0;
-  }
+  )
 }
 
 /* This selects the best move available according to their valuations.
@@ -3678 +3669 @@
     best_move = NO_MOVE;
 
     /* Search through all board positions for the highest valued move. */
-    for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
+    scan_board(pos,
       float this_value = move[pos].final_value;
       if (allowed_moves && !allowed_moves[pos])
         continue;
-      if (!ON_BOARD(pos) || move[pos].final_value == 0.0)
+      if (move[pos].final_value == 0.0)
         continue;
         
       if (this_value > best_value) {
@@ -3697 +3688 @@
           move[pos].final_value = 0.0;
         }
       }
-    }
+        )
     
     /* If the best move is an illegal ko capture, reevaluate ko
      * threats and search again.
@@ -3945 +3936 @@
   double common_lower_limit = 0.0;
 
   /* Find all moves with positive values. */
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
+  scan_board(pos,
     probabilities[pos] = 0.0;
 
-    if (ON_BOARD(pos)) {
       /* FIXME: what about point redistribution? */
       if (move[pos].final_value > 0.0) {
         double scale = 0.01 * (double) move[pos].randomness_scaling;
@@ -3964 +3954 @@
 
         num_moves++;
       }
-    }
-  }
+  )
 
   /* Compute probability of each move. */
   for (k = 0; k < num_moves; k++) {