Ticket #148: worm2.diff

engine/board.c

@@ -874 +874 @@
       return 0;
     
     /* 4. The location must not be the ko point, unless ignore_ko == 1. */
-        if (!ignore_ko && pos == board_ko_pos) {
+    if (!ignore_ko && pos == board_ko_pos) {
       /*    The ko position is guaranteed to have all neighbors of the
        *    same color, or off board. If that color is the same as the
        *    move the ko is being filled, it is always allowed. This
@@ -884 +884 @@
       if (board[WEST(pos)] == OTHER_COLOR(color)
           || board[EAST(pos)] == OTHER_COLOR(color))
         return 0;
-        }
+    }
 
     /* 5. Test for suicide. */
     if (is_suicide(pos, color))

engine/liberty.h

@@ -336 +336 @@
 /* movelist.c */
 int movelist_move_known(int move, int max_points, int points[], int codes[]);
 void movelist_change_point(int move, int code, int max_points, 
-                           int points[], int codes[]);
+                           int points[], int codes[], int discarded_points[]);
+int discarded_move_known(int move, int max_points, int points[]);
+void movelist_change_discarded(int move, int max_points, int points[]);
 
 /* worm.c */
 void change_tactical_point(int str, int move, int code,
-                           int points[], int codes[]);
+                           int points[], int codes[], int discarded_points[]);
 
 /* surround.c */
 int compute_surroundings(int pos, int apos, int showboard,
@@ -837 +839 @@
    */
   int attack_points[MAX_TACTICAL_POINTS];
   int attack_codes[MAX_TACTICAL_POINTS];
+  int discarded_attacks[MAX_TACTICAL_POINTS];
   int defense_points[MAX_TACTICAL_POINTS];
   int defense_codes[MAX_TACTICAL_POINTS];
+  int discarded_defenses[MAX_TACTICAL_POINTS];
   int attack_threat_points[MAX_TACTICAL_POINTS];
   int attack_threat_codes[MAX_TACTICAL_POINTS]; 
+  int discarded_att_threats[MAX_TACTICAL_POINTS];
   int defense_threat_points[MAX_TACTICAL_POINTS];
   int defense_threat_codes[MAX_TACTICAL_POINTS];
+  int discarded_def_threats[MAX_TACTICAL_POINTS];
 };
 
 extern struct worm_data worm[BOARDMAX];

engine/movelist.c

@@ -41 +41 @@
   int k;
 
   for (k = 0; k < max_points; k++) {
-    if (codes[k] == 0)
+    if (points[k] == 0)
       return 0;
     if (points[k] == move)
       return codes[k];
@@ -50 +50 @@
 }
 
 
+/* Return true if the move was previously discarded.
+ */
+int
+discarded_move_known(int move, int max_points, int points[])
+{
+  int k;
+
+  for (k = 0; k < max_points; k++) {
+    if (points[k] == 0)
+      return 0;
+    if (points[k] == move)
+      return 1;
+  }
+  return 0;
+}
+
+
 /*
  * This function does the real work for change_attack(),
  * change_defense(), change_attack_threat(), and
@@ -58 +75 @@
 
 void
 movelist_change_point(int move, int code, int max_points,
-                      int points[], int codes[])
+                      int points[], int codes[], int discarded_points[])
 {
   int k;
 
   /* First see if we already know about this point. */
-  for (k = 0; k < max_points; k++)
+  for (k = 0; k < max_points; k++) {
     if (points[k] == move)
       break;
 
+    if (points[k] == 0) {
+      /* We have empty space to store the move. */
+      points[k] = move;
+      codes[k] = code;
+      move_up_list(points, codes, k);
+      return;
+    }
+  }
+
   /* Yes, we do. */
   if (k < max_points) {
     if (code >= codes[k])
@@ -78 +104 @@
   /* This tactical point is new to us. */
   else {
     k--; /* last index */
-    if (code <= codes[k])
+    if (code <= codes[k]) {
+      movelist_change_discarded(move, max_points, discarded_points);
       return; /* Too bad move to store. */
+    }
 
     points[k] = move;
     codes[k] = code;
@@ -88 +116 @@
 }
 
 
+/*
+ * This function changes discarded moves list.
+ */
+void
+movelist_change_discarded(int move, int max_points, int points[])
+{
+  int k;
+
+  /* We store only max_points discarded moves. */
+  for (k = 0; k < max_points; k++) {
+    if (points[k] == move)
+      return;
+
+    if (points[k] == 0) {
+      points[k] = move;
+      return;
+    }
+  }
+}
+
+
 /* Sort the changed tactical point. We set it to the higher value, so
  * we just have to move it up the table.
  */

engine/owl.c

@@ -927 +927 @@
         case 5:
           checked_moves = shape_offensive_moves;
           break;
+        default:
+          checked_moves = NULL;
+          gg_assert(0);
         }
 
         for (k = 0; k < MAX_MOVES; k++) {

engine/reading.c

@@ -1035 +1035 @@
   int k;
   int l;
   int r;
+  int discard;
 
   ASSERT1(IS_STONE(board[str]), str);
 
@@ -1060 +1061 @@
       if (trymove(aa, other, "attack_threats-A", str)) {
        int acode = attack(str, NULL);
        if (acode != 0)
-         change_tactical_point(str, aa, acode, moves, codes);
+         change_tactical_point(str, aa, acode, moves, codes,
+                               worm[str].discarded_att_threats);
        popgo();
       }
 
@@ -1070 +1072 @@
 
        if (!ON_BOARD(bb)
            || IS_STONE(board[bb])
+           || attack_threat_move_known(bb, str)
+           || discarded_move_known(bb, MAX_TACTICAL_POINTS,
+                                   worm[str].discarded_att_threats)
            || liberty_of_string2(bb, str))
          continue;
 
+       discard = 1;
+
        if (trymove(bb, other, "attack_threats-B", str)) {
          int acode = attack(str, NULL);
-         if (acode != 0)
-           change_tactical_point(str, bb, acode, moves, codes);
+         if (acode != 0) {
+           change_tactical_point(str, bb, acode, moves, codes,
+                                 worm[str].discarded_att_threats);
+           discard = 0;
+         }
          popgo();
        }
+
+       if (discard)
+         movelist_change_discarded(bb, MAX_TACTICAL_POINTS,
+                                   worm[str].discarded_att_threats);
       }
     }
   }
@@ -1087 +1101 @@
   num_adj = chainlinks(str, adjs);
   for (k = 0; k < num_adj; k++) {
     int bb;
-    int dd;  /* Defense point of weak neighbor. */
     int acode;
     int dcode;
 
-    attack_and_defend(adjs[k], &acode, NULL, &dcode, &dd);
+    attack_and_defend(adjs[k], &acode, NULL, &dcode, NULL);
     if (acode == 0 || dcode == 0)
       continue;
 
-    /* The strange code using r == -1 below is only avoid duplication
-     * of the code starting with "if (trymove..)" below.
-     * If r == -1 and stackp == 0 then use the defense point what we got from
-     * attack_and_defend above. Otherwise step through all defense points.
-     */
-    for (r = -1; r < max_points; r++) {
-      if (stackp == 0) {
-        if (r == -1)
-          continue;
-        if (worm[adjs[k]].defense_codes[r] == 0)
-          break;
-        bb = worm[adjs[k]].defense_points[r];
-      }
-      else {
-        if (r == -1)
-          bb = dd;
-        else
-          break;
-      }
+    /* Step through all defense points. */
+    for (r = 0; r < max_points; r++) {
+      if (worm[adjs[k]].defense_codes[r] == 0)
+        break;
+      bb = worm[adjs[k]].defense_points[r];
 
       /* Test the move and see if it is a threat. */
       if (trymove(bb, other, "attack_threats-C", str)) {
@@ -1122 +1121 @@
         else
           acode = attack(str, NULL);
         if (acode != 0)
-          change_tactical_point(str, bb, acode, moves, codes);
+          change_tactical_point(str, bb, acode, moves, codes,
+                                worm[str].discarded_att_threats);
         popgo();
       }
     }
   }
 
   /* Return actual number of threats found regardless of attack code. */
-  if (codes[max_points - 1] > 0)
-    return max_points;
   for (num_threats = 0; num_threats < max_points; num_threats++)
     if (codes[num_threats] == 0)
       break;

engine/unconditional.c

@@ -676 +676 @@
 void
 clear_unconditionally_meaningless_moves()
 {
-  int pos;
-  
-  for (pos = BOARDMIN; pos < BOARDMAX; pos++)
-    if (ON_BOARD(pos)) {
-      meaningless_black_moves[pos] = -1;
-      meaningless_white_moves[pos] = -1;
-    }
+  memset(meaningless_black_moves, -1, sizeof(meaningless_black_moves));
+  memset(meaningless_white_moves, -1, sizeof(meaningless_black_moves));
 }
 
 /* Pick up antisuji and replacement move reasons found by analysis

engine/worm.c

@@ -884 +884 @@
   int k;
   int l;
   int color;
+  int discard;
   
   for (str = BOARDMIN; str < BOARDMAX; str++) {
     color = board[str];
@@ -951 +952 @@
           
           if (!ON_BOARD(bb)
               || IS_STONE(board[bb])
+              || defense_threat_move_known(bb, str)
+              || discarded_move_known(bb, MAX_TACTICAL_POINTS,
+                                      worm[str].discarded_def_threats)
               || liberty_of_string2(bb, str))
             continue;
+
+          discard = 1;
           
           if (trymove(bb, color, "threaten defense", str)) {
             if (attack(str, NULL) == WIN) {
               int dcode = find_defense(str, NULL);
-              if (dcode != 0)
+              if (dcode != 0) {
                 change_defense_threat(str, bb, dcode);
+                discard = 0;
+              }
             }
             popgo();
           }
+
+          if (discard)
+            movelist_change_discarded(bb, MAX_TACTICAL_POINTS,
+                                      worm[str].discarded_def_threats);
         }
       }
       
@@ -1063 +1075 @@
 void
 change_defense(int str, int move, int dcode)
 {
-  str = worm[str].origin;
   change_tactical_point(str, move, dcode,
-                        worm[str].defense_points, worm[str].defense_codes);
+                        worm[str].defense_points, worm[str].defense_codes,
+                        worm[str].discarded_defenses);
 }
 
 
@@ -1080 +1092 @@
 void
 change_attack(int str, int move, int acode)
 {
-  str = worm[str].origin;
   DEBUG(DEBUG_WORMS, "change_attack: %1m %1m %d\n", str, move, acode);
   change_tactical_point(str, move, acode,
-                        worm[str].attack_points, worm[str].attack_codes);
+                        worm[str].attack_points, worm[str].attack_codes,
+                        worm[str].discarded_attacks);
 }
 
 
@@ -1099 +1111 @@
 void
 change_defense_threat(int str, int move, int dcode)
 {
-  str = worm[str].origin;
   change_tactical_point(str, move, dcode,
                         worm[str].defense_threat_points,
-                        worm[str].defense_threat_codes);
+                        worm[str].defense_threat_codes,
+                        worm[str].discarded_def_threats);
 }
 
 
@@ -1118 +1130 @@
 void
 change_attack_threat(int str, int move, int acode)
 {
-  str = worm[str].origin;
   change_tactical_point(str, move, acode,
                         worm[str].attack_threat_points,
-                        worm[str].attack_threat_codes);
+                        worm[str].attack_threat_codes,
+                        worm[str].discarded_att_threats);
 }
 
 
@@ -1181 +1193 @@
 void
 change_tactical_point(int str, int move, int code,
                       int points[MAX_TACTICAL_POINTS],
-                      int codes[MAX_TACTICAL_POINTS])
+                      int codes[MAX_TACTICAL_POINTS],
+                      int discarded_points[MAX_TACTICAL_POINTS])
 {
   ASSERT_ON_BOARD1(str);
-  ASSERT1(str == worm[str].origin, str);
   
-  movelist_change_point(move, code, MAX_TACTICAL_POINTS, points, codes);
+  movelist_change_point(move, code, MAX_TACTICAL_POINTS, points, codes,
+                        discarded_points);
   propagate_worm2(str);
 }
 
@@ -1602 +1615 @@
       if (countlib(str) > 4)
         continue;
 
-      if (attack_move_known(move, str))
+      if (attack_move_known(move, str)
+          || discarded_move_known(move, MAX_TACTICAL_POINTS,
+                                  worm[str].discarded_attacks))
         continue;
 
       /* No defenses are known at this time, so defend_code is always 0. */
@@ -1612 +1627 @@
         continue;
 #endif
       
-      /* FIXME: Don't attack the same string more than once.
-       * Play (move) and see if there is a defense.
-       */
+      /* Play (move) and see if there is a defense. */
       if (trymove(move, color, "attack_callback", str)) {
         int dcode;
         if (!board[str])
@@ -1637 +1650 @@
                 "Attack pattern %s+%d found attack on %1m at %1m with code %d\n",
                 pattern->name, ll, str, move, REVERSE_RESULT(dcode));
         }
+        else
+          movelist_change_discarded(move, MAX_TACTICAL_POINTS,
+                                    worm[str].discarded_attacks);
       }
+      else
+        movelist_change_discarded(move, MAX_TACTICAL_POINTS,
+                                  worm[str].discarded_attacks);
     }
   }
 }
@@ -1688 +1707 @@
       int str = worm[pos].origin;
 
       if (worm[str].attack_codes[0] == 0
-          || defense_move_known(move, str))
+          || defense_move_known(move, str)
+          || discarded_move_known(move, MAX_TACTICAL_POINTS,
+                                  worm[str].discarded_defenses))
         continue;
       
-      /* FIXME: Don't try to defend the same string more than once.
-       * FIXME: For all attacks on this string, we should test whether
+      /* FIXME: For all attacks on this string, we should test whether
        *        the proposed move happens to refute the attack.
        * Play (move) and see if there is an attack.
        */
@@ -1707 +1727 @@
                 "Defense pattern %s+%d found defense of %1m at %1m with code %d\n",
                 pattern->name, ll, str, move, REVERSE_RESULT(acode));
         }
+        else
+          movelist_change_discarded(move, MAX_TACTICAL_POINTS,
+                                    worm[str].discarded_defenses);
       }
+      else
+        movelist_change_discarded(move, MAX_TACTICAL_POINTS,
+                                  worm[str].discarded_defenses);
     }
   }
 }

interface/gnugo.vcproj

@@ -400 +400 @@
                                 RelativePath=".\interface.h"
                                 >
                         </File>
+                        <File
+                                RelativePath="..\engine\liberty.h"
+                                >
+                        </File>
                 </Filter>
                 <Filter
                         Name="Resource Files"