assert our arguments

[matchsticks-search.git] / main.c

diff --git a/main.c b/main.c
index 6ccfea7bb0384f472c23befb0ec89bde375b0251..538073724fa159d3734140bb3ed336be43a1990e 100644 (file)
--- a/main.c
+++ b/main.c
@@ -4,17 +4,16 @@
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
+#include <stdbool.h>
 #include <inttypes.h>
 
 #include <publib.h>
 #include <glpk.h>
 
 typedef uint32_t AdjWord;
-#define PRADJ "04"PRIx32
+#define PRADJ "08"PRIx32
 
-static int n, m;
-static AdjWord *adjmatrix_counters;
-static AdjWord *adjmatrix_offsets;
+static int n, m, maxhamweight;
 static AdjWord *adjmatrix;
 static AdjWord adjall;
 
@@ -29,14 +28,9 @@ static AdjWord *xalloc_adjmatrix(void) {
 }
 
 static void prep(void) {
-  int i;
   adjall = ~((~(AdjWord)0) << m);
   adjmatrix = xalloc_adjmatrix();
-  adjmatrix_counters = xalloc_adjmatrix();
-  adjmatrix_offsets = xalloc_adjmatrix();
   glp_term_out(GLP_OFF);
-  for (i=0; i<n; i++)
-    adjmatrix_offsets[i] = ((i+1)*(AdjWord)0x12345678) & adjall;
 }
 
 static AdjWord one_adj_bit(int bitnum) {
@@ -58,18 +52,31 @@ static void optimise(int doprint) {
       if (!doprint) { doprint = 1; goto retry_with_print; }    \
     })
  retry_with_print:
+  if (prob) {
+    glp_delete_prob(prob);
+    prob = 0;
+  }
+
 #define PRINTF if (!doprint) ; else printf /* bodgy */
 
+  PRINTF("%2d ", maxhamweight);
+
+  bool had_max = 0;
   for (i=0, totalfrags=0; i<n; i++) {
     int frags = count_set_adj_bits(adjmatrix[i]);
+    had_max += (frags == maxhamweight);
     totalfrags += frags;
-    PRINTF("%"PRADJ"/%"PRADJ" ", adjmatrix_counters[i], adjmatrix[i]);
+    PRINTF("%"PRADJ" ", adjmatrix[i]);
     double maxminsize = (double)m / frags;
     if (maxminsize <= best) {
       PRINTF(" too fine");
       goto out;
     }
   }
+  if (!had_max) {
+    PRINTF(" nomaxham");
+    goto out;
+  }
 
   /*
    * We formulate our problem as an LP problem as follows.
@@ -236,29 +243,36 @@ static void optimise(int doprint) {
 
 static void iterate_recurse(int i, AdjWord min) {
   if (i >= n) {
-    int ii;
-    for (ii=0; ii<n; ii++) {
-      adjmatrix[ii] = adjmatrix_counters[ii] ^ adjmatrix_offsets[ii];
-      if (!adjmatrix[ii]) return;
-    }
     printcounter++;
     optimise(!(printcounter & 0xfff));
     return;
   }
-  for (adjmatrix_counters[i] = min;
+  for (adjmatrix[i] = min;
        ;
-       adjmatrix_counters[i]++) {
-    iterate_recurse(i+1, adjmatrix_counters[i]);
-    if (adjmatrix_counters[i] == adjall)
+       adjmatrix[i]++) {
+    if (count_set_adj_bits(adjmatrix[i]) > maxhamweight)
+      goto again;
+
+    iterate_recurse(i+1, adjmatrix[i]);
+
+  again:
+    if (adjmatrix[i] == adjall)
       return;
   }
 }
 
 static void iterate(void) {
-  iterate_recurse(0, 0);
+  for (maxhamweight=1; maxhamweight<=m; maxhamweight++) {
+    double maxminsize = (double)m / maxhamweight;
+    if (maxminsize <= best)
+      continue;
+
+    iterate_recurse(0, 1);
+  }
 }
 
 int main(int argc, char **argv) {
+  assert(argc==3);
   n = atoi(argv[1]);
   m = atoi(argv[2]);
   prep();