output improvements

[matchsticks-search.git] / main.c

diff --git a/main.c b/main.c
index 22fa3437bfd7b7b7d3e43a2a25d69ea33a6ef26b..f8348cbf4860cc6fb05a235a0ba0d256580c9ce3 100644 (file)
--- a/main.c
+++ b/main.c
@@ -2,6 +2,7 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
+#include <string.h>
 #include <assert.h>
 #include <inttypes.h>
 
@@ -16,10 +17,17 @@ static AdjWord *adjmatrix;
 static AdjWord adjall;
 
 static double best;
+static glp_prob *best_prob;
+static AdjWord *best_adjmatrix;
+
+static AdjWord *xalloc_adjmatrix(void) {
+  return xmalloc(sizeof(*adjmatrix)*n);
+}
 
 static void prep(void) {
   adjall = ~((~(AdjWord)0) << m);
-  adjmatrix = xmalloc(sizeof(*adjmatrix)*n);
+  adjmatrix = xalloc_adjmatrix();
+  glp_term_out(GLP_OFF);
 }
 
 static AdjWord one_adj_bit(int bitnum) {
@@ -34,6 +42,7 @@ static int count_set_adj_bits(AdjWord w) {
 }
 
 static void optimise(void) {
+  glp_prob *prob = 0;
   int i, j, totalfrags;
 
   for (i=0, totalfrags=0; i<n; i++) {
@@ -42,8 +51,8 @@ static void optimise(void) {
     printf("%"PRADJ" ", adjmatrix[i]);
     double maxminsize = (double)m / frags;
     if (maxminsize < best) {
-      printf(" too fine\n");
-      return;
+      printf(" too fine            ");
+      goto out;
     }
   }
 
@@ -71,21 +80,22 @@ 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];
   int matrix_entries_XY[2][matrix_entries_size];
 
 #define ADD_MATRIX_ENTRY(Y,X) ({                       \
-      assert(matrix_entries_size < next_matrix_entry); \
-      matrix_entries_XY[0][next_matrix_entry] = X;     \
-      matrix_entries_XY[1][next_matrix_entry] = Y;     \
+      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[next_matrix_entry] = 0;           \
       next_matrix_entry++;                             \
     })
@@ -108,7 +118,7 @@ static void optimise(void) {
   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;
@@ -132,11 +142,71 @@ 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);
 
-  printf("nyi\n");
+  int r = glp_simplex(prob, NULL);
+  printf(" simplex=%d", r);
+
+#define OKERR(e) \
+  case e: printf(" " #e ); goto out;
+#define BADERR(e) \
+  case e: printf(" " #e " CRASHING"); exit(-1);
+#define DEFAULT \
+  default: printf(" ! CRASHING"); exit(-1);
+
+  switch (r) {
+  OKERR(GLP_ESING);
+  OKERR(GLP_ECOND);
+  OKERR(GLP_EBOUND);
+  OKERR(GLP_EFAIL);
+  OKERR(GLP_ENOPFS);
+  OKERR(GLP_ENODFS);
+  BADERR(GLP_EBADB);
+  BADERR(GLP_EOBJLL);
+  BADERR(GLP_EOBJUL);
+  BADERR(GLP_EITLIM);
+  BADERR(GLP_ETMLIM);
+  case 0: break;
+  DEFAULT;
+  }
+
+  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;
+  }
+
+  double got = glp_get_obj_val(prob);
+  printf("  %g", got);
+  if (got <= best)
+    goto out;
+
+  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);
+  printf("\r");
 }
 
 static void iterate_recurse(int i, AdjWord min) {
@@ -162,6 +232,7 @@ int main(int argc, char **argv) {
   m = atoi(argv[2]);
   prep();
   iterate();
+  printf("\n");
   if (ferror(stdout) || fclose(stdout)) { perror("stdout"); exit(-1); }
   return 0;
 }