less printing, optimise

[matchsticks-search.git] / main.c

diff --git a/main.c b/main.c
index f8348cbf4860cc6fb05a235a0ba0d256580c9ce3..94baac77aba2287287db6334185976a9b9393677 100644 (file)
--- a/main.c
+++ b/main.c
@@ -20,6 +20,8 @@ static double best;
 static glp_prob *best_prob;
 static AdjWord *best_adjmatrix;
 
+static unsigned printcounter;
+
 static AdjWord *xalloc_adjmatrix(void) {
   return xmalloc(sizeof(*adjmatrix)*n);
 }
@@ -41,17 +43,17 @@ static int count_set_adj_bits(AdjWord w) {
   return total;
 }
 
-static void optimise(void) {
+static void optimise(int doprint) {
   glp_prob *prob = 0;
   int i, j, totalfrags;
 
   for (i=0, totalfrags=0; i<n; i++) {
     int frags = count_set_adj_bits(adjmatrix[i]);
     totalfrags += frags;
-    printf("%"PRADJ" ", adjmatrix[i]);
+    if (doprint) printf("%"PRADJ" ", adjmatrix[i]);
     double maxminsize = (double)m / frags;
     if (maxminsize < best) {
-      printf(" too fine            ");
+      if (doprint) printf(" too fine");
       goto out;
     }
   }
@@ -147,14 +149,14 @@ static void optimise(void) {
                  matrix_entries);
 
   int r = glp_simplex(prob, NULL);
-  printf(" simplex=%d", r);
+  if (doprint) printf(" simplex=%d", r);
 
 #define OKERR(e) \
-  case e: printf(" " #e ); goto out;
+  case e: if (doprint) printf(" " #e ); goto out;
 #define BADERR(e) \
-  case e: printf(" " #e " CRASHING"); exit(-1);
+  case e: if (doprint) printf(" " #e " CRASHING"); exit(-1);
 #define DEFAULT \
-  default: printf(" ! CRASHING"); exit(-1);
+  default: if (doprint) printf(" ! CRASHING"); exit(-1);
 
   switch (r) {
   OKERR(GLP_ESING);
@@ -173,7 +175,7 @@ static void optimise(void) {
   }
 
   r = glp_get_status(prob);
-  printf(" status=%d", r);
+  if (doprint) printf(" status=%d", r);
 
   switch (r) {
   OKERR(GLP_NOFEAS);
@@ -186,10 +188,15 @@ static void optimise(void) {
   }
 
   double got = glp_get_obj_val(prob);
-  printf("  %g", got);
+  if (doprint) printf("  %g", got);
   if (got <= best)
     goto out;
 
+  if (!doprint) {
+    optimise(1);
+    goto out;
+  }
+
   best = got;
 
   if (best_prob) glp_delete_prob(best_prob);
@@ -206,12 +213,13 @@ static void optimise(void) {
  out:
   if (prob)
     glp_delete_prob(prob);
-  printf("\r");
+  if (doprint) { printf("        \r"); fflush(stdout); }
 }
 
 static void iterate_recurse(int i, AdjWord min) {
   if (i >= n) {
-    optimise();
+    printcounter++;
+    optimise(!(printcounter & 0xfff));
     return;
   }
   for (adjmatrix[i] = min;