diff --git a/gadapt/factory/ga_factory.py b/gadapt/factory/ga_factory.py index 622b0ec..e6f42bc 100644 --- a/gadapt/factory/ga_factory.py +++ b/gadapt/factory/ga_factory.py @@ -115,14 +115,16 @@ from gadapt.operations.population_update.cost_diversity_population_updater import ( CostDiversityPopulationUpdater, ) -from operations.chromosome_update.base_chromosome_updater import ( +from gadapt.operations.chromosome_update.base_chromosome_updater import ( BaseChromosomeUpdater, ) -from operations.chromosome_update.parent_diversity_chromosome_updater import ( +from gadapt.operations.chromosome_update.parent_diversity_chromosome_updater import ( ParentDiversityChromosomeUpdater, ) -from operations.gene_update.base_gene_updater import BaseGeneUpdater -from operations.population_update.base_population_updater import BasePopulationUpdater +from gadapt.operations.gene_update.base_gene_updater import BaseGeneUpdater +from gadapt.operations.population_update.base_population_updater import ( + BasePopulationUpdater, +) class GAFactory(BaseGAFactory): diff --git a/gadapt/operations/chromosome_update/parent_diversity_chromosome_updater.py b/gadapt/operations/chromosome_update/parent_diversity_chromosome_updater.py index e790276..36c5b14 100644 --- a/gadapt/operations/chromosome_update/parent_diversity_chromosome_updater.py +++ b/gadapt/operations/chromosome_update/parent_diversity_chromosome_updater.py @@ -1,7 +1,7 @@ from gadapt.ga_model.chromosome import Chromosome from gadapt.ga_model.allele import Allele from gadapt.utils import ga_utils -from operations.chromosome_update.base_chromosome_updater import ( +from gadapt.operations.chromosome_update.base_chromosome_updater import ( BaseChromosomeUpdater, ) diff --git a/gadapt/operations/crossover/base_crossover.py b/gadapt/operations/crossover/base_crossover.py index 7922c5c..ef19c52 100644 --- a/gadapt/operations/crossover/base_crossover.py +++ b/gadapt/operations/crossover/base_crossover.py @@ -4,7 +4,7 @@ from gadapt.ga_model.allele import Allele from gadapt.ga_model.chromosome import Chromosome -from operations.chromosome_update.base_chromosome_updater import ( +from gadapt.operations.chromosome_update.base_chromosome_updater import ( BaseChromosomeUpdater, ) diff --git a/gadapt/operations/crossover/blending_crossover.py b/gadapt/operations/crossover/blending_crossover.py index 2b840b4..bb50c0a 100644 --- a/gadapt/operations/crossover/blending_crossover.py +++ b/gadapt/operations/crossover/blending_crossover.py @@ -1,7 +1,7 @@ import random from gadapt.operations.crossover.base_crossover import BaseCrossover -from operations.chromosome_update.base_chromosome_updater import ( +from gadapt.operations.chromosome_update.base_chromosome_updater import ( BaseChromosomeUpdater, ) diff --git a/gadapt/operations/crossover/uniform_crossover.py b/gadapt/operations/crossover/uniform_crossover.py index 7a02208..1df5fe1 100644 --- a/gadapt/operations/crossover/uniform_crossover.py +++ b/gadapt/operations/crossover/uniform_crossover.py @@ -2,7 +2,7 @@ from typing import Tuple from gadapt.operations.crossover.base_crossover import BaseCrossover -from operations.chromosome_update.base_chromosome_updater import ( +from gadapt.operations.chromosome_update.base_chromosome_updater import ( BaseChromosomeUpdater, ) diff --git a/gadapt/operations/mutation/chromosome_mutation/cross_diversity_gene_mutation_rate_determinator.py b/gadapt/operations/mutation/chromosome_mutation/cross_diversity_gene_mutation_rate_determinator.py index 41760de..d479a2f 100644 --- a/gadapt/operations/mutation/chromosome_mutation/cross_diversity_gene_mutation_rate_determinator.py +++ b/gadapt/operations/mutation/chromosome_mutation/cross_diversity_gene_mutation_rate_determinator.py @@ -1,7 +1,7 @@ from math import isnan import gadapt.utils.ga_utils as ga_utils -from adapters.ga_logging.logging_settings import gadapt_log_error +from gadapt.adapters.ga_logging.logging_settings import gadapt_log_error from gadapt.operations.mutation.chromosome_mutation.random_gene_mutation_rate_determinator import ( RandomGeneMutationRateDeterminator, ) diff --git a/gadapt/operations/mutation/gene_mutation/normal_distribution_cross_diversity_gene_mutator.py b/gadapt/operations/mutation/gene_mutation/normal_distribution_cross_diversity_gene_mutator.py index 006c8dd..116272d 100644 --- a/gadapt/operations/mutation/gene_mutation/normal_distribution_cross_diversity_gene_mutator.py +++ b/gadapt/operations/mutation/gene_mutation/normal_distribution_cross_diversity_gene_mutator.py @@ -2,7 +2,7 @@ import numpy as np -from adapters.ga_logging.logging_settings import gadapt_log_error +from gadapt.adapters.ga_logging.logging_settings import gadapt_log_error from gadapt.operations.mutation.gene_mutation.normal_distribution_gene_mutator import ( NormalDistributionGeneMutator, ) diff --git a/gadapt/operations/mutation/population_mutation/cost_diversity_chromosome_mutation_rate_determinator.py b/gadapt/operations/mutation/population_mutation/cost_diversity_chromosome_mutation_rate_determinator.py index 67bf8d0..9092e7a 100644 --- a/gadapt/operations/mutation/population_mutation/cost_diversity_chromosome_mutation_rate_determinator.py +++ b/gadapt/operations/mutation/population_mutation/cost_diversity_chromosome_mutation_rate_determinator.py @@ -1,6 +1,6 @@ import math -from adapters.ga_logging.logging_settings import gadapt_log_error +from gadapt.adapters.ga_logging.logging_settings import gadapt_log_error from gadapt.operations.mutation.population_mutation.base_chromosome_mutation_rate_determinator import ( BaseChromosomeMutationRateDeterminator, ) diff --git a/gadapt/operations/mutation/population_mutation/parent_diversity_chromosome_mutation_selector.py b/gadapt/operations/mutation/population_mutation/parent_diversity_chromosome_mutation_selector.py index 451de0a..bb37599 100644 --- a/gadapt/operations/mutation/population_mutation/parent_diversity_chromosome_mutation_selector.py +++ b/gadapt/operations/mutation/population_mutation/parent_diversity_chromosome_mutation_selector.py @@ -1,7 +1,7 @@ import random from math import isnan -from adapters.ga_logging.logging_settings import gadapt_log_error +from gadapt.adapters.ga_logging.logging_settings import gadapt_log_error from gadapt.ga_model.chromosome import Chromosome from gadapt.operations.mutation.population_mutation.base_chromosome_mutation_rate_determinator import ( BaseChromosomeMutationRateDeterminator, diff --git a/setup.py b/setup.py index 275b501..0225ac8 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name="gadapt", - version="0.4.17", + version="0.4.18", author="Zoran Jankovic", author_email="bpzoran@yahoo.com", url="https://github.com/bpzoran/gadapt",