loop in reverse order - this is a better search path

[matchsticks-search.git] / main.c

diff --git a/main.c b/main.c
index 9e7b0ede95c7fdd5327776a6a381ff3cbee66a21..7cad48ad9d9979405a0aa03414c9c19e46a1a984 100644 (file)
--- a/main.c
+++ b/main.c
@@ -161,14 +161,14 @@ static void optimise(int doprint) {
                  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;
 #define BADERR(e) \
-  case e: HAVE_PRINTED; printf(" " #e " CRASHING"); exit(-1);
+  case e: HAVE_PRINTED; printf(" " #e " CRASHING\n"); exit(-1);
 #define DEFAULT \
-  default: HAVE_PRINTED; printf(" ! CRASHING"); exit(-1);
+  default: HAVE_PRINTED; printf(" ! CRASHING\n"); exit(-1);
 
   switch (r) {
   OKERR(GLP_ESING);
@@ -182,6 +182,8 @@ static void optimise(int doprint) {
   BADERR(GLP_EOBJUL);
   BADERR(GLP_EITLIM);
   BADERR(GLP_ETMLIM);
+  BADERR(GLP_EINSTAB);
+  BADERR(GLP_ENOCVG);
   case 0: break;
   DEFAULT;
   }
@@ -231,11 +233,11 @@ static void iterate_recurse(int i, AdjWord min) {
     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;
   }
 }