[gnugo-devel] tuning patch

[Gunnar Farneback]

This is a tuning patch against current CVS.

- tuning, owl tuning, eye tuning
- new and updated test cases

Some of the new test cases make use of three new game records. I added
those directly in the CVS. I'll wait with this patch until I've run
the regressions.

/Gunnar

Index: patterns/eyes.db
===================================================================
RCS file: /cvsroot/gnugo/gnugo/patterns/eyes.db,v
retrieving revision 1.5
diff -u -r1.5 eyes.db
--- patterns/eyes.db    2001/10/01 17:37:58     1.5
+++ patterns/eyes.db    2001/10/05 19:33:50
@@ -1042,6 +1042,17 @@
 
 
 Pattern 602
+# Bent four in the corner.
+
+ !
+|.
+|.XX.
++---
+
+:1,1
+
+
+Pattern 603
 # Special corner shape
 
 |*X.
@@ -1051,98 +1062,98 @@
 :2,1
 
 
-Pattern 603
+Pattern 604
 
 xxxxxx
 
 :2,2
 
 
-Pattern 604
+Pattern 605
 
 !....x
 
 :2,2
 
 
-Pattern 605
+Pattern 606
 
 @..xXx
 
 :2,1
 
 
-Pattern 606
+Pattern 607
 
 @.XX>.
 
 :2,1
 
 
-Pattern 607
+Pattern 608
 
 !..X.X
 
 :2,2
 
 
-Pattern 608
+Pattern 609
 
 !.X...
 
 :2,2
 
 
-Pattern 609
+Pattern 610
 
 !.XxxX
 
 :2,2
 
 
-Pattern 610
+Pattern 611
 
 @.XxX.
 
 :2,1
 
 
-Pattern 611
+Pattern 612
 
 @X.xxx
 
 :2,1
 
 
-Pattern 612
+Pattern 613
 
 @Xx.xx
 
 :2,1
 
 
-Pattern 613
+Pattern 614
 
 @Xxx.x
 
 :2,1
 
 
-Pattern 614
+Pattern 615
 
 @XXXXx
 
 :2,0
 
 
-Pattern 615
+Pattern 616
 
 !.xx.!
 
 :1,1
 
 
-Pattern 616
+Pattern 617
 
 (address@hidden
 
@@ -1153,21 +1164,21 @@
 #                points.
 
 
-Pattern 617
+Pattern 618
 
 @XX>X!
 
 :1,0
 
 
-Pattern 618
+Pattern 619
 
 @XXX.!
 
 :1,0
 
 
-Pattern 619
+Pattern 620
 
 address@hidden).!
 
Index: patterns/owl_attackpats.db
===================================================================
RCS file: /cvsroot/gnugo/gnugo/patterns/owl_attackpats.db,v
retrieving revision 1.10
diff -u -r1.10 owl_attackpats.db
--- patterns/owl_attackpats.db  2001/10/04 18:22:33     1.10
+++ patterns/owl_attackpats.db  2001/10/05 19:33:53
@@ -2474,10 +2474,27 @@
 
 :/,-,value(95)
 
+a*
+Xb
+
+; !xplay_defend_both(*,a,b) && vital_chain(a) && vital_chain(b)
+
+
+Pattern A1107b
+# gf New pattern. (3.1.9)
+
+*.
+O.          defend the surrounding chain
+XO
+
+:8,-,value(96)
+
+*.
 ba
 Xc
 
-; !xplay_defend_both(a,b,c) && vital_chain(b) && vital_chain(c)
+;lib(c)>2 && !xplay_defend_both(a,b,c) && vital_chain(b)
+;&& vital_chain(c) && oplay_attack(*,a,a)
 
 
 Pattern A1108
Index: patterns/owl_defendpats.db
===================================================================
RCS file: /cvsroot/gnugo/gnugo/patterns/owl_defendpats.db,v
retrieving revision 1.11
diff -u -r1.11 owl_defendpats.db
--- patterns/owl_defendpats.db  2001/10/04 18:22:33     1.11
+++ patterns/owl_defendpats.db  2001/10/05 19:33:54
@@ -2604,6 +2604,24 @@
 :8,s,value(35)
 
 
+Pattern D832
+# gf New pattern. (3.1.9)
+
+|O??        throw in to improve eye potential
+|.Oo
+|*XX
++---
+
+:8,s,value(35)
+
+|O??
+|.Oo
+|*AX
++---
+
+;oplay_defend(*,A) != WIN
+
+
 #########################################################
 #                                                       #
 #                  Prevent intrusion                    #
Index: patterns/patterns.db
===================================================================
RCS file: /cvsroot/gnugo/gnugo/patterns/patterns.db,v
retrieving revision 1.12
diff -u -r1.12 patterns.db
--- patterns/patterns.db        2001/10/04 18:22:33     1.12
+++ patterns/patterns.db        2001/10/05 19:33:56
@@ -4381,9 +4381,10 @@
 
 
 Pattern EB617
+# gf Revised pattern. (3.1.9)
 
 oO.?           Prevent monkey jump or other incursion
-..*X
+o.*X
 ....
 ----
 
@@ -12610,6 +12611,7 @@
 
 
 Pattern LE4
+# gf Revised constraint. (3.1.9)
 
 ...      hane to prevent incursion
 .*o
Index: patterns/patterns2.db
===================================================================
RCS file: /cvsroot/gnugo/gnugo/patterns/patterns2.db,v
retrieving revision 1.9
diff -u -r1.9 patterns2.db
--- patterns/patterns2.db       2001/10/02 19:51:33     1.9
+++ patterns/patterns2.db       2001/10/05 19:33:56
@@ -2731,6 +2731,7 @@
 
 
 Pattern DD12
+# gf Revised. (3.1.9)
 
 OX?        double attack
 X*.
@@ -2740,18 +2741,20 @@
 
 :8,-
 
-OB?
+EB?
 A*d
-Ace
+Ac.
 A..
 ---
 
-;lib(A)==3 && oplay_attack(*,B) && oplay_attack(*,c,d,e,B)
+;lib(A)==3 && !oplay_attack(*,E) && oplay_attack(*,d,A)
+;&& !oplay_defend_both(*,c,d,A,B)
 
 >add_attack_either_move(A,B)
 
 
 Pattern DD13
+# gf Revised. (3.1.9)
 
 XO?        double defense
 O*.
@@ -2761,13 +2764,14 @@
 
 :8,-
 
-Xb?
+eb?
 a*d
-ace
+ac.
 a..
 ---
 
-;lib(a)==3 && xplay_attack(*,b) && xplay_attack(*,c,d,e,b)
+;lib(a)==3 && !attack(e) && xplay_attack(*,d,a)
+;&& !xplay_defend_both(*,c,d,a,b)
 
 >add_defend_both_move(a,b)
 
Index: regression/blunder.tst
===================================================================
RCS file: /cvsroot/gnugo/gnugo/regression/blunder.tst,v
retrieving revision 1.7
diff -u -r1.7 blunder.tst
--- regression/blunder.tst      2001/09/15 00:24:22     1.7
+++ regression/blunder.tst      2001/10/05 19:33:56
@@ -78,4 +78,7 @@
 17 gg_genmove white
 #? [R7]*
 
-
+# A simplification of incident 136. Black E6 is a bad blunder.
+loadsgf games/blunder13.sgf
+18 gg_genmove black
+#? [F5]
\ No newline at end of file
Index: regression/nicklas3.tst
===================================================================
RCS file: /cvsroot/gnugo/gnugo/regression/nicklas3.tst,v
retrieving revision 1.4
diff -u -r1.4 nicklas3.tst
--- regression/nicklas3.tst     2001/10/01 03:49:08     1.4
+++ regression/nicklas3.tst     2001/10/05 19:33:57
@@ -20,9 +20,12 @@
 #? [C6]*
 
 # J6 gives a gote seki.
+# However, playing sente moves against the group, starting with H9,
+# and then taking gote at H1 gives the same end result. Thus H9 is
+# also okay.
 loadsgf games/nicklas/nicklas14.sgf 48
 1403 gg_genmove white
-#? [J6]*
+#? [J6|H9]*
 
 ############ End of Tests #################
 
Index: regression/owl.tst
===================================================================
RCS file: /cvsroot/gnugo/gnugo/regression/owl.tst,v
retrieving revision 1.9
diff -u -r1.9 owl.tst
--- regression/owl.tst  2001/10/04 18:22:33     1.9
+++ regression/owl.tst  2001/10/05 19:33:57
@@ -805,13 +805,16 @@
 # Additionally D7, C8 and some other odd moves work. H9 does not.
 loadsgf games/trevor/trevor_24.sgf 33
 221 owl_defend H8
-#? [D8|E8]*
+#? [1 D8|E8]*
 
 # E6 almost kills tactically.
 loadsgf games/trevor/trevor_27.sgf 36
 222 owl_attack E5
-#? [E6]*
+#? [1 E6]*
 
+loadsgf games/incident169.sgf 224
+223 owl_defend R17
+#? [3 S16]
 
 ########### end of tests #####################
 
Index: regression/reading.tst
===================================================================
RCS file: /cvsroot/gnugo/gnugo/regression/reading.tst,v
retrieving revision 1.6
diff -u -r1.6 reading.tst
--- regression/reading.tst      2001/10/01 16:46:15     1.6
+++ regression/reading.tst      2001/10/05 19:33:57
@@ -605,6 +605,10 @@
 154 attack E4
 #? [1 G4]*
 
+loadsgf games/reading32.sgf
+155 attack G9
+#? [0]*
+
 # Report number of nodes visited by the tactical reading
 10000 get_reading_node_counter
 #? [0]&
Index: regression/strategy2.tst
===================================================================
RCS file: /cvsroot/gnugo/gnugo/regression/strategy2.tst,v
retrieving revision 1.4
diff -u -r1.4 strategy2.tst
--- regression/strategy2.tst    2001/09/15 00:24:22     1.4
+++ regression/strategy2.tst    2001/10/05 19:33:57
@@ -165,9 +165,9 @@
 #? [P14]*
 
 loadsgf games/heikki/heikki01.sgf 35
-# J2 makes ko
+# J18 makes ko
 84 gg_genmove black
-#? [J2]*
+#? [J18]*
 
 loadsgf games/strategy24.sgf
 85 gg_genmove white
Index: regression/strategy3.tst
===================================================================
RCS file: /cvsroot/gnugo/gnugo/regression/strategy3.tst,v
retrieving revision 1.13
diff -u -r1.13 strategy3.tst
--- regression/strategy3.tst    2001/10/01 03:49:08     1.13
+++ regression/strategy3.tst    2001/10/05 19:33:57
@@ -119,6 +119,8 @@
 125 gg_genmove black
 #? [K17|J17|K18|L18|K19|L19|M19|H16]
 
+# The move valuation must become aware of the distinction between
+# attack and defense with or without ko.
 loadsgf games/strategy29.sgf 138
 126 gg_genmove white
 #? [B19]*
@@ -223,6 +225,7 @@
 149 gg_genmove white
 #? [!O1]
 
+# Owl reading mistake, eyespace related.
 loadsgf games/gwe.sgf 203
 150 gg_genmove white
 #? [Q1]*
Index: regression/strategy4.tst
===================================================================
RCS file: /cvsroot/gnugo/gnugo/regression/strategy4.tst,v
retrieving revision 1.5
diff -u -r1.5 strategy4.tst
--- regression/strategy4.tst    2001/10/01 03:49:08     1.5
+++ regression/strategy4.tst    2001/10/05 19:33:57
@@ -168,6 +168,12 @@
 184 gg_genmove black
 #? [H13]*
 
+# We may want to move this to a dedicated seki or semeai test suite in
+# the future.
+loadsgf games/seki02.sgf
+185 gg_genmove black
+#? [E7]
+
 ############ End of Tests #################
 
 # Report number of nodes visited by the tactical reading