chiark
/
gitweb
/
~ianmdlvl
/
matchsticks-search.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "mix up the order" and "mix up the order"
[matchsticks-search.git]
/
main.c
diff --git
a/main.c
b/main.c
index 9e7b0ede95c7fdd5327776a6a381ff3cbee66a21..e093311d63ea31e18909fdc7a7f71c6d409318bb 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);
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) \
#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 \
#define DEFAULT \
- default: HAVE_PRINTED; printf(" ! CRASHING"); exit(-1);
+ default: HAVE_PRINTED; printf(" ! CRASHING
\n
"); exit(-1);
switch (r) {
OKERR(GLP_ESING);
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_EOBJUL);
BADERR(GLP_EITLIM);
BADERR(GLP_ETMLIM);
+ BADERR(GLP_EINSTAB);
+ BADERR(GLP_ENOCVG);
case 0: break;
DEFAULT;
}
case 0: break;
DEFAULT;
}