[gnugo-devel] make --experimental-break-in default

[Arend Bayer]

With Dan and Gunnar's consent, this patch makes it default to use the
break-in stuff. It is not yet clear whether it is a net benefit
(considering its performance costs), so this is not a decision for 3.4.

At this point, this should get it more testing. (It should also be stable
enough not to hinder other testing.)


Arend


Index: config.vc
===================================================================
RCS file: /cvsroot/gnugo/gnugo/config.vc,v
retrieving revision 1.79
diff -u -p -r1.79 config.vc
--- config.vc   7 Jun 2003 10:35:06 -0000       1.79
+++ config.vc   9 Jun 2003 16:27:35 -0000
@@ -53,7 +53,7 @@
 #define SEMEAI_NODE_LIMIT 500

 /* Break-in module. Default not enabled. */
-#define USE_BREAK_IN 0
+#define USE_BREAK_IN 1


 /* Version number of package */
Index: config.vcin
===================================================================
RCS file: /cvsroot/gnugo/gnugo/config.vcin,v
retrieving revision 1.25
diff -u -p -r1.25 config.vcin
--- config.vcin 7 Jun 2003 10:35:06 -0000       1.25
+++ config.vcin 9 Jun 2003 16:27:35 -0000
@@ -53,7 +53,7 @@
 #define SEMEAI_NODE_LIMIT 500

 /* Break-in module. Default not enabled. */
-#define USE_BREAK_IN 0
+#define USE_BREAK_IN 1


 /* Version number of package */
Index: configure
===================================================================
RCS file: /cvsroot/gnugo/gnugo/configure,v
retrieving revision 1.82
diff -u -p -r1.82 configure
--- configure   7 Jun 2003 10:35:06 -0000       1.82
+++ configure   9 Jun 2003 16:27:41 -0000
@@ -692,8 +692,8 @@ Optional Features:
   --disable-oracle                   don't enable oracle (default)
   --enable-experimental-semeai       use the semeai module (default)
   --disable-experimental-semeai      use old semeai module
-  --enable-experimental-break-in     use the breakin module
-  --disable-experimental-break-in    don't use the breakin module (default)
+  --enable-experimental-break-in     use the breakin module (default)
+  --disable-experimental-break-in    don't use the breakin module
   --enable-experimental-owl-ext      use the experimental GAIN/LOSS codes
   --disable-experimental-owl-ext     use standard owl module (default)
   --enable-experimental-reading      use experimental pattern-based reading
@@ -4847,14 +4847,14 @@ EOF

 fi

-if test "$enable_experimental_break_in" = "yes" ; then
+if test "$enable_experimental_break_in" = "no" ; then
    cat >>confdefs.h <<\EOF
-#define USE_BREAK_IN 1
+#define USE_BREAK_IN 0
 EOF

 else
    cat >>confdefs.h <<\EOF
-#define USE_BREAK_IN 0
+#define USE_BREAK_IN 1
 EOF

 fi
Index: configure.in
===================================================================
RCS file: /cvsroot/gnugo/gnugo/configure.in,v
retrieving revision 1.84
diff -u -p -r1.84 configure.in
--- configure.in        7 Jun 2003 10:35:06 -0000       1.84
+++ configure.in        9 Jun 2003 16:27:41 -0000
@@ -88,8 +88,8 @@ AC_ARG_ENABLE(experimental-semeai,
   --disable-experimental-semeai      use old semeai module])

 AC_ARG_ENABLE(experimental-break-in,
- [  --enable-experimental-break-in     use the breakin module
-  --disable-experimental-break-in    don't use the breakin module (default)])
+ [  --enable-experimental-break-in     use the breakin module (default)
+  --disable-experimental-break-in    don't use the breakin module])

 AC_ARG_ENABLE(experimental-owl-ext,
  [  --enable-experimental-owl-ext      use the experimental GAIN/LOSS codes
@@ -430,10 +430,10 @@ dnl ------------ Experimental Breakin en
 AH_TEMPLATE([USE_BREAK_IN],
 [Break-in module. Default not enabled.])

-if test "$enable_experimental_break_in" = "yes" ; then
-   AC_DEFINE(USE_BREAK_IN, 1)
-else
+if test "$enable_experimental_break_in" = "no" ; then
    AC_DEFINE(USE_BREAK_IN, 0)
+else
+   AC_DEFINE(USE_BREAK_IN, 1)
 fi

 dnl ------------ Semeai -------------------
Index: makevcdist.pl
===================================================================
RCS file: /cvsroot/gnugo/gnugo/makevcdist.pl,v
retrieving revision 1.16
diff -u -p -r1.16 makevcdist.pl
--- makevcdist.pl       7 Jun 2003 10:35:06 -0000       1.16
+++ makevcdist.pl       9 Jun 2003 16:27:41 -0000
@@ -20,7 +20,7 @@ my %defaults =
    EXPERIMENTAL_READING => 0,
    GRID_OPT => 1,
    OWL_THREATS => 0,
-   USE_BREAK_IN => 0,
+   USE_BREAK_IN => 1,
    ORACLE => 0);

 my @skip = qw/
Index: engine/globals.c
===================================================================
RCS file: /cvsroot/gnugo/gnugo/engine/globals.c,v
retrieving revision 1.49
diff -u -p -r1.49 globals.c
--- engine/globals.c    9 Jun 2003 16:19:16 -0000       1.49
+++ engine/globals.c    9 Jun 2003 16:27:44 -0000
@@ -140,7 +140,8 @@ int experimental_semeai = EXPERIMENTAL_S
 int experimental_connections = EXPERIMENTAL_CONNECTIONS;
 /* use alternate connection reading algorithm */
 int alternate_connections = ALTERNATE_CONNECTIONS;
-int owl_threats = OWL_THREATS;          /* compute owl threats */
+/* compute owl threats */
+int owl_threats = OWL_THREATS;
 /* use experimental owl extension (GAIN/LOSS) */
 int experimental_owl_ext = EXPERIMENTAL_OWL_EXT;
 /* use experimental territory break-in module */
Index: interface/main.c
===================================================================
RCS file: /cvsroot/gnugo/gnugo/interface/main.c,v
retrieving revision 1.72
diff -u -p -r1.72 main.c
--- interface/main.c    2 Jun 2003 23:49:48 -0000       1.72
+++ interface/main.c    9 Jun 2003 16:27:55 -0000
@@ -92,7 +92,8 @@ enum {OPT_BOARDSIZE=127,
       OPT_EXPERIMENTAL_CONNECTIONS,
       OPT_EXPERIMENTAL_INFLUENCE,
       OPT_ALTERNATE_CONNECTIONS,
-      OPT_EXPERIMENTAL_BREAK_IN,
+      OPT_WITH_BREAK_IN,
+      OPT_WITHOUT_BREAK_IN,
       OPT_OPTIONS,
       OPT_STANDARD_SEMEAI,
       OPT_STANDARD_CONNECTIONS,
@@ -227,7 +228,8 @@ static struct gg_option const long_optio
   {"standard-connections",  no_argument, 0, OPT_STANDARD_CONNECTIONS},
   {"standard-semeai", no_argument,      0, OPT_STANDARD_SEMEAI},
   {"alternate-connections",  no_argument, 0, OPT_ALTERNATE_CONNECTIONS},
-  {"experimental-break-in",  no_argument, 0, OPT_EXPERIMENTAL_BREAK_IN},
+  {"with-break-in",    no_argument, 0, OPT_WITH_BREAK_IN},
+  {"without-break-in",  no_argument, 0, OPT_WITHOUT_BREAK_IN},
   {"options",        no_argument, 0, OPT_OPTIONS},
   {"allow-suicide",  no_argument,       0, OPT_ALLOW_SUICIDE},
   {"capture-all-dead",   no_argument,   0, OPT_CAPTURE_ALL_DEAD},
@@ -448,6 +450,9 @@ main(int argc, char *argv[])
        if (EXPERIMENTAL_READING)
          fprintf(stderr,
                  "configure option enabled: experimental reading\n");
+       if (USE_BREAK_IN)
+         fprintf(stderr,
+                 "configure option enabled: experimental break-in\n");
        if (HASHING_SCHEME != 2)
          fprintf(stderr, "hash scheme %d\n", HASHING_SCHEME);
        if (OWL_THREATS)
@@ -551,8 +556,12 @@ main(int argc, char *argv[])
        alternate_connections = !alternate_connections;
        break;

-      case OPT_EXPERIMENTAL_BREAK_IN:
+      case OPT_WITH_BREAK_IN:
        experimental_break_in = 1;
+       break;
+
+      case OPT_WITHOUT_BREAK_IN:
+       experimental_break_in = 0;
        break;

       case OPT_ALLOW_SUICIDE: