From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 7 Mar 2014 17:35:56 +0000 (+0000)
Subject: Revert "mix up the order" and "mix up the order"
X-Git-Tag: v1~9
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=matchsticks-search.git;a=commitdiff_plain;h=f695bdefee6f7b1d746e34eb7abe6e60f2f74ad9;hp=2e084dc7235e257b62d034b663e8466a2c7b6af0

Revert "mix up the order" and "mix up the order"

This is not correct; I think it doesn't in fact search all relevant
bit patterns.
---

diff --git a/main.c b/main.c
index 6ccfea7..e093311 100644
--- a/main.c
+++ b/main.c
@@ -10,11 +10,9 @@
 #include <glpk.h>
 
 typedef uint32_t AdjWord;
-#define PRADJ "04"PRIx32
+#define PRADJ "08"PRIx32
 
 static int n, m;
-static AdjWord *adjmatrix_counters;
-static AdjWord *adjmatrix_offsets;
 static AdjWord *adjmatrix;
 static AdjWord adjall;
 
@@ -29,14 +27,9 @@ 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) {
@@ -63,7 +56,7 @@ static void optimise(int doprint) {
   for (i=0, totalfrags=0; i<n; i++) {
     int frags = count_set_adj_bits(adjmatrix[i]);
     totalfrags += frags;
-    PRINTF("%"PRADJ"/%"PRADJ" ", adjmatrix_counters[i], adjmatrix[i]);
+    PRINTF("%"PRADJ" ", adjmatrix[i]);
     double maxminsize = (double)m / frags;
     if (maxminsize <= best) {
       PRINTF(" too fine");
@@ -236,26 +229,21 @@ 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_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) {
-  iterate_recurse(0, 0);
+  iterate_recurse(0, 1);
 }
 
 int main(int argc, char **argv) {