Ticket #77: arend_7_9.6.diff

engine/combination.c

@@ -408 +408 @@
   memset(forbidden, 0, sizeof(forbidden));
   memset(defense_points, 0, sizeof(defense_points));
 
-  /* FIXME: Maybe these should be moved after the tryko() below? */
-  compute_aa_status(other, safe_stones);
-  compute_aa_values(other);
-
   /* Accept illegal ko capture here. */
   if (!tryko(move, color, NULL))
     /* Really shouldn't happen. */
     abortgo(__FILE__, __LINE__, "trymove", move);
+
+  compute_aa_status(other, safe_stones);
+  compute_aa_values(other);
+
   increase_depth_values();
 
   aa_val = do_atari_atari(other, &apos, &defense_point, defense_points,

engine/move_reasons.c

@@ -1637 +1637 @@
     else
       safe_stones[pos] = 0;
   }
-  safe_stones[move_pos] = move[move_pos].move_safety;
+  safe_stones[move_pos]
+    = move[move_pos].move_safety && safe_move(move_pos, color) == WIN;
 }
 
 

engine/owl.c

@@ -5957 +5957 @@
   int result;
   double start = 0.0;
   struct local_owl_data *owl;
+  int num_moves = 0;
 
   if (debug & DEBUG_OWL_PERFORMANCE)
     start = gg_cputime();
@@ -5968 +5969 @@
 
   owl->color = OTHER_COLOR(board[str]);
   local_owl_node_counter = 0;
-  gg_assert(stackp == 0);
 
   /* Big strings are always substantial since the biggest nakade is
    * six stones. (There are probably rare exceptions to this
@@ -6008 +6008 @@
       if (get_level() >= 8)
         increase_depth_values();
       owl->goal[libs[k]] = 1;
+      num_moves++;
     }
     else {
       /* if we can't fill, try swapping with the next liberty */
@@ -6017 +6018 @@
           increase_depth_values();
         owl->goal[libs[k+1]] = 1;
         libs[k+1] = libs[k];
+        num_moves++;
       }
       else {
         /* Can't fill the liberties. Give up! */
-        while (stackp > 0) {
+        while (num_moves-- > 0) {
           if (get_level() >= 8)
             decrease_depth_values();
           popgo();
@@ -6041 +6043 @@
     result = 0;
   else
     result = 1;
-  while (stackp > 0) {
+  while (num_moves-- > 0) {
     if (get_level() >= 8)
       decrease_depth_values();
     popgo();