From 004e35ebc6807098c2c1914601672eff597f1da5 Mon Sep 17 00:00:00 2001 From: Fabian Becker Date: Thu, 31 Dec 2015 01:30:18 +0100 Subject: [PATCH] Organise imports --- src/main/java/eva2/cli/Main.java | 2 +- src/main/java/eva2/gui/BeanInspector.java | 5 ++++- src/main/java/eva2/gui/PropertyBoolSelector.java | 1 - src/main/java/eva2/gui/PropertyEditorProvider.java | 4 ---- src/main/java/eva2/gui/PropertySheetPanel.java | 3 +-- src/main/java/eva2/gui/editor/ArrayEditor.java | 1 - src/main/java/eva2/gui/plot/FunctionArea.java | 5 ++++- src/main/java/eva2/gui/plot/Plot.java | 3 --- .../optimization/mocco/paretofrontviewer/MOCCOViewer.java | 2 +- .../mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java | 2 +- .../java/eva2/optimization/modules/GenericModuleAdapter.java | 2 +- .../optimization/operator/archiving/AbstractArchiving.java | 2 +- .../optimization/operator/archiving/ArchivingMaxiMin.java | 2 +- .../optimization/operator/archiving/ArchivingNSGAII.java | 2 +- .../optimization/operator/archiving/ArchivingSPEAII.java | 2 +- .../eva2/optimization/operator/cluster/ClusteringKMeans.java | 2 +- .../eva2/optimization/operator/cluster/ClusteringXMeans.java | 2 +- .../operator/migration/MOClusteringSeparation.java | 2 +- .../optimization/operator/migration/MOConeSeparation.java | 2 +- .../optimization/operator/migration/MOXMeansSeparation.java | 2 +- .../eva2/optimization/operator/mutation/CMAParamSet.java | 2 +- .../operator/mutation/MutateESCovarianceMatrixAdaption.java | 4 ++-- .../eva2/optimization/operator/mutation/MutateESGlobal.java | 2 +- .../optimization/operator/mutation/MutateESRankMuCMA.java | 2 +- .../eva2/optimization/operator/selection/SelectMOSPEAII.java | 2 +- .../operator/terminators/CombinedTerminator.java | 2 +- .../operator/terminators/HistoryConvergenceTerminator.java | 2 +- .../operator/terminators/ParetoMetricTerminator.java | 3 +-- .../operator/terminators/PopulationMeasureTerminator.java | 2 +- src/main/java/eva2/optimization/strategies/CBNPSO.java | 2 +- .../eva2/optimization/strategies/ClusterBasedNichingEA.java | 2 +- src/main/java/eva2/optimization/strategies/HillClimbing.java | 1 - src/main/java/eva2/optimization/strategies/NichePSO.java | 2 +- .../optimization/strategies/ParticleSwarmOptimization.java | 4 ++-- .../java/eva2/optimization/tools/AbstractObjectEditor.java | 1 - .../java/eva2/problems/AbstractMultiModalProblemKnown.java | 2 +- .../problems/AbstractMultiObjectiveOptimizationProblem.java | 2 +- src/main/java/eva2/problems/AbstractProblemDouble.java | 4 ++-- src/main/java/eva2/problems/PSymbolicRegression.java | 2 +- src/main/java/eva2/yaml/OptimizationConstructor.java | 1 - 40 files changed, 42 insertions(+), 50 deletions(-) diff --git a/src/main/java/eva2/cli/Main.java b/src/main/java/eva2/cli/Main.java index e17430aa..de4d03b8 100644 --- a/src/main/java/eva2/cli/Main.java +++ b/src/main/java/eva2/cli/Main.java @@ -6,8 +6,8 @@ import eva2.optimization.OptimizationParameters; import eva2.optimization.Processor; import eva2.optimization.individuals.IndividualInterface; import eva2.optimization.operator.terminators.InterfaceTerminator; -import eva2.optimization.population.PopulationInterface; import eva2.optimization.population.Population; +import eva2.optimization.population.PopulationInterface; import eva2.optimization.statistics.*; import eva2.optimization.strategies.InterfaceOptimizer; import eva2.problems.InterfaceAdditionalPopulationInformer; diff --git a/src/main/java/eva2/gui/BeanInspector.java b/src/main/java/eva2/gui/BeanInspector.java index f4248fe0..21770bc5 100644 --- a/src/main/java/eva2/gui/BeanInspector.java +++ b/src/main/java/eva2/gui/BeanInspector.java @@ -7,7 +7,10 @@ import eva2.tools.Tag; import eva2.util.annotation.Description; import eva2.util.annotation.Parameter; -import java.beans.*; +import java.beans.BeanInfo; +import java.beans.IntrospectionException; +import java.beans.Introspector; +import java.beans.PropertyDescriptor; import java.lang.reflect.Array; import java.lang.reflect.Method; import java.util.ArrayList; diff --git a/src/main/java/eva2/gui/PropertyBoolSelector.java b/src/main/java/eva2/gui/PropertyBoolSelector.java index 775c7554..30da759d 100644 --- a/src/main/java/eva2/gui/PropertyBoolSelector.java +++ b/src/main/java/eva2/gui/PropertyBoolSelector.java @@ -1,7 +1,6 @@ package eva2.gui; import javax.swing.*; -import java.awt.*; import java.awt.event.ItemEvent; import java.beans.PropertyEditor; diff --git a/src/main/java/eva2/gui/PropertyEditorProvider.java b/src/main/java/eva2/gui/PropertyEditorProvider.java index 34166a51..29314d1d 100644 --- a/src/main/java/eva2/gui/PropertyEditorProvider.java +++ b/src/main/java/eva2/gui/PropertyEditorProvider.java @@ -10,10 +10,6 @@ import eva2.tools.StringSelection; import java.beans.PropertyDescriptor; import java.beans.PropertyEditor; import java.beans.PropertyEditorManager; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; public class PropertyEditorProvider { // if true, we use the GenericObjectEditor whenever no specific one is registered, so keep it true diff --git a/src/main/java/eva2/gui/PropertySheetPanel.java b/src/main/java/eva2/gui/PropertySheetPanel.java index b636badf..a022bba0 100644 --- a/src/main/java/eva2/gui/PropertySheetPanel.java +++ b/src/main/java/eva2/gui/PropertySheetPanel.java @@ -4,7 +4,6 @@ import eva2.gui.editor.GenericObjectEditor; import eva2.tools.StringTools; import eva2.util.annotation.Description; import eva2.util.annotation.Hidden; -import eva2.util.annotation.Parameter; import javax.swing.*; import javax.swing.table.*; @@ -13,7 +12,7 @@ import java.awt.event.MouseEvent; import java.beans.*; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.util.*; +import java.util.EventObject; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/src/main/java/eva2/gui/editor/ArrayEditor.java b/src/main/java/eva2/gui/editor/ArrayEditor.java index ecd34ad1..5f610bf2 100644 --- a/src/main/java/eva2/gui/editor/ArrayEditor.java +++ b/src/main/java/eva2/gui/editor/ArrayEditor.java @@ -9,7 +9,6 @@ import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; import java.awt.*; import java.awt.event.*; -import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; import java.beans.PropertyEditor; diff --git a/src/main/java/eva2/gui/plot/FunctionArea.java b/src/main/java/eva2/gui/plot/FunctionArea.java index 848cdfad..100392e0 100644 --- a/src/main/java/eva2/gui/plot/FunctionArea.java +++ b/src/main/java/eva2/gui/plot/FunctionArea.java @@ -8,7 +8,10 @@ import eva2.tools.chart2d.*; import javax.swing.*; import java.awt.*; -import java.awt.event.*; +import java.awt.event.ActionListener; +import java.awt.event.InputEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; import java.awt.image.BufferedImage; import java.io.File; import java.io.FileOutputStream; diff --git a/src/main/java/eva2/gui/plot/Plot.java b/src/main/java/eva2/gui/plot/Plot.java index 1f2ddb1f..4db37409 100644 --- a/src/main/java/eva2/gui/plot/Plot.java +++ b/src/main/java/eva2/gui/plot/Plot.java @@ -11,11 +11,8 @@ import javax.imageio.ImageIO; import javax.swing.*; import javax.swing.event.InternalFrameAdapter; import javax.swing.event.InternalFrameEvent; -import javax.swing.plaf.IconUIResource; import javax.swing.plaf.metal.MetalIconFactory; import java.awt.*; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; import java.awt.image.BufferedImage; import java.io.*; import java.util.Formatter; diff --git a/src/main/java/eva2/optimization/mocco/paretofrontviewer/MOCCOViewer.java b/src/main/java/eva2/optimization/mocco/paretofrontviewer/MOCCOViewer.java index 361846e7..59336922 100644 --- a/src/main/java/eva2/optimization/mocco/paretofrontviewer/MOCCOViewer.java +++ b/src/main/java/eva2/optimization/mocco/paretofrontviewer/MOCCOViewer.java @@ -9,8 +9,8 @@ import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.population.Population; import eva2.problems.InterfaceMultiObjectiveDeNovoProblem; import eva2.problems.InterfaceOptimizationObjective; -import eva2.tools.chart2d.DPointContentSelectable; import eva2.tools.chart2d.DPoint; +import eva2.tools.chart2d.DPointContentSelectable; import eva2.tools.chart2d.DPointIcon; import eva2.tools.chart2d.ScaledBorder; diff --git a/src/main/java/eva2/optimization/mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java b/src/main/java/eva2/optimization/mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java index 3bf40f53..3d30f553 100644 --- a/src/main/java/eva2/optimization/mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java +++ b/src/main/java/eva2/optimization/mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java @@ -8,8 +8,8 @@ import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.population.Population; import eva2.problems.InterfaceMultiObjectiveDeNovoProblem; import eva2.problems.InterfaceOptimizationObjective; -import eva2.tools.chart2d.DPointContentSelectable; import eva2.tools.chart2d.DPoint; +import eva2.tools.chart2d.DPointContentSelectable; import eva2.tools.chart2d.DPointIcon; import eva2.tools.chart2d.ScaledBorder; diff --git a/src/main/java/eva2/optimization/modules/GenericModuleAdapter.java b/src/main/java/eva2/optimization/modules/GenericModuleAdapter.java index e1491032..df60c826 100644 --- a/src/main/java/eva2/optimization/modules/GenericModuleAdapter.java +++ b/src/main/java/eva2/optimization/modules/GenericModuleAdapter.java @@ -1,9 +1,9 @@ package eva2.optimization.modules; +import eva2.gui.JParaPanel; import eva2.gui.ModuleButtonPanelMaker; import eva2.gui.TabbedFrameMaker; -import eva2.gui.JParaPanel; import eva2.gui.editor.GenericObjectEditor; import eva2.optimization.InterfaceOptimizationParameters; import eva2.optimization.Processor; diff --git a/src/main/java/eva2/optimization/operator/archiving/AbstractArchiving.java b/src/main/java/eva2/optimization/operator/archiving/AbstractArchiving.java index 09e0c3ff..46b626d6 100644 --- a/src/main/java/eva2/optimization/operator/archiving/AbstractArchiving.java +++ b/src/main/java/eva2/optimization/operator/archiving/AbstractArchiving.java @@ -4,9 +4,9 @@ import eva2.gui.plot.GraphPointSet; import eva2.gui.plot.Plot; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.population.Population; -import eva2.tools.chart2d.DPointIconCross; import eva2.tools.chart2d.DPoint; import eva2.tools.chart2d.DPointIcon; +import eva2.tools.chart2d.DPointIconCross; /** * This is an abstract archiving strategy giving default implementation of determining diff --git a/src/main/java/eva2/optimization/operator/archiving/ArchivingMaxiMin.java b/src/main/java/eva2/optimization/operator/archiving/ArchivingMaxiMin.java index cfc72356..bf2dea45 100644 --- a/src/main/java/eva2/optimization/operator/archiving/ArchivingMaxiMin.java +++ b/src/main/java/eva2/optimization/operator/archiving/ArchivingMaxiMin.java @@ -4,8 +4,8 @@ import eva2.optimization.operator.moso.MOSOMaxiMin; import eva2.optimization.operator.selection.InterfaceSelection; import eva2.optimization.operator.selection.SelectBestIndividuals; import eva2.optimization.population.Population; -import eva2.tools.chart2d.DPointIconCross; import eva2.tools.chart2d.DPointIcon; +import eva2.tools.chart2d.DPointIconCross; import eva2.util.annotation.Description; diff --git a/src/main/java/eva2/optimization/operator/archiving/ArchivingNSGAII.java b/src/main/java/eva2/optimization/operator/archiving/ArchivingNSGAII.java index 179dbabd..1a11fe70 100644 --- a/src/main/java/eva2/optimization/operator/archiving/ArchivingNSGAII.java +++ b/src/main/java/eva2/optimization/operator/archiving/ArchivingNSGAII.java @@ -1,8 +1,8 @@ package eva2.optimization.operator.archiving; import eva2.optimization.population.Population; -import eva2.tools.chart2d.DPointIconCross; import eva2.tools.chart2d.DPointIcon; +import eva2.tools.chart2d.DPointIconCross; import eva2.util.annotation.Description; import java.util.ArrayList; diff --git a/src/main/java/eva2/optimization/operator/archiving/ArchivingSPEAII.java b/src/main/java/eva2/optimization/operator/archiving/ArchivingSPEAII.java index da4e7968..61436ea6 100644 --- a/src/main/java/eva2/optimization/operator/archiving/ArchivingSPEAII.java +++ b/src/main/java/eva2/optimization/operator/archiving/ArchivingSPEAII.java @@ -7,9 +7,9 @@ import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.operator.distancemetric.InterfaceDistanceMetric; import eva2.optimization.operator.distancemetric.ObjectiveSpaceMetric; import eva2.optimization.population.Population; +import eva2.tools.chart2d.DPoint; import eva2.tools.chart2d.DPointIconCircle; import eva2.tools.chart2d.DPointIconText; -import eva2.tools.chart2d.DPoint; import eva2.util.annotation.Description; /** diff --git a/src/main/java/eva2/optimization/operator/cluster/ClusteringKMeans.java b/src/main/java/eva2/optimization/operator/cluster/ClusteringKMeans.java index 840d99a8..35686d9b 100644 --- a/src/main/java/eva2/optimization/operator/cluster/ClusteringKMeans.java +++ b/src/main/java/eva2/optimization/operator/cluster/ClusteringKMeans.java @@ -9,9 +9,9 @@ import eva2.optimization.operator.distancemetric.EuclideanMetric; import eva2.optimization.operator.distancemetric.InterfaceDistanceMetric; import eva2.optimization.population.Population; import eva2.problems.F1Problem; +import eva2.tools.chart2d.DPoint; import eva2.tools.chart2d.DPointIconCircle; import eva2.tools.chart2d.DPointIconText; -import eva2.tools.chart2d.DPoint; import eva2.util.annotation.Description; import java.util.Arrays; diff --git a/src/main/java/eva2/optimization/operator/cluster/ClusteringXMeans.java b/src/main/java/eva2/optimization/operator/cluster/ClusteringXMeans.java index 5c1f5108..82a2e874 100644 --- a/src/main/java/eva2/optimization/operator/cluster/ClusteringXMeans.java +++ b/src/main/java/eva2/optimization/operator/cluster/ClusteringXMeans.java @@ -6,9 +6,9 @@ import eva2.optimization.individuals.ESIndividualDoubleData; import eva2.optimization.individuals.InterfaceDataTypeDouble; import eva2.optimization.population.Population; import eva2.problems.F1Problem; +import eva2.tools.chart2d.DPoint; import eva2.tools.chart2d.DPointIconCircle; import eva2.tools.chart2d.DPointIconText; -import eva2.tools.chart2d.DPoint; import eva2.tools.math.RNG; import eva2.util.annotation.Description; diff --git a/src/main/java/eva2/optimization/operator/migration/MOClusteringSeparation.java b/src/main/java/eva2/optimization/operator/migration/MOClusteringSeparation.java index db0024a1..cd31b7b8 100644 --- a/src/main/java/eva2/optimization/operator/migration/MOClusteringSeparation.java +++ b/src/main/java/eva2/optimization/operator/migration/MOClusteringSeparation.java @@ -12,9 +12,9 @@ import eva2.optimization.population.Population; import eva2.optimization.strategies.InterfaceOptimizer; import eva2.problems.AbstractMultiObjectiveOptimizationProblem; import eva2.problems.InterfaceOptimizationProblem; +import eva2.tools.chart2d.DPoint; import eva2.tools.chart2d.DPointIconCircle; import eva2.tools.chart2d.DPointIconText; -import eva2.tools.chart2d.DPoint; import eva2.util.annotation.Description; import java.io.BufferedWriter; diff --git a/src/main/java/eva2/optimization/operator/migration/MOConeSeparation.java b/src/main/java/eva2/optimization/operator/migration/MOConeSeparation.java index e08cb5c3..ee4642e0 100644 --- a/src/main/java/eva2/optimization/operator/migration/MOConeSeparation.java +++ b/src/main/java/eva2/optimization/operator/migration/MOConeSeparation.java @@ -15,9 +15,9 @@ import eva2.optimization.population.Population; import eva2.optimization.strategies.InterfaceOptimizer; import eva2.problems.AbstractMultiObjectiveOptimizationProblem; import eva2.problems.InterfaceOptimizationProblem; +import eva2.tools.chart2d.DPoint; import eva2.tools.chart2d.DPointIconCircle; import eva2.tools.chart2d.DPointIconText; -import eva2.tools.chart2d.DPoint; import eva2.util.annotation.Description; import java.io.BufferedWriter; diff --git a/src/main/java/eva2/optimization/operator/migration/MOXMeansSeparation.java b/src/main/java/eva2/optimization/operator/migration/MOXMeansSeparation.java index 909b96d0..2a865956 100644 --- a/src/main/java/eva2/optimization/operator/migration/MOXMeansSeparation.java +++ b/src/main/java/eva2/optimization/operator/migration/MOXMeansSeparation.java @@ -13,9 +13,9 @@ import eva2.optimization.population.Population; import eva2.optimization.strategies.InterfaceOptimizer; import eva2.problems.AbstractMultiObjectiveOptimizationProblem; import eva2.problems.InterfaceOptimizationProblem; +import eva2.tools.chart2d.DPoint; import eva2.tools.chart2d.DPointIconCircle; import eva2.tools.chart2d.DPointIconText; -import eva2.tools.chart2d.DPoint; import eva2.util.annotation.Description; import java.io.BufferedWriter; diff --git a/src/main/java/eva2/optimization/operator/mutation/CMAParamSet.java b/src/main/java/eva2/optimization/operator/mutation/CMAParamSet.java index 7d94ec53..f0ab795a 100644 --- a/src/main/java/eva2/optimization/operator/mutation/CMAParamSet.java +++ b/src/main/java/eva2/optimization/operator/mutation/CMAParamSet.java @@ -1,11 +1,11 @@ package eva2.optimization.operator.mutation; +import Jama.Matrix; import eva2.optimization.individuals.InterfaceDataTypeDouble; import eva2.optimization.population.InterfacePopulationChangedEventListener; import eva2.optimization.population.Population; import eva2.optimization.strategies.EvolutionStrategies; import eva2.tools.EVAERROR; -import Jama.Matrix; import eva2.tools.math.Mathematics; import java.io.Serializable; diff --git a/src/main/java/eva2/optimization/operator/mutation/MutateESCovarianceMatrixAdaption.java b/src/main/java/eva2/optimization/operator/mutation/MutateESCovarianceMatrixAdaption.java index 3e593949..849e4d84 100644 --- a/src/main/java/eva2/optimization/operator/mutation/MutateESCovarianceMatrixAdaption.java +++ b/src/main/java/eva2/optimization/operator/mutation/MutateESCovarianceMatrixAdaption.java @@ -1,11 +1,11 @@ package eva2.optimization.operator.mutation; +import Jama.EigenvalueDecomposition; +import Jama.Matrix; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceESIndividual; import eva2.optimization.population.Population; import eva2.problems.InterfaceOptimizationProblem; -import Jama.EigenvalueDecomposition; -import Jama.Matrix; import eva2.tools.math.Mathematics; import eva2.tools.math.RNG; import eva2.util.annotation.Description; diff --git a/src/main/java/eva2/optimization/operator/mutation/MutateESGlobal.java b/src/main/java/eva2/optimization/operator/mutation/MutateESGlobal.java index 9bb4cb30..f91f340f 100644 --- a/src/main/java/eva2/optimization/operator/mutation/MutateESGlobal.java +++ b/src/main/java/eva2/optimization/operator/mutation/MutateESGlobal.java @@ -3,8 +3,8 @@ package eva2.optimization.operator.mutation; import eva2.optimization.enums.MutateESCrossoverType; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceESIndividual; -import eva2.optimization.population.PopulationInterface; import eva2.optimization.population.Population; +import eva2.optimization.population.PopulationInterface; import eva2.problems.InterfaceAdditionalPopulationInformer; import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; diff --git a/src/main/java/eva2/optimization/operator/mutation/MutateESRankMuCMA.java b/src/main/java/eva2/optimization/operator/mutation/MutateESRankMuCMA.java index 605f6d59..cde39d2e 100644 --- a/src/main/java/eva2/optimization/operator/mutation/MutateESRankMuCMA.java +++ b/src/main/java/eva2/optimization/operator/mutation/MutateESRankMuCMA.java @@ -1,5 +1,6 @@ package eva2.optimization.operator.mutation; +import Jama.EigenvalueDecomposition; import eva2.gui.editor.GenericObjectEditor; import eva2.optimization.enums.ESMutationInitialSigma; import eva2.optimization.individuals.AbstractEAIndividual; @@ -11,7 +12,6 @@ import eva2.optimization.strategies.EvolutionStrategies; import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.EVAERROR; import eva2.tools.Pair; -import Jama.EigenvalueDecomposition; import eva2.tools.math.Mathematics; import eva2.tools.math.RNG; import eva2.util.annotation.Description; diff --git a/src/main/java/eva2/optimization/operator/selection/SelectMOSPEAII.java b/src/main/java/eva2/optimization/operator/selection/SelectMOSPEAII.java index 72b3a6c7..42c23a97 100644 --- a/src/main/java/eva2/optimization/operator/selection/SelectMOSPEAII.java +++ b/src/main/java/eva2/optimization/operator/selection/SelectMOSPEAII.java @@ -5,9 +5,9 @@ import eva2.gui.plot.Plot; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.operator.archiving.ArchivingSPEAII; import eva2.optimization.population.Population; +import eva2.tools.chart2d.DPoint; import eva2.tools.chart2d.DPointIconCircle; import eva2.tools.chart2d.DPointIconText; -import eva2.tools.chart2d.DPoint; import eva2.util.annotation.Description; /** diff --git a/src/main/java/eva2/optimization/operator/terminators/CombinedTerminator.java b/src/main/java/eva2/optimization/operator/terminators/CombinedTerminator.java index de33da1f..1d6a8f83 100644 --- a/src/main/java/eva2/optimization/operator/terminators/CombinedTerminator.java +++ b/src/main/java/eva2/optimization/operator/terminators/CombinedTerminator.java @@ -1,7 +1,7 @@ package eva2.optimization.operator.terminators; -import eva2.optimization.population.PopulationInterface; import eva2.optimization.population.InterfaceSolutionSet; +import eva2.optimization.population.PopulationInterface; import eva2.problems.InterfaceOptimizationProblem; import eva2.util.annotation.Description; import eva2.util.annotation.Parameter; diff --git a/src/main/java/eva2/optimization/operator/terminators/HistoryConvergenceTerminator.java b/src/main/java/eva2/optimization/operator/terminators/HistoryConvergenceTerminator.java index 84a7b4a5..564114e8 100644 --- a/src/main/java/eva2/optimization/operator/terminators/HistoryConvergenceTerminator.java +++ b/src/main/java/eva2/optimization/operator/terminators/HistoryConvergenceTerminator.java @@ -3,9 +3,9 @@ package eva2.optimization.operator.terminators; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.EAIndividualComparator; import eva2.optimization.operator.distancemetric.ObjectiveSpaceMetric; -import eva2.optimization.population.PopulationInterface; import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.Population; +import eva2.optimization.population.PopulationInterface; import eva2.problems.InterfaceOptimizationProblem; import eva2.util.annotation.Description; diff --git a/src/main/java/eva2/optimization/operator/terminators/ParetoMetricTerminator.java b/src/main/java/eva2/optimization/operator/terminators/ParetoMetricTerminator.java index 99ff3882..170ea2e7 100644 --- a/src/main/java/eva2/optimization/operator/terminators/ParetoMetricTerminator.java +++ b/src/main/java/eva2/optimization/operator/terminators/ParetoMetricTerminator.java @@ -3,11 +3,10 @@ package eva2.optimization.operator.terminators; import eva2.gui.BeanInspector; import eva2.optimization.operator.paretofrontmetrics.InterfaceParetoFrontMetric; import eva2.optimization.operator.paretofrontmetrics.MetricS; -import eva2.optimization.population.PopulationInterface; import eva2.optimization.population.Population; +import eva2.optimization.population.PopulationInterface; import eva2.problems.AbstractMultiObjectiveOptimizationProblem; import eva2.problems.InterfaceOptimizationProblem; -import eva2.tools.EVAERROR; import eva2.util.annotation.Description; import eva2.util.annotation.Parameter; diff --git a/src/main/java/eva2/optimization/operator/terminators/PopulationMeasureTerminator.java b/src/main/java/eva2/optimization/operator/terminators/PopulationMeasureTerminator.java index 2855fc64..953d2096 100644 --- a/src/main/java/eva2/optimization/operator/terminators/PopulationMeasureTerminator.java +++ b/src/main/java/eva2/optimization/operator/terminators/PopulationMeasureTerminator.java @@ -1,7 +1,7 @@ package eva2.optimization.operator.terminators; -import eva2.optimization.population.PopulationInterface; import eva2.optimization.population.InterfaceSolutionSet; +import eva2.optimization.population.PopulationInterface; import eva2.problems.InterfaceOptimizationProblem; import eva2.util.annotation.Description; import eva2.util.annotation.Parameter; diff --git a/src/main/java/eva2/optimization/strategies/CBNPSO.java b/src/main/java/eva2/optimization/strategies/CBNPSO.java index 47e0f479..10ef9307 100644 --- a/src/main/java/eva2/optimization/strategies/CBNPSO.java +++ b/src/main/java/eva2/optimization/strategies/CBNPSO.java @@ -7,8 +7,8 @@ import eva2.optimization.operator.paramcontrol.CbpsoFitnessThresholdBasedAdaptio import eva2.optimization.operator.paramcontrol.LinearParamAdaption; import eva2.optimization.operator.paramcontrol.ParamAdaption; import eva2.optimization.operator.paramcontrol.SinusoidalParamAdaption; -import eva2.optimization.population.PopulationInterface; import eva2.optimization.population.Population; +import eva2.optimization.population.PopulationInterface; import eva2.optimization.population.SolutionSet; import eva2.problems.AbstractProblemDouble; import eva2.problems.InterfaceInterestingHistogram; diff --git a/src/main/java/eva2/optimization/strategies/ClusterBasedNichingEA.java b/src/main/java/eva2/optimization/strategies/ClusterBasedNichingEA.java index 47a4f061..eda295ce 100644 --- a/src/main/java/eva2/optimization/strategies/ClusterBasedNichingEA.java +++ b/src/main/java/eva2/optimization/strategies/ClusterBasedNichingEA.java @@ -18,9 +18,9 @@ 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.PopulationInterface; import eva2.optimization.population.InterfacePopulationChangedEventListener; import eva2.optimization.population.Population; +import eva2.optimization.population.PopulationInterface; import eva2.optimization.population.SolutionSet; import eva2.problems.*; import eva2.tools.EVAERROR; diff --git a/src/main/java/eva2/optimization/strategies/HillClimbing.java b/src/main/java/eva2/optimization/strategies/HillClimbing.java index b43eb447..d2c49c19 100644 --- a/src/main/java/eva2/optimization/strategies/HillClimbing.java +++ b/src/main/java/eva2/optimization/strategies/HillClimbing.java @@ -5,7 +5,6 @@ import eva2.optimization.operator.mutation.InterfaceMutation; import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.Population; import eva2.optimization.population.SolutionSet; -import eva2.problems.B1Problem; import eva2.problems.InterfaceOptimizationProblem; import eva2.util.annotation.Description; diff --git a/src/main/java/eva2/optimization/strategies/NichePSO.java b/src/main/java/eva2/optimization/strategies/NichePSO.java index 5bfea4a2..badd5a55 100644 --- a/src/main/java/eva2/optimization/strategies/NichePSO.java +++ b/src/main/java/eva2/optimization/strategies/NichePSO.java @@ -22,8 +22,8 @@ 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.PopulationInterface; import eva2.optimization.population.Population; +import eva2.optimization.population.PopulationInterface; import eva2.optimization.population.SolutionSet; import eva2.problems.*; import eva2.tools.chart2d.*; diff --git a/src/main/java/eva2/optimization/strategies/ParticleSwarmOptimization.java b/src/main/java/eva2/optimization/strategies/ParticleSwarmOptimization.java index 06658911..b0b7a3d2 100644 --- a/src/main/java/eva2/optimization/strategies/ParticleSwarmOptimization.java +++ b/src/main/java/eva2/optimization/strategies/ParticleSwarmOptimization.java @@ -1,5 +1,6 @@ package eva2.optimization.strategies; +import Jama.Matrix; import eva2.gui.BeanInspector; import eva2.gui.editor.GenericObjectEditor; import eva2.gui.plot.Plot; @@ -11,16 +12,15 @@ import eva2.optimization.individuals.InterfaceDataTypeDouble; import eva2.optimization.operator.distancemetric.PhenotypeMetric; import eva2.optimization.operator.paramcontrol.ParamAdaption; import eva2.optimization.operator.paramcontrol.ParameterControlManager; -import eva2.optimization.population.PopulationInterface; import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.Population; +import eva2.optimization.population.PopulationInterface; import eva2.optimization.population.SolutionSet; import eva2.problems.Interface2DBorderProblem; import eva2.problems.InterfaceAdditionalPopulationInformer; import eva2.problems.InterfaceProblemDouble; import eva2.tools.chart2d.DPoint; import eva2.tools.chart2d.DPointSet; -import Jama.Matrix; import eva2.tools.math.Mathematics; import eva2.tools.math.RNG; import eva2.util.annotation.Description; diff --git a/src/main/java/eva2/optimization/tools/AbstractObjectEditor.java b/src/main/java/eva2/optimization/tools/AbstractObjectEditor.java index 9b3006cd..3e926e1c 100644 --- a/src/main/java/eva2/optimization/tools/AbstractObjectEditor.java +++ b/src/main/java/eva2/optimization/tools/AbstractObjectEditor.java @@ -7,7 +7,6 @@ import eva2.gui.PropertyEditorProvider; import eva2.gui.PropertySheetPanel; import eva2.gui.editor.GenericObjectEditor; import eva2.tools.StringTools; -import eva2.util.annotation.Parameter; import javax.swing.*; import java.awt.*; diff --git a/src/main/java/eva2/problems/AbstractMultiModalProblemKnown.java b/src/main/java/eva2/problems/AbstractMultiModalProblemKnown.java index ae4b9f3f..3efaac24 100644 --- a/src/main/java/eva2/problems/AbstractMultiModalProblemKnown.java +++ b/src/main/java/eva2/problems/AbstractMultiModalProblemKnown.java @@ -6,8 +6,8 @@ import eva2.optimization.individuals.InterfaceDataTypeDouble; import eva2.optimization.operator.distancemetric.InterfaceDistanceMetric; import eva2.optimization.operator.distancemetric.PhenotypeMetric; import eva2.optimization.operator.postprocess.PostProcess; -import eva2.optimization.population.PopulationInterface; import eva2.optimization.population.Population; +import eva2.optimization.population.PopulationInterface; import eva2.tools.EVAERROR; import eva2.tools.ToolBox; import eva2.tools.math.Mathematics; diff --git a/src/main/java/eva2/problems/AbstractMultiObjectiveOptimizationProblem.java b/src/main/java/eva2/problems/AbstractMultiObjectiveOptimizationProblem.java index 85b31454..e08b16fd 100644 --- a/src/main/java/eva2/problems/AbstractMultiObjectiveOptimizationProblem.java +++ b/src/main/java/eva2/problems/AbstractMultiObjectiveOptimizationProblem.java @@ -14,9 +14,9 @@ import eva2.optimization.population.Population; import eva2.optimization.population.PopulationInterface; import eva2.optimization.strategies.InterfaceOptimizer; import eva2.tools.ToolBox; +import eva2.tools.chart2d.DPoint; import eva2.tools.chart2d.DPointIconCircle; import eva2.tools.chart2d.DPointIconText; -import eva2.tools.chart2d.DPoint; import javax.swing.*; import java.awt.*; diff --git a/src/main/java/eva2/problems/AbstractProblemDouble.java b/src/main/java/eva2/problems/AbstractProblemDouble.java index 133f9b80..0b81f727 100644 --- a/src/main/java/eva2/problems/AbstractProblemDouble.java +++ b/src/main/java/eva2/problems/AbstractProblemDouble.java @@ -1,5 +1,6 @@ package eva2.problems; +import Jama.Matrix; import eva2.gui.editor.GenericObjectEditor; import eva2.gui.plot.TopoPlot; import eva2.optimization.enums.PostProcessMethod; @@ -13,13 +14,12 @@ import eva2.optimization.operator.terminators.FitnessConvergenceTerminator; import eva2.optimization.operator.terminators.PopulationMeasureTerminator.ChangeTypeEnum; import eva2.optimization.operator.terminators.PopulationMeasureTerminator.DirectionTypeEnum; import eva2.optimization.operator.terminators.PopulationMeasureTerminator.StagnationTypeEnum; -import eva2.optimization.population.PopulationInterface; import eva2.optimization.population.Population; +import eva2.optimization.population.PopulationInterface; import eva2.optimization.strategies.InterfaceOptimizer; import eva2.tools.Pair; import eva2.tools.ToolBox; import eva2.tools.diagram.ColorBarCalculator; -import Jama.Matrix; import eva2.tools.math.Mathematics; import eva2.tools.math.RNG; import eva2.util.annotation.Parameter; diff --git a/src/main/java/eva2/problems/PSymbolicRegression.java b/src/main/java/eva2/problems/PSymbolicRegression.java index e9a98b3d..5c524859 100644 --- a/src/main/java/eva2/problems/PSymbolicRegression.java +++ b/src/main/java/eva2/problems/PSymbolicRegression.java @@ -3,8 +3,8 @@ package eva2.problems; import eva2.gui.plot.Plot; import eva2.optimization.individuals.*; import eva2.optimization.individuals.codings.gp.*; -import eva2.optimization.population.PopulationInterface; import eva2.optimization.population.Population; +import eva2.optimization.population.PopulationInterface; import eva2.optimization.strategies.InterfaceOptimizer; import eva2.problems.regression.InterfaceRegressionFunction; import eva2.problems.regression.RFKoza_GPI_7_3; diff --git a/src/main/java/eva2/yaml/OptimizationConstructor.java b/src/main/java/eva2/yaml/OptimizationConstructor.java index e61bf536..54ea23d4 100644 --- a/src/main/java/eva2/yaml/OptimizationConstructor.java +++ b/src/main/java/eva2/yaml/OptimizationConstructor.java @@ -3,7 +3,6 @@ package eva2.yaml; import eva2.optimization.operator.distancemetric.InterfaceDistanceMetric; import eva2.optimization.population.Population; import eva2.optimization.population.PopulationInitMethod; -import eva2.tools.Pair; import org.yaml.snakeyaml.constructor.AbstractConstruct; import org.yaml.snakeyaml.constructor.Constructor; import org.yaml.snakeyaml.nodes.MappingNode;