r
/
fifth
1
Fork 0
Code

10x speedup; still slightly off though

master
Joshua Potter 2015-06-06 19:39:46 -04:00
parent e64dfa9e79
commit 94211ab723
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/life.py
View File

@ -16,4 +16,4 @@ if __name__ == '__main__':
p = cam_parser.CAMParser('B3/S23', c) p = cam_parser.CAMParser('B3/S23', c)
c.randomize() c.randomize()
c.start_plot(100, p.ruleset) c.start_plot(50, p.ruleset)

12
src/configuration.py
View File

@ -45,14 +45,14 @@ class Neighborhood:
Offsetted cells belonging in the given neighborhood must be added separately. Offsetted cells belonging in the given neighborhood must be added separately.
""" """
self.states = None
self.bit_indices = None
self.flat_indices = None
self.total = total self.total = total
self.bit_index = bit_index self.bit_index = bit_index
self.flat_index = flat_index self.flat_index = flat_index
self.states = np.array([])
self.bit_indices = np.array([])
self.flat_indices = np.array([])
def process_offsets(self, plane, offsets): def process_offsets(self, plane, offsets):
""" """
@ -179,9 +179,9 @@ class Configuration:
""" """
if not vfunc(plane, neighborhood, *args): if not vfunc(plane, neighborhood, *args):
return (False, None) return (False, None)
elif callable(self.next_state): try:
return (True, self.next_state(plane, neighborhood, *args)) return (True, self.next_state(plane, neighborhood, *args))
else: except TypeError:
return (True, self.next_state) return (True, self.next_state)

8
src/ruleset.py
View File

@ -95,10 +95,11 @@ class Ruleset:
# Chunk into groups of 9 and sum all values # Chunk into groups of 9 and sum all values
# These summations represent the total number of active states in a given neighborhood # These summations represent the total number of active states in a given neighborhood
totals = [0] * plane.N totals = [0] * plane.N
chunks = list(map(sum, [neighboring[i:i+9] for i in range(0, len(neighboring), 9)])) chunks = map(sum, [neighboring[i:i+9] for i in range(0, len(neighboring), 9)])
for chunk in chunks: for chunk in chunks:
i_chunk = list(map(int, str(chunk).zfill(plane.N))) i_chunk = map(int, str(chunk).zfill(plane.N))
totals = list(map(sum, zip(totals, i_chunk))) totals = map(sum, zip(totals, i_chunk))
totals = list(totals)
# Determine which function should be used to test success # Determine which function should be used to test success
if self.method == Ruleset.Method.MATCH: if self.method == Ruleset.Method.MATCH:
@ -111,6 +112,7 @@ class Ruleset:
vfunc = lambda *args: True vfunc = lambda *args: True
# Apply change to all successful configurations # Apply change to all successful configurations
for bit_index in to_update: for bit_index in to_update:
neighborhood = c.Neighborhood(flat_index, bit_index, totals[bit_index]) neighborhood = c.Neighborhood(flat_index, bit_index, totals[bit_index])
success, state = config.passes(plane, neighborhood, vfunc, *args) success, state = config.passes(plane, neighborhood, vfunc, *args)