From 6ae2aa28b9721eef930fd4c760c939b7b5d30b36 Mon Sep 17 00:00:00 2001 From: Fabian Becker Date: Sat, 22 Nov 2014 11:48:17 +0100 Subject: [PATCH] Finally getting rid of the eva2.optimization.go package - Moved GUI related stuff (StandaloneOptimization, MOCCOStandalone, ...) to eva2.gui - Moved InterfaceOptimizationParameters and implementations up to eva2.optimization - Moved Processor out of modules --- src/eva2/OptimizerFactory.java | 2 +- src/eva2/OptimizerRunnable.java | 4 ++-- src/eva2/cli/Main.java | 6 +++--- src/eva2/cli/OptimizationBuilder.java | 4 ++-- src/eva2/cli/OptimizationLogger.java | 2 +- src/eva2/cli/ParameterGenerator.java | 2 +- src/eva2/examples/TestingCbnPostProc.java | 2 +- src/eva2/examples/TestingGAB1.java | 2 +- src/eva2/examples/TestingPlusCmaEs.java | 2 +- src/eva2/gui/EvATabbedFrameMaker.java | 2 +- src/eva2/gui/EvATreeNode.java | 2 +- .../go => gui}/InterfaceStandaloneOptimization.java | 2 +- .../{optimization/go => gui}/MOCCOStandalone.java | 7 +++---- src/eva2/gui/Main.java | 3 ++- .../go => gui}/StandaloneOptimization.java | 12 +++++------- src/eva2/{optimization/go => gui}/SwingWorker.java | 2 +- .../AbstractOptimizationParameters.java | 4 +--- src/eva2/optimization/EvAMainAdapter.java | 1 - src/eva2/optimization/EvAMainAdapterImpl.java | 1 - .../{go => }/InterfaceNotifyOnInformers.java | 2 +- .../{go => }/InterfaceOptimizationParameters.java | 2 +- .../{modules => }/InterfaceProcessor.java | 2 +- src/eva2/optimization/ModuleServer.java | 1 - .../{modules => }/OptimizationParameters.java | 4 +--- src/eva2/optimization/{modules => }/Processor.java | 5 +---- src/eva2/optimization/go/package-info.java | 1 - .../optimization/mocco/MOCCOChooseMOStrategy.java | 2 +- .../mocco/MOCCOChooseReferencePoint.java | 2 +- .../mocco/MOCCOChooseReferenceSolution.java | 2 +- .../mocco/MOCCOInitialPopulationSize.java | 2 +- .../optimization/mocco/MOCCOParameterizeGDF.java | 2 +- src/eva2/optimization/mocco/MOCCOParameterizeMO.java | 2 +- .../mocco/MOCCOParameterizeRefPoint.java | 2 +- src/eva2/optimization/mocco/MOCCOParameterizeSO.java | 2 +- .../optimization/mocco/MOCCOParameterizeSTEP.java | 2 +- .../mocco/MOCCOParameterizeTchebycheff.java | 2 +- src/eva2/optimization/mocco/MOCCOPhase.java | 2 +- .../mocco/MOCCOProblemInitialization.java | 2 +- .../optimization/mocco/MOCCOProblemRedefinition.java | 2 +- .../mocco/paretofrontviewer/MOCCOViewer.java | 2 +- .../optimization/modules/AbstractModuleAdapter.java | 4 +++- src/eva2/optimization/modules/GOModuleAdapter.java | 3 ++- .../optimization/modules/GenericModuleAdapter.java | 3 ++- .../paramcontrol/ParameterControlManager.java | 2 +- .../operator/postprocess/PostProcess.java | 2 +- .../optimization/statistics/AbstractStatistics.java | 2 +- .../optimization/statistics/InterfaceStatistics.java | 2 +- .../optimization/statistics/OptimizationJob.java | 2 +- .../optimization/statistics/OptimizationJobList.java | 4 ++-- .../optimization/statistics/StatisticsDummy.java | 2 +- .../statistics/StatisticsParameters.java | 3 +-- .../optimization/statistics/StatisticsWithGUI.java | 2 +- src/eva2/optimization/strategies/ANPSO.java | 2 +- src/eva2/optimization/strategies/NichePSO.java | 2 +- src/eva2/optimization/strategies/ScatterSearch.java | 2 +- src/eva2/problems/ERPStarter.java | 2 +- src/eva2/problems/FLensProblem.java | 4 ++-- src/eva2/util/EvAComAdapter.java | 2 +- 58 files changed, 71 insertions(+), 81 deletions(-) rename src/eva2/{optimization/go => gui}/InterfaceStandaloneOptimization.java (80%) rename src/eva2/{optimization/go => gui}/MOCCOStandalone.java (99%) rename src/eva2/{optimization/go => gui}/StandaloneOptimization.java (99%) rename src/eva2/{optimization/go => gui}/SwingWorker.java (99%) rename src/eva2/optimization/{modules => }/AbstractOptimizationParameters.java (98%) rename src/eva2/optimization/{go => }/InterfaceNotifyOnInformers.java (90%) rename src/eva2/optimization/{go => }/InterfaceOptimizationParameters.java (98%) rename src/eva2/optimization/{modules => }/InterfaceProcessor.java (95%) rename src/eva2/optimization/{modules => }/OptimizationParameters.java (95%) rename src/eva2/optimization/{modules => }/Processor.java (99%) delete mode 100644 src/eva2/optimization/go/package-info.java diff --git a/src/eva2/OptimizerFactory.java b/src/eva2/OptimizerFactory.java index 7404d5d7..e787b51c 100644 --- a/src/eva2/OptimizerFactory.java +++ b/src/eva2/OptimizerFactory.java @@ -5,7 +5,7 @@ import eva2.optimization.enums.MutateESCrossoverType; import eva2.optimization.enums.PSOTopology; import eva2.optimization.enums.PostProcessMethod; import eva2.optimization.individuals.*; -import eva2.optimization.modules.OptimizationParameters; +import eva2.optimization.OptimizationParameters; import eva2.optimization.operator.archiving.ArchivingNSGAII; import eva2.optimization.operator.archiving.InformationRetrievalInserting; import eva2.optimization.operator.archiving.InterfaceArchiving; diff --git a/src/eva2/OptimizerRunnable.java b/src/eva2/OptimizerRunnable.java index a425d3c1..c87e5a7c 100644 --- a/src/eva2/OptimizerRunnable.java +++ b/src/eva2/OptimizerRunnable.java @@ -1,12 +1,12 @@ package eva2; import eva2.optimization.OptimizationStateListener; -import eva2.optimization.go.InterfaceOptimizationParameters; +import eva2.optimization.InterfaceOptimizationParameters; import eva2.optimization.individuals.IndividualInterface; import eva2.optimization.individuals.InterfaceDataTypeBinary; import eva2.optimization.individuals.InterfaceDataTypeDouble; import eva2.optimization.individuals.InterfaceDataTypeInteger; -import eva2.optimization.modules.Processor; +import eva2.optimization.Processor; import eva2.optimization.operator.postprocess.InterfacePostProcessParams; import eva2.optimization.operator.postprocess.PostProcessParams; import eva2.optimization.operator.terminators.InterfaceTerminator; diff --git a/src/eva2/cli/Main.java b/src/eva2/cli/Main.java index 1802204e..f2940d60 100644 --- a/src/eva2/cli/Main.java +++ b/src/eva2/cli/Main.java @@ -1,10 +1,10 @@ package eva2.cli; import eva2.EvAInfo; -import eva2.optimization.go.InterfaceOptimizationParameters; +import eva2.optimization.InterfaceOptimizationParameters; import eva2.optimization.individuals.IndividualInterface; -import eva2.optimization.modules.OptimizationParameters; -import eva2.optimization.modules.Processor; +import eva2.optimization.OptimizationParameters; +import eva2.optimization.Processor; import eva2.optimization.operator.terminators.InterfaceTerminator; import eva2.optimization.population.Population; import eva2.optimization.population.PopulationInterface; diff --git a/src/eva2/cli/OptimizationBuilder.java b/src/eva2/cli/OptimizationBuilder.java index 56299663..0a65be5d 100644 --- a/src/eva2/cli/OptimizationBuilder.java +++ b/src/eva2/cli/OptimizationBuilder.java @@ -1,8 +1,8 @@ package eva2.cli; import eva2.gui.BeanInspector; -import eva2.optimization.go.InterfaceOptimizationParameters; -import eva2.optimization.modules.OptimizationParameters; +import eva2.optimization.InterfaceOptimizationParameters; +import eva2.optimization.OptimizationParameters; import eva2.optimization.statistics.InterfaceStatisticsParameters; import eva2.optimization.statistics.StatisticsParameters; import eva2.tools.ReflectPackage; diff --git a/src/eva2/cli/OptimizationLogger.java b/src/eva2/cli/OptimizationLogger.java index 218ff226..c917cfc1 100644 --- a/src/eva2/cli/OptimizationLogger.java +++ b/src/eva2/cli/OptimizationLogger.java @@ -1,7 +1,7 @@ package eva2.cli; import eva2.optimization.OptimizationStateListener; -import eva2.optimization.go.InterfaceOptimizationParameters; +import eva2.optimization.InterfaceOptimizationParameters; import eva2.optimization.population.InterfacePopulationChangedEventListener; import java.io.OutputStream; diff --git a/src/eva2/cli/ParameterGenerator.java b/src/eva2/cli/ParameterGenerator.java index 921b53ea..f45e1c6b 100644 --- a/src/eva2/cli/ParameterGenerator.java +++ b/src/eva2/cli/ParameterGenerator.java @@ -1,6 +1,6 @@ package eva2.cli; -import eva2.optimization.modules.OptimizationParameters; +import eva2.optimization.OptimizationParameters; import eva2.tools.ReflectPackage; import java.beans.BeanInfo; diff --git a/src/eva2/examples/TestingCbnPostProc.java b/src/eva2/examples/TestingCbnPostProc.java index 6cba2a58..1e313ad5 100644 --- a/src/eva2/examples/TestingCbnPostProc.java +++ b/src/eva2/examples/TestingCbnPostProc.java @@ -2,7 +2,7 @@ package eva2.examples; import eva2.OptimizerFactory; import eva2.optimization.individuals.AbstractEAIndividual; -import eva2.optimization.modules.OptimizationParameters; +import eva2.optimization.OptimizationParameters; import eva2.optimization.operator.postprocess.PostProcessParams; import eva2.optimization.operator.terminators.EvaluationTerminator; import eva2.problems.FM0Problem; diff --git a/src/eva2/examples/TestingGAB1.java b/src/eva2/examples/TestingGAB1.java index 317c9adb..27aea386 100644 --- a/src/eva2/examples/TestingGAB1.java +++ b/src/eva2/examples/TestingGAB1.java @@ -1,7 +1,7 @@ package eva2.examples; import eva2.OptimizerFactory; -import eva2.optimization.modules.OptimizationParameters; +import eva2.optimization.OptimizationParameters; import eva2.optimization.operator.selection.SelectXProbRouletteWheel; import eva2.optimization.operator.terminators.EvaluationTerminator; import eva2.optimization.population.Population; diff --git a/src/eva2/examples/TestingPlusCmaEs.java b/src/eva2/examples/TestingPlusCmaEs.java index 087dfec0..5d45725e 100644 --- a/src/eva2/examples/TestingPlusCmaEs.java +++ b/src/eva2/examples/TestingPlusCmaEs.java @@ -2,7 +2,7 @@ package eva2.examples; import eva2.OptimizerFactory; import eva2.optimization.individuals.AbstractEAIndividual; -import eva2.optimization.modules.OptimizationParameters; +import eva2.optimization.OptimizationParameters; import eva2.optimization.operator.crossover.CrossoverESDefault; import eva2.optimization.operator.mutation.MutateESCovarianceMatrixAdaption; import eva2.optimization.operator.terminators.EvaluationTerminator; diff --git a/src/eva2/gui/EvATabbedFrameMaker.java b/src/eva2/gui/EvATabbedFrameMaker.java index 2b4b0a75..079dc09c 100644 --- a/src/eva2/gui/EvATabbedFrameMaker.java +++ b/src/eva2/gui/EvATabbedFrameMaker.java @@ -1,6 +1,6 @@ package eva2.gui; -import eva2.optimization.go.InterfaceNotifyOnInformers; +import eva2.optimization.InterfaceNotifyOnInformers; import eva2.problems.InterfaceAdditionalPopulationInformer; import javax.swing.*; diff --git a/src/eva2/gui/EvATreeNode.java b/src/eva2/gui/EvATreeNode.java index 6dee4ac2..ca43454f 100644 --- a/src/eva2/gui/EvATreeNode.java +++ b/src/eva2/gui/EvATreeNode.java @@ -11,7 +11,7 @@ import javax.swing.tree.DefaultMutableTreeNode; * * @author mkron * @see PropertySheetPanel - * @see eva2.optimization.modules.OptimizationParameters + * @see eva2.optimization.OptimizationParameters */ public class EvATreeNode extends DefaultMutableTreeNode { private String[] childrenNames = null; diff --git a/src/eva2/optimization/go/InterfaceStandaloneOptimization.java b/src/eva2/gui/InterfaceStandaloneOptimization.java similarity index 80% rename from src/eva2/optimization/go/InterfaceStandaloneOptimization.java rename to src/eva2/gui/InterfaceStandaloneOptimization.java index 762ea436..a2934de5 100644 --- a/src/eva2/optimization/go/InterfaceStandaloneOptimization.java +++ b/src/eva2/gui/InterfaceStandaloneOptimization.java @@ -1,4 +1,4 @@ -package eva2.optimization.go; +package eva2.gui; /** * diff --git a/src/eva2/optimization/go/MOCCOStandalone.java b/src/eva2/gui/MOCCOStandalone.java similarity index 99% rename from src/eva2/optimization/go/MOCCOStandalone.java rename to src/eva2/gui/MOCCOStandalone.java index 74d837ea..c6a29abd 100644 --- a/src/eva2/optimization/go/MOCCOStandalone.java +++ b/src/eva2/gui/MOCCOStandalone.java @@ -1,6 +1,5 @@ -package eva2.optimization.go; +package eva2.gui; -import eva2.gui.PropertyDoubleArray; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.mocco.*; import eva2.optimization.mocco.paretofrontviewer.MOCCOViewer; @@ -25,7 +24,7 @@ import java.io.*; public class MOCCOStandalone implements InterfaceStandaloneOptimization, InterfacePopulationChangedEventListener, Serializable { public volatile MOCCOState state; - private SwingWorker worker; + private eva2.gui.SwingWorker worker; private volatile boolean stillWorking = false; public int iteration = -1; private JFrame mainFrame; @@ -471,7 +470,7 @@ public class MOCCOStandalone implements InterfaceStandaloneOptimization, Interfa this.state.optimizer.initialize(); } this.state.optimizer.addPopulationChangedEventListener(this); - worker = new SwingWorker() { + worker = new eva2.gui.SwingWorker() { @Override public Object construct() { return doWork(); diff --git a/src/eva2/gui/Main.java b/src/eva2/gui/Main.java index 33b4023a..e80209c1 100644 --- a/src/eva2/gui/Main.java +++ b/src/eva2/gui/Main.java @@ -1,8 +1,9 @@ package eva2.gui; import eva2.EvAInfo; +import eva2.optimization.OptimizationParameters; import eva2.optimization.OptimizationStateListener; -import eva2.optimization.go.InterfaceOptimizationParameters; +import eva2.optimization.InterfaceOptimizationParameters; import eva2.optimization.modules.*; import eva2.optimization.statistics.AbstractStatistics; import eva2.optimization.statistics.InterfaceStatisticsListener; diff --git a/src/eva2/optimization/go/StandaloneOptimization.java b/src/eva2/gui/StandaloneOptimization.java similarity index 99% rename from src/eva2/optimization/go/StandaloneOptimization.java rename to src/eva2/gui/StandaloneOptimization.java index 8c8bab74..af49a158 100644 --- a/src/eva2/optimization/go/StandaloneOptimization.java +++ b/src/eva2/gui/StandaloneOptimization.java @@ -1,13 +1,11 @@ -package eva2.optimization.go; +package eva2.gui; -import eva2.gui.BeanInspector; -import eva2.gui.JParaPanel; import eva2.gui.plot.Plot; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.ESIndividualDoubleData; import eva2.optimization.individuals.GAIndividualDoubleData; import eva2.optimization.individuals.InterfaceDataTypeDouble; -import eva2.optimization.modules.OptimizationParameters; +import eva2.optimization.OptimizationParameters; import eva2.optimization.operator.crossover.CrossoverGAGINPoint; import eva2.optimization.operator.mutation.InterfaceMutation; import eva2.optimization.operator.mutation.MutateESFixedStepSize; @@ -45,7 +43,7 @@ public class StandaloneOptimization implements InterfaceStandaloneOptimization, transient private JComponent statusPanel; transient private JLabel statusField; transient private JProgressBar progressBar; - transient private SwingWorker worker; + transient private eva2.gui.SwingWorker worker; transient private boolean show = false; // transient private InterfaceTest test = new Test1(); // Opt. Algorithms and Parameters @@ -184,7 +182,7 @@ public class StandaloneOptimization implements InterfaceStandaloneOptimization, ActionListener runListener = new ActionListener() { @Override public void actionPerformed(ActionEvent event) { - worker = new SwingWorker() { + worker = new eva2.gui.SwingWorker() { @Override public Object construct() { return doWork(); @@ -230,7 +228,7 @@ public class StandaloneOptimization implements InterfaceStandaloneOptimization, @Override public void actionPerformed(ActionEvent event) { // todo something need to be done here... - worker = new SwingWorker() { + worker = new eva2.gui.SwingWorker() { @Override public Object construct() { return doWork(); diff --git a/src/eva2/optimization/go/SwingWorker.java b/src/eva2/gui/SwingWorker.java similarity index 99% rename from src/eva2/optimization/go/SwingWorker.java rename to src/eva2/gui/SwingWorker.java index b2fdea39..d4ba123f 100644 --- a/src/eva2/optimization/go/SwingWorker.java +++ b/src/eva2/gui/SwingWorker.java @@ -1,4 +1,4 @@ -package eva2.optimization.go; +package eva2.gui; import javax.swing.*; diff --git a/src/eva2/optimization/modules/AbstractOptimizationParameters.java b/src/eva2/optimization/AbstractOptimizationParameters.java similarity index 98% rename from src/eva2/optimization/modules/AbstractOptimizationParameters.java rename to src/eva2/optimization/AbstractOptimizationParameters.java index 09137877..0e9f7faa 100644 --- a/src/eva2/optimization/modules/AbstractOptimizationParameters.java +++ b/src/eva2/optimization/AbstractOptimizationParameters.java @@ -1,8 +1,6 @@ -package eva2.optimization.modules; +package eva2.optimization; import eva2.gui.BeanInspector; -import eva2.optimization.go.InterfaceNotifyOnInformers; -import eva2.optimization.go.InterfaceOptimizationParameters; import eva2.optimization.operator.postprocess.InterfacePostProcessParams; import eva2.optimization.operator.postprocess.PostProcessParams; import eva2.optimization.operator.terminators.InterfaceTerminator; diff --git a/src/eva2/optimization/EvAMainAdapter.java b/src/eva2/optimization/EvAMainAdapter.java index 5f0d8a0e..8076a5af 100644 --- a/src/eva2/optimization/EvAMainAdapter.java +++ b/src/eva2/optimization/EvAMainAdapter.java @@ -9,7 +9,6 @@ package eva2.optimization; * $Author: mkron $ */ -import eva2.optimization.go.InterfaceOptimizationParameters; import eva2.optimization.modules.ModuleAdapter; /** diff --git a/src/eva2/optimization/EvAMainAdapterImpl.java b/src/eva2/optimization/EvAMainAdapterImpl.java index 40930211..c7fb231e 100644 --- a/src/eva2/optimization/EvAMainAdapterImpl.java +++ b/src/eva2/optimization/EvAMainAdapterImpl.java @@ -11,7 +11,6 @@ package eva2.optimization; */ import eva2.EvAInfo; -import eva2.optimization.go.InterfaceOptimizationParameters; import eva2.optimization.modules.ModuleAdapter; /** diff --git a/src/eva2/optimization/go/InterfaceNotifyOnInformers.java b/src/eva2/optimization/InterfaceNotifyOnInformers.java similarity index 90% rename from src/eva2/optimization/go/InterfaceNotifyOnInformers.java rename to src/eva2/optimization/InterfaceNotifyOnInformers.java index 34c7d272..e823b86f 100644 --- a/src/eva2/optimization/go/InterfaceNotifyOnInformers.java +++ b/src/eva2/optimization/InterfaceNotifyOnInformers.java @@ -1,4 +1,4 @@ -package eva2.optimization.go; +package eva2.optimization; import eva2.problems.InterfaceAdditionalPopulationInformer; diff --git a/src/eva2/optimization/go/InterfaceOptimizationParameters.java b/src/eva2/optimization/InterfaceOptimizationParameters.java similarity index 98% rename from src/eva2/optimization/go/InterfaceOptimizationParameters.java rename to src/eva2/optimization/InterfaceOptimizationParameters.java index 1db140c9..73a68037 100644 --- a/src/eva2/optimization/go/InterfaceOptimizationParameters.java +++ b/src/eva2/optimization/InterfaceOptimizationParameters.java @@ -1,4 +1,4 @@ -package eva2.optimization.go; +package eva2.optimization; import eva2.optimization.operator.postprocess.InterfacePostProcessParams; import eva2.optimization.operator.terminators.InterfaceTerminator; diff --git a/src/eva2/optimization/modules/InterfaceProcessor.java b/src/eva2/optimization/InterfaceProcessor.java similarity index 95% rename from src/eva2/optimization/modules/InterfaceProcessor.java rename to src/eva2/optimization/InterfaceProcessor.java index f8c65c54..c063d0a3 100644 --- a/src/eva2/optimization/modules/InterfaceProcessor.java +++ b/src/eva2/optimization/InterfaceProcessor.java @@ -1,4 +1,4 @@ -package eva2.optimization.modules; +package eva2.optimization; import eva2.optimization.OptimizationStateListener; diff --git a/src/eva2/optimization/ModuleServer.java b/src/eva2/optimization/ModuleServer.java index de52fca7..fdc6c597 100644 --- a/src/eva2/optimization/ModuleServer.java +++ b/src/eva2/optimization/ModuleServer.java @@ -1,6 +1,5 @@ package eva2.optimization; -import eva2.optimization.go.InterfaceOptimizationParameters; import eva2.optimization.modules.ModuleAdapter; import eva2.tools.EVAERROR; import eva2.tools.ReflectPackage; diff --git a/src/eva2/optimization/modules/OptimizationParameters.java b/src/eva2/optimization/OptimizationParameters.java similarity index 95% rename from src/eva2/optimization/modules/OptimizationParameters.java rename to src/eva2/optimization/OptimizationParameters.java index 19e169fd..1becfa03 100644 --- a/src/eva2/optimization/modules/OptimizationParameters.java +++ b/src/eva2/optimization/OptimizationParameters.java @@ -1,6 +1,5 @@ -package eva2.optimization.modules; +package eva2.optimization; -import eva2.optimization.go.InterfaceOptimizationParameters; import eva2.optimization.operator.terminators.EvaluationTerminator; import eva2.optimization.operator.terminators.InterfaceTerminator; import eva2.optimization.strategies.DifferentialEvolution; @@ -11,7 +10,6 @@ import eva2.util.annotation.Description; import org.yaml.snakeyaml.Yaml; import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.Serializable; import java.util.logging.Level; diff --git a/src/eva2/optimization/modules/Processor.java b/src/eva2/optimization/Processor.java similarity index 99% rename from src/eva2/optimization/modules/Processor.java rename to src/eva2/optimization/Processor.java index 78adf94e..99382bf1 100644 --- a/src/eva2/optimization/modules/Processor.java +++ b/src/eva2/optimization/Processor.java @@ -1,9 +1,6 @@ -package eva2.optimization.modules; +package eva2.optimization; import eva2.gui.BeanInspector; -import eva2.optimization.OptimizationStateListener; -import eva2.optimization.go.InterfaceNotifyOnInformers; -import eva2.optimization.go.InterfaceOptimizationParameters; import eva2.optimization.operator.paramcontrol.ConstantParameters; import eva2.optimization.operator.paramcontrol.InterfaceParameterControl; import eva2.optimization.operator.postprocess.PostProcess; diff --git a/src/eva2/optimization/go/package-info.java b/src/eva2/optimization/go/package-info.java deleted file mode 100644 index a3631ea7..00000000 --- a/src/eva2/optimization/go/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package eva2.optimization.go; \ No newline at end of file diff --git a/src/eva2/optimization/mocco/MOCCOChooseMOStrategy.java b/src/eva2/optimization/mocco/MOCCOChooseMOStrategy.java index 91ac85fc..b14a9ce7 100644 --- a/src/eva2/optimization/mocco/MOCCOChooseMOStrategy.java +++ b/src/eva2/optimization/mocco/MOCCOChooseMOStrategy.java @@ -1,7 +1,7 @@ package eva2.optimization.mocco; -import eva2.optimization.go.MOCCOStandalone; +import eva2.gui.MOCCOStandalone; import eva2.tools.BasicResourceLoader; import javax.swing.*; diff --git a/src/eva2/optimization/mocco/MOCCOChooseReferencePoint.java b/src/eva2/optimization/mocco/MOCCOChooseReferencePoint.java index c2429d0a..863ed1b0 100644 --- a/src/eva2/optimization/mocco/MOCCOChooseReferencePoint.java +++ b/src/eva2/optimization/mocco/MOCCOChooseReferencePoint.java @@ -1,7 +1,7 @@ package eva2.optimization.mocco; -import eva2.optimization.go.MOCCOStandalone; +import eva2.gui.MOCCOStandalone; import eva2.optimization.mocco.paretofrontviewer.InterfaceRefPointListener; import eva2.problems.InterfaceMultiObjectiveDeNovoProblem; import eva2.problems.InterfaceOptimizationObjective; diff --git a/src/eva2/optimization/mocco/MOCCOChooseReferenceSolution.java b/src/eva2/optimization/mocco/MOCCOChooseReferenceSolution.java index 22e90634..021e3be1 100644 --- a/src/eva2/optimization/mocco/MOCCOChooseReferenceSolution.java +++ b/src/eva2/optimization/mocco/MOCCOChooseReferenceSolution.java @@ -1,7 +1,7 @@ package eva2.optimization.mocco; -import eva2.optimization.go.MOCCOStandalone; +import eva2.gui.MOCCOStandalone; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.mocco.paretofrontviewer.InterfaceRefSolutionListener; import eva2.optimization.population.Population; diff --git a/src/eva2/optimization/mocco/MOCCOInitialPopulationSize.java b/src/eva2/optimization/mocco/MOCCOInitialPopulationSize.java index 446ebf1a..7060440b 100644 --- a/src/eva2/optimization/mocco/MOCCOInitialPopulationSize.java +++ b/src/eva2/optimization/mocco/MOCCOInitialPopulationSize.java @@ -1,6 +1,6 @@ package eva2.optimization.mocco; -import eva2.optimization.go.MOCCOStandalone; +import eva2.gui.MOCCOStandalone; import javax.swing.*; import java.awt.*; diff --git a/src/eva2/optimization/mocco/MOCCOParameterizeGDF.java b/src/eva2/optimization/mocco/MOCCOParameterizeGDF.java index c9c30d8f..ab450147 100644 --- a/src/eva2/optimization/mocco/MOCCOParameterizeGDF.java +++ b/src/eva2/optimization/mocco/MOCCOParameterizeGDF.java @@ -4,7 +4,7 @@ package eva2.optimization.mocco; import eva2.gui.PropertyDoubleArray; import eva2.gui.PropertyEditorProvider; import eva2.gui.editor.GenericObjectEditor; -import eva2.optimization.go.MOCCOStandalone; +import eva2.gui.MOCCOStandalone; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.operator.moso.MOSOWeightedFitness; import eva2.optimization.operator.terminators.InterfaceTerminator; diff --git a/src/eva2/optimization/mocco/MOCCOParameterizeMO.java b/src/eva2/optimization/mocco/MOCCOParameterizeMO.java index 04891492..9787e40d 100644 --- a/src/eva2/optimization/mocco/MOCCOParameterizeMO.java +++ b/src/eva2/optimization/mocco/MOCCOParameterizeMO.java @@ -3,7 +3,7 @@ package eva2.optimization.mocco; import eva2.gui.PropertyEditorProvider; import eva2.gui.editor.GenericObjectEditor; -import eva2.optimization.go.MOCCOStandalone; +import eva2.gui.MOCCOStandalone; import eva2.optimization.operator.terminators.InterfaceTerminator; import eva2.optimization.population.Population; import eva2.optimization.strategies.GeneticAlgorithm; diff --git a/src/eva2/optimization/mocco/MOCCOParameterizeRefPoint.java b/src/eva2/optimization/mocco/MOCCOParameterizeRefPoint.java index 792b3d13..bba86a24 100644 --- a/src/eva2/optimization/mocco/MOCCOParameterizeRefPoint.java +++ b/src/eva2/optimization/mocco/MOCCOParameterizeRefPoint.java @@ -3,7 +3,7 @@ package eva2.optimization.mocco; import eva2.gui.PropertyEditorProvider; import eva2.gui.editor.GenericObjectEditor; -import eva2.optimization.go.MOCCOStandalone; +import eva2.gui.MOCCOStandalone; import eva2.optimization.operator.migration.SOBestMigration; import eva2.optimization.operator.moso.MOSOLpMetric; import eva2.optimization.operator.terminators.InterfaceTerminator; diff --git a/src/eva2/optimization/mocco/MOCCOParameterizeSO.java b/src/eva2/optimization/mocco/MOCCOParameterizeSO.java index 5c1f9976..e3ff420c 100644 --- a/src/eva2/optimization/mocco/MOCCOParameterizeSO.java +++ b/src/eva2/optimization/mocco/MOCCOParameterizeSO.java @@ -3,7 +3,7 @@ package eva2.optimization.mocco; import eva2.gui.PropertyEditorProvider; import eva2.gui.editor.GenericObjectEditor; -import eva2.optimization.go.MOCCOStandalone; +import eva2.gui.MOCCOStandalone; import eva2.optimization.operator.terminators.InterfaceTerminator; import eva2.optimization.strategies.GeneticAlgorithm; import eva2.optimization.strategies.InterfaceOptimizer; diff --git a/src/eva2/optimization/mocco/MOCCOParameterizeSTEP.java b/src/eva2/optimization/mocco/MOCCOParameterizeSTEP.java index bc693f23..fc590793 100644 --- a/src/eva2/optimization/mocco/MOCCOParameterizeSTEP.java +++ b/src/eva2/optimization/mocco/MOCCOParameterizeSTEP.java @@ -4,7 +4,7 @@ package eva2.optimization.mocco; import eva2.gui.PropertyDoubleArray; import eva2.gui.PropertyEditorProvider; import eva2.gui.editor.GenericObjectEditor; -import eva2.optimization.go.MOCCOStandalone; +import eva2.gui.MOCCOStandalone; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.operator.moso.MOSOWeightedFitness; import eva2.optimization.operator.terminators.InterfaceTerminator; diff --git a/src/eva2/optimization/mocco/MOCCOParameterizeTchebycheff.java b/src/eva2/optimization/mocco/MOCCOParameterizeTchebycheff.java index c54c98f3..c1d51673 100644 --- a/src/eva2/optimization/mocco/MOCCOParameterizeTchebycheff.java +++ b/src/eva2/optimization/mocco/MOCCOParameterizeTchebycheff.java @@ -3,7 +3,7 @@ package eva2.optimization.mocco; import eva2.gui.PropertyEditorProvider; import eva2.gui.editor.GenericObjectEditor; -import eva2.optimization.go.MOCCOStandalone; +import eva2.gui.MOCCOStandalone; import eva2.optimization.operator.migration.SOBestMigration; import eva2.optimization.operator.moso.MOSOWeightedLPTchebycheff; import eva2.optimization.operator.terminators.InterfaceTerminator; diff --git a/src/eva2/optimization/mocco/MOCCOPhase.java b/src/eva2/optimization/mocco/MOCCOPhase.java index ea63691f..48971b00 100644 --- a/src/eva2/optimization/mocco/MOCCOPhase.java +++ b/src/eva2/optimization/mocco/MOCCOPhase.java @@ -1,6 +1,6 @@ package eva2.optimization.mocco; -import eva2.optimization.go.MOCCOStandalone; +import eva2.gui.MOCCOStandalone; import javax.swing.*; import java.awt.*; diff --git a/src/eva2/optimization/mocco/MOCCOProblemInitialization.java b/src/eva2/optimization/mocco/MOCCOProblemInitialization.java index e5db42bb..405da154 100644 --- a/src/eva2/optimization/mocco/MOCCOProblemInitialization.java +++ b/src/eva2/optimization/mocco/MOCCOProblemInitialization.java @@ -1,7 +1,7 @@ package eva2.optimization.mocco; import eva2.gui.JParaPanel; -import eva2.optimization.go.MOCCOStandalone; +import eva2.gui.MOCCOStandalone; import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.ReflectPackage; diff --git a/src/eva2/optimization/mocco/MOCCOProblemRedefinition.java b/src/eva2/optimization/mocco/MOCCOProblemRedefinition.java index 60514892..ed19b155 100644 --- a/src/eva2/optimization/mocco/MOCCOProblemRedefinition.java +++ b/src/eva2/optimization/mocco/MOCCOProblemRedefinition.java @@ -2,7 +2,7 @@ package eva2.optimization.mocco; import eva2.gui.JParaPanel; -import eva2.optimization.go.MOCCOStandalone; +import eva2.gui.MOCCOStandalone; import eva2.problems.InterfaceOptimizationProblem; import javax.swing.*; diff --git a/src/eva2/optimization/mocco/paretofrontviewer/MOCCOViewer.java b/src/eva2/optimization/mocco/paretofrontviewer/MOCCOViewer.java index 32b8fcdf..6708d3d0 100644 --- a/src/eva2/optimization/mocco/paretofrontviewer/MOCCOViewer.java +++ b/src/eva2/optimization/mocco/paretofrontviewer/MOCCOViewer.java @@ -4,7 +4,7 @@ package eva2.optimization.mocco.paretofrontviewer; import eva2.gui.plot.FunctionArea; import eva2.gui.plot.GraphPointSet; import eva2.gui.plot.InterfaceDPointWithContent; -import eva2.optimization.go.MOCCOStandalone; +import eva2.gui.MOCCOStandalone; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.population.Population; import eva2.problems.InterfaceMultiObjectiveDeNovoProblem; diff --git a/src/eva2/optimization/modules/AbstractModuleAdapter.java b/src/eva2/optimization/modules/AbstractModuleAdapter.java index e4f40d4b..f41d3459 100644 --- a/src/eva2/optimization/modules/AbstractModuleAdapter.java +++ b/src/eva2/optimization/modules/AbstractModuleAdapter.java @@ -1,8 +1,10 @@ package eva2.optimization.modules; +import eva2.optimization.InterfaceProcessor; import eva2.optimization.OptimizationStateListener; -import eva2.optimization.go.InterfaceOptimizationParameters; +import eva2.optimization.InterfaceOptimizationParameters; +import eva2.optimization.Processor; import java.io.Serializable; import java.util.ArrayList; diff --git a/src/eva2/optimization/modules/GOModuleAdapter.java b/src/eva2/optimization/modules/GOModuleAdapter.java index 5343a83d..36d92949 100644 --- a/src/eva2/optimization/modules/GOModuleAdapter.java +++ b/src/eva2/optimization/modules/GOModuleAdapter.java @@ -1,6 +1,7 @@ package eva2.optimization.modules; -import eva2.optimization.go.InterfaceOptimizationParameters; +import eva2.optimization.InterfaceOptimizationParameters; +import eva2.optimization.OptimizationParameters; import java.io.Serializable; diff --git a/src/eva2/optimization/modules/GenericModuleAdapter.java b/src/eva2/optimization/modules/GenericModuleAdapter.java index a339fe67..1f5a55cd 100644 --- a/src/eva2/optimization/modules/GenericModuleAdapter.java +++ b/src/eva2/optimization/modules/GenericModuleAdapter.java @@ -5,7 +5,8 @@ import eva2.gui.EvAModuleButtonPanelMaker; import eva2.gui.EvATabbedFrameMaker; import eva2.gui.JParaPanel; import eva2.gui.editor.GenericObjectEditor; -import eva2.optimization.go.InterfaceOptimizationParameters; +import eva2.optimization.InterfaceOptimizationParameters; +import eva2.optimization.Processor; import eva2.optimization.statistics.*; import java.io.Serializable; diff --git a/src/eva2/optimization/operator/paramcontrol/ParameterControlManager.java b/src/eva2/optimization/operator/paramcontrol/ParameterControlManager.java index 1f468861..5aded6bc 100644 --- a/src/eva2/optimization/operator/paramcontrol/ParameterControlManager.java +++ b/src/eva2/optimization/operator/paramcontrol/ParameterControlManager.java @@ -1,7 +1,7 @@ package eva2.optimization.operator.paramcontrol; import eva2.gui.BeanInspector; -import eva2.optimization.modules.Processor; +import eva2.optimization.Processor; import eva2.optimization.population.Population; import eva2.tools.Pair; import eva2.util.annotation.Description; diff --git a/src/eva2/optimization/operator/postprocess/PostProcess.java b/src/eva2/optimization/operator/postprocess/PostProcess.java index 2d178840..f2df2b18 100644 --- a/src/eva2/optimization/operator/postprocess/PostProcess.java +++ b/src/eva2/optimization/operator/postprocess/PostProcess.java @@ -8,7 +8,7 @@ import eva2.gui.plot.TopoPlot; import eva2.optimization.enums.ESMutationInitialSigma; import eva2.optimization.enums.PostProcessMethod; import eva2.optimization.individuals.*; -import eva2.optimization.modules.OptimizationParameters; +import eva2.optimization.OptimizationParameters; import eva2.optimization.operator.cluster.ClusteringDensityBased; import eva2.optimization.operator.cluster.InterfaceClustering; import eva2.optimization.operator.crossover.CrossoverESDefault; diff --git a/src/eva2/optimization/statistics/AbstractStatistics.java b/src/eva2/optimization/statistics/AbstractStatistics.java index 7f95bbb4..e4ab84a1 100644 --- a/src/eva2/optimization/statistics/AbstractStatistics.java +++ b/src/eva2/optimization/statistics/AbstractStatistics.java @@ -1,7 +1,7 @@ package eva2.optimization.statistics; import eva2.gui.BeanInspector; -import eva2.optimization.go.InterfaceOptimizationParameters; +import eva2.optimization.InterfaceOptimizationParameters; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.IndividualInterface; import eva2.optimization.population.Population; diff --git a/src/eva2/optimization/statistics/InterfaceStatistics.java b/src/eva2/optimization/statistics/InterfaceStatistics.java index 732d6e13..0562610f 100644 --- a/src/eva2/optimization/statistics/InterfaceStatistics.java +++ b/src/eva2/optimization/statistics/InterfaceStatistics.java @@ -1,6 +1,6 @@ package eva2.optimization.statistics; -import eva2.optimization.go.InterfaceOptimizationParameters; +import eva2.optimization.InterfaceOptimizationParameters; import eva2.optimization.individuals.IndividualInterface; import eva2.optimization.population.Population; import eva2.optimization.population.PopulationInterface; diff --git a/src/eva2/optimization/statistics/OptimizationJob.java b/src/eva2/optimization/statistics/OptimizationJob.java index fa4b53cf..2207ca3b 100644 --- a/src/eva2/optimization/statistics/OptimizationJob.java +++ b/src/eva2/optimization/statistics/OptimizationJob.java @@ -1,6 +1,6 @@ package eva2.optimization.statistics; -import eva2.optimization.go.InterfaceOptimizationParameters; +import eva2.optimization.InterfaceOptimizationParameters; import eva2.tools.StringSelection; import java.io.Serializable; diff --git a/src/eva2/optimization/statistics/OptimizationJobList.java b/src/eva2/optimization/statistics/OptimizationJobList.java index 592fca49..290ae825 100644 --- a/src/eva2/optimization/statistics/OptimizationJobList.java +++ b/src/eva2/optimization/statistics/OptimizationJobList.java @@ -5,9 +5,9 @@ import eva2.gui.PropertySelectableList; import eva2.gui.editor.ArrayEditor; import eva2.optimization.enums.StatisticsOnSingleDataSet; import eva2.optimization.enums.StatisticsOnTwoSampledData; -import eva2.optimization.go.InterfaceOptimizationParameters; +import eva2.optimization.InterfaceOptimizationParameters; import eva2.optimization.modules.AbstractModuleAdapter; -import eva2.optimization.modules.AbstractOptimizationParameters; +import eva2.optimization.AbstractOptimizationParameters; import eva2.optimization.modules.GenericModuleAdapter; import eva2.optimization.modules.ModuleAdapter; import eva2.optimization.tools.FileTools; diff --git a/src/eva2/optimization/statistics/StatisticsDummy.java b/src/eva2/optimization/statistics/StatisticsDummy.java index ff906973..dfea47e0 100644 --- a/src/eva2/optimization/statistics/StatisticsDummy.java +++ b/src/eva2/optimization/statistics/StatisticsDummy.java @@ -1,6 +1,6 @@ package eva2.optimization.statistics; -import eva2.optimization.go.InterfaceOptimizationParameters; +import eva2.optimization.InterfaceOptimizationParameters; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.IndividualInterface; import eva2.optimization.population.Population; diff --git a/src/eva2/optimization/statistics/StatisticsParameters.java b/src/eva2/optimization/statistics/StatisticsParameters.java index 363979e3..79a75b58 100644 --- a/src/eva2/optimization/statistics/StatisticsParameters.java +++ b/src/eva2/optimization/statistics/StatisticsParameters.java @@ -2,10 +2,9 @@ package eva2.optimization.statistics; import eva2.gui.BeanInspector; import eva2.gui.editor.GenericObjectEditor; -import eva2.optimization.go.InterfaceNotifyOnInformers; +import eva2.optimization.InterfaceNotifyOnInformers; import eva2.problems.InterfaceAdditionalPopulationInformer; import eva2.tools.EVAERROR; -import eva2.tools.Serializer; import eva2.tools.StringSelection; import eva2.util.annotation.Description; import eva2.util.annotation.Hidden; diff --git a/src/eva2/optimization/statistics/StatisticsWithGUI.java b/src/eva2/optimization/statistics/StatisticsWithGUI.java index cce85d91..c4ed8618 100644 --- a/src/eva2/optimization/statistics/StatisticsWithGUI.java +++ b/src/eva2/optimization/statistics/StatisticsWithGUI.java @@ -7,7 +7,7 @@ import eva2.gui.plot.Graph; import eva2.gui.plot.GraphWindow; import eva2.gui.plot.Plot; import eva2.gui.plot.PlotInterface; -import eva2.optimization.go.InterfaceOptimizationParameters; +import eva2.optimization.InterfaceOptimizationParameters; import eva2.optimization.population.PopulationInterface; import eva2.problems.InterfaceAdditionalPopulationInformer; import eva2.tools.Pair; diff --git a/src/eva2/optimization/strategies/ANPSO.java b/src/eva2/optimization/strategies/ANPSO.java index 8c91225f..c8b7cf84 100644 --- a/src/eva2/optimization/strategies/ANPSO.java +++ b/src/eva2/optimization/strategies/ANPSO.java @@ -5,7 +5,7 @@ import eva2.gui.editor.GenericObjectEditor; import eva2.optimization.enums.PSOTopology; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceDataTypeDouble; -import eva2.optimization.modules.OptimizationParameters; +import eva2.optimization.OptimizationParameters; import eva2.optimization.operator.nichepso.deactivation.StandardDeactivationStrategy; import eva2.optimization.operator.paramcontrol.LinearParamAdaption; import eva2.optimization.operator.paramcontrol.ParamAdaption; diff --git a/src/eva2/optimization/strategies/NichePSO.java b/src/eva2/optimization/strategies/NichePSO.java index 3f3391bf..3a15b01e 100644 --- a/src/eva2/optimization/strategies/NichePSO.java +++ b/src/eva2/optimization/strategies/NichePSO.java @@ -6,7 +6,7 @@ import eva2.gui.plot.TopoPlot; import eva2.optimization.enums.PSOTopology; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceDataTypeDouble; -import eva2.optimization.modules.OptimizationParameters; +import eva2.optimization.OptimizationParameters; import eva2.optimization.operator.nichepso.absorption.EuclideanDiversityAbsorptionStrategy; import eva2.optimization.operator.nichepso.absorption.InterfaceAbsorptionStrategy; import eva2.optimization.operator.nichepso.absorption.StandardAbsorptionStrategy; diff --git a/src/eva2/optimization/strategies/ScatterSearch.java b/src/eva2/optimization/strategies/ScatterSearch.java index 4441748a..59292cfd 100644 --- a/src/eva2/optimization/strategies/ScatterSearch.java +++ b/src/eva2/optimization/strategies/ScatterSearch.java @@ -6,7 +6,7 @@ import eva2.gui.BeanInspector; import eva2.gui.editor.GenericObjectEditor; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceDataTypeDouble; -import eva2.optimization.modules.OptimizationParameters; +import eva2.optimization.OptimizationParameters; import eva2.optimization.operator.distancemetric.PhenotypeMetric; import eva2.optimization.operator.postprocess.PostProcess; import eva2.optimization.operator.terminators.EvaluationTerminator; diff --git a/src/eva2/problems/ERPStarter.java b/src/eva2/problems/ERPStarter.java index 35daf8e6..0f081222 100644 --- a/src/eva2/problems/ERPStarter.java +++ b/src/eva2/problems/ERPStarter.java @@ -5,7 +5,7 @@ import eva2.OptimizerRunnable; import eva2.gui.BeanInspector; import eva2.gui.Main; import eva2.optimization.individuals.AbstractEAIndividual; -import eva2.optimization.modules.OptimizationParameters; +import eva2.optimization.OptimizationParameters; import eva2.optimization.operator.crossover.CrossoverESDefault; import eva2.optimization.operator.moso.MOSONoConvert; import eva2.optimization.operator.moso.MOSOWeightedFitness; diff --git a/src/eva2/problems/FLensProblem.java b/src/eva2/problems/FLensProblem.java index c547fbae..fac641b1 100644 --- a/src/eva2/problems/FLensProblem.java +++ b/src/eva2/problems/FLensProblem.java @@ -2,11 +2,11 @@ package eva2.problems; import eva2.gui.JEFrame; -import eva2.optimization.go.StandaloneOptimization; +import eva2.gui.StandaloneOptimization; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.ESIndividualDoubleData; import eva2.optimization.individuals.InterfaceDataTypeDouble; -import eva2.optimization.modules.OptimizationParameters; +import eva2.optimization.OptimizationParameters; import eva2.optimization.population.Population; import eva2.optimization.strategies.InterfaceOptimizer; import eva2.tools.math.RNG; diff --git a/src/eva2/util/EvAComAdapter.java b/src/eva2/util/EvAComAdapter.java index 86e3ca3c..cf35f191 100644 --- a/src/eva2/util/EvAComAdapter.java +++ b/src/eva2/util/EvAComAdapter.java @@ -3,7 +3,7 @@ package eva2.util; import eva2.optimization.EvAMainAdapter; import eva2.optimization.EvAMainAdapterImpl; -import eva2.optimization.go.InterfaceOptimizationParameters; +import eva2.optimization.InterfaceOptimizationParameters; import eva2.optimization.modules.ModuleAdapter; import java.util.logging.Logger;