wip lp seems to work so far...

diff --git a/main.c b/main.c
index bdcb18bfbb2c2fa54582aa14b383539e92a28e49..86b5d7329b49aae0bd85b1ac527d9534c58e9d4a 100644 (file)
--- a/main.c
+++ b/main.c
@@ -91,8 +91,8 @@ static void optimise(void) {
 
 #define ADD_MATRIX_ENTRY(Y,X) ({                       \
       assert(next_matrix_entry < matrix_entries_size); \
 
 #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++;                             \
     })
       matrix_entries[next_matrix_entry] = 0;           \
       next_matrix_entry++;                             \
     })


@@ -115,7 +115,7 @@ static void optimise(void) {
   glp_set_obj_dir(prob, GLP_MAX);
   glp_set_obj_coef(prob, X_minimum, 1);
 
   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;
     for (j=0; j<m; j++) {
       if (!(adjmatrix[i] & one_adj_bit(j)))
        continue;


@@ -139,53 +139,69 @@ static void optimise(void) {
 
   assert(next_matrix_entry == matrix_entries_size);
 
 
   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);
                  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(" simplex=%d", r);

 
 #define OKERR(e) \
 
 #define OKERR(e) \

-  case e: printf(" " #e "\n"); break;
+  case e: printf(" " #e "\n"); goto out;
+#define BADERR(e) \
+  case e: printf(" " #e " CRASHING\n"); exit(-1);
+#define DEFAULT \
+  default: 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);
   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_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;
+  }

 
 

-  default: printf(" r=%d! CRASHING\n", r); exit(-1);
+  double got = glp_get_obj_val(prob);
+  printf("  %g", got);
+  if (got <= best) {
+    printf("\n");
+    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(" <--\n");
+  return;
+
+ out:

   glp_delete_prob(prob);
 }
 
   glp_delete_prob(prob);
 }