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=9e7b0ede95c7fdd5327776a6a381ff3cbee66a21;hb=f695bdefee6f7b1d746e34eb7abe6e60f2f74ad9;hpb=80c34053de5a0c1a015610560da874a9c8789a61 diff --git a/main.c b/main.c index 9e7b0ed..e093311 100644 --- 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; }