Ticket #49: gunnar_7_8.8.diff

regression/regress.pl

@@ -134 +134 @@
 my @failed_links;
 my @FAILED_links;
 
-my @counters = qw/life_node owl_node reading_node trymove/;
+my @counters = qw/connection_node owl_node reading_node trymove/;
 
 my %counters;
 
@@ -446 +446 @@
         #print "NOT SKIPPING: $next_cmd\n";
         $top_moves = "";
         if ($do_topmove) {
-          if ($next_cmd =~ /gg_genmove\s+([blackwhite])+/) {
-            $next_cmd =~ s/gg_genmove\s+([blackwhite]+)/top_moves_$1/;
+          if ($next_cmd =~ /reg_genmove\s+([blackwhite])+/) {
+            $next_cmd =~ s/reg_genmove\s+([blackwhite]+)/top_moves_$1/;
             $top_moves = 1;
           }
         }
@@ -611 +611 @@
   my $no_dragon_data = 0;
   my %stones;
 
-  if ($prev_cmd =~ /gg_genmove/) {
+  if ($prev_cmd =~ /reg_genmove/) {
     #FIXME: There may be other commands that won't require dragon_data
     #to be regenerated.  Better might be to provide a way to query the
     #engine whether dragon_data is currently available w/out regenerating.
@@ -680 +680 @@
     }
   }
   
-  if ($prev_cmd =~ /^[0-9]*\s*gg_genmove/) {
+  if ($prev_cmd =~ /^[0-9]*\s*reg_genmove/) {
     if (! ($next_cmd =~ /^#\?\s*\[(!)?\(?(.*)\)?\]\*?\s*$/)) {
       print "BAD TEST: $next_cmd\n";
     }
@@ -700 +700 @@
       $stones{$result} .= ";try_wrong;";
     }
   } else {
-    # Experimental - should work for gg_genmove too!
+    # Experimental - should work for reg_genmove too!
     if (! ($next_cmd =~ /^#\?\s*\[(!)?\(?(.*)\)?\]\*?\s*$/)) {
       print "BAD TEST: $next_cmd\n";
     }  #see commend on this regex above.
@@ -757 +757 @@
   }
 
   my %tmarr;
-  if ($prev_cmd =~ /.*gg_genmove\s+([whiteblack]+)/) {
+  if ($prev_cmd =~ /.*reg_genmove\s+([whiteblack]+)/) {
     go_command ("top_moves");
     my $top_moves = <$goprog_out>;
     <$goprog_out>;

regression/regress.plx

@@ -329 +329 @@
   $_;
 }
  
-my @counters = qw/life_node owl_node reading_node trymove/;
+my @counters = qw/connection_node owl_node reading_node trymove/;
 
 if ($move) {
 #CASE 2a - move detail - extract interesting info from trace file.
@@ -512 +512 @@
   my $cmdline = "gq -l $1 " . ($2 ? "-L $2 " : "");
   if ($gtpall =~ m@ .* (owl_attack|owl_defend|dragon_status) \s* ([A-Z]\d{1,2}) \s* $ @x) {
     $cmdline .= "--decide-dragon $2 -o x.sgf" ;
-  } elsif ($gtpall =~ m@ .* (gg_genmove\s+[whiteblack]*)  \s* $@x) {
+  } elsif ($gtpall =~ m@ .* (reg_genmove\s+[whiteblack]*)  \s* $@x) {
     $cmdline .= "-t -w -d0x101800";
   } elsif ($gtpall =~ m@ .* (attack|defend) \s* ([A-Z]\d{1,2}) \s* $ @x) {
     $cmdline .= "--decide-string $2 -o x.sgf";