diff options
Diffstat (limited to 'model_layer.py')
| -rw-r--r-- | model_layer.py | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/model_layer.py b/model_layer.py index f30020a..bf6baae 100644 --- a/model_layer.py +++ b/model_layer.py @@ -1,5 +1,5 @@ # coding: UTF-8 -# Copyright 2009 Thomas Jourdan +# Copyright 2009, 2010 Thomas Jourdan # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -19,7 +19,6 @@ import random import cairo import model_random import model_allele -import model_constraintpool from gettext import gettext as _ ## Cairo's compositing operators @@ -50,34 +49,20 @@ class Layer(model_allele.Allele): """Layer constructor""" super(Layer, self).__init__(trunk) self.random_seed = 1512 -# self.operator = cairo.OPERATOR_OVER - -# def dump(self): -# return (repr(type(self)), id(self), -# self.random_seed, -# self.OPERATOR_NAMES[self.operator], -# ) def __eq__(self, other): """Equality based on the cells color components.""" equal = isinstance(other, Layer) \ 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.random_seed = random.randint(1, 65535) -# operator_constraint = cpool.get(self, OPERATOR_CONSTRAINT) -# self.operator = random.choice(operator_constraint) def mutate(self): """Make small random changes to the layers components.""" -# if model_random.is_mutating(): -# cpool = model_constraintpool.ConstraintPool.get_pool() -# operator_constraint = cpool.get(self, OPERATOR_CONSTRAINT) -# self.operator = random.choice(operator_constraint) + pass def swap_places(self): """Layer is an abstract class. Call swap_places() on sub classes only. @@ -97,11 +82,9 @@ class Layer(model_allele.Allele): pre: isinstance(other, Layer) pre: cross_lenght >= 0 """ - cross_sequence = model_random.crossing_sequence(cross_lenght + 2) + cross_sequence = model_random.crossing_sequence(cross_lenght + 1) 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 render(self, task, ctx, width, height): @@ -119,8 +102,8 @@ class Layer(model_allele.Allele): ctx.set_operator(cairo.OPERATOR_SOURCE) def explain(self, formater): - formater.text_item('Painters algorithm: ' + self.__class__.__name__) - formater.text_item('Seed value for random generator: ' \ + formater.text_item(_('Painters algorithm: ') + self.__class__.__name__) + formater.text_item(_('Seed value for random generator: ') \ + str(self.random_seed)) def copy(self): @@ -133,4 +116,3 @@ class Layer(model_allele.Allele): pre: isinstance(new_one, Layer) """ new_one.random_seed = self.random_seed -# new_one.operator = self.operator |