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

@@ -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;

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;

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;

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;

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;

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;

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;

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;

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;

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.*;

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;

src/eva2/gui/InterfaceStandaloneOptimization.java

@@ -1,4 +1,4 @@
-package eva2.optimization.go;
+package eva2.gui;
 
 /**
  *

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();

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;

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();

src/eva2/gui/SwingWorker.java

@@ -1,4 +1,4 @@
-package eva2.optimization.go;
+package eva2.gui;
 
 import javax.swing.*;
 

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;

src/eva2/optimization/EvAMainAdapter.java

@@ -9,7 +9,6 @@ package eva2.optimization;
  *            $Author: mkron $
  */
 
-import eva2.optimization.go.InterfaceOptimizationParameters;
 import eva2.optimization.modules.ModuleAdapter;
 
 /**

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;
 
 /**

src/eva2/optimization/InterfaceNotifyOnInformers.java

@@ -1,4 +1,4 @@
-package eva2.optimization.go;
+package eva2.optimization;
 
 import eva2.problems.InterfaceAdditionalPopulationInformer;
 

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;

src/eva2/optimization/InterfaceProcessor.java

@@ -1,4 +1,4 @@
-package eva2.optimization.modules;
+package eva2.optimization;
 
 import eva2.optimization.OptimizationStateListener;
 

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;

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;
 

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;

src/eva2/optimization/go/package-info.java

@@ -1 +0,0 @@
-package eva2.optimization.go;

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.*;

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;

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;

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.*;

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;

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;

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;

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;

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;

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;

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.*;

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;
 

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.*;

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;

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;

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;