From 7dc9c17e741cffa57d828673bf63ca121ee6e517 Mon Sep 17 00:00:00 2001 From: SimpleArt <71458112+SimpleArt@users.noreply.github.com> Date: Wed, 30 Dec 2020 14:36:50 -0500 Subject: [PATCH] Minor import changes --- src/EasyGA.py | 8 ++++---- src/attributes.py | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/EasyGA.py b/src/EasyGA.py index 900dce9..5e17553 100644 --- a/src/EasyGA.py +++ b/src/EasyGA.py @@ -26,17 +26,17 @@ from structure import Population as make_population from structure import Chromosome as make_chromosome from structure import Gene as make_gene -# Structure Methods -from fitness_function import Fitness_Examples +# Misc. Methods +from fitness_function import Fitness_Examples from termination_point import Termination_Methods # Parent/Survivor Selection Methods -from parent_selection import Parent_Selection +from parent_selection import Parent_Selection from survivor_selection import Survivor_Selection # Genetic Operator Methods -from mutation import Mutation_Methods from crossover import Crossover_Methods +from mutation import Mutation_Methods # Default Attributes for the GA from attributes import Attributes diff --git a/src/attributes.py b/src/attributes.py index 768f28e..95615c9 100644 --- a/src/attributes.py +++ b/src/attributes.py @@ -1,8 +1,8 @@ # Import signature tool to check if functions start with self or ga from inspect import signature -# Import square root function for ga.adapt() and ga.dist() -from math import sqrt +# Import math for square root (ga.dist()) and ceil (crossover methods) +import math import random import sqlite3 @@ -13,17 +13,17 @@ from structure import Population as make_population from structure import Chromosome as make_chromosome from structure import Gene as make_gene -# Structure Methods -from fitness_function import Fitness_Examples +# Misc. Methods +from fitness_function import Fitness_Examples from termination_point import Termination_Methods # Parent/Survivor Selection Methods -from parent_selection import Parent_Selection +from parent_selection import Parent_Selection from survivor_selection import Survivor_Selection # Genetic Operator Methods -from mutation import Mutation_Methods from crossover import Crossover_Methods +from mutation import Mutation_Methods # Database class from database import sql_database @@ -217,7 +217,7 @@ class Attributes: def dist(self, chromosome_1, chromosome_2): """Default distance lambda. Returns the square root of the difference in fitnesses.""" - return sqrt(abs(chromosome_1.fitness - chromosome_2.fitness)) + return math.sqrt(abs(chromosome_1.fitness - chromosome_2.fitness)) def gene_impl(self, *args, **kwargs): @@ -299,7 +299,7 @@ class Attributes: # Euclidean norm self.dist = lambda self, chromosome_1, chromosome_2:\ - sqrt(sum( + math.sqrt(sum( (gene_1.value - gene_2.value) ** 2 for gene_1, gene_2 in zip(chromosome_1, chromosome_2)