Ticket #182: draqo-owl_test_cuts-optimize.diff

engine/owl.c

@@ -4941 +4941 @@
     signed char component[MAX_CUTS];
     signed char component2[BOARDMAX];
     int component_size[MAX_CUTS];
+    int component_libs[MAX_CUTS];
     int num_components;
     int biggest_component = -1;
     struct connection_data *conn_data;
@@ -4965 +4966 @@
      */
     memset(component2, -1, BOARDMAX);
     memset(component_size, 0, sizeof(int) * num_components);
+    memset(component_libs, 0, sizeof(int) * num_components);
     conn_data = malloc(sizeof(struct connection_data) * num_components);
     for (c_id = 0; c_id < num_components; c_id++) {
       signed char this_goal[BOARDMAX];
@@ -5000 +5002 @@
       if (closest_component != -1) {
         mark_string(pos, component2, closest_component);
         component_size[closest_component] += countstones(pos);
+        component_libs[closest_component] += countlib(pos);
       }
     }
 
-    /* Now find the biggest_component. */
+    /* Now find the biggest_component. If some components have the same
+     * size, one with the fewest number of liberties is chosen.
+     */
     {
       int biggest_size = 0;
+      int fewest_libs = (size_t)-1;
       for (c_id = 0; c_id < num_components; c_id++)
         if (component_size[c_id] > biggest_size) {
           biggest_size = component_size[c_id];
+          fewest_libs = component_libs[c_id];
           biggest_component = c_id;
         }
+        else if (component_size[c_id] == biggest_size
+                 && component_libs[c_id] < fewest_libs) {
+            fewest_libs = component_libs[c_id];
+            biggest_component = c_id;
+        }
       gg_assert(biggest_component != -1);
     }