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
loop in reverse order - this is a better search path
[matchsticks-search.git]
/
main.c
diff --git
a/main.c
b/main.c
index 006c071ed77920b962248aab889df35ea4197128..7cad48ad9d9979405a0aa03414c9c19e46a1a984 100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-121,6
+121,7
@@
static void optimise(int doprint) {
/* x_minimum >= 0 */
glp_set_col_bnds(prob, X_minimum, GLP_LO, 0, 0);
/* x_minimum >= 0 */
glp_set_col_bnds(prob, X_minimum, GLP_LO, 0, 0);
+ glp_set_col_name(prob, X_minimum, "minimum");
/* objective is maximising x_minimum */
glp_set_obj_dir(prob, GLP_MAX);
/* objective is maximising x_minimum */
glp_set_obj_dir(prob, GLP_MAX);
@@
-138,6
+139,11
@@
static void optimise(int doprint) {
/* x_morefrag_i_j >= 0 */
int X_morefrag_i_j = glp_add_cols(prob, 1);
glp_set_col_bnds(prob, X_morefrag_i_j, GLP_LO, 0, 0);
/* x_morefrag_i_j >= 0 */
int X_morefrag_i_j = glp_add_cols(prob, 1);
glp_set_col_bnds(prob, X_morefrag_i_j, GLP_LO, 0, 0);
+ if (doprint) {
+ char buf[255];
+ snprintf(buf,sizeof(buf),"mf %d,%d",i,j);
+ glp_set_col_name(prob, X_morefrag_i_j, buf);
+ }
/* x_total_i += x_morefrag_i_j */
/* x_total_j += x_morefrag_i_j */
/* x_total_i += x_morefrag_i_j */
/* x_total_j += x_morefrag_i_j */
@@
-155,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);
@@
-176,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;
}
@@
-225,11
+233,11
@@
static void iterate_recurse(int i, AdjWord min) {
optimise(!(printcounter & 0xfff));
return;
}
optimise(!(printcounter & 0xfff));
return;
}
- for (adjmatrix[i] =
min
;
+ for (adjmatrix[i] =
adjall
;
;
;
- adjmatrix[i]
++
) {
+ adjmatrix[i]
--
) {
iterate_recurse(i+1, adjmatrix[i]);
iterate_recurse(i+1, adjmatrix[i]);
- if (adjmatrix[i] ==
adjall
)
+ if (adjmatrix[i] ==
min
)
return;
}
}
return;
}
}
@@
-244,6
+252,8
@@
int main(int argc, char **argv) {
prep();
iterate();
printf("\n");
prep();
iterate();
printf("\n");
+ if (best_prob)
+ glp_print_sol(best_prob,"/dev/stdout");
if (ferror(stdout) || fclose(stdout)) { perror("stdout"); exit(-1); }
return 0;
}
if (ferror(stdout) || fclose(stdout)) { perror("stdout"); exit(-1); }
return 0;
}