[gnugo-devel] tuning patch

[Gunnar Farneback]

A little tuning and some more connection tests.

/Gunnar

Index: patterns/barriers.db
===================================================================
RCS file: /cvsroot/gnugo/gnugo/patterns/barriers.db,v
retrieving revision 1.18
diff -u -r1.18 barriers.db
--- patterns/barriers.db        10 Jan 2002 20:36:58 -0000      1.18
+++ patterns/barriers.db        17 Jan 2002 19:56:10 -0000
@@ -1484,6 +1484,29 @@
 ;safe_omove(a) && oplay_attack(a,b,C)
 
 
+Pattern Intrusion46
+# gf New pattern. (3.1.22)
+# FIXME: This pattern exaggerates the intrusion since X can stop it
+#        on one of the sides, but we don't know which one he will
+#        choose. This may or may not be a problem in practice.
+
+x.O.x
+.!X!.
+x...x
+x...x
+-----
+
+:|,B,value(10)
+
+x.dbx
+.cXa.
+.....
+.....
+-----
+
+;!oplay_attack(a,b,c,d)
+
+
 Pattern Nonterritory1
 
 OxO
@@ -1981,6 +2004,36 @@
 ?aX
 OXb
 ?OX
+
+;safe_omove(a)
+
+>non_xterritory(b);
+
+
+Pattern Nonterritory27
+# gf New Pattern (3.1.22)
+
+O..
+
+:-,t
+
+Oab
+
+;safe_omove(a)
+
+>non_xterritory(b);
+
+
+Pattern Nonterritory28
+# gf New Pattern (3.1.22)
+
+O.
+x.
+
+:8,t
+
+Oa
+xb
 
 ;safe_omove(a)
 
Index: patterns/conn.db
===================================================================
RCS file: /cvsroot/gnugo/gnugo/patterns/conn.db,v
retrieving revision 1.15
diff -u -r1.15 conn.db
--- patterns/conn.db    10 Jan 2002 20:36:58 -0000      1.15
+++ patterns/conn.db    17 Jan 2002 19:56:10 -0000
@@ -412,11 +412,12 @@
 
 
 Pattern EB24
+# gf Revised pattern. (3.1.22)
 
 ??X
 ?!.
 .*O
-.!.
+.!o
 ---
 
 :8,B
@@ -424,7 +425,7 @@
 ??X
 ?!.
 .*a
-.!.
+.!o
 ---
 
 ;!xplay_defend(*,a)
Index: patterns/fuseki.db
===================================================================
RCS file: /cvsroot/gnugo/gnugo/patterns/fuseki.db,v
retrieving revision 1.7
diff -u -r1.7 fuseki.db
--- patterns/fuseki.db  10 Jan 2002 20:36:58 -0000      1.7
+++ patterns/fuseki.db  17 Jan 2002 19:56:10 -0000
@@ -490,6 +490,8 @@
 
 
 Pattern F109
+# gf Added constraint. (3.1.22)
+# See nngs:1030.
 
 |.......       enclosure from star
 |..*....
@@ -502,6 +504,35 @@
 
 :8,FtE,shape(-2)
 
+|...a...
+|..*....
+|.......
+|...O...
+|.......
+|.......
+|.......
++-------
+
+;!omoyo(a)
+
+
+Pattern F109b
+# gf New pattern. (3.1.22)
+
+|.......       enclosure from star
+|.......
+|.......
+|.......
+|..*....
+|.......
+|...O...
+|.......
+|.......
+|.......
++-------
+
+:8,FtE,shape(-2)
+
 
 Pattern F110
 
@@ -1285,28 +1316,6 @@
 ; x_somewhere(a,b,c,d)
 
 
-#Pattern F701
-#..........    invade with space to extend in both directions
-#X....*....
-#..........
-#..........
-#----------
-#
-#:8,sjE
-#
-#
-#
-#Pattern F702
-#
-#X.........    invade with space to extend in both directions
-#.....*....
-#..........
-#..........
-#----------
-#
-#:8,sjE
-#
-
 Pattern F703
 
 X.......X    invade
@@ -1319,7 +1328,10 @@
 
 
 Pattern F704
+# gf Added constraint. (3.1.22)
+# See nngs:1030.
 
+???????
 ?.....?       invade 4 space extension
 .X.....
 ....*.X
@@ -1328,6 +1340,16 @@
 -------
 
 :8,FstE,shape(-1)
+
+???c?d?
+?.....?
+.A.....
+....*.B
+.......
+.......
+-------
+
+;weak(A) || weak(B) || !xmoyo(c) || !xmoyo(d)
 
 
 Pattern F705
Index: patterns/owl_attackpats.db
===================================================================
RCS file: /cvsroot/gnugo/gnugo/patterns/owl_attackpats.db,v
retrieving revision 1.47
diff -u -r1.47 owl_attackpats.db
--- patterns/owl_attackpats.db  10 Jan 2002 20:36:58 -0000      1.47
+++ patterns/owl_attackpats.db  17 Jan 2002 19:56:12 -0000
@@ -2923,6 +2923,25 @@
 ; && oplay_defend_both(*,g,f,e,f,*)
 
 
+Pattern A1016
+# gf New pattern. (3.1.22)
+# Converse to D1376. See lazarus:114 for an example.
+
+XxO?
+o.*X
+----
+
+:8,-,value(75)
+
+Bde?
+oc*A
+----
+
+; (owl_escape_value(A) > 0 || owl_escape_value(B) > 0)
+; && ((x_somewhere(d) && xplay_attack_either(*,c,c,e))
+;     || (!x_somewhere(d) && !xplay_defend_both(*,c,d,c,e)))
+
+
 #########################################################
 #                                                       #
 #              Reinforce the perimeter                  #
Index: patterns/owl_defendpats.db
===================================================================
RCS file: /cvsroot/gnugo/gnugo/patterns/owl_defendpats.db,v
retrieving revision 1.50
diff -u -r1.50 owl_defendpats.db
--- patterns/owl_defendpats.db  10 Jan 2002 20:36:58 -0000      1.50
+++ patterns/owl_defendpats.db  17 Jan 2002 19:56:13 -0000
@@ -5877,6 +5877,7 @@
 
 Pattern D1376
 # tm New Pattern (3.1.16)
+# gf Revised constraint. (3.1.22)
 
 OoX?
 x.*O
@@ -5884,12 +5885,13 @@
 
 :8,-,value(75)
 
-bdF?
-ec*a
+bdE?
+xc*a
 ----
 
 ; (owl_escape_value(a) > 0 || owl_escape_value(b) > 0)
-; && oplay_attack_either(*,c,d,c,F)
+; && ((o_somewhere(d) && oplay_attack_either(*,c,c,E))
+;     || (!o_somewhere(d) && !oplay_defend_both(*,c,d,c,E)))
 
 
 Pattern D1377
Index: regression/atari_atari.tst
===================================================================
RCS file: /cvsroot/gnugo/gnugo/regression/atari_atari.tst,v
retrieving revision 1.10
diff -u -r1.10 atari_atari.tst
--- regression/atari_atari.tst  16 Jan 2002 22:19:04 -0000      1.10
+++ regression/atari_atari.tst  17 Jan 2002 19:56:13 -0000
@@ -57,3 +57,7 @@
 loadsgf games/trevor/auto/c24.sgf 62
 13 combination_attack black
 #? [D8]*
+
+loadsgf games/nngs/gnugo-3.1.18-gopriest-200201072104.sgf 104
+14 combination_attack black
+#? [0]*
Index: regression/connection.tst
===================================================================
RCS file: /cvsroot/gnugo/gnugo/regression/connection.tst,v
retrieving revision 1.16
diff -u -r1.16 connection.tst
--- regression/connection.tst   15 Jan 2002 07:26:07 -0000      1.16
+++ regression/connection.tst   17 Jan 2002 19:56:14 -0000
@@ -115,9 +115,10 @@
 32 disconnect B12 E9
 #? [1 D9]*
 
+# White can't cut unconditionally but black has to make the first ko threat.
 loadsgf games/trevor/auto/a035.sgf 28
 33 disconnect B4 C6
-#? [1 B5]*
+#? [2 B5]*
 
 # Monkey jumps and relatives.
 loadsgf games/connection3.sgf
@@ -205,6 +206,36 @@
 loadsgf games/nngs/Lazarus-gnugo-3.1.19-200201092246.sgf 258
 63 connect N13 N17
 #? [1 N16|O17|P16]*
+
+loadsgf games/trevor/auto/b72.sgf 30
+64 disconnect G11 K11
+#? [1 H11]
+65 same_dragon G11 K11
+#? [0]*
+
+loadsgf games/trevor/auto/b67.sgf 58
+66 disconnect M6 L3
+#? [1 M5|M3]
+67 connect M6 L3
+#? [1 M3|M2|M5]
+68 disconnect M6 L1
+#? [1 M5|M3|M2|M1]
+69 connect M6 L1
+#? [1 M2|M3]*
+70 same_dragon M6 L3
+#? [0]*
+
+loadsgf games/nngs/gnugo-3.1.18-goku-200201042350.sgf 52
+71 connect D3 G3
+#? [1 (F3|H3|E3|G2|F2|H2|E2)]
+72 disconnect D3 G3
+#? [1 F3]*
+73 connect D3 J2
+#? [1 (F3|H3|E3|G2|F2|H2|E2)]*
+74 disconnect D3 J2
+#? [1 F3]*
+75 same_dragon D3 G3
+#? [0]*
 
 # Report number of nodes visited by the tactical reading
 10000 get_reading_node_counter