X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=main.c;h=7cad48ad9d9979405a0aa03414c9c19e46a1a984;hb=35e60acecf2f2657a3fd53f89053de9e57a0d7fe;hp=f8348cbf4860cc6fb05a235a0ba0d256580c9ce3;hpb=89e27900d9d197cc320f7697c61059a5670c86bb;p=matchsticks-search.git

diff --git a/main.c b/main.c
index f8348cb..7cad48a 100644
--- 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,23 @@ 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;
 
+#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;
-    printf("%"PRADJ" ", adjmatrix[i]);
+    PRINTF("%"PRADJ" ", adjmatrix[i]);
     double maxminsize = (double)m / frags;
-    if (maxminsize < best) {
-      printf(" too fine            ");
+    if (maxminsize <= best) {
+      PRINTF(" too fine");
       goto out;
     }
   }
@@ -113,6 +121,7 @@ static void optimise(void) {
 
   /* x_minimum >= 0 */
   glp_set_col_bnds(prob, X_minimum, GLP_LO, 0, 0);
+  glp_set_col_name(prob, X_minimum, "minimum");
 
   /* objective is maximising x_minimum */
   glp_set_obj_dir(prob, GLP_MAX);
@@ -130,6 +139,11 @@ static void optimise(void) {
       /* x_morefrag_i_j >= 0 */
       int X_morefrag_i_j = glp_add_cols(prob, 1);
       glp_set_col_bnds(prob, X_morefrag_i_j, GLP_LO, 0, 0);
+      if (doprint) {
+	char buf[255];
+	snprintf(buf,sizeof(buf),"mf %d,%d",i,j);
+	glp_set_col_name(prob, X_morefrag_i_j, buf);
+      }
 
       /* x_total_i += x_morefrag_i_j */
       /* x_total_j += x_morefrag_i_j */
@@ -147,14 +161,14 @@ static void optimise(void) {
 		  matrix_entries);
 
   int r = glp_simplex(prob, NULL);
-  printf(" simplex=%d", r);
+  PRINTF(" glp=%d", r);
 
 #define OKERR(e) \
-  case e: printf(" " #e ); goto out;
+  case e: PRINTF(" " #e ); goto out;
 #define BADERR(e) \
-  case e: printf(" " #e " CRASHING"); exit(-1);
+  case e: HAVE_PRINTED; printf(" " #e " CRASHING\n"); exit(-1);
 #define DEFAULT \
-  default: printf(" ! CRASHING"); exit(-1);
+  default: HAVE_PRINTED; printf(" ! CRASHING\n"); exit(-1);
 
   switch (r) {
   OKERR(GLP_ESING);
@@ -168,12 +182,14 @@ static void optimise(void) {
   BADERR(GLP_EOBJUL);
   BADERR(GLP_EITLIM);
   BADERR(GLP_ETMLIM);
+  BADERR(GLP_EINSTAB);
+  BADERR(GLP_ENOCVG);
   case 0: break;
   DEFAULT;
   }
 
   r = glp_get_status(prob);
-  printf(" status=%d", r);
+  PRINTF(" status=%d", r);
 
   switch (r) {
   OKERR(GLP_NOFEAS);
@@ -186,10 +202,12 @@ static void optimise(void) {
   }
 
   double got = glp_get_obj_val(prob);
-  printf("  %g", got);
+  PRINTF("  %g", got);
   if (got <= best)
     goto out;
 
+  HAVE_PRINTED;
+
   best = got;
 
   if (best_prob) glp_delete_prob(best_prob);
@@ -206,19 +224,20 @@ 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;
+  for (adjmatrix[i] = adjall;
        ;
-       adjmatrix[i]++) {
+       adjmatrix[i]--) {
     iterate_recurse(i+1, adjmatrix[i]);
-    if (adjmatrix[i] == adjall)
+    if (adjmatrix[i] == min)
       return;
   }
 }
@@ -233,6 +252,8 @@ int main(int argc, char **argv) {
   prep();
   iterate();
   printf("\n");
+  if (best_prob)
+    glp_print_sol(best_prob,"/dev/stdout");
   if (ferror(stdout) || fclose(stdout)) { perror("stdout"); exit(-1); }
   return 0;
 }