From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 7 Mar 2014 17:24:49 +0000 (+0000)
Subject: mix up the order
X-Git-Tag: v1~11
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=matchsticks-search.git;a=commitdiff_plain;h=d02a0a9b6bb301033c3eb01a51095c6c00fb601b

mix up the order
---

diff --git a/main.c b/main.c
index e093311..cbc7885 100644
--- a/main.c
+++ b/main.c
@@ -13,6 +13,8 @@ typedef uint32_t AdjWord;
 #define PRADJ "08"PRIx32
 
 static int n, m;
+static AdjWord *adjmatrix_counters;
+static AdjWord *adjmatrix_offsets;
 static AdjWord *adjmatrix;
 static AdjWord adjall;
 
@@ -27,9 +29,14 @@ static AdjWord *xalloc_adjmatrix(void) {
 }
 
 static void prep(void) {
+  int i;
   adjall = ~((~(AdjWord)0) << m);
   adjmatrix = xalloc_adjmatrix();
+  adjmatrix_counters = xalloc_adjmatrix();
+  adjmatrix_offsets = xalloc_adjmatrix();
   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) {
@@ -229,21 +236,26 @@ static void optimise(int doprint) {
 
 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;
   }
-  for (adjmatrix[i] = min;
+  for (adjmatrix_counters[i] = min;
        ;
-       adjmatrix[i]++) {
-    iterate_recurse(i+1, adjmatrix[i]);
-    if (adjmatrix[i] == adjall)
+       adjmatrix_counters[i]++) {
+    iterate_recurse(i+1, adjmatrix_counters[i]);
+    if (adjmatrix_counters[i] == adjall)
       return;
   }
 }
 
 static void iterate(void) {
-  iterate_recurse(0, 1);
+  iterate_recurse(0, 0);
 }
 
 int main(int argc, char **argv) {