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 cbc78857a6bf17a1b7ed95270aba783e66b1fb80..e093311d63ea31e18909fdc7a7f71c6d409318bb 100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-13,8
+13,6
@@
typedef uint32_t AdjWord;
#define PRADJ "08"PRIx32
static int n, m;
#define PRADJ "08"PRIx32
static int n, m;
-static AdjWord *adjmatrix_counters;
-static AdjWord *adjmatrix_offsets;
static AdjWord *adjmatrix;
static AdjWord adjall;
static AdjWord *adjmatrix;
static AdjWord adjall;
@@
-29,14
+27,9
@@
static AdjWord *xalloc_adjmatrix(void) {
}
static void prep(void) {
}
static void prep(void) {
- int i;
adjall = ~((~(AdjWord)0) << m);
adjmatrix = xalloc_adjmatrix();
adjall = ~((~(AdjWord)0) << m);
adjmatrix = xalloc_adjmatrix();
- adjmatrix_counters = xalloc_adjmatrix();
- adjmatrix_offsets = xalloc_adjmatrix();
glp_term_out(GLP_OFF);
glp_term_out(GLP_OFF);
- for (i=0; i<n; i++)
- adjmatrix_offsets[i] = ((i+1)*(AdjWord)0x12345678) & adjall;
}
static AdjWord one_adj_bit(int bitnum) {
}
static AdjWord one_adj_bit(int bitnum) {
@@
-236,26
+229,21
@@
static void optimise(int doprint) {
static void iterate_recurse(int i, AdjWord min) {
if (i >= n) {
static void iterate_recurse(int i, AdjWord min) {
if (i >= n) {
- int ii;
- for (ii=0; ii<n; ii++) {
- adjmatrix[ii] = adjmatrix_counters[ii] ^ adjmatrix_offsets[ii];
- if (!adjmatrix[ii]) return;
- }
printcounter++;
optimise(!(printcounter & 0xfff));
return;
}
printcounter++;
optimise(!(printcounter & 0xfff));
return;
}
- for (adjmatrix
_counters
[i] = min;
+ for (adjmatrix[i] = min;
;
;
- adjmatrix
_counters
[i]++) {
- iterate_recurse(i+1, adjmatrix
_counters
[i]);
- if (adjmatrix
_counters
[i] == adjall)
+ adjmatrix[i]++) {
+ iterate_recurse(i+1, adjmatrix[i]);
+ if (adjmatrix[i] == adjall)
return;
}
}
static void iterate(void) {
return;
}
}
static void iterate(void) {
- iterate_recurse(0,
0
);
+ iterate_recurse(0,
1
);
}
int main(int argc, char **argv) {
}
int main(int argc, char **argv) {