From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 7 Mar 2014 16:37:17 +0000 (+0000)
Subject: fix printing more
X-Git-Tag: v1~15
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=matchsticks-search.git;a=commitdiff_plain;h=3ef7017fa33e925e0e19efc6ba6e38e02b269f3e

fix printing more
---

diff --git a/main.c b/main.c
index 94baac7..9732659 100644
--- a/main.c
+++ b/main.c
@@ -47,13 +47,19 @@ static void optimise(int doprint) {
   glp_prob *prob = 0;
   int i, j, totalfrags;
 
+#define HAVE_PRINTED ({						\
+      if (!doprint) { doprint = 1; goto retry_with_print; }	\
+    })
+ retry_with_print:
+#define PRINTF if (!doprint) ; else printf /* bodgy */
+
   for (i=0, totalfrags=0; i<n; i++) {
     int frags = count_set_adj_bits(adjmatrix[i]);
     totalfrags += frags;
-    if (doprint) printf("%"PRADJ" ", adjmatrix[i]);
+    PRINTF("%"PRADJ" ", adjmatrix[i]);
     double maxminsize = (double)m / frags;
     if (maxminsize < best) {
-      if (doprint) printf(" too fine");
+      PRINTF(" too fine");
       goto out;
     }
   }
@@ -149,14 +155,14 @@ static void optimise(int doprint) {
 		  matrix_entries);
 
   int r = glp_simplex(prob, NULL);
-  if (doprint) printf(" simplex=%d", r);
+  PRINTF(" simplex=%d", r);
 
 #define OKERR(e) \
-  case e: if (doprint) printf(" " #e ); goto out;
+  case e: PRINTF(" " #e ); goto out;
 #define BADERR(e) \
-  case e: if (doprint) printf(" " #e " CRASHING"); exit(-1);
+  case e: HAVE_PRINTED; printf(" " #e " CRASHING"); exit(-1);
 #define DEFAULT \
-  default: if (doprint) printf(" ! CRASHING"); exit(-1);
+  default: HAVE_PRINTED; printf(" ! CRASHING"); exit(-1);
 
   switch (r) {
   OKERR(GLP_ESING);
@@ -175,7 +181,7 @@ static void optimise(int doprint) {
   }
 
   r = glp_get_status(prob);
-  if (doprint) printf(" status=%d", r);
+  PRINTF(" status=%d", r);
 
   switch (r) {
   OKERR(GLP_NOFEAS);
@@ -188,14 +194,11 @@ static void optimise(int doprint) {
   }
 
   double got = glp_get_obj_val(prob);
-  if (doprint) printf("  %g", got);
+  PRINTF("  %g", got);
   if (got <= best)
     goto out;
 
-  if (!doprint) {
-    optimise(1);
-    goto out;
-  }
+  HAVE_PRINTED;
 
   best = got;