--- a/CircularCA.py	Sun Jan 13 13:10:46 2013 -0600
+++ b/CircularCA.py	Sun Jan 13 16:24:00 2013 -0600
@@ -14,19 +14,19 @@
 class CircularCA(CA):
     """A circular cellular automaton; the cells are arranged in a ring."""
 
-    def __init__(self, rule, n=100, ratio=2):
+    def __init__(self, rule, n=100, m=50):
         """Parameters:
 
         * rule: an integer in the range 0-255 that represents the CA rule
         using Wolfram's encoding
         * n: the number of rows (time steps) in the result
-        * ratio: the ratio of columns to rows
+        * m: the number of columns
 
         """
         self.table = self.make_table(rule)
         self.n = n
         # a ghost column is added to either end
-        self.m = ratio * n + 3      # add 2 ghost columns
+        self.m = m + 2      # add 2 ghost columns
         self.array = numpy.zeros((n, self.m), dtype=numpy.int8)
         self.next = 0
 
@@ -50,6 +50,10 @@
         for j in xrange(1, self.m - 1):
             a[i, j] = t[tuple(a[i - 1, j-1:j+2])]
 
+    def loop(self, steps=1):
+        """Executes the given number of time steps."""
+        for i in xrange(steps):
+            self.step()
 
     def get_array(self, start=0, end=None):
         """Gets a slice of columns from the CA, with slice indices
@@ -62,16 +66,26 @@
         else:
             return self.array[:, start+1:end+1]
 
+    def wrap(self):
+        """Copies the last row to row 0, then resets the CA to start back at the
+        top.
+
+        """
+        a = self.array
+        a[0, :] = a[self.next - 1, :]
+        self.next = 1
+
 
 if __name__ == '__main__':
 
     import sys
     from CADrawer import PyplotDrawer
 
-    def main(script, rule, n):
+    def main(script, rule, n, m):
         rule = int(rule)
         n = int(n)
-        ca = CircularCA(rule, n)
+        m = int(m)
+        ca = CircularCA(rule, n, m)
         ca.start_single()
         ca.loop(n - 1)