Automate creation of Bedbugs.rule

All the manual hackery is now automated, but the result is equivalent.
Still quite shonky.

diff --git a/Bedbugs.rule b/Bedbugs.rule
index fdcb9b40adfbf2689b236fcce908d3a27d631879..7c2c381efbb134cab9fb4060e8eafc3f52b7add0 100644 (file)
--- a/Bedbugs.rule
+++ b/Bedbugs.rule
@@ -9,7 +9,6 @@ neighborhood:Moore
 symmetries:none
 # Bedsteadisation rules generated by bedbugs.c
 # FIXME: vars to allow edit in off states?
 symmetries:none
 # Bedsteadisation rules generated by bedbugs.c
 # FIXME: vars to allow edit in off states?

-# 1st one hacked

 0,0,0,0,0,0,0,0,0,0
 0,0,0,0,0,0,0,0,1,2
 0,1,0,0,0,0,0,0,0,2
 0,0,0,0,0,0,0,0,0,0
 0,0,0,0,0,0,0,0,1,2
 0,1,0,0,0,0,0,0,0,2


@@ -523,8 +522,15 @@ symmetries:none
 1,1,1,1,1,1,1,1,0,33
 1,1,1,1,1,1,1,1,1,33
 # Conway rules (autogenerated)
 1,1,1,1,1,1,1,1,0,33
 1,1,1,1,1,1,1,1,1,33
 # Conway rules (autogenerated)

-#zz,qn,qne,qe,qse,qs,qsw,qw,qnw,0
-#aa,qn,qne,qe,qse,qs,qsw,qw,qnw,1
+# rules: 190
+#
+# Golly rule-table format.
+# Each rule: C,N,NE,E,SE,S,SW,W,NW,C'
+# N.B. Where the same variable appears multiple times in a transition,
+# it takes the same value each time.
+#
+# All transitions should be included below, including no-change ones.
+#

 var zz={0,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17}
 var aa={18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33}
 var zc={zz}
 var zz={0,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17}
 var aa={18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33}
 var zc={zz}

diff --git a/src/.gitignore b/src/.gitignore
index 0afa5f6fb66221c6e3c888b7ba3b250ff967a851..731092dd7b31b51bf876da4719e243e8705a41fd 100644 (file)
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -2,4 +2,3 @@ bedbugs
 make-ruletable
 life.table
 mungedlife.table
 make-ruletable
 life.table
 mungedlife.table

-bedbugs.rule

diff --git a/src/Bedbugs.rule.template b/src/Bedbugs.rule.template
new file mode 100644 (file)
index 0000000..12b4811
--- /dev/null
+++ b/src/Bedbugs.rule.template
@@ -0,0 +1,20 @@
+@RULE Bedbugs
+Bedbugs: standard Conway life with complication to use Bedstead rendering
+Alternates between Conway propagation and Bedsteadisation
+2 states for Conway -> 32 states (16x2) for Bedstead -> 2 etc.
+
+@TABLE
+n_states:34
+neighborhood:Moore
+symmetries:none
+# Bedsteadisation rules generated by bedbugs.c
+# FIXME: vars to allow edit in off states?
+@@BEDSTEAD
+# Conway rules (autogenerated)
+@@mungedlife.table
+
+@COLORS
+255 255 255  255 255 255  white to white
+
+@ICONS
+@@ICONS

diff --git a/src/Makefile b/src/Makefile
index 8c41a029058a16d8189d240b7375b562faf08dd8..fc8c0a013f495d05b2221233011adcd8f2981da4 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,12 +1,12 @@
-all: bedbugs.rule mungedlife.table
+../Bedbugs.rule: bedbugs mungedlife.table
+       ./bedbugs <Bedbugs.rule.template >../Bedbugs.rule

 
 clean:
 
 clean:

-       rm bedbugs bedbugs.rule make-ruletable life.table mungedlife.table
+       rm -f bedbugs make-ruletable life.table mungedlife.table
+reallyquiteclean: clean
+       rm -f ../Bedbugs.rule

 .PHONY: clean
 
 .PHONY: clean
 

-bedbugs.rule: bedbugs
-       ./bedbugs >bedbugs.rule
-

 mungedlife.table: life.table mungetable.pl
        perl mungetable.pl <life.table >mungedlife.table
 
 mungedlife.table: life.table mungetable.pl
        perl mungetable.pl <life.table >mungedlife.table
 

diff --git a/src/bedbugs.c b/src/bedbugs.c
index f703ad673011086f42bb472c28dc8815e3202728..05d22ba39bb3ba41b11fd58d67b4f9f88a546373 100644 (file)
--- a/src/bedbugs.c
+++ b/src/bedbugs.c
@@ -125,6 +125,8 @@
  * [...]
  */
 
  * [...]
  */
 

+#include <assert.h>
+#include <errno.h>

 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>


@@ -208,16 +210,12 @@ blackpixel(bool *r, int size, int bl, int br, int tr, int tl)
     }
 }
 
     }
 }
 

-int main(int argc, char *argv[])
+void bedstead (void)

 {
 {

-
-        /* FIXME: output a complete rule file rather than a heap of
-         * fragments requiring manual assembly */
-
-        /* Bedbugs step 1: output smoothing rules as a Golly rule
-         * table mapping from (0,1) to an expanded set of states that
-         * we can hang icons from. (The smoothing algorithm requires
-         * a 3x3 neighbourhood, which is fortuitous.) */
+        /* Output smoothing rules as a Golly rule table mapping from
+         * (0,1) to an expanded set of states that we can hang icons
+         * from. (The smoothing algorithm requires a 3x3 neighbourhood,
+         * which is fortuitous.) */

 
         /* Index into small bitmap */
 #define GETPIX(x,y) (!!(iter & 1u<<((y)*3+(x))))
 
         /* Index into small bitmap */
 #define GETPIX(x,y) (!!(iter & 1u<<((y)*3+(x))))


@@ -266,15 +264,26 @@ int main(int argc, char *argv[])
                                 /* Off states are 2..17 */
                                 state = 2 + (bl | br<<1 | tr<<2 | tl<<3);
                        }
                                 /* Off states are 2..17 */
                                 state = 2 + (bl | br<<1 | tr<<2 | tl<<3);
                        }

+                        if (iter == 0) {
+                                /* Special case: we don't want to try to
+                                 * flip all of infinite empty space between
+                                 * 0 and 2 every step (this has odd effects
+                                 * on Golly) */
+                                assert(state == 2);
+                                state = 0;
+                        }

                         /* Output rule in Golly rule format
                          * (FIXME completely unoptimised) */
                         printf("%d,%d,%d,%d,%d,%d,%d,%d,%d,%d\n",
                                GETPIX(x,y),U,UR,R,DR,D,DL,L,UL,state);
         }
                         /* Output rule in Golly rule format
                          * (FIXME completely unoptimised) */
                         printf("%d,%d,%d,%d,%d,%d,%d,%d,%d,%d\n",
                                GETPIX(x,y),U,UR,R,DR,D,DL,L,UL,state);
         }

+}

 
 

-        /* Bedbugs step 2: icons. In each size supported by Golly,
+void icons(void)
+{
+        /* Bedbugs icons. In each size supported by Golly,

          * draw one icon per state, in the XPM format Golly wants.
          * draw one icon per state, in the XPM format Golly wants.

-         * This does not actually depend on step 1 at all.
+         * This does not actually depend on bedstead() at all.

          * (FIXME: but it could. Some of the states we generate icons
          * and rules for are not actually reachable. We could spot
          * unused states above and avoid generating icons or rules for
          * (FIXME: but it could. Some of the states we generate icons
          * and rules for are not actually reachable. We could spot
          * unused states above and avoid generating icons or rules for


@@ -313,5 +322,50 @@ int main(int argc, char *argv[])
                 }
             }
         }
                 }
             }
         }

-        return 0;
+}
+
+int main(int argc, char *argv[])
+{
+    while (!feof(stdin)) {
+        char l[100]; /* bleah */
+        if (!fgets(l, sizeof(l), stdin)) {
+            break;
+        }
+        if (strlen(l) == sizeof(l)-1) {
+            fprintf(stderr, "Long input line; possible truncation; I suck\n");
+            exit(1);
+        }
+        if (strlen(l) >= 2 && l[0] == '@' && l[1] == '@') {
+            size_t n = strcspn(l+2, "\n");
+            if (strncmp(l+2, "BEDSTEAD", n) == 0) {
+                bedstead();
+            } else if (strncmp(l+2, "ICONS", n) == 0) {
+                icons();
+            } else {
+                /* Bodily insert named file on stdout. */
+                FILE *f;
+                l[n+2]='\0';
+                if (!(f = fopen(l+2, "r"))) {
+                    fprintf(stderr, "Couldn't open '%s': %s\n", l+2,
+                            strerror(errno));
+                    exit(1);
+                } else {
+                    do {
+                        char buf[2048]; /* also bleah */
+                        size_t n = fread(buf, 1, sizeof(buf), f);
+                        fwrite(buf, 1, n, stdout);
+                    } while (!feof(f) && !ferror(f));
+                    if (ferror(f)) {
+                        fprintf(stderr, "Error reading '%s': %s\n", l+2,
+                                strerror(errno));
+                        exit(1);
+                    }
+                    fclose(f);
+                }
+            }
+        } else {
+            printf("%s", l);
+        }
+    }
+    return 0;

 }
 }

diff --git a/src/mungetable.pl b/src/mungetable.pl
index 369d861dcf852cfaf52d20e43c956d3cc8752f5a..d6eef08a1d7742924d8214bc4feb31c487e8bb4d 100755 (executable)
--- a/src/mungetable.pl
+++ b/src/mungetable.pl
@@ -33,7 +33,8 @@ while(<>) {
     if (m/^#/) {
         print $_;
     } elsif (m/^(n_states|neighborhood|symmetries):/) {
     if (m/^#/) {
         print $_;
     } elsif (m/^(n_states|neighborhood|symmetries):/) {

-        print $_;
+        # Suppress -- assume matching ones will be provided elsewhere
+        ;

     } elsif (m/^var /) {
         die "Complicated variable" unless m/^var (.)=\{0,1\}$/;
         $vars{$1} = 1;
     } elsif (m/^var /) {
         die "Complicated variable" unless m/^var (.)=\{0,1\}$/;
         $vars{$1} = 1;