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

Fixed sort by best fitness

Browse Source
This commit is contained in:
SimpleArt
2021-01-04 23:44:40 -05:00
parent fe2804bdbc
commit 411e26ab7c
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/EasyGA.py
View File

@ -72,7 +72,6 @@ class GA(Attributes):
# Otherwise evolve the population. # Otherwise evolve the population.
else: else:
self.parent_selection_impl() self.parent_selection_impl()
self.crossover_population_impl() self.crossover_population_impl()
self.survivor_selection_impl() self.survivor_selection_impl()
@ -273,7 +272,7 @@ class GA(Attributes):
chromosome.fitness = self.fitness_function_impl(chromosome) chromosome.fitness = self.fitness_function_impl(chromosome)
def sort_by_best_fitness(self, chromosome_list = None, in_place = False): def sort_by_best_fitness(self, chromosome_list = None, in_place = True):
"""Sorts the chromosome list by fitness based on fitness type. """Sorts the chromosome list by fitness based on fitness type.
1st element has best fitness. 1st element has best fitness.
2nd element has second best fitness. 2nd element has second best fitness.
@ -291,7 +290,7 @@ class GA(Attributes):
reverse = (self.target_fitness_type == 'max') reverse = (self.target_fitness_type == 'max')
# Sort by fitness, assuming None should be moved to the end of the list # Sort by fitness, assuming None should be moved to the end of the list
key = lambda chromosome: chromosome.fitness if chromosome.fitness is not None else float('inf') * (+1, -1)[int(reverse)] key = lambda chromosome: (chromosome.fitness if (chromosome.fitness is not None) else (float('inf') * (+1, -1)[int(reverse)]))
if in_place: if in_place:
chromosome_list.sort(key = key, reverse = reverse) chromosome_list.sort(key = key, reverse = reverse)