Re: [gnugo-devel] trevor_1_14.2

[Gunnar Farneback]

I have added arend_1_14.1 (with correction of strategy2:68),
trevor_1_14.2, and the appended patch to CVS.

I wrote:
> I think both these patterns, or at least the second one, would be
> better implemented as eye patterns instead.

This is done in this patch. I also added a set of test cases in
ld_owl.tst with variations of this corner position. See
regression/games/life_and_death/ld19.sgf.

/Gunnar

Index: patterns/connections.c
===================================================================
RCS file: /cvsroot/gnugo/gnugo/patterns/connections.c,v
retrieving revision 1.18
diff -u -r1.18 connections.c
--- patterns/connections.c      2001/11/10 09:26:25     1.18
+++ patterns/connections.c      2001/11/10 10:42:21
@@ -197,14 +197,10 @@
               && dragon[pos].origin != first_dragon) {
        second_dragon = dragon[pos].origin;
        /* A second dragon found, we amalgamate them at once. */
-       /* Want this output if verbose or DEBUG_DRAGONS is on, but not both.*/
-       if (verbose) {
-         TRACE("Pattern %s joins %C dragons %1m, %1m\n",
-             pattern->name, color, first_dragon, second_dragon);
-       } else {
-         DEBUG(DEBUG_DRAGONS, "Pattern %s joins %C dragons %1m, %1m\n",
-             pattern->name, color, first_dragon, second_dragon);
-       }
+       /* Want this output if verbose or DEBUG_DRAGONS is on. */
+       if (verbose || (debug & DEBUG_DRAGONS))
+         gprintf("Pattern %s joins %C dragons %1m, %1m\n",
+                 pattern->name, color, first_dragon, second_dragon);
        fflush(stdout);
        join_dragons(second_dragon, first_dragon);
        /* Now look for another second dragon. */
Index: patterns/eyes.db
===================================================================
RCS file: /cvsroot/gnugo/gnugo/patterns/eyes.db,v
retrieving revision 1.7
diff -u -r1.7 eyes.db
--- patterns/eyes.db    2001/10/18 19:17:21     1.7
+++ patterns/eyes.db    2001/11/10 10:42:21
@@ -1875,13 +1875,47 @@
 
 Pattern 753
 
+|.
+|X
+|XX
+|.*.
++---
+
+:2,1
+
+
+Pattern 754
+
+|.
+|*
+|XX
+|.X.
++---
+
+:2,1
+
+
+Pattern 755
+
+|.
+|X
+|XX
+|.X.
++---
+
+:1,1
+
+
+Pattern 756
+
   xXx
 @..x
 
 :2,1
 
-Pattern 754
 
+Pattern 757
+
   x.!
 !.xx
 
@@ -2114,13 +2148,25 @@
 
 Pattern 809
 
+ !
+|.
+|.
+|XX
+|.*.
++---
+
+:2,1
+
+
+Pattern 810
+
 !.x
  x.x.@
 
 :2,1
 
 
-Pattern 810
+Pattern 811
 # in some cases this could become seki
 
 !.x
@@ -2141,6 +2187,32 @@
 :2,1
 
 
+#             ....
+# Topology: ....
+#
+
+Pattern 830
+
+|.
+|*
+|XX
+|...!
++----
+
+:2,1
+
+
+Pattern 831
+
+|.
+|X
+|XX
+|...!
++----
+
+:1,1
+
+
 ###############################
 #          9 elements         #
 ###############################
@@ -2197,6 +2269,18 @@
 # :2,1
 
  
+Pattern 906
+
+ !
+|.
+|.
+|*X
+|...!
++----
+
+:2,1
+
+
 
 ###############################
 #         10 elements         #
Index: patterns/owl_attackpats.db
===================================================================
RCS file: /cvsroot/gnugo/gnugo/patterns/owl_attackpats.db,v
retrieving revision 1.22
diff -u -r1.22 owl_attackpats.db
--- patterns/owl_attackpats.db  2001/11/10 09:26:25     1.22
+++ patterns/owl_attackpats.db  2001/11/10 10:42:21
@@ -3587,31 +3587,6 @@
 :8,s,value(50)
 
 
-Pattern A1343
-# tm new pattern (3.1.14)
-# See strategy4:208
-
-|.Xx    1-2 point often vital in this shape
-|.oX
-|.*.
-+---
-:8,s,value(50)
-
-
-Pattern A1343
-# tm new pattern (3.1.14)
-# See strategy4:208
-
-|XX?     Try destroying X's eye.
-|.X?
-|*Xx    
-|OoX
-|...
-+---
-
-:8,s,value(50)
-
-
 #########################################################
 #                                                       #
 #               Invasion patterns                       #
Index: regression/ld_owl.tst
===================================================================
RCS file: /cvsroot/gnugo/gnugo/regression/ld_owl.tst,v
retrieving revision 1.5
diff -u -r1.5 ld_owl.tst
--- regression/ld_owl.tst       2001/11/07 05:41:30     1.5
+++ regression/ld_owl.tst       2001/11/10 10:42:21
@@ -331,6 +331,24 @@
 305 dragon_status C3
 #? [critical E2 (E2|E1)]
 
+loadsgf games/life_and_death/ld19.sgf
+306 owl_attack C17
+#? [1 B19]
+307 owl_defend C17
+#? [1 (E19|C19|B19|A18|A16)]
+308 owl_attack R17
+#? [1 T17]
+309 owl_defend R17
+#? [1 (T17|S19|Q19)]
+310 owl_attack R3
+#? [1 T2]
+311 owl_defend R3
+#? [1 (T2|R1|P1)]
+310 owl_attack C3
+#? [1 B1]
+311 owl_defend C3
+#? [1 (B1|A4)]
+
 # Report number of nodes visited by the tactical reading
 10000 get_reading_node_counter
 #? [0]&
Index: regression/games/life_and_death/ld19.sgf
===================================================================
RCS file: ld19.sgf
diff -N ld19.sgf
--- /dev/null   Sat Apr 14 20:46:23 2001
+++ ld19.sgf    Sat Nov 10 05:42:21 2001
@@ -0,0 +1,10 @@
+(;GM[1]FF[3]
+RU[Japanese]SZ[19]HA[0]KM[5.5]
+PW[White]
+PB[Black]
+GN[White (W) vs. Black (B)]
+DT[2001-11-10]
+SY[Cgoban 1.9.2]TM[5:00:00(5x1:00)];
+AW[bb][fb][gb][nb][ob][rb][sb][fc][oc][dd][ed][fd][od][pd][be][ce][de][pe][bf][pf][qf][rf][rg][bm][bn][cn][dn][rn][do][po][qo][ro][dp][ep][np][op][pp][aq][eq][nq][ar][br][er][fr][mr][nr][rr][rs]
+AB[cb][db][eb][pb][qb][bc][cc][qc][rc][bd][rd][re][se][ao][bo][bp][rp][sp][bq][cq][qq][rq][cr][dr][or][pr][qr][ds]
+)