[gnugo-devel] tuning and bugfix patch

[Gunnar Farneback]

This patch includes tuning and a serious bugfix.

- trivial bugfix in move_reasons.c
- important bugfix in semeai.c, could cause a crash
- tuning
- owl tuning
- one revised regression test

The regression tests owl:219, ld_owl:42, and arb:233 should be fixed
by this patch. Additionally it happens to solve owl:229 independently
of Trevor's fix.

/Gunnar

Index: engine/move_reasons.c
===================================================================
RCS file: /cvsroot/gnugo/gnugo/engine/move_reasons.c,v
retrieving revision 1.33
diff -u -r1.33 move_reasons.c
--- engine/move_reasons.c       2001/10/28 15:35:07     1.33
+++ engine/move_reasons.c       2001/10/29 20:08:11
@@ -2844,7 +2844,7 @@
   tot_value += this_value;
   /* subtract one point for a sacrifice (playing in opponent's territory) */
   if (tot_value > 1.0 && safe_move(pos, color) != WIN) {
-    TRACE("  %1m:   -1 - unsafe move, assumed sacrifice\n", pos, this_value);
+    TRACE("  %1m:   -1 - unsafe move, assumed sacrifice\n", pos);
     tot_value -= 1.0;
   }
 
Index: engine/semeai.c
===================================================================
RCS file: /cvsroot/gnugo/gnugo/engine/semeai.c,v
retrieving revision 1.17
diff -u -r1.17 semeai.c
--- engine/semeai.c     2001/10/26 07:21:11     1.17
+++ engine/semeai.c     2001/10/29 20:08:12
@@ -358,10 +358,12 @@
    */
 
   if (dragon[my_dragon].owl_status == CRITICAL
+      && dragon[my_dragon].owl_attack_point != NO_MOVE
       && !liberty_of_string(dragon[my_dragon].owl_attack_point, my_dragon))
     mylibs++;
   
   if (dragon[your_dragon].owl_status == CRITICAL
+      && dragon[your_dragon].owl_attack_point != NO_MOVE
       && !liberty_of_string(dragon[your_dragon].owl_attack_point, your_dragon))
     yourlibs++;
   
Index: patterns/owl_attackpats.db
===================================================================
RCS file: /cvsroot/gnugo/gnugo/patterns/owl_attackpats.db,v
retrieving revision 1.16
diff -u -r1.16 owl_attackpats.db
--- patterns/owl_attackpats.db  2001/10/29 17:35:01     1.16
+++ patterns/owl_attackpats.db  2001/10/29 20:08:12
@@ -1246,22 +1246,21 @@
 ; lib(A)>1
 
 
-# Pattern A419
-# # gf New pattern. (3.1.10)
-# #    (This pattern is probably good, but is disabled awaiting
-# #     investigation of some broken regressions.)
-# 
-# X.O
-# .*X      cut to stop escape
-# 
-# :8,-,value(55)
-# 
-# A.O
-# .*B
-# 
-# ;owl_escape_value(A)>0 || owl_escape_value(B)>0
+Pattern A419
+# gf New pattern. (3.1.10)
+# gf Uncommented pattern (3.1.13)
 
+X.O
+.*X      cut to stop escape
 
+:8,-,value(55)
+
+A.O
+.*B
+
+;owl_escape_value(A)>0 || owl_escape_value(B)>0
+
+
 Pattern A420
 # gf New pattern. (3.1.12)
 
@@ -3514,6 +3513,17 @@
 +---
 
 :8,s,value(75)
+
+
+Pattern A1340
+# gf New pattern. (3.1.13)
+
+|X.X?     destroy eyespace
+|.OXx
+|.*.X
++----
+
+:8,s,value(40)
 
 
 #########################################################
Index: patterns/owl_defendpats.db
===================================================================
RCS file: /cvsroot/gnugo/gnugo/patterns/owl_defendpats.db,v
retrieving revision 1.17
diff -u -r1.17 owl_defendpats.db
--- patterns/owl_defendpats.db  2001/10/28 16:01:18     1.17
+++ patterns/owl_defendpats.db  2001/10/29 20:08:13
@@ -819,6 +819,46 @@
 ;owl_goal_dragon(a) && owl_escape_value(b)>0
 
 
+Pattern D227
+# gf New pattern. (3.1.13)
+
+X.O.         jump and threaten to cut, connect, or force
+OX..
+O.*.
+o...
+----
+
+:8,-,value(65)
+
+X.O.
+aX..
+a.*.
+o...
+----
+
+;owl_goal_dragon(a) && !oplay_attack(*,a)
+
+
+Pattern D228
+# gf New pattern. (3.1.13)
+
+X.O.         followup
+OXX*
+O.O.
+o...
+----
+
+:8,-,value(65)
+
+X.O.
+aXX*
+a.O.
+o...
+----
+
+;owl_goal_dragon(a) && !oplay_attack(*,a)
+
+
 #########################################################
 #                                                       #
 #          Expanding moves in the center                #
Index: patterns/owl_vital_apats.db
===================================================================
RCS file: /cvsroot/gnugo/gnugo/patterns/owl_vital_apats.db,v
retrieving revision 1.5
diff -u -r1.5 owl_vital_apats.db
--- patterns/owl_vital_apats.db 2001/10/29 17:35:01     1.5
+++ patterns/owl_vital_apats.db 2001/10/29 20:08:13
@@ -333,7 +333,7 @@
 
 OX.x
 A.*.
-AA.x
+AA..
 ----
 
 ;lib(A)==2 && owl_big_eyespace(*,A)
Index: patterns/patterns.db
===================================================================
RCS file: /cvsroot/gnugo/gnugo/patterns/patterns.db,v
retrieving revision 1.20
diff -u -r1.20 patterns.db
--- patterns/patterns.db        2001/10/26 07:21:11     1.20
+++ patterns/patterns.db        2001/10/29 20:08:15
@@ -10564,6 +10564,7 @@
 # This should strictly give an "attack one out of three" move reason,
 # but since there is no support for these, we do something ad hoc
 # instead.
+# gf Revised constraint. (3.1.13)
 
 ?OOX         atari twice to capture something
 XOX.
@@ -10572,16 +10573,18 @@
 
 :8,Xads,value(7)
 
-?OOX
-EOXa
+?ffX
+EfXa
 bD*o
 ?co?
 
 ;olib(b)>=2 && !attack(E) && !attack(D) && oplay_attack_either(*,a,b,c,D,E)
+;&& !oplay_attack(*,f)
 
 
 Pattern CD101
 # Converse of previous pattern. Same comment applies.
+# gf Revised constraint. (3.1.13)
 
 ?XXO         defend against atari sequence
 OXO.
@@ -10590,12 +10593,13 @@
 
 :8,Xad,value(7)
 
-?XXO
-eXOa
+?FFO
+eFOa
 bd*o
 ?co?
 
-;xlib(b)>=2 && !attack(e) && !attack(d) && xplay_attack_either(*,a,b,c,d,e)
+;xlib(b)>=2 && !attack(e) && !attack(d) && !attack(F)
+;&& xplay_attack_either(*,a,b,c,d,e)
 
 
 Pattern CD102
@@ -10614,6 +10618,7 @@
 
 
 Pattern CD103
+# gf Revised constraint. (3.1.13)
 
 ?XOX?       capture something!
 .*X..
@@ -10621,11 +10626,11 @@
 
 :|,sa,value(12)
 
-?XOX?
+?XbX?
 .*Xa.
 ?...?
 
-; o_aa_attack(*,a) && o_aa_attack(a,*)
+;!oplay_attack(*,b) && o_aa_attack(*,a) && o_aa_attack(a,*)
 
 
 Pattern CD103a
Index: regression/owl.tst
===================================================================
RCS file: /cvsroot/gnugo/gnugo/regression/owl.tst,v
retrieving revision 1.18
diff -u -r1.18 owl.tst
--- regression/owl.tst  2001/10/29 03:23:28     1.18
+++ regression/owl.tst  2001/10/29 20:08:15
@@ -199,7 +199,7 @@
 56 owl_attack M19
 #? [1 (Q19|T13)]
 57 owl_defend M19
-#? [1 T13]*
+#? [1 (T13|N19)]*
 58 owl_attack T19
 #? [1 (T13|N19)]
 59 owl_defend T19