[gnugo-devel] trevor_1_13.4

[Trevor Morris]

http://www.public32.com/games/go/trevor_1_13.4
 - Adds CPU time to display; Adds CMD line hint.



Index: regression/regress.plx
===================================================================
RCS file: /cvsroot/gnugo/gnugo/regression/regress.plx,v
retrieving revision 1.1
diff -u -r1.1 regress.plx
--- regression/regress.plx      2001/10/29 02:31:25     1.1
+++ regression/regress.plx      2001/10/31 17:29:08
@@ -213,8 +213,18 @@
   $colorboard .= "\n</TABLE>\n";
 
   print $colorboard;
+  
+  $attribs{gtp_all} =~ address@hidden ((?:\w|[-.\\/])+)  \s* (\d*) @xm or
die  $attribs{gtp_all};
+  my $cmdline = "gq -l $1 " . ($2 ? "-L $2 " : "");
+  if ($attribs{gtp_all} =~ address@hidden(owl_[attackdefend]*) \s+ 
([A-Z]\d{1,2})
@sx) {
+    $cmdline .= "--decide-dragon $2 -o x.sgf"  if $1;
+  } else {
+    $cmdline .= " <BR> (directive unrecognized)";
+  }
   print qq@<HR>\n\n@;
-  print qq@<TABLE border=1><TR><TD>Full
GTP:</TD><TD>$attribs{gtp_all}</TD></TR></TABLE>@;
+  print qq@<TABLE border=1>\n@;
+  print qq@ <TR><TD>CMD Line Hint:</TD><TD>$cmdline</TD></TR>\n@;
+  print qq@ <TR><TD>Full
GTP:</TD><TD>$attribs{gtp_all}</TD></TR>\n</TABLE>\n@;
   print qq@<HR>\nSGF board not generated - does anybody care?@;
   
   print "\n\n</HTML>";
@@ -255,6 +265,7 @@
   <TH>expected </TH>
   <TH>got</TH>
   <TH>gtp</TH>
+  <TH><A href="regress.plx?tstfile=$tstfile&sortby=cputime">cputime</A></TH>
 </TR>\n@;
 
   my @files = glob("html/$tstfile/*.xml");
@@ -279,6 +290,9 @@
       if $content =~ m@<CORRECT>(.*?)</CORRECT>@s;
     my $got = $1
       if $content =~ m@<ANSWER>(.*?)</ANSWER>@s;
+    my $cputime = $1
+      if $content =~ m@<TIME.*?CPU=((\d|\.)*)@s;
+    $cputime =~ s/0*$//;
     $files{$curfile} = {
       gtp_all => $gtp_all,
       gtp => $gtp,
@@ -286,7 +300,8 @@
       num => $num,
       expected => $expected,
       got => $got,
-      result => $result
+      result => $result,
+      cputime => $cputime
     }
   }
  
@@ -296,12 +311,17 @@
     fptonum($files{$a}{"result"}) <=> fptonum($files{$b}{"result"})
     or byfilepos();
   }
+  sub bycputime {
+    $files{$b}{cputime} <=> $files{$a}{cputime}
+    or byfilepos();
+  }
   
   sub filesby {
     $_ = shift;
-    return byfilepos if /filepos/;
-    return bynum if /num/;
-    return byresult if /result/;
+    return byfilepos if /filepos/i;
+    return bynum if /num/i;
+    return byresult if /result/i;
+    return bycputime if /cputime/i;
     $files{$a}{$_} <=> $files{$b}{$_};   
   }
   
@@ -311,7 +331,7 @@
     my $r = $h{result};
     $r =~ address@hidden([A-Z]*)$@<B>$1</B>@;
     print TF
"<TR><TD>$h{filepos}</TD><TD>$numURL</TD><TD>$r</TD><TD>$h{expected}</TD>"
-        . "<TD>$h{got}</TD><TD>$h{gtp}</TD></TR>\n";
+        . "<TD>$h{got}</TD><TD>$h{gtp}</TD><TD>$h{cputime}</TD></TR>\n";
   }
 
   #close TF;