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
rename {n,m}_over_best to {n,m}_max_frags to reflect way used in most of the code
[matchsticks-search.git]
/
main.c
diff --git
a/main.c
b/main.c
index 2fc3a51f86979e5468fb4237cdd4efb760e4d089..de880e9c356936fa2e847cce8d166ffa9941f6eb 100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-34,6
+34,7
@@
#include <unistd.h>
#include <stdbool.h>
#include <inttypes.h>
#include <unistd.h>
#include <stdbool.h>
#include <inttypes.h>
+#include <math.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <sys/uio.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <sys/uio.h>
@@
-41,6
+42,10
@@
#include <glpk.h>
#include <glpk.h>
+#ifndef VERSION
+#define VERSION "(unknown-version)"
+#endif
+
/*
* Algorithm.
*
/*
* Algorithm.
*
@@
-86,6
+91,8
@@
typedef uint32_t AdjWord;
#define PRADJ "08"PRIx32
typedef uint32_t AdjWord;
#define PRADJ "08"PRIx32
+#define FOR_BITS(j,m) for (j=0, j##bit=1; j < (m); j++, j##bit<<=1)
+
static int n, m, maxhamweight;
static AdjWord *adjmatrix;
static AdjWord adjall;
static int n, m, maxhamweight;
static AdjWord *adjmatrix;
static AdjWord adjall;
@@
-94,7
+101,7
@@
static double best;
static glp_prob *best_prob;
static AdjWord *best_adjmatrix;
static glp_prob *best_prob;
static AdjWord *best_adjmatrix;
-static int n_
over_best
;
+static int n_
max_frags, m_max_frags
;
static int *weight;
static unsigned printcounter;
static int *weight;
static unsigned printcounter;
@@
-112,7
+119,8
@@
static void progress_eol(void) {
static void set_best(double new_best) {
best = new_best;
static void set_best(double new_best) {
best = new_best;
- n_over_best = n / best;
+ n_max_frags = floor(n / best);
+ m_max_frags = floor(m / best);
}
/*----- multicore support -----*/
}
/*----- multicore support -----*/
@@
-154,10
+162,11
@@
typedef struct {
pid_t pid;
} Worker;
static Worker *mc_us;
pid_t pid;
} Worker;
static Worker *mc_us;
+static bool mc_am_generator;
static void multicore_check_for_new_best(void);
static void multicore_check_for_new_best(void);
-#define MAX_NIOVS
3
+#define MAX_NIOVS
4
static AdjWord mc_iter_min;
static int mc_niovs;
static size_t mc_iovlen;
static AdjWord mc_iter_min;
static int mc_niovs;
static size_t mc_iovlen;
@@
-178,6
+187,7
@@
static void mc_rwvsetup_outer(void) {
IOV(maxhamweight, 1);
IOV(mc_iter_min, 1);
IOV(*adjmatrix, multicore_iteration_boundary);
IOV(maxhamweight, 1);
IOV(mc_iter_min, 1);
IOV(*adjmatrix, multicore_iteration_boundary);
+ IOV(*weight, m);
}
static void mc_rwvsetup_full(void) {
}
static void mc_rwvsetup_full(void) {
@@
-244,8
+254,8
@@
static void mc_iterate_worker(void) {
iterate_recurse(mc_org_it_bound, mc_iter_min);
multicore_iteration_boundary = mc_org_it_bound;
}
iterate_recurse(mc_org_it_bound, mc_iter_min);
multicore_iteration_boundary = mc_org_it_bound;
}
- LPRINTF("worker %2d reporting",mc_us->w);
if (best_adjmatrix) {
if (best_adjmatrix) {
+ LPRINTF("worker %2d reporting",mc_us->w);
adjmatrix = best_adjmatrix;
mc_rwvsetup_full();
ssize_t r = writev(fileno(mc_us->results), mc_iov, mc_niovs);
adjmatrix = best_adjmatrix;
mc_rwvsetup_full();
ssize_t r = writev(fileno(mc_us->results), mc_iov, mc_niovs);
@@
-288,6
+298,7
@@
static void multicore(void) {
genpid = fork(); assert(genpid >= 0);
if (!genpid) {
genpid = fork(); assert(genpid >= 0);
if (!genpid) {
+ mc_am_generator = 1;
LPRINTF("generator running");
iterate();
exit(0);
LPRINTF("generator running");
iterate();
exit(0);
@@
-303,13
+314,15
@@
static void multicore(void) {
LPRINTF("reading report from %2d",w);
ssize_t sr = preadv(fileno(mc_workers[w].results), mc_iov, mc_niovs, 0);
if (!sr) continue;
LPRINTF("reading report from %2d",w);
ssize_t sr = preadv(fileno(mc_workers[w].results), mc_iov, mc_niovs, 0);
if (!sr) continue;
+ LPRINTF("got report from %2d",w);
maxhamweight = 0;
optimise(1);
}
}
static void multicore_check_for_new_best(void) {
maxhamweight = 0;
optimise(1);
}
}
static void multicore_check_for_new_best(void) {
- if (!ncpus) return;
+ if (!(mc_us || mc_am_generator))
+ return;
for (;;) {
double msg;
for (;;) {
double msg;
@@
-323,7
+336,8
@@
static void multicore_check_for_new_best(void) {
}
static void multicore_found_new_best(void) {
}
static void multicore_found_new_best(void) {
- if (!ncpus) return;
+ if (!mc_us)
+ return;
if (mc_us /* might be master */) fprintf(stderr," w%-2d ",mc_us->w);
ssize_t wrote = write(mc_bus, &best, sizeof(best));
if (mc_us /* might be master */) fprintf(stderr," w%-2d ",mc_us->w);
ssize_t wrote = write(mc_bus, &best, sizeof(best));
@@
-342,17
+356,21
@@
static void prep(void) {
glp_term_out(GLP_OFF);
setlinebuf(stderr);
weight = calloc(sizeof(*weight), m); assert(weight);
glp_term_out(GLP_OFF);
setlinebuf(stderr);
weight = calloc(sizeof(*weight), m); assert(weight);
- n_over_best = INT_MAX;
+ n_max_frags = INT_MAX;
+ m_max_frags = INT_MAX;
}
}
+#if 0
static AdjWord one_adj_bit(int bitnum) {
return (AdjWord)1 << bitnum;
}
static AdjWord one_adj_bit(int bitnum) {
return (AdjWord)1 << bitnum;
}
+#endif
static int count_set_adj_bits(AdjWord w) {
static int count_set_adj_bits(AdjWord w) {
- int j, total;
- for (j=0, total=0; j<m; j++)
- total += !!(w & one_adj_bit(j));
+ int j, total = 0;
+ AdjWord jbit;
+ FOR_BITS(j,m)
+ total += !!(w & jbit);
return total;
}
return total;
}
@@
-361,8
+379,7
@@
static int count_set_adj_bits(AdjWord w) {
static int totalfrags;
static bool maxhamweight_ok(void) {
static int totalfrags;
static bool maxhamweight_ok(void) {
- double maxminsize = (double)m / maxhamweight;
- return maxminsize > best;
+ return maxhamweight <= m_max_frags;
}
static bool preconsider_ok(int nwords, bool doprint) {
}
static bool preconsider_ok(int nwords, bool doprint) {
@@
-373,14
+390,13
@@
static bool preconsider_ok(int nwords, bool doprint) {
bool had_max = 0;
for (i=0, totalfrags=0; i<nwords; i++) {
int frags = count_set_adj_bits(adjmatrix[i]);
bool had_max = 0;
for (i=0, totalfrags=0; i<nwords; i++) {
int frags = count_set_adj_bits(adjmatrix[i]);
- had_max += (frags >= maxhamweight);
- totalfrags += frags;
PRINTF("%"PRADJ" ", adjmatrix[i]);
PRINTF("%"PRADJ" ", adjmatrix[i]);
- double maxminsize = (double)m / frags;
- if (maxminsize <= best) {
+ if (frags > m_max_frags) {
PRINTF(" too fine");
goto out;
}
PRINTF(" too fine");
goto out;
}
+ had_max += (frags >= maxhamweight);
+ totalfrags += frags;
}
if (!had_max) {
/* Skip this candidate as its max hamming weight is lower than
}
if (!had_max) {
/* Skip this candidate as its max hamming weight is lower than
@@
-400,6
+416,7
@@
static void optimise(bool doprint) {
/* Consider the best answer (if any) for a given adjacency matrix */
glp_prob *prob = 0;
int i, j;
/* Consider the best answer (if any) for a given adjacency matrix */
glp_prob *prob = 0;
int i, j;
+ AdjWord jbit;
/*
* Up to a certain point, optimise() can be restarted. We use this
/*
* Up to a certain point, optimise() can be restarted. We use this
@@
-485,8
+502,8
@@
static void optimise(bool doprint) {
glp_set_obj_coef(prob, X_minimum, 1);
for (i=0; i<n; i++) {
glp_set_obj_coef(prob, X_minimum, 1);
for (i=0; i<n; i++) {
- for (j=0
; j<m; j++
) {
- if (!(adjmatrix[i] &
one_adj_bit(j)
))
+ for (j=0
, jbit=1; j<m; j++, jbit<<=1
) {
+ if (!(adjmatrix[i] &
jbit
))
continue;
/* x_total_i += x_minimum */
/* x_total_j += x_minimum */
continue;
/* x_total_i += x_minimum */
/* x_total_j += x_minimum */
@@
-587,6
+604,9
@@
static void optimise(bool doprint) {
}
static void iterate_recurse(int i, AdjWord min) {
}
static void iterate_recurse(int i, AdjWord min) {
+ int j;
+ AdjWord jbit;
+
if (i >= n) {
printcounter++;
optimise(!(printcounter & 0xfff));
if (i >= n) {
printcounter++;
optimise(!(printcounter & 0xfff));
@@
-604,18
+624,18
@@
static void iterate_recurse(int i, AdjWord min) {
if (i == 0 && (adjmatrix[i] & (1+adjmatrix[i])))
goto again;
if (i == 0 && (adjmatrix[i] & (1+adjmatrix[i])))
goto again;
-
for (int j = 0; j < m; j++
)
- if (adjmatrix[i] &
one_adj_bit(j)
)
+
FOR_BITS(j,m
)
+ if (adjmatrix[i] &
jbit
)
weight[j]++;
for (int j = 0; j < m; j++)
weight[j]++;
for (int j = 0; j < m; j++)
- if (weight[j] >= n_
over_best
)
+ if (weight[j] >= n_
max_frags
)
goto takeout;
iterate_recurse(i+1, adjmatrix[i]);
takeout:
goto takeout;
iterate_recurse(i+1, adjmatrix[i]);
takeout:
-
for (int j = 0; j < m; j++
)
- if (adjmatrix[i] &
one_adj_bit(j)
)
+
FOR_BITS(j,m
)
+ if (adjmatrix[i] &
jbit
)
weight[j]--;
again:
weight[j]--;
again:
@@
-649,7
+669,7
@@
static void report(void) {
continue;
a[x][y] = min + glp_get_col_prim(best_prob, i);
}
continue;
a[x][y] = min + glp_get_col_prim(best_prob, i);
}
- printf("%d into %d: min fragment %g
\n", n, m, min
);
+ printf("%d into %d: min fragment %g
[%s]\n", n, m, min, VERSION
);
for (i = 0; i < n; i++) {
for (j = 0; j < m; j++) {
if (a[i][j])
for (i = 0; i < n; i++) {
for (j = 0; j < m; j++) {
if (a[i][j])