[gnugo-devel] tuning patch

[Gunnar Farneback]

This patch includes some tuning, a number of pattern bugfixes
(incorrect symmetry, inconsistent diagrams), and removal of a few
redundant patterns.

Teun wrote (on January 7):
> This patch makes mkpat.c even more complex than it already is...
> 
> The aim is to improve consistency checking between diagram and
> constraint diagram. This initial version checks
> for every xXoO in the constraint diagram whether there is a
> corresponding
> one in the diagram.

Does this work? It seems to me it should have barfed at pattern A1100
in owl_attackpats.db at least.

/Gunnar

Index: patterns/barriers.db
===================================================================
RCS file: /cvsroot/gnugo/gnugo/patterns/barriers.db,v
retrieving revision 1.20
diff -u -r1.20 barriers.db
--- patterns/barriers.db        19 Jan 2002 16:11:16 -0000      1.20
+++ patterns/barriers.db        23 Jan 2002 17:05:26 -0000
@@ -47,11 +47,12 @@
 
 
 Pattern Barrier1b
+# gf Corrected symmetry. (3.1.23)
 
 o,o
 O,O
 
-:+,D
+:|,D
 
 
 Pattern Barrier2
@@ -261,11 +262,12 @@
 
 
 Pattern Barrier20
+# gf Corrected symmetry. (3.1.23)
 
 O,,O
 O..o
 
-:|,D
+:8,D
 
 Obae
 Ocdo
@@ -1495,6 +1497,7 @@
 
 Pattern Intrusion46
 # gf New pattern. (3.1.22)
+# gf Fixed diagram inconsistency. (3.1.23)
 # 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.
@@ -1509,13 +1512,31 @@
 
 x.dbx
 .cXa.
-.....
-.....
+x...x
+x...x
 -----
 
 ;!oplay_attack(a,b,c,d)
 
 
+Pattern Intrusion47
+# gf New pattern. (3.1.23)
+
+??X.?
+o..!.
+O....
+-----
+
+:8,B,value(20)
+
+??X.?
+o..!.
+a....
+-----
+
+;lib(a)>2
+
+
 Pattern Nonterritory1
 
 OxO
@@ -2047,6 +2068,83 @@
 ;safe_omove(a)
 
 >non_xterritory(b);
+
+
+Pattern Nonterritory29
+# gf New pattern. (3.1.23)
+
+?OO.
+X...
+----
+
+:8,t
+
+?OOc
+Xab.
+----
+
+;!safe_omove(a) && oplay_attack(b,a,b)
+
+>non_oterritory(b);
+>non_oterritory(c);
+
+
+Pattern Nonterritory30
+# gf New pattern. (3.1.23)
+
+?XX.
+O...
+----
+
+:8,t
+
+?EEd
+Oabc
+----
+
+;oplay_attack(a,b,b) && !oplay_attack(a,c,b,b) && oplay_attack(a,c,b,E)
+
+>non_xterritory(c);
+>non_xterritory(d);
+
+
+Pattern Nonterritory31
+# gf New pattern. (3.1.23)
+
+?XXX.
+O....
+-----
+
+:8,t
+
+?XXXd
+Oabc.
+-----
+
+;oplay_attack(a,b,b) && oplay_attack(a,c,b,c)
+
+>non_xterritory(c);
+>non_xterritory(d);
+
+
+Pattern Nonterritory32
+# gf New pattern. (3.1.23)
+
+..O
+...
+X..
+
+:/,t
+
+e.O
+da.
+Xbc
+
+;!oplay_attack(a,b,c,d,e,d)
+
+>non_oterritory(a);
+>non_oterritory(c);
+>non_oterritory(e);
 
 
 # END OF FILE
Index: patterns/endgame.db
===================================================================
RCS file: /cvsroot/gnugo/gnugo/patterns/endgame.db,v
retrieving revision 1.25
diff -u -r1.25 endgame.db
--- patterns/endgame.db 19 Jan 2002 16:36:14 -0000      1.25
+++ patterns/endgame.db 23 Jan 2002 17:05:26 -0000
@@ -931,6 +931,24 @@
 ;marginal_eye(*) && proper_eye(a)
 
 
+Pattern EE903
+# gf New pattern. (3.1.23)
+
+??XO?
+?OO*.
+X....
+-----
+
+:8,bOX
+
+??XO?
+?OO*.
+Xa...
+-----
+
+;!safe_omove(a)
+
+
 # third line moves
 ##################
 
@@ -1533,12 +1551,13 @@
 Pattern CF2
 # tm New Pattern (3.1.19)  (see trevorc:130)
 #   see comment for Patterm CF1 on over-generality
+# gf Corrected symmetry. (3.1.23)
 
 xxx
 x.x
 X*X
 
-:-,X,followup(2)
+:|,X,followup(2)
 
 xBx
 AdC
Index: patterns/influence.db
===================================================================
RCS file: /cvsroot/gnugo/gnugo/patterns/influence.db,v
retrieving revision 1.5
diff -u -r1.5 influence.db
--- patterns/influence.db       6 Nov 2001 16:36:51 -0000       1.5
+++ patterns/influence.db       23 Jan 2002 17:05:26 -0000
@@ -105,13 +105,14 @@
 
 
 Pattern Enhance8
+# gf Corrected symmetry. (3.1.23)
 
 oO....
 o...*.
 o.....
 oO....
 
-:-,E,value(15)
+:8,E,value(15)
 
 
 Pattern Enhance9
@@ -556,6 +557,7 @@
 
 
 Pattern Invade7c
+# gf Corrected symmetry. (3.1.23)
 
 .......
 .......
@@ -565,7 +567,7 @@
 .......
 .......
 
-:\,Ie,value(0.2)
+:-,Ie,value(0.2)
 
 
 Pattern Invade7d
Index: patterns/owl_attackpats.db
===================================================================
RCS file: /cvsroot/gnugo/gnugo/patterns/owl_attackpats.db,v
retrieving revision 1.49
diff -u -r1.49 owl_attackpats.db
--- patterns/owl_attackpats.db  19 Jan 2002 16:36:14 -0000      1.49
+++ patterns/owl_attackpats.db  23 Jan 2002 17:05:28 -0000
@@ -2986,6 +2986,7 @@
 
 Pattern A1100
 #tm New Pattern (3.1.22) (see pattern D1100)
+# gf Fixed diagram inconsistency. (3.1.23)
 
 XO         defend connect out
 .*
@@ -2995,7 +2996,7 @@
 
 cb
 a*
-XO
+OX
 
 ;owl_escape_value(c)>0 && xplay_attack_either(*,a,a,b)
 
Index: patterns/owl_defendpats.db
===================================================================
RCS file: /cvsroot/gnugo/gnugo/patterns/owl_defendpats.db,v
retrieving revision 1.52
diff -u -r1.52 owl_defendpats.db
--- patterns/owl_defendpats.db  19 Jan 2002 16:36:14 -0000      1.52
+++ patterns/owl_defendpats.db  23 Jan 2002 17:05:29 -0000
@@ -382,6 +382,7 @@
 
 Pattern D117
 # tm modified (3.1.22)
+# gf Fixed diagram inconsistency. (3.1.23)
 
 ?*O.X           extend on third line
 o...O
@@ -391,7 +392,7 @@
 :8,-,value(70)
 
 ?*O.X
-?...a
+o...a
 ?....
 -----
 
@@ -744,6 +745,7 @@
 Pattern D217
 # tm Pattern revised. (3.1.13)
 # tm Pattern revised. (3.1.17)
+# gf FIXME: This constraint is weird. (3.1.23)
 
 o...
 O.*.     expand eyespace
@@ -1020,6 +1022,25 @@
 ;  && oplay_attack(*,a,b,a))
 
 
+Pattern D232
+# gf New pattern. (3.1.23)
+# See nngs:1630.
+
+??O??    defend eye against edge descent tesuji
+XO.O*
+..O.X
+-----
+
+:8,-,value(45)
+
+??O??
+XOab*
+cdOeF
+-----
+
+;lib(F)>=3 && owl_topological_eye(a,b)<=2 && !xplay_attack(c,d,e,c)
+
+
 #########################################################
 #                                                       #
 #          Expanding moves in the center                #
@@ -2493,6 +2514,7 @@
 
 Pattern D704b
 # gf Revised constraint. (3.1.15)
+# gf Revised constraint. (3.1.23)
 
 oO.         half eye sometimes missed
 O.*
@@ -2501,10 +2523,10 @@
 :8,-,value(35)
 
 cOb
-Oa*
+O.*
 ---
 
-; safe_xmove(b) && safe_xmove(*) && oplay_attack(*,b,b)
+; (safe_xmove(b) || safe_xmove(*)) && oplay_attack(*,b,b)
 ; && (o_somewhere(c) || !safe_xmove(c))
 
 
@@ -5011,16 +5033,17 @@
 
 Pattern D1320a
 # tm New Pattern (3.1.20)
+# gf Changed symmetry to accomodate for asymmetric constraint. (3.1.23)
 
 ?X?
 O*O      connect to friendly dragon
 ...
 
-:|,n,value(70)
+:8,n,value(70)
 
-?f?
+?X?
 A*B
-cde
+cd.
 
 ; (!owl_goal_dragon(A) || !owl_goal_dragon(B))
 ; && !xplay_attack_either(*,d,c,c,*)
Index: patterns/patterns.db
===================================================================
RCS file: /cvsroot/gnugo/gnugo/patterns/patterns.db,v
retrieving revision 1.48
diff -u -r1.48 patterns.db
--- patterns/patterns.db        19 Jan 2002 16:36:14 -0000      1.48
+++ patterns/patterns.db        23 Jan 2002 17:05:31 -0000
@@ -1247,6 +1247,23 @@
 ; !dead(A) && (xplay_attack(*,B) || xplay_attack(*,A))
 
 
+Pattern CC83
+# gf New pattern. (3.1.23)
+# See stragety3:142.
+
+O...
+X.*.
+?X.O
+
+:8,CX
+
+Oac.
+Xb*.
+?X.O
+
+;!oplay_defend(*,a,b,a) && oplay_attack(*,b,a,c,c)
+
+
 ##########################
 #
 # General Edge Connections
@@ -3057,21 +3074,23 @@
 
 
 Pattern CS19
+# gf Corrected symmetry. (3.1.23)
 
 X...
 O.*.
 O..X
 
-:|,adOX
+:8,adOX
 
 
 Pattern CS20
+# gf Corrected symmetry. (3.1.23)
 
 X..
 O*.
 ?xX
 
-:|,adOX
+:8,adOX
 
 
 Pattern CS21
@@ -5112,6 +5131,7 @@
 
 Pattern EB717
 # tm New Pattern (3.1.18)
+# gf FIXME: lib(A)==2 is always true in this pattern. (3.1.23)
 
 ?OO..        prevent incursion
 .XX*.
@@ -5120,7 +5140,7 @@
 :8,sOXb
 
 ?OB..
-cXA*.
+.AA*.
 -----
 
 ; lib(A) == 2
@@ -5161,6 +5181,7 @@
 
 
 Pattern EB802
+# gf FIXME: Change this to an oplay_connect() when that is reliable. (3.1.23)
 
 ooxxxx    monkey jump
 oO....
@@ -5526,15 +5547,16 @@
 :8,OXe
 
 
-Pattern EB1002
-
-?X.?..     extend if opponent attaches!
-.X.O..
-*O....
-......
-------
-
-:8,OXe
+# Pattern EB1002
+# # gf Redundant, strict subset of EB1001. (3.1.23)
+# 
+# ?X.?..     extend if opponent attaches!
+# .X.O..
+# *O....
+# ......
+# ------
+# 
+# :8,OXe
 
 
 Pattern EB1003
@@ -5649,14 +5671,15 @@
 :8,OXe
 
 
-Pattern EB1010
-
-X...          extend on second line
-O*..
-....
-----
-
-:8,OXe
+# Pattern EB1010
+# # gf Redundant, strict subset of EB1007. (3.1.23)
+# 
+# X...          extend on second line
+# O*..
+# ....
+# ----
+# 
+# :8,OXe
 
 
 Pattern EB1011
@@ -7167,15 +7190,16 @@
 # Miscellaneous
 ###############
 
-Pattern CB201
-
-.O.?    large value to override defender
-.*XX
-OXO.
-...X
-..O?
-
-:8,bE
+# Pattern CB201
+# # Too specific and probably redundant anyway. (3.1.23)
+# 
+# .O.?    large value to override defender
+# .*XX
+# OXO.
+# ...X
+# ..O?
+# 
+# :8,bE
 
 
 Pattern CB202
@@ -7276,12 +7300,13 @@
 
 
 Pattern CB207
+# gf Merge with CB208. (3.1.23)
 
 ??x      threaten connection
 O*.
 .XO
 
-:8,nOXba
+:8,nOXba,shape(2)
 
 ??x
 O*.
@@ -7290,19 +7315,20 @@
 ;(lib(a)>1) && (!attack(b) || defend(b))
 
 
-Pattern CB208
-
-??x      threaten connection
-O*.
-.XO
-
-:8,nOX,shape(3)
-
-??x
-O*.
-.ba
-
-;(lib(a)>1) && (!attack(b) || defend(b))
+# Pattern CB208
+# # gf Merged with CB207 and reduced shape value. (3.1.23)
+# 
+# ??x      threaten connection
+# O*.
+# .XO
+# 
+# :8,nOX,shape(3)
+# 
+# ??x
+# O*.
+# .ba
+# 
+# ;(lib(a)>1) && (!attack(b) || defend(b))
 
 
 Pattern CB209
@@ -7685,19 +7711,20 @@
 :8,OXbe
 
 
-Pattern CB239
-
-...            block off area
-O*O
-?X?
-
-:8,OXb
-
-cab
-O*O
-?X?
-
-;omoyo(b) && omoyo(c) && !xplay_attack(*,a,b,b)
+# Pattern CB239
+# gf Redundant, strict subset of CB238
+# 
+# ...            block off area
+# O*O
+# ?X?
+# 
+# :8,OXb
+# 
+# cab
+# O*O
+# ?X?
+# 
+# ;omoyo(b) && omoyo(c) && !xplay_attack(*,a,b,b)
 
 
 Pattern CB240
@@ -7876,21 +7903,22 @@
 
 
 Pattern CB252
+# gf Merged with CB253. (3.1.23)
 
 ...       bend around
 O*.
-OXo
+OX?
 
 :8,OXe
 
 
-Pattern CB253
-
-...       bend around
-O*.
-OXX
-
-:8,OXe
+# Pattern CB253
+# 
+# ...       bend around
+# O*.
+# OXX
+# 
+# :8,OXe
 
 
 Pattern CB254
@@ -8707,6 +8735,7 @@
 
 
 Pattern CB322a
+# gf Corrected symmetry. (3.1.23)
 
 ??.ooo?       block to attack
 ??.ooo?
@@ -8715,7 +8744,7 @@
 ??....?
 ??.ooo?
 
-:-,XEa
+:8,XEa
 
 ??.bcd?
 ??.efg?
@@ -8771,13 +8800,15 @@
 
 
 Pattern CB327
+# gf Reduced shape value. (3.1.23)
+# See nngs:1750
 
 ?.?         seal opponent in
 ...      
 .*O
 OX?
 
-:8,OXcbeEd,shape(5)
+:8,OXcbeEd,shape(2)
 
 
 Pattern CB328
@@ -12644,6 +12675,7 @@
 
 
 Pattern HH2
+# gf Corrected symmetry. (3.1.23)
 
 .......   Add stone where the distance is large.
 .......
@@ -12652,7 +12684,7 @@
 .......
 .......
 
-:-,-,value(40),high_handicap_helper
+:|,-,value(40),high_handicap_helper
 
 
 Pattern HH3