Ticket #150: gunnar_7_12.14.diff

patterns/patterns.h

@@ -293 +293 @@
 };
 
 
+/* Monte Carlo local patterns. */
+struct mc_pattern_database {
+  const char *name;
+  const unsigned int *values;
+};
 
 
 /* helper functions */
@@ -352 +357 @@
 extern struct fullboard_pattern fuseki13[];
 extern struct fullboard_pattern fuseki9[];
 
+extern struct mc_pattern_database mc_pattern_databases[];
+
 struct corner_db;
 struct corner_variation;
 struct corner_pattern;

patterns/Makefile.am

@@ -1 @@
-noinst_PROGRAMS = mkpat joseki mkeyes uncompress_fuseki
+noinst_PROGRAMS = mkpat joseki mkeyes uncompress_fuseki mkmcpat
 EXTRA_PROGRAMS = extract_fuseki compress_fuseki
 
 DSP = dfa.dsp patterns.dsp joseki.dsp mkeyes.dsp mkpat.dsp fuseki.dsp
@@ -51 +51 @@
 joseki_AM_CPPFLAGS = $(GNU_GO_WARNINGS) -I$(top_srcdir)/sgf
 mkeyes_SOURCES = mkeyes.c
 mkeyes_LDADD = ../utils/libutils.a
+mkmcpat_SOURCES  = mkmcpat.c
+mkmcpat_LDADD = ../engine/libengine.a ../sgf/libsgf.a ../utils/libutils.a
+mkmcpat_AM_CPPFLAGS = $(GNU_GO_WARNINGS)
 extract_fuseki_SOURCES  = extract_fuseki.c
 # Yes, we currently need duplicate libengine.a and libpatterns.a.
 extract_fuseki_LDADD = ../engine/libengine.a libpatterns.a\
@@ -69 +72 @@
                  owl_attackpat.c\
                  owl_vital_apat.c owl_defendpat.c fusekipat.c\
                  fuseki9.c fuseki13.c fuseki19.c josekidb.c\
-                 handipat.c oraclepat.c
+                 handipat.c oraclepat.c mcpat.c
 
 DBBUILT = gogo.db hoshi_keima.db hoshi_other.db komoku.db sansan.db \
           mokuhazushi.db takamoku.db
@@ -77 +80 @@
 DBBUILT_INPUT = -i gogo.db -i hoshi_keima.db -i hoshi_other.db -i komoku.db \
                -i sansan.db -i mokuhazushi.db -i takamoku.db
 
+MC_DB = $(srcdir)/mc_montegnu_classic.db $(srcdir)/mc_mogo_classic.db \
+        $(srcdir)/mc_uniform.db
+
 DB_TO_TAG = aa_attackpats.db attack.db barriers.db conn.db defense.db\
             endgame.db eyes.db fuseki.db fuseki9.dbz fuseki13.dbz fuseki19.dbz\
             handicap.db influence.db oracle.db owl_attackpats.db\
@@ -183 +189 @@
 handipat.c : $(srcdir)/handicap.db mkpat$(EXEEXT)
         ./mkpat -b handipat -i $(srcdir)/handicap.db -o handipat.c
 
+mcpat.c : $(MC_DB) mkmcpat$(EXEEXT)
+        ./mkmcpat $(MC_DB) > mcpat.c
 
+
 ETAGS_ARGS = --language none --regex '/^Pattern[ \t]+[a-zA-Z0-9]+/' $(DB_TO_TAG)\
              --language auto --no-regex
 TAGS_DEPENDENCIES = $(DB_TO_TAG)

patterns/Makefile.in

@@ -1 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16 +16 @@
 
 
 
-SOURCES = $(libpatterns_a_SOURCES) $(compress_fuseki_SOURCES) $(extract_fuseki_SOURCES) $(joseki_SOURCES) $(mkeyes_SOURCES) $(mkpat_SOURCES) $(uncompress_fuseki_SOURCES)
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -39 +37 @@
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 noinst_PROGRAMS = mkpat$(EXEEXT) joseki$(EXEEXT) mkeyes$(EXEEXT) \
-        uncompress_fuseki$(EXEEXT)
+        uncompress_fuseki$(EXEEXT) mkmcpat$(EXEEXT)
 EXTRA_PROGRAMS = extract_fuseki$(EXEEXT) compress_fuseki$(EXEEXT)
 subdir = patterns
 DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.am \
@@ -62 +60 @@
         owl_attackpat.$(OBJEXT) owl_vital_apat.$(OBJEXT) \
         owl_defendpat.$(OBJEXT) fusekipat.$(OBJEXT) fuseki9.$(OBJEXT) \
         fuseki13.$(OBJEXT) fuseki19.$(OBJEXT) josekidb.$(OBJEXT) \
-        handipat.$(OBJEXT) oraclepat.$(OBJEXT)
+        handipat.$(OBJEXT) oraclepat.$(OBJEXT) mcpat.$(OBJEXT)
 am_libpatterns_a_OBJECTS = connections.$(OBJEXT) helpers.$(OBJEXT) \
         transform.$(OBJEXT) $(am__objects_1)
 libpatterns_a_OBJECTS = $(am_libpatterns_a_OBJECTS)
@@ -82 +80 @@
 am_mkeyes_OBJECTS = mkeyes.$(OBJEXT)
 mkeyes_OBJECTS = $(am_mkeyes_OBJECTS)
 mkeyes_DEPENDENCIES = ../utils/libutils.a
+am_mkmcpat_OBJECTS = mkmcpat.$(OBJEXT)
+mkmcpat_OBJECTS = $(am_mkmcpat_OBJECTS)
+mkmcpat_DEPENDENCIES = ../engine/libengine.a ../sgf/libsgf.a \
+        ../utils/libutils.a
 am_mkpat_OBJECTS = mkpat.$(OBJEXT) transform.$(OBJEXT) dfa.$(OBJEXT)
 mkpat_OBJECTS = $(am_mkpat_OBJECTS)
 mkpat_DEPENDENCIES = ../utils/libutils.a
@@ -98 +100 @@
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(libpatterns_a_SOURCES) $(compress_fuseki_SOURCES) \
         $(extract_fuseki_SOURCES) $(joseki_SOURCES) $(mkeyes_SOURCES) \
-        $(mkpat_SOURCES) $(uncompress_fuseki_SOURCES)
+        $(mkmcpat_SOURCES) $(mkpat_SOURCES) \
+        $(uncompress_fuseki_SOURCES)
 DIST_SOURCES = $(libpatterns_a_SOURCES) $(compress_fuseki_SOURCES) \
         $(extract_fuseki_SOURCES) $(joseki_SOURCES) $(mkeyes_SOURCES) \
-        $(mkpat_SOURCES) $(uncompress_fuseki_SOURCES)
+        $(mkmcpat_SOURCES) $(mkpat_SOURCES) \
+        $(uncompress_fuseki_SOURCES)
 HEADERS = $(noinst_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -134 +138 @@
 GCC_ONLY_FALSE = @GCC_ONLY_FALSE@
 GCC_ONLY_TRUE = @GCC_ONLY_TRUE@
 GNU_GO_WARNINGS = @GNU_GO_WARNINGS@
+GREP = @GREP@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -160 +165 @@
 STRIP = @STRIP@
 VERSION = @VERSION@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
@@ -172 +175 @@
 bindir = @bindir@
 build_alias = @build_alias@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 glibconfig = @glibconfig@
 host_alias = @host_alias@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
@@ -234 +244 @@
 joseki_AM_CPPFLAGS = $(GNU_GO_WARNINGS) -I$(top_srcdir)/sgf
 mkeyes_SOURCES = mkeyes.c
 mkeyes_LDADD = ../utils/libutils.a
+mkmcpat_SOURCES = mkmcpat.c
+mkmcpat_LDADD = ../engine/libengine.a ../sgf/libsgf.a ../utils/libutils.a
+mkmcpat_AM_CPPFLAGS = $(GNU_GO_WARNINGS)
 extract_fuseki_SOURCES = extract_fuseki.c
 # Yes, we currently need duplicate libengine.a and libpatterns.a.
 extract_fuseki_LDADD = ../engine/libengine.a libpatterns.a\
@@ -250 +263 @@
                  owl_attackpat.c\
                  owl_vital_apat.c owl_defendpat.c fusekipat.c\
                  fuseki9.c fuseki13.c fuseki19.c josekidb.c\
-                 handipat.c oraclepat.c
+                 handipat.c oraclepat.c mcpat.c
 
 DBBUILT = gogo.db hoshi_keima.db hoshi_other.db komoku.db sansan.db \
           mokuhazushi.db takamoku.db
@@ -258 +271 @@
 DBBUILT_INPUT = -i gogo.db -i hoshi_keima.db -i hoshi_other.db -i komoku.db \
                -i sansan.db -i mokuhazushi.db -i takamoku.db
 
+MC_DB = $(srcdir)/mc_montegnu_classic.db $(srcdir)/mc_mogo_classic.db \
+        $(srcdir)/mc_uniform.db
+
 DB_TO_TAG = aa_attackpats.db attack.db barriers.db conn.db defense.db\
             endgame.db eyes.db fuseki.db fuseki9.dbz fuseki13.dbz fuseki19.dbz\
             handicap.db influence.db oracle.db owl_attackpats.db\
@@ -336 +352 @@
 mkeyes$(EXEEXT): $(mkeyes_OBJECTS) $(mkeyes_DEPENDENCIES) 
         @rm -f mkeyes$(EXEEXT)
         $(LINK) $(mkeyes_LDFLAGS) $(mkeyes_OBJECTS) $(mkeyes_LDADD) $(LIBS)
+mkmcpat$(EXEEXT): $(mkmcpat_OBJECTS) $(mkmcpat_DEPENDENCIES) 
+        @rm -f mkmcpat$(EXEEXT)
+        $(LINK) $(mkmcpat_LDFLAGS) $(mkmcpat_OBJECTS) $(mkmcpat_LDADD) $(LIBS)
 mkpat$(EXEEXT): $(mkpat_OBJECTS) $(mkpat_DEPENDENCIES) 
         @rm -f mkpat$(EXEEXT)
         $(LINK) $(mkpat_LDFLAGS) $(mkpat_OBJECTS) $(mkpat_LDADD) $(LIBS)
@@ -369 +388 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/influence.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/joseki.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/josekidb.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mcpat.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkeyes.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkmcpat.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkpat.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oraclepat.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/owl_attackpat.Po@am__quote@
@@ -648 +669 @@
 
 handipat.c : $(srcdir)/handicap.db mkpat$(EXEEXT)
         ./mkpat -b handipat -i $(srcdir)/handicap.db -o handipat.c
+
+mcpat.c : $(MC_DB) mkmcpat$(EXEEXT)
+        ./mkmcpat $(MC_DB) > mcpat.c
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

interface/main.c

@@ -159 +159 @@
       OPT_RESIGN_ALLOWED,
       OPT_NEVER_RESIGN,
       OPT_MONTE_CARLO,
-      OPT_MC_GAMES_PER_LEVEL
+      OPT_MC_GAMES_PER_LEVEL,
+      OPT_MC_PATTERNS,
+      OPT_MC_LIST_PATTERNS,
+      OPT_MC_LOAD_PATTERNS
 };
 
 /* names of playing modes */
@@ -309 +312 @@
   {"never-resign",   no_argument,       0, OPT_NEVER_RESIGN},
   {"monte-carlo",    no_argument,       0, OPT_MONTE_CARLO},
   {"mc-games-per-level", required_argument, 0, OPT_MC_GAMES_PER_LEVEL},
+  {"mc-patterns",    required_argument, 0, OPT_MC_PATTERNS},
+  {"mc-list-patterns", no_argument,     0, OPT_MC_LIST_PATTERNS},
+  {"mc-load-patterns", required_argument, 0, OPT_MC_LOAD_PATTERNS},
   {NULL, 0, NULL, 0}
 };
 
@@ -344 +350 @@
   FILE *output_check;
   int orientation = 0;
 
+  char mc_pattern_name[40] = "";
+  char mc_pattern_filename[320] = "";
+
   float memory = (float) DEFAULT_MEMORY; /* Megabytes used for hash table. */
 
   /* If seed is zero, GNU Go will play a different game each time. If
@@ -645 +654 @@
         mc_games_per_level = atoi(gg_optarg);
         break;
 
+      case OPT_MC_PATTERNS:
+        if (strlen(gg_optarg) >= sizeof(mc_pattern_name)) {
+          fprintf(stderr, "Too long name given as value to --mc-patterns option.\n");
+          exit(EXIT_FAILURE);
+        }
+        strcpy(mc_pattern_name, gg_optarg);
+        break;
+
+      case OPT_MC_LIST_PATTERNS:
+        list_mc_patterns();
+        return EXIT_SUCCESS;
+        break;
+
+      case OPT_MC_LOAD_PATTERNS:
+        if (strlen(gg_optarg) >= sizeof(mc_pattern_filename)) {
+          fprintf(stderr, "Too long name given as value to --mc-load-patterns option.\n");
+          exit(EXIT_FAILURE);
+        }
+        strcpy(mc_pattern_filename, gg_optarg);
+        break;
+
       case OPT_MODE: 
         if (strcmp(gg_optarg, "ascii") == 0)
           playmode = MODE_ASCII;
@@ -987 +1017 @@
   /* Initialize the GNU Go engine. */
   init_gnugo(memory, seed);
 
+  /* Load Monte Carlo patterns if one has been specified. Either
+   * choose one of the compiled in ones or load directly from a
+   * database file.
+   */
+  if (strlen(mc_pattern_filename) > 0) {
+    if (!mc_load_patterns_from_db(mc_pattern_filename, NULL))
+      return EXIT_FAILURE;
+  }
+  else if (strlen(mc_pattern_name) > 0) {
+    if (!choose_mc_patterns(mc_pattern_name)) {
+      fprintf(stderr, "Unknown Monte Carlo pattern database name %s.\n",
+              mc_pattern_name);
+      fprintf(stderr, "Use \"--mc-list-patterns\" to list the available databases.\n");
+      return EXIT_FAILURE;
+    }
+  }
+
   /* Read the infile if there is one. Also play up the position. */
   if (infilename) {
     if (!sgftree_readfile(&sgftree, infilename)) {
@@ -1536 +1583 @@
    --mirror-limit <n>      stop mirroring when n stones on board\n\n\
    --monte-carlo           enable Monte Carlo move generation (9x9 or smaller)\n\
    --mc-games-per-level <n> number of Monte Carlo simulations per level\n\
+   --mc-list-patterns      list names of builtin Monte Carlo patterns\n\
+   --mc-patterns <name>    choose a built in Monte Carlo pattern database\n\
+   --mc-load-patterns <filename> read Monte Carlo patterns from file\n\
    --alternate-connections\n\
    --experimental-connections\n\
    --experimental-owl-ext\n\

engine/interface.c

@@ -52 +52 @@
 
   transformation_init();
   dfa_match_init();
+  choose_mc_patterns(NULL);
 
   clear_approxlib_cache();
   clear_accuratelib_cache();

engine/utils.c

@@ -33 +33 @@
 #include "sgftree.h"
 #include "random.h"
 #include "gg_utils.h"
+#include "patterns.h"
 
-
 /*
  * Change the status of all the stones in the dragon at (dr).
  */
@@ -1959 +1959 @@
 }
 
 
+/* Set up a compiled in pattern database for use by the Monte Carlo
+ * code. If name is NULL, the first pattern database is used.
+ *
+ * The reason why this function and the next are placed here rather
+ * than in montecarlo.c is to keep that file free from dependency on
+ * patterns.h.
+ */
+int
+choose_mc_patterns(char *name)
+{
+  int k;
+  for (k = 0; mc_pattern_databases[k].name; k++) {
+    if (!name || strcmp(name, mc_pattern_databases[k].name) == 0) {
+      mc_init_patterns(mc_pattern_databases[k].values);
+      return 1;
+    }
+  }
+
+  return 0;
+}
+
+/* List compiled in Monte Carlo pattern databases. */
+void
+list_mc_patterns(void)
+{
+  int k;
+  printf("Available builtin Monte Carlo local patterns:\n\n");
+  for (k = 0; mc_pattern_databases[k].name; k++) {
+    if (k == 0)
+      printf("* %s (default)\n", mc_pattern_databases[k].name);
+    else
+      printf("* %s\n", mc_pattern_databases[k].name);
+  }
+  printf("\nUse \"--mc-patterns name\" to choose one of these.\n");
+  printf("Use \"--mc-load-patterns filename\" to directly load a pattern database.\n");
+}
+
 /*
  * Local Variables:
  * tab-width: 8

engine/liberty.h

@@ -497 +497 @@
                       int allowed_moves[BOARDMAX]);
 enum dragon_status aftermath_final_status(int color, int pos);
 
+int mc_get_size_of_pattern_values_table(void);
+int mc_load_patterns_from_db(const char *filename, unsigned int *values);
+void mc_init_patterns(const unsigned int *values);
+int choose_mc_patterns(char *name);
+void list_mc_patterns(void);
+
 void uct_genmove(int color, int *move, int *forbidden_moves,
                  int *allowed_moves, int nodes, float *move_values,
                  int *move_frequencies);

engine/montecarlo.c

@@ -37 +37 @@
 /* FIXME: Replace with a DEBUG_MC symbol for use with -d. */
 static int mc_debug = 0;
 
-#define CACHE_CAPTURE_MOVES 1
+#define TURN_OFF_ASSERTIONS 1
 
+
 /* Special board code for Monte Carlo simulations.
  *
  * A liberty edge is the combination of the position of the liberty
@@ -58 +59 @@
  * origin in the global board. The reference stone is the only one
  * which is guaranteed to have a valid pointer to the "first" liberty
  * edge (just an arbitrary element in the circular list).
+ *
+ * The local_context field contains information about the surrounding
+ * 8 points. The bit layout is
+ *
+ * 23   : Black suicide.
+ * 22   : White suicide.
+ * 21   : Black self-atari.
+ * 20   : White self-atari.
+ * 19,18: Number of stones captured by black move.
+ * 17,16: Number of stones captured by white move.
+ * 15,14: Color to the southeast.
+ * 13,12: Color to the northeast.
+ * 11,10: Color to the northwest.
+ *  9, 8: Color to the southwest.
+ *  7, 6: Color to the east.
+ *  5, 4: Color to the north.
+ *  3, 2: Color to the west.
+ *  1, 0: Color to the south.
+ *
+ * The number of stones in atari is 0 if empty or not atari, 1 if one
+ * stone in atari, 2 if two stones in atari, and 3 if three or more stones
+ * in atari.
+ *
+ * The queue array is used to form a linked single list data structure
+ * with O(1) add, O(1) lookup, and O(n) delete operations. The
+ * assumption is that v1 = queue[0] points to the first board vertex
+ * in the list, v2 = queue[v1] points to the second vertex and so on.
+ * The list ends when the next vertex is the off-board point 1. Board
+ * vertices not included in the list have queue[v1] = 0. Thus an empty
+ * list is characterized by queue[0] = 1 and queue[v] = 0 for all
+ * vertices on the board. Generally queue[v] can be used to test for
+ * membership in the list. The list is used to keep track of points
+ * needing updated local context or value information.
+ *
+ * The move_values_*, partitioned_move_value_sums_*,
+ * move_partition_lists_*, and move_value_sum_* fields are together
+ * used to track move values and quickly sample according the
+ * distribution determined by the move values.
+ *
+ * The move_values_* arrays naturally hold the values of each move.
+ *
+ * The move_partition_lists_* arrays form a two-level access to the
+ * legal moves of respective color. Depending on the MAX_BOARD size,
+ * the vertices are split into 2, 4, 8, or 16 partitions (see below)
+ * where the partition number of each vertex is given by the 1, 2, 3,
+ * or 4 least significant bits of the vertex index respectively. The
+ * legal moves in each partition are linked together just like the
+ * queue array described above. The only difference is that multiple
+ * partition linked lists are represented in the same array by
+ * starting from out of board indices 0..1, 0..3, 0..7, and 0..15
+ * respectively.
+ *
+ * The partitioned_move_value_sums_* arrays are simply the sums of
+ * move values in each partition and the move_value_sum_white_* fields
+ * are the sum of the values of all legal moves.
  */
 
+#if MAX_BOARD < 4
+#define NUM_MOVE_PARTITIONS 2
+#elif MAX_BOARD < 8
+#define NUM_MOVE_PARTITIONS 4
+#elif MAX_BOARD < 16
+#define NUM_MOVE_PARTITIONS 8
+#else
+#define NUM_MOVE_PARTITIONS 16
+#endif
 
 struct mc_board {
   Intersection board[BOARDSIZE];
+  int local_context[BOARDSIZE];
+  int queue[BOARDMAX];
+  unsigned int move_values_white[BOARDMAX];
+  unsigned int move_values_black[BOARDMAX];
+  unsigned int partitioned_move_value_sums_white[NUM_MOVE_PARTITIONS];
+  unsigned int partitioned_move_value_sums_black[NUM_MOVE_PARTITIONS];
+  int move_partition_lists_white[BOARDMAX];
+  int move_partition_lists_black[BOARDMAX];
+  unsigned int move_value_sum_white;
+  unsigned int move_value_sum_black;
   int board_ko_pos;
   int reference_stone[BOARDMAX];
   int next_stone[BOARDMAX];
@@ -72 +147 @@
   Hash_data hash;
 };
 
+#define MC_ADD_TO_UPDATE_QUEUE(mc, pos) \
+  do {                                  \
+    if (!mc->queue[pos]) {              \
+      mc->queue[pos] = mc->queue[0];    \
+      mc->queue[0] = pos;               \
+    }                                   \
+  } while (0)
+
 #define MC_ON_BOARD(pos) (mc->board[pos] != GRAY)
 
-/* FIXME: In principle same a MAXCHAIN but we don't need to care about
- * such high numbers.
- */
-#define MAX_NEIGHBORS 20
-
 /* Add a liberty edge for a string at pos with liberty at lib and
  * direction dir.
  */
@@ -89 +167 @@
   int reference = mc->reference_stone[pos];
   int first_liberty_edge = mc->first_liberty_edge[reference];
 
+#if !TURN_OFF_ASSERTIONS
   gg_assert(lib + delta[dir] == pos);
+#endif
   
   if (first_liberty_edge) {
     int second_liberty_edge = mc->next_liberty_edge[first_liberty_edge];
@@ -117 +197 @@
   int next = mc->next_liberty_edge[this_liberty_edge];
   int previous = mc->previous_liberty_edge[this_liberty_edge];
   
+#if !TURN_OFF_ASSERTIONS
   gg_assert(lib + delta[dir] == pos);
+#endif
   
   if (next == this_liberty_edge) {
     mc->first_liberty_edge[reference] = 0;
@@ -174 +256 @@
 }
 
 
+/* Does the string at str have at most two liberties? In that case,
+ * add them to the update queue.
+ */
+static void
+mc_queue_max_two_liberties(struct mc_board *mc, int str)
+{
+  int reference = mc->reference_stone[str];
+  int first_liberty_edge = mc->first_liberty_edge[reference];
+  int first_liberty = first_liberty_edge >> 2;
+  int liberty_edge = mc->next_liberty_edge[first_liberty_edge];
+  int second_liberty;
+#if !TURN_OFF_ASSERTIONS
+  ASSERT1(IS_STONE(mc->board[str]), str);
+#endif
+  if (first_liberty == NO_MOVE)
+    return;
+  while (liberty_edge != first_liberty_edge) {
+    if ((liberty_edge >> 2) != first_liberty) {
+      second_liberty = liberty_edge >> 2;
+      while (liberty_edge != first_liberty_edge) {
+        if ((liberty_edge >> 2) != first_liberty
+            && (liberty_edge >> 2) != second_liberty)
+          return;
+        liberty_edge = mc->next_liberty_edge[liberty_edge];
+      }
+      MC_ADD_TO_UPDATE_QUEUE(mc, first_liberty);
+      MC_ADD_TO_UPDATE_QUEUE(mc, second_liberty);
+      return;
+    }
+    liberty_edge = mc->next_liberty_edge[liberty_edge];
+  }
+
+  MC_ADD_TO_UPDATE_QUEUE(mc, first_liberty);
+}
+
+
 /* Remove the string at str from the board. */
 static int
 mc_remove_string(struct mc_board *mc, int str)
@@ -185 +303 @@
   int k;
   
   do {
-    for (k = 0; k < 4; k++)
-      if (mc->board[pos + delta[k]] == other)
+    for (k = 0; k < 8; k++) {
+      if (k < 4 && mc->board[pos + delta[k]] == other) {
+        mc_queue_max_two_liberties(mc, pos + delta[k]);
         mc_add_liberty_edge(mc, pos + delta[k], pos, k);
+      }
+      if (mc->board[pos + delta[k]] == EMPTY)
+        MC_ADD_TO_UPDATE_QUEUE(mc, pos + delta[k]);
+    }
     mc->board[pos] = EMPTY;
+    mc->local_context[NW(pos)] ^= color << 14;
+    mc->local_context[SW(pos)] ^= color << 12;
+    mc->local_context[SE(pos)] ^= color << 10;
+    mc->local_context[NE(pos)] ^= color << 8;
+    mc->local_context[WEST(pos)] ^= color << 6;
+    mc->local_context[SOUTH(pos)] ^= color << 4;
+    mc->local_context[EAST(pos)] ^= color << 2;
+    mc->local_context[NORTH(pos)] ^= color;
     hashdata_invert_stone(&(mc->hash), pos, color);
+    MC_ADD_TO_UPDATE_QUEUE(mc, pos);
     num_removed_stones++;
     pos = mc->next_stone[pos];
   } while (pos != str);
@@ -211 +343 @@
   memcpy(mc->board, board, sizeof(mc->board));
   mc->board_ko_pos = board_ko_pos;
   mc->hash = board_hash;
+  memset(mc->queue, 0, sizeof(mc->queue));
+  mc->queue[0] = 1;
 
   memset(mc->next_stone, 0, sizeof(mc->next_stone));
   for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
+    int geometry = ((mc->board[SE(pos)] << 14)
+                    | (mc->board[NE(pos)] << 12)
+                    | (mc->board[NW(pos)] << 10)
+                    | (mc->board[SW(pos)] << 8)
+                    | (mc->board[EAST(pos)] << 6)
+                    | (mc->board[NORTH(pos)] << 4)
+                    | (mc->board[WEST(pos)] << 2)
+                    | mc->board[SOUTH(pos)]);
+    mc->local_context[pos] = geometry;
+    if (board[pos] == EMPTY) {
+      int s;
+      int captured_black_stones = 0;
+      int captured_white_stones = 0;
+      if (is_self_atari(pos, WHITE))
+        mc->local_context[pos] |= 1 << 20;
+      if (is_self_atari(pos, BLACK))
+        mc->local_context[pos] |= 1 << 21;
+      if (is_suicide(pos, WHITE))
+        mc->local_context[pos] |= 1 << 22;
+      if (is_suicide(pos, BLACK))
+        mc->local_context[pos] |= 1 << 23;
+      for (s = 0; s < 4; s++) {
+        if (board[pos + delta[s]] == BLACK
+            && countlib(pos + delta[s]) == 1)
+          captured_black_stones += countstones(pos + delta[s]);
+        else if (board[pos + delta[s]] == WHITE
+                 && countlib(pos + delta[s]) == 1)
+          captured_white_stones += countstones(pos + delta[s]);
+      }
+      if (captured_black_stones > 3)
+        captured_black_stones = 3;
+      if (captured_white_stones > 3)
+        captured_white_stones = 3;
+      mc->local_context[pos] |= captured_black_stones << 16;
+      mc->local_context[pos] |= captured_white_stones << 18;
+    }
+    
     if (IS_STONE(board[pos]) && mc->next_stone[pos] == 0) {
       num_stones = findstones(pos, BOARDMAX, stones);
       mc->first_liberty_edge[pos] = 0;
@@ -288 +459 @@
 #endif
 
 
-/* Write the Monte Carlo board to outfile.
- */
+/* Write the Monte Carlo board to outfile. */
 static void
 mc_showboard(struct mc_board *mc, FILE *outfile)
 {
@@ -329 +499 @@
   return num_stones;
 }
 
-/* Is a move at pos by color suicide? */
-static int
-mc_is_suicide(struct mc_board *mc, int pos, int color)
-{
-  int k;
-  
-  if (mc->board[SOUTH(pos)] == EMPTY
-      || mc->board[WEST(pos)] == EMPTY
-      || mc->board[NORTH(pos)] == EMPTY
-      || mc->board[EAST(pos)] == EMPTY)
-    return 0;
 
-  for (k = 0; k < 4; k++) {
-    int first_liberty_edge;
-    int liberty_edge;
-    int additional_liberty = 0;
-    if (!ON_BOARD(pos + delta[k]))
-      continue;
+/* Suicide is incrementally tracked by the local context information. */
+#define mc_is_suicide(mc, pos, color) \
+  ((mc->local_context[pos] >> (21 + color)) & 1)
 
-    first_liberty_edge = (pos << 2) | k;
-    liberty_edge = mc->next_liberty_edge[first_liberty_edge];