Ticket #162: worm_data_7_11.1a.diff

engine/aftermath.c

@@ -2 +2 @@
  * This is GNU Go, a Go program. Contact gnugo@gnu.org, or see       *
  * http://www.gnu.org/software/gnugo/ for more information.          *
  *                                                                   *
- * Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005 and 2006       *
+ * Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 and 2007 *
  * by the Free Software Foundation.                                  *
  *                                                                   *
  * This program is free software; you can redistribute it and/or     *
@@ -490 +490 @@
           safety = INVINCIBLE;
         
         if (k < 4) {
-          int apos = worm[pos2].origin;
+          int apos = find_origin(pos2);
           
           if (!mx[apos]) {
             own_worms++;

engine/combination.c

@@ -572 +572 @@
    */
   for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
     if (board[pos] == other
-        && worm[pos].origin == pos
-        && worm[pos].liberties == 2
+        && find_origin(pos) == pos
+        && countlib(pos) == 2
         && aa_status[pos] == ALIVE) {
       int libs[2];
       findlib(pos, 2, libs);
@@ -587 +587 @@
       if (!owl_substantial(pos)) {
         int pos2;
         for (pos2 = BOARDMIN; pos2 < BOARDMAX; pos2++)
-          if (ON_BOARD(pos2) && is_worm_origin(pos2, pos))
+          if (IS_STONE(board[pos2]) && is_worm_origin(pos2, pos))
             aa_status[pos2] = INSUBSTANTIAL;
       }
     }

engine/liberty.h

@@ -803 +803 @@
 
 #define MAX_TACTICAL_POINTS 10
 
+/* all this data is valid only, when stackp==0 */
 struct worm_data {
   int color;         /* its color */
   int size;          /* its cardinality */

engine/owl.c

@@ -454 +454 @@
   if (verbose > 0)
     verbose--;
   for (str = BOARDMIN; str < BOARDMAX; str++) 
-    if (ON_BOARD(str) && ms[str] && worm[str].origin == str) {
+    if (ON_BOARD(str) && ms[str] && find_origin(str) == str) {
       int adj;
       int adjs[MAXCHAIN];
       int k;
@@ -4616 +4616 @@
   int color = board[apos];
   
   ASSERT1(bpos == NO_MOVE || board[bpos] == color, bpos);
+  apos = find_origin(apos);
+  if (bpos != NO_MOVE)
+    bpos = find_origin(bpos);
 
   for (pos = BOARDMIN; pos < BOARDMAX; pos++)
     if (ON_BOARD(pos)) {
-      if (is_same_worm(pos, apos) || is_same_worm(pos, bpos))
+      if (IS_STONE(board[pos])
+          && (find_origin(pos) == apos || find_origin(pos) == bpos))
         owl->goal[pos] = 1;
       else
         owl->goal[pos] = 0;
@@ -6898 +6902 @@
         continue;
 
       for (ii = BOARDMIN; ii < BOARDMAX && w < MAX_GOAL_WORMS; ii++)
-        if (ON_BOARD(ii) && board[ii] && worm[ii].origin == ii
-            && worm[ii].size >= 3 && dragon[ii].id == d)
+        if (IS_STONE(board[ii]) && find_origin(ii) == ii
+            && countstones(ii) >= 3 && dragon[ii].id == d)
           goal_worm[w++] = ii;
     }
   }