From 024279899ca1ef373956b0dfe3f7cf5880c54763 Mon Sep 17 00:00:00 2001 From: Fabian Becker Date: Fri, 17 Jan 2014 09:25:42 +0100 Subject: [PATCH] Optimize imports --- src/eva2/optimization/strategies/ANPSO.java | 2 +- src/eva2/optimization/strategies/ClusterBasedNichingEA.java | 2 +- src/eva2/optimization/strategies/EvolutionStrategyIPOP.java | 2 +- src/eva2/optimization/strategies/NichePSO.java | 2 +- src/eva2/optimization/strategies/ScatterSearch.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/eva2/optimization/strategies/ANPSO.java b/src/eva2/optimization/strategies/ANPSO.java index e4be97b5..5d07a4c2 100644 --- a/src/eva2/optimization/strategies/ANPSO.java +++ b/src/eva2/optimization/strategies/ANPSO.java @@ -3,7 +3,6 @@ package eva2.optimization.strategies; import eva2.OptimizerFactory; import eva2.gui.editor.GenericObjectEditor; import eva2.optimization.enums.PSOTopologyEnum; -import eva2.optimization.operator.terminators.InterfaceTerminator; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceDataTypeDouble; import eva2.optimization.modules.OptimizationParameters; @@ -11,6 +10,7 @@ import eva2.optimization.operator.nichepso.deactivation.StandardDeactivationStra import eva2.optimization.operator.paramcontrol.LinearParamAdaption; import eva2.optimization.operator.paramcontrol.ParamAdaption; import eva2.optimization.operator.terminators.EvaluationTerminator; +import eva2.optimization.operator.terminators.InterfaceTerminator; import eva2.optimization.population.Population; import eva2.optimization.population.PopulationInterface; import eva2.optimization.problems.AbstractOptimizationProblem; diff --git a/src/eva2/optimization/strategies/ClusterBasedNichingEA.java b/src/eva2/optimization/strategies/ClusterBasedNichingEA.java index 8ef1bdf9..6bbdb31d 100644 --- a/src/eva2/optimization/strategies/ClusterBasedNichingEA.java +++ b/src/eva2/optimization/strategies/ClusterBasedNichingEA.java @@ -6,7 +6,6 @@ import eva2.gui.plot.GraphPointSet; import eva2.gui.plot.Plot; import eva2.gui.plot.TopoPlot; import eva2.optimization.go.InterfacePopulationChangedEventListener; -import eva2.optimization.operator.terminators.InterfaceTerminator; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.AbstractEAIndividualComparator; import eva2.optimization.individuals.InterfaceDataTypeDouble; @@ -19,6 +18,7 @@ import eva2.optimization.operator.paramcontrol.InterfaceHasUpperDoubleBound; import eva2.optimization.operator.paramcontrol.ParamAdaption; import eva2.optimization.operator.paramcontrol.ParameterControlManager; import eva2.optimization.operator.terminators.HistoryConvergenceTerminator; +import eva2.optimization.operator.terminators.InterfaceTerminator; import eva2.optimization.population.Population; import eva2.optimization.population.PopulationInterface; import eva2.optimization.population.SolutionSet; diff --git a/src/eva2/optimization/strategies/EvolutionStrategyIPOP.java b/src/eva2/optimization/strategies/EvolutionStrategyIPOP.java index 4148f7b2..9fdfda76 100644 --- a/src/eva2/optimization/strategies/EvolutionStrategyIPOP.java +++ b/src/eva2/optimization/strategies/EvolutionStrategyIPOP.java @@ -2,10 +2,10 @@ package eva2.optimization.strategies; import eva2.gui.editor.GenericObjectEditor; import eva2.optimization.go.InterfacePopulationChangedEventListener; -import eva2.optimization.operator.terminators.InterfaceTerminator; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.operator.mutation.MutateESRankMuCMA; import eva2.optimization.operator.terminators.FitnessConvergenceTerminator; +import eva2.optimization.operator.terminators.InterfaceTerminator; import eva2.optimization.operator.terminators.PopulationMeasureTerminator.ChangeTypeEnum; import eva2.optimization.operator.terminators.PopulationMeasureTerminator.DirectionTypeEnum; import eva2.optimization.operator.terminators.PopulationMeasureTerminator.StagnationTypeEnum; diff --git a/src/eva2/optimization/strategies/NichePSO.java b/src/eva2/optimization/strategies/NichePSO.java index 5c1997b5..86b501b7 100644 --- a/src/eva2/optimization/strategies/NichePSO.java +++ b/src/eva2/optimization/strategies/NichePSO.java @@ -5,7 +5,6 @@ import eva2.gui.editor.GenericObjectEditor; import eva2.gui.plot.TopoPlot; import eva2.optimization.enums.PSOTopologyEnum; import eva2.optimization.go.InterfacePopulationChangedEventListener; -import eva2.optimization.operator.terminators.InterfaceTerminator; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceDataTypeDouble; import eva2.optimization.modules.OptimizationParameters; @@ -23,6 +22,7 @@ import eva2.optimization.operator.paramcontrol.LinearParamAdaption; import eva2.optimization.operator.paramcontrol.ParamAdaption; import eva2.optimization.operator.paramcontrol.ParameterControlManager; import eva2.optimization.operator.terminators.EvaluationTerminator; +import eva2.optimization.operator.terminators.InterfaceTerminator; import eva2.optimization.population.Population; import eva2.optimization.population.PopulationInterface; import eva2.optimization.population.SolutionSet; diff --git a/src/eva2/optimization/strategies/ScatterSearch.java b/src/eva2/optimization/strategies/ScatterSearch.java index 0245398b..7776215c 100644 --- a/src/eva2/optimization/strategies/ScatterSearch.java +++ b/src/eva2/optimization/strategies/ScatterSearch.java @@ -5,13 +5,13 @@ import eva2.OptimizerRunnable; import eva2.gui.BeanInspector; import eva2.gui.editor.GenericObjectEditor; import eva2.optimization.go.InterfacePopulationChangedEventListener; -import eva2.optimization.operator.terminators.InterfaceTerminator; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceDataTypeDouble; import eva2.optimization.modules.OptimizationParameters; import eva2.optimization.operator.distancemetric.PhenotypeMetric; import eva2.optimization.operator.postprocess.PostProcess; import eva2.optimization.operator.terminators.EvaluationTerminator; +import eva2.optimization.operator.terminators.InterfaceTerminator; import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.Population; import eva2.optimization.population.SolutionSet;