X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=matchsticks-search.git;a=blobdiff_plain;f=main.c;h=e093311d63ea31e18909fdc7a7f71c6d409318bb;hp=bdcb18bfbb2c2fa54582aa14b383539e92a28e49;hb=f695bdefee6f7b1d746e34eb7abe6e60f2f74ad9;hpb=63f39a339d46152875081ec5772868b23deba821

diff --git a/main.c b/main.c
index bdcb18b..e093311 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);
 }
@@ -27,6 +29,7 @@ static AdjWord *xalloc_adjmatrix(void) {
 static void prep(void) {
   adjall = ~((~(AdjWord)0) << m);
   adjmatrix = xalloc_adjmatrix();
+  glp_term_out(GLP_OFF);
 }
 
 static AdjWord one_adj_bit(int bitnum) {
@@ -40,17 +43,24 @@ 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\n");
-      return;
+    if (maxminsize <= best) {
+      PRINTF(" too fine");
+      goto out;
     }
   }
 
@@ -78,12 +88,13 @@ static void optimise(void) {
    * which we build up as we go.
    */
 
-  glp_prob *prob = glp_create_prob();
+  prob = glp_create_prob();
 
   int Y_totals_i = glp_add_rows(prob, n);
   int Y_totals_j = glp_add_rows(prob, m);
   int X_minimum = glp_add_cols(prob, 1);
 
+  {
   int next_matrix_entry = 1; /* wtf GLPK! */
   int matrix_entries_size = next_matrix_entry + n + m + totalfrags*2;
   double matrix_entries[matrix_entries_size];
@@ -91,8 +102,8 @@ static void optimise(void) {
 
 #define ADD_MATRIX_ENTRY(Y,X) ({			\
       assert(next_matrix_entry < matrix_entries_size);	\
-      matrix_entries_XY[0][next_matrix_entry] = X;	\
-      matrix_entries_XY[1][next_matrix_entry] = Y;	\
+      matrix_entries_XY[0][next_matrix_entry] = (X);	\
+      matrix_entries_XY[1][next_matrix_entry] = (Y);	\
       matrix_entries[next_matrix_entry] = 0;		\
       next_matrix_entry++;				\
     })
@@ -110,12 +121,13 @@ 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);
   glp_set_obj_coef(prob, X_minimum, 1);
 
-  for (i=0; i<n; j++) {
+  for (i=0; i<n; i++) {
     for (j=0; j<m; j++) {
       if (!(adjmatrix[i] & one_adj_bit(j)))
 	continue;
@@ -127,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 */
@@ -139,59 +156,81 @@ static void optimise(void) {
 
   assert(next_matrix_entry == matrix_entries_size);
 
-  glp_load_matrix(prob, next_matrix_entry,
+  glp_load_matrix(prob, matrix_entries_size-1,
 		  matrix_entries_XY[1], matrix_entries_XY[0],
 		  matrix_entries);
 
   int r = glp_simplex(prob, NULL);
-  switch (r) {
-  case 0:;
-
-    double got = glp_get_obj_val(prob);
-    printf("%g", got);
-    if (got <= best) {
-      printf("\n");
-      break;
-    }
-
-    best = got;
-
-    if (best_prob) glp_delete_prob(best_prob);
-    best_prob = prob;
-
-    free(best_adjmatrix);
-    best_adjmatrix = xalloc_adjmatrix();
-    memcpy(best_adjmatrix, adjmatrix, sizeof(*adjmatrix)*n);
-
-    printf(" <--\n");
-    return;
+  PRINTF(" glp=%d", r);
 
 #define OKERR(e) \
-  case e: printf(" " #e "\n"); break;
+  case e: PRINTF(" " #e ); goto out;
+#define BADERR(e) \
+  case e: HAVE_PRINTED; printf(" " #e " CRASHING\n"); exit(-1);
+#define DEFAULT \
+  default: HAVE_PRINTED; printf(" ! CRASHING\n"); exit(-1);
+
+  switch (r) {
   OKERR(GLP_ESING);
   OKERR(GLP_ECOND);
   OKERR(GLP_EBOUND);
   OKERR(GLP_EFAIL);
   OKERR(GLP_ENOPFS);
   OKERR(GLP_ENODFS);
-
-#define BADERR(e) \
-  case e: printf(" " #e " CRASHING\n"); exit(-1);
   BADERR(GLP_EBADB);
   BADERR(GLP_EOBJLL);
   BADERR(GLP_EOBJUL);
   BADERR(GLP_EITLIM);
   BADERR(GLP_ETMLIM);
+  BADERR(GLP_EINSTAB);
+  BADERR(GLP_ENOCVG);
+  case 0: break;
+  DEFAULT;
+  }
 
-  default: printf(" r=%d! CRASHING\n", r); exit(-1);
+  r = glp_get_status(prob);
+  PRINTF(" status=%d", r);
+
+  switch (r) {
+  OKERR(GLP_NOFEAS);
+  OKERR(GLP_UNDEF);
+  BADERR(GLP_FEAS);
+  BADERR(GLP_INFEAS);
+  BADERR(GLP_UNBND);
+  case GLP_OPT: break;
+  DEFAULT;
   }
 
-  glp_delete_prob(prob);
+  double got = glp_get_obj_val(prob);
+  PRINTF("  %g", got);
+  if (got <= best)
+    goto out;
+
+  HAVE_PRINTED;
+
+  best = got;
+
+  if (best_prob) glp_delete_prob(best_prob);
+  best_prob = prob;
+
+  free(best_adjmatrix);
+  best_adjmatrix = xalloc_adjmatrix();
+  memcpy(best_adjmatrix, adjmatrix, sizeof(*adjmatrix)*n);
+
+  printf(" BEST        \n");
+  return;
+
+  }
+ out:
+  if (prob)
+    glp_delete_prob(prob);
+  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;
@@ -212,6 +251,9 @@ int main(int argc, char **argv) {
   m = atoi(argv[2]);
   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;
 }