diff options
author | Thomas Jourdan <b.vehikel@googlemail.com> | 2009-08-28 14:14:32 (GMT) |
---|---|---|
committer | Thomas Jourdan <b.vehikel@googlemail.com> | 2009-08-28 14:14:32 (GMT) |
commit | 6d7854472b3674eb30a1845690f1104b685f7980 (patch) | |
tree | 490dbe1898c97e876c4ba2fbcb450022a4b9c900 /model_layer.py | |
parent | 2b7768ebf9d320dcf4b906bcb453092a45c4e1a2 (diff) |
implementing markov chain layer, dummy implementaion replaced
Diffstat (limited to 'model_layer.py')
-rw-r--r-- | model_layer.py | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/model_layer.py b/model_layer.py index 5d2eb25..3953d67 100644 --- a/model_layer.py +++ b/model_layer.py @@ -87,20 +87,20 @@ class Layer(model_allele.Allele): def __init__(self, trunk): """Layer constructor""" super(Layer, self).__init__(trunk) - self.seed = 1512 + self.random_seed = 1512 self.operator = cairo.OPERATOR_OVER def __eq__(self, other): """Equality based on the cells color components.""" equal = isinstance(other, Layer) \ - and self.seed == other.seed \ + and self.random_seed == other.random_seed \ and self.operator == other.operator return equal def randomize(self): """Randomize the layers components.""" cpool = model_constraintpool.ConstraintPool.get_pool() - self.seed = random.randint(1, 65535) + self.random_seed = random.randint(1, 65535) operator_constraint = cpool.get(self, OPERATOR_CONSTRAINT) self.operator = random.choice(operator_constraint) @@ -127,14 +127,10 @@ class Layer(model_allele.Allele): pre: cross_lenght >= 0 """ cross_sequence = ka_random.crossing_sequence(cross_lenght + 2) - if cross_sequence[cross_lenght]: - new_one.seed = self.seed - else: - new_one.seed = other.seed - if cross_sequence[cross_lenght+1]: - new_one.operator = self.operator - else: - new_one.operator = other.operator + new_one.random_seed = self.random_seed \ + if cross_sequence[cross_lenght] else other.random_seed + new_one.operator = self.operator \ + if cross_sequence[cross_lenght+1] else other.operator return cross_sequence def draw(self, ctx, width, height): @@ -163,5 +159,5 @@ class Layer(model_allele.Allele): """The layers copy constructor pre: isinstance(new_one, Layer) """ - new_one.seed = self.seed + new_one.random_seed = self.random_seed new_one.operator = self.operator |