[gnugo-devel] mixed tuning

[Arend Bayer]

This is mostly some tuning brought over from the new_escape patch.
Two changes try to make a little more sure that GNU Go follows joseki.
It adds an intrusion pattern related to the gifu03 testcase we were
discussing, mostly as a preparation for my try about resetting blocks
next to intrusions.
Finally, it makes the "dragon_weakness" function accessible from pattern
helpers, so that we can write patterns as this one:

Pattern ES3a
# gf New pattern. (3.5.3)

..O..
....X         invade with support from above
X.*..
.....
.....
-----

:8,OEa

..a..
....X
X.*..
.....
.....
-----

;weakness(a)<0.7

Since weak(a) was a bit too drastic. Does this make sense to people?

Arend


Index: engine/liberty.h
===================================================================
RCS file: /cvsroot/gnugo/gnugo/engine/liberty.h,v
retrieving revision 1.226
diff -u -p -r1.226 liberty.h
--- engine/liberty.h    11 Sep 2004 01:01:03 -0000      1.226
+++ engine/liberty.h    12 Sep 2004 19:23:53 -0000
@@ -300,6 +300,7 @@ int vital_chain(int pos);
 int confirm_safety(int move, int color, int *defense_point,
                   char safe_stones[BOARDMAX]);
 int dragon_weak(int pos);
+float dragon_weakness(int pos, int ignore_dead_dragons);
 int size_of_biggest_critical_dragon(void);
 float blunder_size(int move, int color, int *defense_point,
                   char safe_stones[BOARDMAX]);
Index: engine/value_moves.c
===================================================================
RCS file: /cvsroot/gnugo/gnugo/engine/value_moves.c,v
retrieving revision 1.130
diff -u -p -r1.130 value_moves.c
--- engine/value_moves.c        24 Aug 2004 15:24:30 -0000      1.130
+++ engine/value_moves.c        12 Sep 2004 19:23:54 -0000
@@ -1325,7 +1325,7 @@ examine_move_safety(int color)
  *        rather where it's called.
  */
 
-static float
+float
 dragon_weakness(int dr, int ignore_dead_dragons)
 {
   int dragon_safety = DRAGON2(dr).safety;
Index: patterns/barriers.db
===================================================================
RCS file: /cvsroot/gnugo/gnugo/patterns/barriers.db,v
retrieving revision 1.65
diff -u -p -r1.65 barriers.db
--- patterns/barriers.db        25 May 2004 03:13:51 -0000      1.65
+++ patterns/barriers.db        12 Sep 2004 19:23:55 -0000
@@ -1660,6 +1660,26 @@ dbc.
 
 ;oplay_attack(a,b,c,d,e,f,f)
 
+Pattern Intrusion30a
+
+????
+????
+oQoo
+...X
+.!..
+????
+
+:8,B,value(30)
+
+????
+????
+ocoo
+.b.X
+.a..
+????
+
+;oplay_connect(a,b,a,c)
+>return (!xplay_attack(b,c))
 
 Pattern Intrusion31
 
Index: patterns/fuseki.db
===================================================================
RCS file: /cvsroot/gnugo/gnugo/patterns/fuseki.db,v
retrieving revision 1.40
diff -u -p -r1.40 fuseki.db
--- patterns/fuseki.db  22 Aug 2004 20:48:36 -0000      1.40
+++ patterns/fuseki.db  12 Sep 2004 19:23:55 -0000
@@ -2703,7 +2703,7 @@ Pattern J46
 ..O...|
 ......|
 
-:8,J
+:8,Jad
 
 
 Pattern J47
Index: patterns/hoshi_keima.sgf
===================================================================
RCS file: /cvsroot/gnugo/gnugo/patterns/hoshi_keima.sgf,v
retrieving revision 1.7
diff -u -p -r1.7 hoshi_keima.sgf
--- patterns/hoshi_keima.sgf    23 Apr 2004 01:58:54 -0000      1.7
+++ patterns/hoshi_keima.sgf    12 Sep 2004 19:23:55 -0000
@@ -39,7 +39,10 @@ GN[Hoshi+keima joseki database]
 )
 
 (;B[qd]C[S]MA[ij];C[#b blocks below];W[pc]C[S]MA[mj]
-(;B[od]C[S]MA[mi];W[rd]C[S]MA[mi];B[re]C[S]MA[mi];W[rc]C[S]MA[mi]
+(;B[od]C[S
+:-,reverse_followup(10),followup(15)
+]MA[mi];W[rd]C[S]
+MA[mi];B[re]C[S]MA[mi];W[rc]C[S]MA[mi]
 (;B[qe]C[S]MA[mi];W[nc]C[S]MA[mi];B[pf]C[S]MA[mj])
 
 (;B[oc]C[0
@@ -351,17 +354,15 @@ W[qa]MA[mi]C[0];B[oa]MA[mi]C[U])
 W[pb]MA[mi]C[0];B[oa]MA[li]C[U])
 
 (;W[qc]MA[mi]C[0];B[rc]MA[mi]C[U];W[qa]MA[mi]C[0];B[oa]MA[mi]C[U];
-W[pb]MA[mi]C[0];B[oa]MA[mi]C[S];W[pa]MA[mi]C[0];B[tt];W[se]
-MA[mi]C[0];B[tt];W[ma]MA[kb]C[0];B[lb]MA[jb]C[U];W[la]MA[jb]
-C[0];B[kb]MA[jb]C[U])
+W[pb]MA[mi]C[0];B[oa]MA[mi]C[S];W[pa]MA[mi]C[0];B[tt];W[se]MA[mi]C[0];
+B[tt];W[ma]MA[kb]C[0];B[lb]MA[jb]C[U];W[la]MA[jb]C[0];B[kb]MA[jb]C[U])
 
 (;W[se]MA[mi]C[0];B[qc]MA[mi]C[U];W[rc]MA[mi]C[0];B[sc]MA[mi]C[U]
 (;W[pb]MA[mi]C[0];B[ma]MA[mi]C[U];W[qa]MA[mi]C[0];B[oa]MA[mi]C[U];
 W[na]MA[mi]C[0];B[oa]MA[mi]C[U])
 
 (;W[qa]MA[mi]C[0];B[oa]MA[mi]C[U];W[pb]MA[mi]C[0];B[oa]MA[mi]C[U];
-W[pa]MA[mi]C[0];B[tt];W[ma]MA[ke]C[0];B[lb]MA[ke]C[U];W[la]
-MA[jc]C[0]
+W[pa]MA[mi]C[0];B[tt];W[ma]MA[ke]C[0];B[lb]MA[ke]C[U];W[la]MA[jc]C[0]
 (;B[kb])
 
 (;B[ka]MA[jb]C[0])
Index: patterns/mkpat.c
===================================================================
RCS file: /cvsroot/gnugo/gnugo/patterns/mkpat.c,v
retrieving revision 1.139
diff -u -p -r1.139 mkpat.c
--- patterns/mkpat.c    8 Sep 2004 17:03:42 -0000       1.139
+++ patterns/mkpat.c    12 Sep 2004 19:23:56 -0000
@@ -296,6 +296,7 @@ static struct autohelper_func autohelper
   {"does_attack",              2, 0, 1.00, "does_attack(%s, %s)"},
   {"attack",                   1, 0, 1.00, "ATTACK_MACRO(%s)"},
   {"defend",                   1, 0, 1.00, "DEFEND_MACRO(%s)"},
+  {"weakness",                 1, 0, 0.01, "dragon_weakness(%s, 0)"},
   {"weak",                     1, 0, 0.01, "dragon_weak(%s)"},
   {"safe_xmove",               1, 0, 1.00, "safe_move(%s, 
OTHER_COLOR(color))"},
   {"safe_omove",               1, 0, 1.00, "safe_move(%s, color)"},
@@ -1555,8 +1556,9 @@ parse_constraint_or_action(char *line, f
            break;
          }
          fprintf(stderr,
-                 "%s(%d) : error : Syntax error in constraint or action, '(' 
expected (pattern %s).\n", 
-                 current_file, current_line_number, pattern_names[patno]);
+                 "%s(%d) : error : Syntax error in constraint or action, '(' 
expected (pattern %s, autohelper %s).\n", 
+                 current_file, current_line_number, pattern_names[patno],
+                 autohelper_functions[n].name);
          fatal_errors++;
          return;
        }
Index: patterns/patterns.db
===================================================================
RCS file: /cvsroot/gnugo/gnugo/patterns/patterns.db,v
retrieving revision 1.130
diff -u -p -r1.130 patterns.db
--- patterns/patterns.db        8 Sep 2004 17:03:42 -0000       1.130
+++ patterns/patterns.db        12 Sep 2004 19:23:58 -0000
@@ -3329,7 +3329,7 @@ X.*..
 .....
 -----
 
-;!weak(a)
+;weakness(a)<0.7
 
 
 Pattern ES3b