paulin/EasyGA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed adapt probability sums

Browse Source
This commit is contained in:
SimpleArt
2020-12-09 11:41:56 -05:00
parent 4edf073f32
commit 03c4648a24
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/EasyGA.py
View File

@ -134,38 +134,38 @@ class GA(Attributes):
# Too few converged: cross more and mutate less # Too few converged: cross more and mutate less
if tol(amount_converged//2) > tol(amount_converged//4)*2: 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, self.adapt_probability_rate * self.max_selection_probability,
(1-self.adapt_probability_rate) * self.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, self.adapt_probability_rate * self.min_chromosome_mutation_rate,
(1-self.adapt_probability_rate) * self.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, self.adapt_probability_rate * self.min_gene_mutation_rate,
(1-self.adapt_probability_rate) * self.gene_mutation_rate (1-self.adapt_probability_rate) * self.gene_mutation_rate
) ))
# Too many converged: cross less and mutate more # Too many converged: cross less and mutate more
else: else:
self.selection_probability = sum( self.selection_probability = sum((
self.adapt_probability_rate * self.min_selection_probability, self.adapt_probability_rate * self.min_selection_probability,
(1-self.adapt_probability_rate) * self.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, self.adapt_probability_rate * self.max_chromosome_mutation_rate,
(1-self.adapt_probability_rate) * self.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, self.adapt_probability_rate * self.max_gene_mutation_rate,
(1-self.adapt_probability_rate) * self.gene_mutation_rate (1-self.adapt_probability_rate) * self.gene_mutation_rate
) ))
def adapt_population(self): def adapt_population(self):