Ticket #145: play_gtp.c.patch

gnugo/interface/play_gtp.c

@@ -2219 +2219 @@
   
   gtp_start_response(GTP_SUCCESS);
 
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
-    if (ON_BOARD(pos)
-        && (pos == str
+  scan_board(pos,
+    if (pos == str
             || (str == NO_MOVE
                 && board[pos] != EMPTY
-                && dragon[pos].origin == pos))) {
+                && dragon[pos].origin == pos)) {
       if (str == NO_MOVE)
         gtp_mprintf("%m: ", I(pos), J(pos));
       
@@ -2246 +2245 @@
       }
       empty_response = 0;
     }
-  }
+  )
 
   if (empty_response)
     gtp_printf("\n");
@@ -2376 +2375 @@
     return gtp_success("PASS");
   
   gtp_start_response(GTP_SUCCESS);
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++)
-    if (ON_BOARD(pos) && defense_points[pos]) {
+  scan_board(pos,
+    if (defense_points[pos]) {
       if (!first)
         gtp_printf(" ");
       else
         first = 0;
       gtp_print_vertex(I(pos), J(pos));
-    }
+        }
+  )
   
   return gtp_finish_response();
 }
@@ -3696 +3696 @@
   compute_move_probabilities(probabilities);
 
   gtp_start_response(GTP_SUCCESS);
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
-    if (ON_BOARD(pos) && probabilities[pos] != 0.0) {
+  scan_board(pos,
+    if (probabilities[pos] != 0.0) {
       gtp_mprintf("%m ", I(pos), J(pos));
       gtp_printf("%.4f\n", probabilities[pos]);
       any_moves_printed = 1;
     }
-  }
+  )
 
   if (!any_moves_printed)
     gtp_printf("\n");
@@ -3731 +3731 @@
   compute_move_probabilities(probabilities);
 
   gtp_start_response(GTP_SUCCESS);
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
-    if (ON_BOARD(pos) && probabilities[pos] > 0.0) {
+  scan_board(pos,
+    if (probabilities[pos] > 0.0) {
       /* Shannon's formula */
       uncertainty += -1 * ((double)probabilities[pos]) *
         log((double)probabilities[pos]) / log(2.0);
     }
-  }
+  )
 
   gtp_printf("%.4f\n\n", uncertainty);