Ticket #29: arend_7_8.5a-large_scale_node_limit.diff

engine/gnugo.h

@@ -354 +354 @@
 int get_reading_node_counter(void);
 void reset_connection_node_counter(void);
 int get_connection_node_counter(void);
-void change_owl_node_limit(int new_limit, int *old_value);
 
 
 

engine/owl.c

@@ -6752 +6752 @@
 }
 
 
-/* Change the owl node limit and sets it to new_limit
- * Use *old_value to get the previous (old) limit
- */  
-void
-change_owl_node_limit(int new_limit, int *old_value)
-{
-  if (old_value)
-    *old_value = owl_node_limit;
-  owl_node_limit = new_limit;
-}
-
-
 /*
  * Local Variables:
  * tab-width: 8

engine/value_moves.c

@@ -396 +396 @@
 {
   int owl_nodes_before;
   int owl_nodes_used;
-  int old_node_limit;
-  int new_node_limit;
   int kworm = NO_MOVE;
   int acode;
   int save_verbose = verbose;
+  int save_owl_node_limit = owl_node_limit;
   
   ASSERT1(board[target] == OTHER_COLOR(color), pos);
   ASSERT1(!owl_attack_move_reason_known(pos, target), pos);
@@ -417 +416 @@
    * distance >= 2.
    */
   if (dist <= 1)
-    new_node_limit = gg_min(350, owl_node_limit);
+    owl_node_limit *= 0.35;
   else
-    new_node_limit = gg_min(150, owl_node_limit);
-  change_owl_node_limit(new_node_limit, &old_node_limit); 
+    owl_node_limit *= 0.15;
 
   if (verbose > 0)
     verbose--;
@@ -445 +443 @@
         owl_nodes_used, dist);
   /* Restore settings. */
   verbose = save_verbose;
-  change_owl_node_limit(old_node_limit, NULL);
   decrease_depth_values(); 
+  owl_node_limit = save_owl_node_limit;
 }