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

Cleaned up code

Browse Source
This commit is contained in:
SimpleArt
2020-11-12 17:50:07 -05:00
parent ae5fed1d71
commit 0c9c545125
1 changed files with 11 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/mutation/mutation_methods.py
View File

@ -7,41 +7,21 @@ class Mutation_Methods:
def random_selection(ga): def random_selection(ga):
"""Selects random chromosomes""" """Selects random chromosomes"""
mutation_count = 0
# Loop until enough mutations occur # Loop until enough mutations occur
while mutation_count < ga.population.size()*ga.chromosome_mutation_rate: for n in range(int(ga.population.size()*ga.chromosome_mutation_rate)):
index = random.randint(0, ga.population.size()-1)
# Loop through the population
for index in range(ga.population.size()):
# Randomly apply mutations
if random.uniform(0, 1) < ga.chromosome_mutation_rate:
mutation_count += 1
ga.population.set_chromosome(ga.mutation_individual_impl(ga, ga.population.get_chromosome(index)), index) ga.population.set_chromosome(ga.mutation_individual_impl(ga, ga.population.get_chromosome(index)), index)
def random_selection_then_cross(ga): def random_selection_then_cross(ga):
"""Selects random chromosomes and self-crosses with parent""" """Selects random chromosomes and self-crosses with parent"""
mutation_count = 0
# Loop until enough mutations occur # Loop until enough mutations occur
while mutation_count < ga.population.size()*ga.chromosome_mutation_rate: for n in range(int(ga.population.size()*ga.chromosome_mutation_rate)):
index = random.randint(0, ga.population.size()-1)
# Loop through the population
for index in range(ga.population.size()):
chromosome = ga.population.get_chromosome(index)
# Randomly apply mutations
if random.uniform(0, 1) < ga.chromosome_mutation_rate:
mutation_count += 1
ga.population.set_chromosome( ga.population.set_chromosome(
ga.crossover_individual_impl( ga.crossover_individual_impl(ga, chromosome, ga.mutation_individual_impl(ga, chromosome)),
ga,
chromosome,
ga.mutation_individual_impl(ga, chromosome)
),
index index
) )
@ -59,11 +39,11 @@ class Mutation_Methods:
index = random.randint(0, chromosome.size()-1) index = random.randint(0, chromosome.size()-1)
# Using the chromosome_impl # Using the chromosome_impl
if ga.chromosome_impl != None: if ga.chromosome_impl is not None:
chromosome.set_gene(ga.make_gene(ga.chromosome_impl()[index]), index) chromosome.set_gene(ga.make_gene(ga.chromosome_impl()[index]), index)
# Using the gene_impl # Using the gene_impl
elif ga.gene_impl != None: elif ga.gene_impl is not None:
chromosome.set_gene(ga.make_gene(ga.gene_impl()), index) chromosome.set_gene(ga.make_gene(ga.gene_impl()), index)
# Exit because no gene creation method specified # Exit because no gene creation method specified