Ticket #148: changes.diff

gnugo/config.h.in

@@ -12 +12 @@
 /* Center oriented influence. Disabled by default. */
 #undef COSMIC_GNUGO
 
-/* Default level (strength). Up to 10 supported */
+/* Default level (strength). Up to 12 is recommended. */
 #undef DEFAULT_LEVEL
 
 /* Default hash table size in megabytes */
@@ -27 +27 @@
 /* GAIN/LOSS codes. Disabled by default. */
 #undef EXPERIMENTAL_OWL_EXT
 
+/* Disable unneeded things. 0 standard. */
+#undef FINAL_RELEASE
+
 /* The concatenation of the strings "GNU ", and PACKAGE. */
 #undef GNU_PACKAGE
 
@@ -103 +106 @@
 /* Semeai Variations. 500 default */
 #undef SEMEAI_NODE_LIMIT
 
+/* The size of a `int', as computed by sizeof. */
+#undef SIZEOF_INT
+
 /* The size of a `long', as computed by sizeof. */
 #undef SIZEOF_LONG
 

gnugo/configure

@@ -2 +2 @@
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.
 #
-# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2006
 # Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
@@ -673 +673 @@
                                          analysis (default)
   --disable-socket-support           don't compile GTP over TCP/IP support
   --enable-socket-support            compile TCP/IP support (default)
+  --enable-final-release             turn off additional chekcs, stats, etc.
+  --disable-final-release            turn on additional chekcs, stats, etc.
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1444 +1446 @@
 
 fi;
 
+# Check whether --enable-final-release or --disable-final-release was given.
+if test "${enable-final-release+set}" = set; then
+  enableval="$enable_final_release"
+
+fi;
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3377 +3385 @@
 #define SIZEOF_LONG $ac_cv_sizeof_long
 EOF
 
+echo "$as_me:3181: checking size of int" >&5
+echo $ECHO_N "checking size of int... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line 3391 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+
+int
+main ()
+{
+FILE *f = fopen ("conftest.val", "w");
+if (!f)
+  exit (1);
+fprintf (f, "%d", (sizeof (int)));
+fclose (f);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:3408: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:3411: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:3413: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:3416: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_sizeof_int=`cat conftest.val`
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.val
+echo "$as_me:3426: result: $ac_cv_sizeof_int" >&5
+echo "${ECHO_T}$ac_cv_sizeof_int" >&6
+cat >>confdefs.h <<EOF
+#define SIZEOF_INT $ac_cv_sizeof_int
+EOF
+
 for ac_func in vsnprintf gettimeofday usleep times
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -4104 +4156 @@
 
 fi
 
+if test "$enable_final_release" = "yes" ; then
+   cat >>confdefs.h <<\EOF
+#define FINAL_RELEASE 1
+EOF
+
+else
+   cat >>confdefs.h <<\EOF
+#define FINAL_RELEASE 0
+EOF
+
+fi
+
 if test "$enable_cosmic_gnugo" = "yes" ; then
    cat >>confdefs.h <<\EOF
 #define COSMIC_GNUGO 1

gnugo/configure.in

@@ -124 +124 @@
 AC_ARG_ENABLE(socket-support,
  [  --disable-socket-support           don't compile GTP over TCP/IP support
   --enable-socket-support            compile TCP/IP support (default)])
+  
+AC_ARG_ENABLE(final-release,
+ [  --enable-final-release     turn off additional chekcs, stats, etc.
+  --disable-final-release    turn on additional chekcs, stats, etc. (default)])
 
 AC_PROG_CC
 
@@ -178 +182 @@
    term_header="no"
 fi
 
+AC_CHECK_SIZEOF(int,,[#include <stdio.h>])
 AC_CHECK_SIZEOF(long,,[#include <stdio.h>])
 
 dnl vsnprintf not universally available
@@ -338 +343 @@
 dnl ------------ set default level  ----------
 
 AH_TEMPLATE([DEFAULT_LEVEL],
-[Default level (strength). Up to 10 supported])
+[Default level (strength). Up to 12 is recommended.])
 
 if test "$enable_level" ; then
    AC_DEFINE_UNQUOTED(DEFAULT_LEVEL, $enable_level)
@@ -491 +496 @@
    AC_DEFINE(OWL_THREATS, 0)
 fi
 
+dnl ------------ Final release -------------------
+
+AH_TEMPLATE([FINAL_RELEASE],
+[Disable unneeded things. 0 standard.])
+
+if test "$enable_final_release" = "yes" ; then
+   AC_DEFINE(FINAL_RELEASE, 1)
+else
+   AC_DEFINE(FINAL_RELEASE, 0)
+fi
+
 dnl ------------ additional valgrind macros ------
 
 AH_TEMPLATE([USE_VALGRIND],

gnugo/engine/aftermath.c

@@ -288 +288 @@
     for (k = 0; k < 4; k++) {
       int dir = delta[k];
       int right = delta[(k+1)%4];
+      int checked_pos = pos + dir;
+
       if (!ON_BOARD(pos - dir)
-          && board[pos + dir] == color
-          && board[pos + dir + right] == other
-          && board[pos + dir - right] == other
-          && (libs > countlib(pos + dir)
-              || (libs > 4
-                  && libs == countlib(pos + dir)))
-          && (DRAGON2(pos + dir).safety == INVINCIBLE
-              || DRAGON2(pos + dir).safety == STRONGLY_ALIVE)) {
-        int this_score = 20 * (owl_hotspot[pos] + reading_hotspot[pos]);
-        if (this_score > best_score) {
-          best_score = this_score;
-          best_scoring_move = pos;
-        }
+          && board[checked_pos] == color
+          && board[checked_pos + right] == other
+          && board[checked_pos - right] == other) {
+
+            int count_lib = countlib(checked_pos);
+            int safety;
+
+            if ((libs > count_lib
+                || (libs > 4 && libs == count_lib))
+            && ((safety = DRAGON2(checked_pos).safety) == INVINCIBLE
+                || safety == STRONGLY_ALIVE)) {
+
+          int this_score = 20 * (owl_hotspot[pos] + reading_hotspot[pos]);
+          if (this_score > best_score) {
+            best_score = this_score;
+            best_scoring_move = pos;
+          }
+            }
       }
     }
   }
@@ -363 +370 @@
             score--;
           else {
             if (board[pos2] == color) {
+              int count_stones = countstones(pos2);
+              int count_lib = countlib(pos2);
               move_ok = 1;
               score += 7;
-              if (countstones(pos2) > 2)
-                score++;
-              if (countstones(pos2) > 4)
+              if (count_stones > 4)
+                score += 2;
+              else if (count_stones > 2)
                 score++;
-              if (countlib(pos2) < 4)
-                score++;
-              if (countlib(pos2) < 3)
+              if (count_lib < 3)
+                score += 2;
+              else if (count_lib < 4)
                 score++;
             }
-            else {
+            else { /* board[pos2] == other */
               int deltalib = (approxlib(pos, other, MAXLIBS, NULL)
                               - countlib(pos2));
               move_ok = 1;
               score++;
-              if (deltalib >= 0)
-                score++;
               if (deltalib > 0)
+                score += 2;
+              else if (deltalib >= 0)
                 score++;
             }
             mark_string(pos2, mx, mark);
@@ -470 +479 @@
 
         if (!mx[origin] && dragon[pos2].status == DEAD) {
           bonus++;
-          if (k < 4 
-              && countlib(pos2) <= 2 
-              && countstones(pos2) >= 3)
-            bonus++;
+          if (k < 4) {
+            int count_lib = countlib(pos2);
+            if (count_lib <= 2
+                && countstones(pos2) >= 3)
+              bonus++;
           
-          if (k < 4 && countlib(pos2) == 1)
-            bonus += 3;
+            if (count_lib == 1)
+              bonus += 3;
+          }
         }
         mx[origin] = 1;
-      }
+          }
       else if (board[pos2] == color) {
         dragons[pos] = pos2;
         
@@ -491 +502 @@
         
         if (k < 4) {
           int apos = worm[pos2].origin;
+          int count_lib = countlib(apos);
           
           if (!mx[apos]) {
             own_worms++;
             if (countstones(apos) == 1)
               bonus += 2;
-            if (countlib(apos) < 6
-                && approxlib(pos, color, 5, NULL) < countlib(apos))
+            if (count_lib < 6
+                && approxlib(pos, color, 5, NULL) < count_lib)
               bonus -= 5;
             mx[apos] = 1;
           }
           
-          if (countlib(apos) <= 2) {
+          if (count_lib <= 2) {
             int r;
             int important = 0;
             int safe_atari = 0;
@@ -612 +624 @@
       int move_ok = 1;
       if (libs < 5) {
         for (k = 0; k < 4; k++) {
-          if (board[move + delta[k]] == color
-              && countlib(move + delta[k]) > libs)
+          int checked_pos = move + delta[k];
+          if (board[checked_pos] == color
+              && countlib(checked_pos) > libs)
             break;
         }
         if (k < 4) {
@@ -681 +694 @@
           break;
         }
       }
-    }
+        }
     if (target == NO_MOVE)
       continue;
     
@@ -723 +736 @@
         cc = pos + delta[k];
         break;
       }
-    }
+        }
     
     /* Copy the potential move to (move). */
     move = pos;
@@ -733 +746 @@
      * potential move possible.
      */
     if (!self_atari_ok) {
-      while (countlib(pos) == 1) {
+      int count_lib;
+      while ((count_lib = countlib(pos)) == 1) {
         int lib;
         findlib(pos, 1, &lib);
         move = lib;
@@ -741 +755 @@
           break;
       }
       
-      if (countlib(pos) == 1)
+      if (count_lib == 1)
         move = NO_MOVE;
     }
 

gnugo/engine/board.c

@@ -32 +32 @@
 #include "hash.h"
 #include "sgftree.h"
 #include "gg_utils.h"
+#include "gnugo.h"
 
 #include <stdio.h>
 #include <string.h>
@@ -91 +92 @@
  * exceeds 40. But since we have no way to recover from running out of
  * stack space, we allocate with a substantial safety margin.
  */
+#ifdef INT_INTERSECTION
+#define STACK_SIZE 2 * 80 * MAXSTACK
+#else
 #define STACK_SIZE 80 * MAXSTACK
+#endif
+
+#ifdef INT_INTERSECTION
+
+#define CLEAR_STACKS() do { \
+  change_stack_pointer = change_stack; \
+  VALGRIND_MAKE_WRITABLE(change_stack, sizeof(change_stack)); \
+} while (0)
+
+/* Begin a record : address == NULL */
+#define BEGIN_CHANGE_RECORD()\
+((change_stack_pointer++)->address = NULL)
+
+/* PUSH_VERTEX should be the same as PUSH_VALUE when Intersection is
+ * int type */
+
+/* Save a value : store the address and the value in the stack */
+#define PUSH_VALUE(v)\
+(change_stack_pointer->address = &(v),\
+ (change_stack_pointer++)->value = (v))
+
+/* Save a board value : store the address and the value in the stack */
+#define PUSH_VERTEX(v)\
+(change_stack_pointer->address = &(v),\
+ (change_stack_pointer++)->value = (v))
+
+#define POP_MOVE()\
+  while ((--change_stack_pointer)->address)\
+  *(change_stack_pointer->address) =\
+  change_stack_pointer->value
 
+#else
 
 #define CLEAR_STACKS() do { \
   change_stack_pointer = change_stack; \
@@ -119 +154 @@
 #define POP_MOVE()\
   while ((--change_stack_pointer)->address)\
   *(change_stack_pointer->address) =\
-  change_stack_pointer->value
-
-
-#define POP_VERTICES()\
+  change_stack_pointer->value;
   while ((--vertex_stack_pointer)->address)\
   *(vertex_stack_pointer->address) =\
   vertex_stack_pointer->value
+#endif
 
 
 /* ================================================================ */
@@ -138 +171 @@
 static struct string_liberties_data string_libs[MAX_STRINGS];
 static struct string_neighbors_data string_neighbors[MAX_STRINGS];
 
-/* Stacks and stack pointers. */
+/* Stacks and stack pointers. Used for undoing changes on the board */
 static struct change_stack_entry change_stack[STACK_SIZE];
 static struct change_stack_entry *change_stack_pointer;
 
+#ifndef INT_INTERSECTION
 static struct vertex_stack_entry vertex_stack[STACK_SIZE];
 static struct vertex_stack_entry *vertex_stack_pointer;
+#endif
 
 
 /* Index into list of strings. The index is only valid if there is a
@@ -164 +199 @@
 /* Macros to traverse the stones of a string.
  *
  * Usage:
- * int s, pos;
- * s = find_the_string()
- * pos = FIRST_STONE(s);
+ * int first, s, pos;
+ * s = find_the_string();
+ * first = FIRST_STONE(s);
+ * pos = first;
  *   do {
  *    use_stone(pos);
  *    pos = NEXT_STONE(pos);
- *  } while (!BACK_TO_FIRST_STONE(s, pos));
+ *  } while (pos != first);
  */
 #define FIRST_STONE(s) \
   (string[s].origin)
@@ -178 +214 @@
 #define NEXT_STONE(pos) \
   (next_stone[pos])
 
-#define BACK_TO_FIRST_STONE(s, pos) \
-  ((pos) == string[s].origin)
-
 
 /* Assorted useful macros.
  *
@@ -197 +230 @@
 #define MARK_LIBERTY(pos) \
   ml[pos] = liberty_mark
 
-#define UNMARKED_STRING(pos) \
-  (string[string_number[pos]].mark != string_mark)
+#define UNMARKED_STRING(str_nr) \
+  (string[str_nr].mark != string_mark)
 
 /* Note that these two macros are not complementary. Both return
  * false if board[pos] != color.
@@ -211 +244 @@
   (board[pos] == color\
    && string[string_number[pos]].mark == string_mark)
 
-#define MARK_STRING(pos) string[string_number[pos]].mark = string_mark
+#define MARK_STRING(str_nr) string[str_nr].mark = string_mark
 
 #define STRING_AT_VERTEX(pos, s, color)\
-  ((board[pos] == color) && string_number[pos] == (s))
+  ((board[pos] == (color)) && string_number[pos] == (s))
 
 #define NEIGHBOR_OF_STRING(pos, s, color)\
   (STRING_AT_VERTEX(SOUTH(pos), s, color)\
@@ -245 +278 @@
   (STRING_AT_VERTEX(EAST(pos), s, color)\
    || STRING_AT_VERTEX(SOUTH(pos), s, color)\
    || STRING_AT_VERTEX(NORTH(pos), s, color))
-  
-#define LIBERTIES(pos)\
-  string[string_number[pos]].liberties
 
-#define COUNTSTONES(pos) \
-  string[string_number[pos]].size
+#define LIBERTIES(str_nr)\
+  string[str_nr].liberties
+
+#define COUNTSTONES(str_nr) \
+  string[str_nr].size
 
 #define ADD_LIBERTY(s, pos)\
   do {\
@@ -267 +300 @@
     ml[pos] = liberty_mark;\
   } while (0)
 
-#define ADD_NEIGHBOR(s, pos)\
-  string_neighbors[s].list[string[s].neighbors++] = string_number[pos]
+#define ADD_NEIGHBOR(s1, s2)\
+  string_neighbors[s1].list[string[s1].neighbors++] = s2
 
 #define DO_ADD_STONE(pos, color)\
   do {\
@@ -304 +337 @@
 static int do_trymove(int pos, int color, int ignore_ko);
 static void undo_trymove(void);
 
-static int do_approxlib(int pos, int color, int maxlib, int *libs);
-static int slow_approxlib(int pos, int color, int maxlib, int *libs);
-static int do_accuratelib(int pos, int color, int maxlib, int *libs);
+
+struct board_cache_entry {
+  int threshold; /* a number of checked, possible liberties
+                  * (liberties <= threshold) */
+  int liberties; /* number of liberties (if liberties == threshold
+                  * there is maybe more liberties) */
+  Hash_data position_hash;
+};
+
+inline static int do_approxlib(int pos, int color, int maxlib, int *libs,
+                                                           struct board_cache_entry *entry);
+inline static int slow_approxlib(int pos, int color, int maxlib, int *libs,
+                                                                 struct board_cache_entry *entry);
+inline static int do_accuratelib(int pos, int color, int maxlib, int *libs,
+                                                                 struct board_cache_entry *entry);
 
 static int is_superko_violation(int pos, int color, enum ko_rules type);
 
 static void new_position(void);
-static int propagate_string(int stone, int str);
-static void find_liberties_and_neighbors(int s);
-static int do_remove_string(int s);
+static int propagate_string(int stone_pos, int str_pos, int color);
+static void find_liberties_and_neighbors(int str_nr);
+static int do_remove_string(int str_nr);
 static void do_commit_suicide(int pos, int color);
 static void do_play_move(int pos, int color);
 
@@ -326 +371 @@
 /* Coordinates for the eight directions, ordered
  * south, west, north, east, southwest, northwest, northeast, southeast.
  */
-int deltai[8] = { 1,  0, -1,  0,  1, -1, -1, 1};
-int deltaj[8] = { 0, -1,  0,  1, -1, -1,  1, 1};
-int delta[8]  = { NS, -1, -NS, 1, NS-1, -NS-1, -NS+1, NS+1};
+const int deltai[8] = { 1,  0, -1,  0,  1, -1, -1, 1};
+const int deltaj[8] = { 0, -1,  0,  1, -1, -1,  1, 1};
+const int delta[8]  = { NS, -WE, -NS, WE, NS-WE, -NS-WE, -NS+WE, NS+WE};
 
 
 /* ================================================================ */
@@ -448 +493 @@
 
   handicap = 0;
   
-  hashdata_recalc(&board_hash, board, board_ko_pos);
+  hashdata_recalc(&board_hash, board, NO_MOVE);
   new_position();
 }
 
@@ -496 +541 @@
  *   }   
  *
  * The message can be written as a comment to an sgf file using 
- * sgfdump(). str can be NO_MOVE if it is not needed but otherwise  
- * the location of str is included in the comment.
+ * sgfdump().
+ * str_pos is currently not used by function
  */
 
 int 
-trymove(int pos, int color, const char *message, int str)
+trymove(int pos, int color, const char *message, int str_pos)
 {
-  UNUSED(str);
+  UNUSED(str_pos);
+
   /* Do the real work elsewhere. */
   if (!do_trymove(pos, color, 0))
     return 0;
 
+#ifndef GG_TURN_OFF_TRACES
   /* Store the move in an sgf tree if one is available. */
   if (sgf_dumptree) {
     char buf[100];
@@ -540 +587 @@
     sgftreeAddPlayLast(sgf_dumptree, color, I(pos), J(pos));
     sgftreeAddComment(sgf_dumptree, buf);
   }
-  
+#else
+  UNUSED(message);
+#endif
+
   if (count_variations)
     count_variations++;
+
+#ifndef GG_TURN_OFF_STATS
   stats.nodes++;
+#endif
 
   return 1;
 }
@@ -567 +620 @@
   if (!do_trymove(pos, color, 1))
     return 0;
 
+#ifndef GG_TURN_OFF_TRACES
   if (sgf_dumptree) {
     char buf[100];
     if (message == NULL)
       message = "UNKNOWN";
     if (komaster != EMPTY)
-      gg_snprintf(buf, 100, "tryko: %s (variation %d, %s, komaster %s:%s)", 
-                  message, count_variations, hashdata_to_string(&board_hash),
+      gg_snprintf(buf, 100, "tryko: %s at %s (variation %d, hash %s, komaster %s:%s)", 
+                  message, location_to_string(pos), count_variations,
+                  hashdata_to_string(&board_hash),
                   color_to_string(komaster), location_to_string(kom_pos));
     else
-      gg_snprintf(buf, 100, "tryko: %s (variation %d, %s)", message,
+      gg_snprintf(buf, 100, "tryko: %s at %s (variation %d, hash %s)", message,
+                  location_to_string(pos),
                   count_variations, hashdata_to_string(&board_hash));
 
     /* Add two pass moves to the SGF output to simulate the ko threat
@@ -595 +651 @@
     sgftreeAddPlayLast(sgf_dumptree, color, I(pos), J(pos));
     sgftreeAddComment(sgf_dumptree, buf);
   }
+#else
+  UNUSED(message);
+#endif
   
   if (count_variations)
     count_variations++;
+
+#ifndef GG_TURN_OFF_STATS
   stats.nodes++;
+#endif
+
+  return 1;
+}
+
+/*
+ * This function is used by komaster_trymove(). It performs checks made by trymove()
+ * and tryko(), so these functions have not to be called twice. It works like
+ * trymove() and it returns (by ko_move_allowed) the result of tryko(), but it
+ * doesn't call really_do_trymove() - we have to call it ourselves and function
+ * trykomaster_move does it for us.
+ */
+
+inline static int
+check_komaster_move(int pos, int color, int *ko_move_allowed)
+{
+  *ko_move_allowed = 0;
+
+  /* 1. The color must be BLACK or WHITE. */
+  gg_assert(color == BLACK || color == WHITE);
+ 
+  if (pos != PASS_MOVE) {
+    /* 2. Unless pass, the move must be inside the board. */
+    ASSERT_ON_BOARD1(pos);
+    
+    /* Update the reading tree shadow. */
+    shadow[pos] = 1;
+
+    /* 3. The location must be empty. */
+    if (board[pos] != EMPTY)
+      return 0;
+    
+    /* 4. Test if the location is the ko point. */
+        if (pos == board_ko_pos) {
+      /*    The ko position is guaranteed to have all neighbors of the
+       *    same color, or off board. If that color is the same as the
+       *    move the ko is being filled, it is always allowed. This
+       *    could be tested with has_neighbor() but here a faster test
+       *    suffices.
+       */
+          if (board[WEST(pos)] == OTHER_COLOR(color)
+              || board[EAST(pos)] == OTHER_COLOR(color))
+        *ko_move_allowed = 1;
+        }
+
+    /* 5. Test for suicide. */
+        if (is_suicide(pos, color)) {
+      *ko_move_allowed = 0;
+      return 0;
+    }