Re: [gnugo-devel] trevor_1_13.3

[Gunnar Farneback]

Trevor wrote:
> Here are a few patterns that solve a number of problems (regression
> still running).  Some are similar to the patterns Gunnar just posted,
> so I'll let him merge the 2 (!), and evaluate my patterns.  A few
> other things thrown in.

Mostly looks good. Some comments:

> +Pattern CBtrevor
> +O*.         another way to cut!
> +X!O
> +
> +:8,B
> +
> +O*.
> +baO
> +
> +; xplay_defend_both(*,a,*,b)
> +

I'm not certain whether this pattern might cause any problems, but if
it doesn't seem to break anything, it'll do. This will all be obsolete
when we get readconnect to work.

> +
> +Pattern AtrevorCut
> +X*.         another way to cut!
> +O.X
> +
> +:8,-,value(10)
> +
> +X*.
> +baX
> +
> +; oplay_defend_both(*,a,*,b)

This is probably redundant together with A419. I left it out.

> +#trevor:450 new patten 3.1.13 -trevor
> +Pattern VA20
> +
> +?X?
> +X.X
> +*X?
> +X.X
> +?X?
> +
> +:8,-,value(75)
> +
> +?X?
> +XaX
> +*C?
> +XbX
> +?X?
> +
> +; owl_topological_eye(a,C) == 2 && 
> +; owl_topological_eye(b,C) == 2

This pattern has a symmetry axis and should have symmetry
classification '-'. That way we don't have to evaluate the constraint
twice. Also there was already a copy of this pattern in CVS.

I also made some formatting changes, added some comments and repaired
the trevor_46.sgf file which was broken in CVS. The resulting patch is
appended below and has been added to CVS.

/Gunnar

Index: patterns/conn.db
===================================================================
RCS file: /cvsroot/gnugo/gnugo/patterns/conn.db,v
retrieving revision 1.7
diff -u -r1.7 conn.db
--- patterns/conn.db    2001/10/26 07:21:11     1.7
+++ patterns/conn.db    2001/10/30 16:00:51
@@ -578,7 +578,22 @@
 ?*bO
 ??O?
 
-; !attack(A) && !attack(B) && !xplay_attack(*,a,b,*) && !xplay_attack(*,b,a,*)
+;!attack(A) && !attack(B) && !xplay_attack(*,a,b,*) && !xplay_attack(*,b,a,*)
+
+
+Pattern CB12
+# tm New pattern. (3.1.13)
+
+O*.         another way to cut!
+X!O
+
+:8,B
+
+O*.
+BaO
+
+;xplay_defend_both(*,a,*,B)
+
 
 
 ########################
Index: patterns/owl_attackpats.db
===================================================================
RCS file: /cvsroot/gnugo/gnugo/patterns/owl_attackpats.db,v
retrieving revision 1.17
diff -u -r1.17 owl_attackpats.db
--- patterns/owl_attackpats.db  2001/10/29 21:19:02     1.17
+++ patterns/owl_attackpats.db  2001/10/30 16:00:51
@@ -2506,8 +2506,10 @@
 ; !safe_omove(a) && lib(b)>1
 
 
-#see owl:229; new pattern 3.1.13 -trevor
 Pattern A1013
+# tm New pattern. (3.1.13)
+# see owl:229
+
 ?O?         enclose!
 X..
 X*?
Index: patterns/owl_defendpats.db
===================================================================
RCS file: /cvsroot/gnugo/gnugo/patterns/owl_defendpats.db,v
retrieving revision 1.18
diff -u -r1.18 owl_defendpats.db
--- patterns/owl_defendpats.db  2001/10/29 21:19:02     1.18
+++ patterns/owl_defendpats.db  2001/10/30 16:00:51
@@ -524,10 +524,11 @@
 
 
 Pattern D204
+# tm Pattern revised. (3.1.13)
 
 ?X?          push
 O*.
-...
+.x.
 ---
 
 :8,-,value(60)
@@ -678,10 +679,11 @@
 
 
 Pattern D217
+# tm Pattern revised. (3.1.13)
 
-O...
+o...
 O.*.     expand eyespace
-....
+.x..
 ----
 
 :8,-,value(60)
@@ -751,11 +753,12 @@
 
 
 Pattern D222
+# tm Pattern revised. (3.1.13)
 
 ????        come straight out
-XX.?
+xX.?
 OO*.
-....
+..x.
 ----
 
 :8,-,value(75)
Index: patterns/owl_vital_apats.db
===================================================================
RCS file: /cvsroot/gnugo/gnugo/patterns/owl_vital_apats.db,v
retrieving revision 1.6
diff -u -r1.6 owl_vital_apats.db
--- patterns/owl_vital_apats.db 2001/10/29 21:19:02     1.6
+++ patterns/owl_vital_apats.db 2001/10/30 16:00:51
@@ -339,8 +339,9 @@
 ;lib(A)==2 && owl_big_eyespace(*,A)
 
 
-#trevor:450 new patten 3.1.13 -trevor
 Pattern VA20
+# tm New pattern. (3.1.13)
+# see trevor:450
 
 ?X?
 X.X
@@ -348,7 +349,7 @@
 X.X
 ?X?
 
-:8,-,value(75)
+:-,-,value(75)
 
 ?X?
 XaX
@@ -358,7 +359,6 @@
 
 ; owl_topological_eye(a,C) == 2 && 
 ; owl_topological_eye(b,C) == 2
-
 
 
 # END OF FILE
Index: regression/regress.pl
===================================================================
RCS file: /cvsroot/gnugo/gnugo/regression/regress.pl,v
retrieving revision 1.7
diff -u -r1.7 regress.pl
--- regression/regress.pl       2001/10/28 14:38:17     1.7
+++ regression/regress.pl       2001/10/30 16:00:52
@@ -104,6 +104,7 @@
 my $testdir;
 my $goprog;
 my $verbose = 0;
+my $old_whole_gtp = "";
 my $html_whole_gtp = "";
 my $testfile;
 my $num;
@@ -119,6 +120,7 @@
 my $testfile_out;
 my $all_batches;
 my $make_images;
+my $cputime;
 
 my $goprog_name = "unknown";
 my $goprog_version = "0";
@@ -253,6 +255,12 @@
   $next_cmd = "";
   $num = 0;
   $filepos = 0;
+  go_command("cputime");
+  $cputime = <$goprog_out>;
+  print "cputime: $cputime\n" if $verbose > 1 or 1;
+  ($cputime) = ($cputime =~ /((\d|\.)+)/);
+  print "cputime: $cputime\n" if $verbose > 1 or 1;
+  <$goprog_out>;  
   my $skipping = 0;
   while (defined($next_cmd))
   {
@@ -299,6 +307,7 @@
              }
            }
           }
+         $old_whole_gtp = $html_whole_gtp;
          $html_whole_gtp = "";
        } else {
          if (!($next_cmd =~ /^\s*$/)) {
@@ -385,6 +394,10 @@
     print $brd qq@<ENGINE version="$goprog_version" name="goprog_name" 
timestamp="goprog_timestamp">\n@;
     print $brd "<CORRECT>$correct</CORRECT>\n";
     print $brd "<ANSWER>$incorrect</ANSWER>\n";
+    if ($html_whole_gtp !~ /^\s*loadsgf/m) {
+      $old_whole_gtp .= $html_whole_gtp;
+      $html_whole_gtp = $old_whole_gtp;
+    }
     print $brd "<GTP_ALL>\n$html_whole_gtp\n</GTP_ALL>";
     foreach my $listval ("DESCRIPTION", "CATEGORY", "SEVERITY") {
       my $astxt;
@@ -393,7 +406,15 @@
       print $brd "<$listval>$astxt</$listval>\n";
     }
     print $brd "<NODES owl=123 reading=123>\n";
-    print $brd "<TIME wall=0.123 CPU=0.123>\n";
+
+    go_command("cputime");
+    my $new_cputime = <$goprog_out>;
+    ($new_cputime) = ($new_cputime =~ /((\d|\.)+)/);
+    print "cputime: ".$new_cputime."\n" if $verbose > 1 or 1;
+    <$goprog_out>;  
+    print $brd "<TIME wall=0.123 CPU=" . sprintf("%.5f", $new_cputime - 
$cputime) .  ">\n";
+    $cputime = $new_cputime;
+
     print $brd "<GTP_COMMAND>$prev_cmd</GTP_COMMAND>\n";
     print $brd $brdout;
     print $brd "</GOPROB>\n";
Index: regression/trevor.tst
===================================================================
RCS file: /cvsroot/gnugo/gnugo/regression/trevor.tst,v
retrieving revision 1.20
diff -u -r1.20 trevor.tst
--- regression/trevor.tst       2001/10/29 17:35:01     1.20
+++ regression/trevor.tst       2001/10/30 16:00:52
@@ -471,6 +471,7 @@
 450 owl_attack E4
 #? [1 D4]*
 
+
 #CATEGORY=OWL_TUNING
 #DESCRIPTION=Missing simple cut pattern
 #SEVERITY=10
@@ -478,3 +479,39 @@
 loadsgf games/trevor/trevor_46.sgf
 460 owl_attack B14
 #? [1 E14]*
+
+#SEE_ALSO trevor:460
+461 gg_genmove black
+#? [E14]*
+
+
+#CATEGORY=OWL_TUNING
+#DESCRIPTION=Yikes, major Ko misunderstanding.
+#SEVERITY=10
+#SEE_ALSO=owl:181
+loadsgf games/trevor/trevor_47.sgf
+470 owl_attack G9
+#? [2 G6]*
+
+#SEE_ALSO=trevor:470
+471 owl_attack A7
+#? [2 A3]*
+
+
+#CATEGORY=pattern_tuning
+#DESCRIPTION=Of course, B8 is inferior to C9
+#SEVERITY=3
+#Shouldn't the move valuator include counting of the eye spaces?
+loadsgf games/trevor/trevor_48.sgf
+480 gg_genmove black
+#? [C9]*
+
+#CATEGORY=owl_tuning
+#DESCRIPTION=Does OWL really need to get this one right?
+#SEVERITY=3
+#SEE_ALSO=owl:191
+#Is it in OWL's charter to get this problem?  
+#attack gets it just fine, of course.
+481 owl_attack C8
+#? [1 B8]*
+
Index: regression/games/trevor/trevor_46.sgf
===================================================================
RCS file: /cvsroot/gnugo/gnugo/regression/games/trevor/trevor_46.sgf,v
retrieving revision 1.1
diff -u -r1.1 trevor_46.sgf
--- regression/games/trevor/trevor_46.sgf       2001/10/29 17:35:01     1.1
+++ regression/games/trevor/trevor_46.sgf       2001/10/30 16:00:52
@@ -5,12 +5,6 @@
 SZ[19]
 AP[Jago:Version 4.18]
 GN[x]
-AW[ad][be][bf][bg][bi][bj][bk][ce][cg][ch][ci][df][fb][fc][fe][fg][ga][gb][g
-d][hc][hd][ib][id][ja][jc][je][kb][kd][ke][km][kn][ko][kp][kq][kr][lb][lc][l
-d][le][nc][no][nq][ob][od][op][or][os][pc][pl][pm][pq][pr][qc][qk][qm][rb][r
-j][rk][rn]
-AB[ah][ak][bc][bd][bl][cj][ck][cm][dd][de][dg][dh][di][dj][dp][ea][eb][ec][f
-a][gp][ie][if][jf][jj][jn][jo][jp][jq][jr][kf][lf][ln][mf][ne][ng][nn][oe][o
-f][og][ol][om][pd][ph][pj][pn][po][pp][ps][qd][qf][qg][qj][qq][qr][qs][rc][r
-e][ri][rp][sd]
+AW[ad][be][bf][bg][bi][bj][bk][ce][cg][ch][ci][df][fb][fc][fe][fg][ga][gb][gd][hc][hd][ib][id][ja][jc][je][kb][kd][ke][km][kn][ko][kp][kq][kr][lb][lc][ld][le][nc][no][nq][ob][od][op][or][os][pc][pl][pm][pq][pr][qc][qk][qm][rb][rj][rk][rn]
+AB[ah][ak][bc][bd][bl][cj][ck][cm][dd][de][dg][dh][di][dj][dp][ea][eb][ec][fa][gp][ie][if][jf][jj][jn][jo][jp][jq][jr][kf][lf][ln][mf][ne][ng][nn][oe][of][og][ol][om][pd][ph][pj][pn][po][pp][ps][qd][qf][qg][qj][qq][qr][qs][rc][re][ri][rp][sd]
 )
Index: regression/games/trevor/trevor_47.sgf
===================================================================
RCS file: trevor_47.sgf
diff -N trevor_47.sgf
--- /dev/null   Sat Apr 14 20:46:23 2001
+++ trevor_47.sgf       Tue Oct 30 11:00:52 2001
@@ -0,0 +1,9 @@
+(
+;
+FF[4]
+GM[1]
+SZ[9]
+AP[Jago:Version 4.18]
+AB[ab][ah][bb][bh][bi][cb][cg][ci][db][dh][di][eb][ec][ed][ee][ef][eg][eh][fa][fb][fc][fd][fe][ge][he][hf][id][if]
+AW[ac][ad][ae][af][bc][bg][cc][ce][cf][dc][dd][de][df][dg][ga][gb][gc][hd][ib][ic]
+)
Index: regression/games/trevor/trevor_48.sgf
===================================================================
RCS file: trevor_48.sgf
diff -N trevor_48.sgf
--- /dev/null   Sat Apr 14 20:46:23 2001
+++ trevor_48.sgf       Tue Oct 30 11:00:52 2001
@@ -0,0 +1,9 @@
+(
+;
+FF[4]
+GM[1]
+SZ[9]
+AP[Jago:Version 4.18]
+AB[aa][ac][ag][ba][bc][bg][cb][cd][ce][cf][cg][ch][ci][db][eb][fb][fc][gb][gc]
+AW[cc][da][dc][dd][de][df][dg][dh][di][ea][ec][fa][fd][ga][gd][ha][hb][hc][hd]
+)