[gnugo-devel] improved show_dragons()

[Gunnar Farneback]

This patch improves the output of show_dragons() and revises a
regression test.

/Gunnar

Index: engine/dragon.c
===================================================================
RCS file: /cvsroot/gnugo/gnugo/engine/dragon.c,v
retrieving revision 1.72
diff -u -r1.72 dragon.c
--- engine/dragon.c     4 Sep 2002 07:23:45 -0000       1.72
+++ engine/dragon.c     4 Sep 2002 20:14:41 -0000
@@ -466,7 +466,7 @@
        }
       }
     }
-  time_report(2, "  compute matcher status", NO_MOVE, 1.0);
+  time_report(2, "  compute status", NO_MOVE, 1.0);
 
   /* The dragon data is now correct at the origin of each dragon but
    * we need to copy it to every vertex.  
@@ -1157,7 +1157,7 @@
     d2 = &(dragon2[dd->id]);
     
     if (dd->origin == pos) {
-      gprintf("%1m : %s dragon size %d (%f), genus %d, half eyes %d, escape 
factor %d, status %s, matcher status %s, moyo size %d safety %s",
+      gprintf("%1m : %s dragon size %d (%f), genus %d, half eyes %d, escape 
factor %d, crude status %s, status %s, moyo size pre owl %d, moyo size post owl 
%d, moyo territory value %f, safety %s, weakness %f",
              pos,
              board[pos] == BLACK ? "B" : "W",
              dd->size,
@@ -1168,7 +1168,10 @@
              snames[dd->crude_status],
              snames[dd->status],
              d2->moyo_size_pre_owl,
-             safety_names[d2->safety]);
+             d2->moyo_size_post_owl,
+             d2->moyo_territorial_value,
+             safety_names[d2->safety],
+             d2->weakness);
       gprintf(", owl status %s\n", snames[dd->owl_status]);
       if (dd->owl_status == CRITICAL) {
        gprintf("... owl attackable at %1m, code %d\n",
Index: regression/auto01.tst
===================================================================
RCS file: /cvsroot/gnugo/gnugo/regression/auto01.tst,v
retrieving revision 1.3
diff -u -r1.3 auto01.tst
--- regression/auto01.tst       31 Aug 2002 16:16:56 -0000      1.3
+++ regression/auto01.tst       4 Sep 2002 20:14:58 -0000
@@ -5,7 +5,7 @@
 
 loadsgf games/auto_gen/auto001.sgf 139
 2 owl_attack r16
-#? [1 (O11|M10)]*
+#? [1 (O11|M10|T10)]*
 
 loadsgf games/auto_gen/auto001.sgf 140
 3 owl_defend r16
Index: regression/blunder.tst
===================================================================
RCS file: /cvsroot/gnugo/gnugo/regression/blunder.tst,v
retrieving revision 1.17
diff -u -r1.17 blunder.tst
--- regression/blunder.tst      6 May 2002 23:38:36 -0000       1.17
+++ regression/blunder.tst      4 Sep 2002 20:14:59 -0000
@@ -55,7 +55,7 @@
 11 gg_genmove black
 #? [D4|E4|E5|F4|C6]
 
-# White D4 kills at least five stones.
+# White D4 kills at least six stones.
 loadsgf games/blunder10.sgf 2
 12 gg_genmove white
 #? [D4]*