From 03c4648a2461780e9cd2c4c488bcbc122d0d7ee4 Mon Sep 17 00:00:00 2001 From: SimpleArt <71458112+SimpleArt@users.noreply.github.com> Date: Wed, 9 Dec 2020 11:41:56 -0500 Subject: [PATCH] Fixed adapt probability sums --- src/EasyGA.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/EasyGA.py b/src/EasyGA.py index 07915c5..207a3a0 100644 --- a/src/EasyGA.py +++ b/src/EasyGA.py @@ -134,38 +134,38 @@ class GA(Attributes): # Too few converged: cross more and mutate less if tol(amount_converged//2) > tol(amount_converged//4)*2: - self.selection_probability = sum( + self.selection_probability = sum(( self.adapt_probability_rate * self.max_selection_probability, (1-self.adapt_probability_rate) * self.selection_probability - ) + )) - self.chromosome_mutation_rate = sum( + self.chromosome_mutation_rate = sum(( self.adapt_probability_rate * self.min_chromosome_mutation_rate, (1-self.adapt_probability_rate) * self.chromosome_mutation_rate - ) + )) - self.gene_mutation_rate = sum( + self.gene_mutation_rate = sum(( self.adapt_probability_rate * self.min_gene_mutation_rate, (1-self.adapt_probability_rate) * self.gene_mutation_rate - ) + )) # Too many converged: cross less and mutate more else: - self.selection_probability = sum( + self.selection_probability = sum(( self.adapt_probability_rate * self.min_selection_probability, (1-self.adapt_probability_rate) * self.selection_probability - ) + )) - self.chromosome_mutation_rate = sum( + self.chromosome_mutation_rate = sum(( self.adapt_probability_rate * self.max_chromosome_mutation_rate, (1-self.adapt_probability_rate) * self.chromosome_mutation_rate - ) + )) - self.gene_mutation_rate = sum( + self.gene_mutation_rate = sum(( self.adapt_probability_rate * self.max_gene_mutation_rate, (1-self.adapt_probability_rate) * self.gene_mutation_rate - ) + )) def adapt_population(self):