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=0c694c8f122aa653a07e64774649068145cc7be8;hb=f695bdefee6f7b1d746e34eb7abe6e60f2f74ad9;hpb=8f790b20274793eb7de88fa16aac9eb5beed32c7 diff --git a/main.c b/main.c index 0c694c8..e093311 100644 --- a/main.c +++ b/main.c @@ -1,46 +1,244 @@ +#include +#include +#include +#include +#include +#include + +#include +#include + typedef uint32_t AdjWord; -#define PRADJ PRIx32 +#define PRADJ "08"PRIx32 static int n, m; -static AdjWord adjmatrix[n]; +static AdjWord *adjmatrix; static AdjWord adjall; static double best; -static AdjWord adjmatrix_best[n]; +static glp_prob *best_prob; +static AdjWord *best_adjmatrix; + +static unsigned printcounter; + +static AdjWord *xalloc_adjmatrix(void) { + return xmalloc(sizeof(*adjmatrix)*n); +} static void prep(void) { adjall = ~((~(AdjWord)0) << m); + adjmatrix = xalloc_adjmatrix(); + glp_term_out(GLP_OFF); +} + +static AdjWord one_adj_bit(int bitnum) { + return (AdjWord)1 << bitnum; } static int count_set_adj_bits(AdjWord w) { - for (int j=0, total=0; j= 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); + glp_set_obj_coef(prob, X_minimum, 1); + for (i=0; i= 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 */ + int ME_totals_i__mf_i_j = ADD_MATRIX_ENTRY(Y_totals_i+i, X_morefrag_i_j); + int ME_totals_j__mf_i_j = ADD_MATRIX_ENTRY(Y_totals_j+j, X_morefrag_i_j); + matrix_entries[ME_totals_i__mf_i_j] = 1; + matrix_entries[ME_totals_j__mf_i_j] = 1; } } - printf("nyi\n"); + assert(next_matrix_entry == matrix_entries_size); + + glp_load_matrix(prob, matrix_entries_size-1, + matrix_entries_XY[1], matrix_entries_XY[0], + matrix_entries); + + int r = glp_simplex(prob, NULL); + PRINTF(" glp=%d", r); + +#define OKERR(e) \ + case e: PRINTF(" " #e ); goto out; +#define BADERR(e) \ + case e: HAVE_PRINTED; printf(" " #e " CRASHING\n"); exit(-1); +#define DEFAULT \ + default: HAVE_PRINTED; 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); + BADERR(GLP_EBADB); + BADERR(GLP_EOBJLL); + BADERR(GLP_EOBJUL); + BADERR(GLP_EITLIM); + BADERR(GLP_ETMLIM); + BADERR(GLP_EINSTAB); + BADERR(GLP_ENOCVG); + 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; + } + + double got = glp_get_obj_val(prob); + PRINTF(" %g", got); + if (got <= best) + goto out; + + HAVE_PRINTED; + + 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(" BEST \n"); + return; + + } + out: + if (prob) + glp_delete_prob(prob); + if (doprint) { printf(" \r"); fflush(stdout); } } static void iterate_recurse(int i, AdjWord min) { - if (i > n) { - optimise(); + if (i >= n) { + printcounter++; + optimise(!(printcounter & 0xfff)); return; } for (adjmatrix[i] = min; ; adjmatrix[i]++) { iterate_recurse(i+1, adjmatrix[i]); + if (adjmatrix[i] == adjall) + return; } } @@ -53,6 +251,9 @@ int main(int argc, char **argv) { m = atoi(argv[2]); 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; }