Changeset 62:3ff0fdc7ce7a

Timestamp:

12/11/10 00:46:25 (5 years ago)

Author:

darkhan

Branch:

default

Message:

Optimization of Automata

File:

• Automata.py (modified) (2 diffs)

Automata.py

@@ -15 +15 @@
                         self.states = states
                 self.symbols = {}
+                self.st_sym = {}
                 for num, st in enumerate(self.states):
                         self.symbols[st.symbol] = num
+                        self.st_sym[st.symbol] = st
                 self.field = []
                 for row in range(height):
@@ -25 +27 @@
         def next_step(self):
                 changed = []
-                for row in range(self.height):
-                        for col in range(self.width):
+                for row in range(1, self.height - 1):
+                        for col in range(1, self.width - 1):
                                 symbol = self.field[row][col]
                                 num = 0
-                                for vert_long in range(row + self.height - 1, 
-                                                                                row + self.height + 2):
-                                        for horiz_long in range(col + self.width - 1, 
-                                                                                        col + self.width + 2):
-                                                vert = vert_long % self.height
-                                                horiz = horiz_long % self.width
+                                for vert in range(row - 1, row + 2):
+                                        for horiz in range(col - 1, col + 2):
                                                 if self.field[vert][horiz] == symbol:
                                                         num += 1
-                                if self.states[self.symbols[symbol]].next_state(num - 1):
+                                if self.st_sym[symbol].next_state(num - 1):
                                         changed.append((row, col))
+                                        
+                for row in range(1, self.height - 1):
+                        symbol1 = self.field[row][0]
+                        symbol2 = self.field[row][self.width - 1]
+                        num1 = 0
+                        num2 = 0
+                        for vert in range(row - 1, row + 2):
+                                for horiz in [0, 1, self.width - 1]:
+                                        if self.field[vert][horiz] == symbol1:
+                                                num1 += 1
+                                for horiz in [self.width - 2, self.width - 1, 0]:
+                                        if self.field[vert][horiz] == symbol2:
+                                                num2 += 1
+                        if self.st_sym[symbol1].next_state(num1 - 1):
+                                changed.append((row, 0))
+                        if self.st_sym[symbol2].next_state(num2 - 1):
+                                changed.append((row, self.width - 1))
+                                
+                for col in range(1, self.width - 1):
+                        symbol1 = self.field[0][col]
+                        symbol2 = self.field[self.height - 1][col]
+                        num1 = 0
+                        num2 = 0
+                        for horiz in range(col - 1, col + 2):
+                                for vert in [0, 1, self.height - 1]:
+                                        if self.field[vert][horiz] == symbol1:
+                                                num1 += 1
+                                for vert in [self.height - 2, self.height - 1, 0]:
+                                        if self.field[vert][horiz] == symbol2:
+                                                num2 += 1
+                        if self.st_sym[symbol1].next_state(num1 - 1):
+                                changed.append((0, col))
+                        if self.st_sym[symbol2].next_state(num2 - 1):
+                                changed.append((self.height - 1, col))
+                                
+                for row, col in [(0, 0), (self.height - 1, self.width - 1),
+                                                (0, self.width - 1), (self.height - 1, 0)]:
+                        symbol = self.field[row][col]
+                        num = 0
+                        for vert_long in range(row + self.height - 1, 
+                                                                        row + self.height + 2):
+                                for horiz_long in range(col + self.width - 1, 
+                                                                                col + self.width + 2):
+                                        vert = vert_long % self.height
+                                        horiz = horiz_long % self.width
+                                        if self.field[vert][horiz] == symbol:
+                                                num += 1
+                        if self.st_sym[symbol].next_state(num - 1):
+                                changed.append((row, col))
                                                 
                 for row, col in changed: