Changeset 49:94406d1874a2

Timestamp:

12/06/10 12:36:59 (5 years ago)

Author:

darkhan

Branch:

default

Children:

50:9cbbff6dbbaf, 51:f411a1e0a5cb

Message:

repr in State, little optimized Automata, cell_size = 8, delay = 1

Files:

• Automata.py (modified) (3 diffs)
• Interface.py (modified) (2 diffs)
• State.py (modified) (1 diff)

Automata.py

@@ -10 +10 @@
                 self.height = height
                 if states == None:
-                        self.states = [State("Dead", ' ', "white", [5]),
+                        self.states = [State("Dead", '-', "white", [5]),
                                                         State("Alive", '+', "black", [0, 1] + range(4, 9))]
                 else:
@@ -25 +25 @@
         def next_step(self):
                 changed = []
-                new_state = []
                 for row in range(self.height):
-                        new_state.append([])
                         for col in range(self.width):
                                 symbol = self.field[row][col]
@@ -39 +37 @@
                                                 if self.field[vert][horiz] == symbol:
                                                         num += 1
-                                new_state[row].append(
-                                                self.states[self.symbols[symbol]].next_state(num - 1))
+                                if self.states[self.symbols[symbol]].next_state(num - 1):
+                                        changed.append((row, col))
                                                 
-                for row in range(self.height):
-                        for col in range(self.width):
-                                if new_state[row][col]:
-                                        changed.append((row, col))
-                                        index = (self.symbols[self.field[row][col]] + 
+                for row, col in changed:
+                        index = (self.symbols[self.field[row][col]] + 
                                                                                                                 1) %  len(self.states)
-                                        self.field[row][col] = self.states[index].symbol
+                        self.field[row][col] = self.states[index].symbol
                 return changed
 

Interface.py

@@ -7 +7 @@
 class Handlers(object):
         
-        def __init__(self, cell_size=10, line_width=1 ,delay=100, offset_x=0, offset_y=0):# cell_size is size of cell, including line width, if there is it
+        def __init__(self, cell_size=8, line_width=1 ,delay=1, offset_x=0, offset_y=0):# cell_size is size of cell, including line width, if there is it
                 self.cell_size = cell_size
                 self.line_width = line_width
@@ -250 +250 @@
 canvas.config(width=500, height=400)
 
-automata = Automata(50, 50) 
+automata = Automata() 
 handlers = Handlers()
 

State.py

@@ -17 +17 @@
 
         def __repr__(self):
-                return self.name + " " + self.symbol
+                return self.symbol + " " + self.name