Ticket #75: arend_7_9.4a.diff

engine/dragon.c

@@ -70 +70 @@
 static int compute_crude_status(int pos);
 static int compute_escape(int pos, int dragon_status_known);
 static void compute_surrounding_moyo_sizes(const struct influence_data *q);
+static void clear_cut_list(void);
 
 static int dragon2_initialized;
 static int lively_white_dragons;
@@ -663 +664 @@
    */
   number_of_dragons = 0;
 
+  clear_cut_list();
+
   memset(black_vital_points, 0, BOARDMAX * sizeof(struct vital_eye_points));
   memset(white_vital_points, 0, BOARDMAX * sizeof(struct vital_eye_points));
 }
@@ -2370 +2373 @@
 }
 
 
+/************************************************************************
+ *         A list of all cuts found during connection matching          *
+ ************************************************************************/
+
+#define MAX_CUTS        3 * MAX_BOARD * MAX_BOARD
+
+struct cut_data {
+  int apos;
+  int bpos;
+  int move;
+};
+
+static int num_cuts = 0;
+static struct cut_data cut_list[MAX_CUTS];
+
+static void
+clear_cut_list()
+{
+  num_cuts = 0;
+}
+
+/* Store in the list that (move) disconnects the two strings at
+ * apos and bpos.
+ */
+void
+add_cut(int apos, int bpos, int move)
+{
+  gg_assert(board[apos] == board[bpos]);
+  if (num_cuts == MAX_CUTS)
+    return;
+  if (apos > bpos) {
+    int tmp = apos;
+    apos = bpos;
+    bpos = tmp;
+  }
+  if (move == NO_MOVE)
+    return;
+  cut_list[num_cuts].apos = apos;
+  cut_list[num_cuts].bpos = bpos;
+  cut_list[num_cuts].move = move;
+  num_cuts++;
+  if (0)
+  gprintf("Added %d-th cut at %1m between %1m and %1m.\n", num_cuts,
+          move, apos, bpos);
+}
+
+/* For every move in the cut list disconnecting two of opponent's strings,
+ * test whether the two strings can be connected at all. If so, add a
+ * CUT_MOVE reason.
+ */
+void
+cut_reasons(int color)
+{
+  int k;
+  for (k = 0; k < num_cuts; k++)
+    if (board[cut_list[k].apos] == OTHER_COLOR(color)
+        && !is_same_dragon(cut_list[k].apos, cut_list[k].bpos)
+        && string_connect(cut_list[k].apos, cut_list[k].bpos, NULL) == WIN)
+      add_cut_move(cut_list[k].move, cut_list[k].apos, cut_list[k].bpos);
+}
+
 
 /* ================================================================ */
 /*                      Debugger functions                          */

engine/genmove.c

@@ -278 +278 @@
   worm_reasons(color);
   semeai_move_reasons(color);
   owl_reasons(color);
+  cut_reasons(color);
   break_in_move_reasons(color);
 }
 

engine/liberty.h

@@ -323 +323 @@
                        float strength[BOARDMAX]);
 void mark_inessential_stones(int color, signed char safe_stones[BOARDMAX]);
 
+void add_cut(int apos, int bpos, int move);
+void cut_reasons(int color);
+
 void get_lively_stones(int color, signed char safe_stones[BOARDMAX]);
 int is_same_worm(int w1, int w2);
 int is_worm_origin(int w, int pos);

patterns/conn.db

@@ -585 +585 @@
 a
 b
 
-;!xcut(a) && !oplay_disconnect(b,c)
+;!xcut(a) && !disconnect_helper(b,c)
 
 
 Pattern CC504
@@ -598 +598 @@
 Xb
 ca
 
-;!xcut(a) && !oplay_disconnect(b,c)
+;!xcut(a) && !disconnect_helper(b,c)
 
 
 Pattern CC505
@@ -611 +611 @@
 Bc
 dA
 
-;(attack(A) || attack(B)) && !oplay_disconnect(c,d)
+;(attack(A) || attack(B)) && !disconnect_helper(c,d)
 
 
 Pattern CC506
@@ -628 +628 @@
 b
 d
 
-;!xcut(a) && !xcut(b) && !oplay_disconnect(c,d)
+;!xcut(a) && !xcut(b) && !disconnect_helper(c,d)
 
 
 Pattern CC506b
@@ -645 +645 @@
 ab
 d.
 
-;!xcut(a) && !xcut(b) && lib(E)<=2 && !oplay_disconnect(c,d)
+;!xcut(a) && !xcut(b) && lib(E)<=2 && !disconnect_helper(c,d)
 
 
 Pattern CC507
@@ -660 +660 @@
 ab
 xd
 
-;!xcut(a) && !xcut(b) && !oplay_disconnect(c,d)
+;!xcut(a) && !xcut(b) && !disconnect_helper(c,d)
 
 
 Pattern CC508
@@ -675 +675 @@
 aX
 xc
 
-;!xcut(a) && !oplay_disconnect(b,c)
+;!xcut(a) && !disconnect_helper(b,c)
 
 
 Pattern CC509
@@ -692 +692 @@
 cd
 xf
 
-;!xcut(a) && !xcut(b) && !xcut(c) && !xcut(d) && !oplay_disconnect(e,f)
+;!xcut(a) && !xcut(b) && !xcut(c) && !xcut(d) && !disconnect_helper(e,f)
 
 
 Pattern CC511

patterns/connections.c

@@ -25 +25 @@
 #include "patterns.h"
 
 
+/* Test whether apos and bpos can be cut. If yes, return 1 and
+ * store it in the cut list of dragons.c.
+ */
+int
+disconnect_helper(int apos, int bpos)
+{
+  int color = board[apos];
+  int move;
+  ASSERT1(color == board[bpos] && IS_STONE(color), apos);
+
+  if (disconnect(apos, bpos, &move)) {
+    add_cut(apos, bpos, move);
+    return 1;
+  }
+  return 0;
+}
+
 /* Try to match all (permutations of) connection patterns at (m,n).
  * For each match, if it is a B pattern, set cutting point in
  * cutting_points array. If it is a C pattern, amalgamate the dragons

patterns/patterns.h

@@ -325 +325 @@
 int adjacent_to_defendable_stone_in_atari(int str);
 void backfill_replace(int move, int str);
 int break_mirror_helper(int str, int color);
+int disconnect_helper(int apos, int bpos);
 
 
 /* pattern arrays themselves */