diff --git a/src/eva2/OptimizerFactory.java b/src/eva2/OptimizerFactory.java index 2eac006c..2dc6875d 100644 --- a/src/eva2/OptimizerFactory.java +++ b/src/eva2/OptimizerFactory.java @@ -27,7 +27,7 @@ import eva2.optimization.operator.terminators.EvaluationTerminator; import eva2.optimization.operator.terminators.InterfaceTerminator; import eva2.optimization.population.PBILPopulation; import eva2.optimization.population.Population; -import eva2.optimization.problems.AbstractOptimizationProblem; +import eva2.problems.AbstractOptimizationProblem; import eva2.optimization.stat.InterfaceStatistics; import eva2.optimization.strategies.*; import eva2.tools.math.RNG; diff --git a/src/eva2/cli/Main.java b/src/eva2/cli/Main.java index 2b059d50..c1f11727 100644 --- a/src/eva2/cli/Main.java +++ b/src/eva2/cli/Main.java @@ -14,8 +14,8 @@ import eva2.optimization.operator.mutation.MutateDefault; import eva2.optimization.operator.selection.InterfaceSelection; import eva2.optimization.operator.selection.SelectXProbRouletteWheel; import eva2.optimization.population.Population; -import eva2.optimization.problems.AbstractProblemDouble; -import eva2.optimization.problems.AbstractProblemDoubleOffset; +import eva2.problems.AbstractProblemDouble; +import eva2.problems.AbstractProblemDoubleOffset; import eva2.optimization.strategies.DifferentialEvolution; import eva2.optimization.strategies.InterfaceOptimizer; import org.apache.commons.cli.*; @@ -172,7 +172,7 @@ public class Main implements OptimizationStateListener, InterfacePopulationChang public static Map> createProblemList() { Map> problemList = new TreeMap>(); - Reflections reflections = new Reflections("eva2.optimization.problems"); + Reflections reflections = new Reflections("eva2.problems"); Set> problems = reflections.getSubTypesOf(AbstractProblemDoubleOffset.class); for (Class problem : problems) { // We only want instantiable classes diff --git a/src/eva2/examples/TerminatorExample.java b/src/eva2/examples/TerminatorExample.java index 9073f3d6..3af6593c 100644 --- a/src/eva2/examples/TerminatorExample.java +++ b/src/eva2/examples/TerminatorExample.java @@ -8,7 +8,7 @@ import eva2.optimization.operator.terminators.PhenotypeConvergenceTerminator; import eva2.optimization.operator.terminators.PopulationMeasureTerminator.ChangeTypeEnum; import eva2.optimization.operator.terminators.PopulationMeasureTerminator.DirectionTypeEnum; import eva2.optimization.operator.terminators.PopulationMeasureTerminator.StagnationTypeEnum; -import eva2.optimization.problems.F1Problem; +import eva2.problems.F1Problem; public class TerminatorExample { diff --git a/src/eva2/examples/TestingCbnPostProc.java b/src/eva2/examples/TestingCbnPostProc.java index 12cf0895..d7861b13 100644 --- a/src/eva2/examples/TestingCbnPostProc.java +++ b/src/eva2/examples/TestingCbnPostProc.java @@ -5,7 +5,7 @@ import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.modules.OptimizationParameters; import eva2.optimization.operator.postprocess.PostProcessParams; import eva2.optimization.operator.terminators.EvaluationTerminator; -import eva2.optimization.problems.FM0Problem; +import eva2.problems.FM0Problem; import java.util.List; diff --git a/src/eva2/examples/TestingF1PSO.java b/src/eva2/examples/TestingF1PSO.java index 58781db5..13ccaed6 100644 --- a/src/eva2/examples/TestingF1PSO.java +++ b/src/eva2/examples/TestingF1PSO.java @@ -1,7 +1,7 @@ package eva2.examples; import eva2.OptimizerFactory; -import eva2.optimization.problems.F1Problem; +import eva2.problems.F1Problem; public class TestingF1PSO { diff --git a/src/eva2/examples/TestingGAB1.java b/src/eva2/examples/TestingGAB1.java index e79731e4..0090f3a2 100644 --- a/src/eva2/examples/TestingGAB1.java +++ b/src/eva2/examples/TestingGAB1.java @@ -5,7 +5,7 @@ import eva2.optimization.modules.OptimizationParameters; import eva2.optimization.operator.selection.SelectXProbRouletteWheel; import eva2.optimization.operator.terminators.EvaluationTerminator; import eva2.optimization.population.Population; -import eva2.optimization.problems.B1Problem; +import eva2.problems.B1Problem; import eva2.optimization.strategies.GeneticAlgorithm; import java.util.BitSet; diff --git a/src/eva2/examples/TestingPlusCmaEs.java b/src/eva2/examples/TestingPlusCmaEs.java index 1fa83b86..9d939c2c 100644 --- a/src/eva2/examples/TestingPlusCmaEs.java +++ b/src/eva2/examples/TestingPlusCmaEs.java @@ -6,7 +6,7 @@ import eva2.optimization.modules.OptimizationParameters; import eva2.optimization.operator.crossover.CrossoverESDefault; import eva2.optimization.operator.mutation.MutateESCovarianceMatrixAdaption; import eva2.optimization.operator.terminators.EvaluationTerminator; -import eva2.optimization.problems.FM0Problem; +import eva2.problems.FM0Problem; import eva2.optimization.strategies.EvolutionStrategies; public class TestingPlusCmaEs { diff --git a/src/eva2/gui/EvATabbedFrameMaker.java b/src/eva2/gui/EvATabbedFrameMaker.java index 6ff9a70b..d36df56e 100644 --- a/src/eva2/gui/EvATabbedFrameMaker.java +++ b/src/eva2/gui/EvATabbedFrameMaker.java @@ -6,7 +6,7 @@ package eva2.gui; */ import eva2.optimization.go.InterfaceNotifyOnInformers; -import eva2.optimization.problems.InterfaceAdditionalPopulationInformer; +import eva2.problems.InterfaceAdditionalPopulationInformer; import javax.swing.*; import javax.swing.plaf.basic.BasicButtonUI; diff --git a/src/eva2/gui/Main.java b/src/eva2/gui/Main.java index 4591810c..f08c1071 100644 --- a/src/eva2/gui/Main.java +++ b/src/eva2/gui/Main.java @@ -63,7 +63,7 @@ public class Main extends JFrame implements OptimizationStateListener { // if not null, the module is loaded automatically and no other can be selected private String useDefaultModule = null; //"Genetic_Optimization"; - private boolean localMode = false; + // measuring optimization runtime private long startTime = 0; @@ -275,7 +275,7 @@ public class Main extends JFrame implements OptimizationStateListener { } private void preloadClasses() { - ClassPreloader cp = new ClassPreloader("eva2.optimization.strategies.InterfaceOptimizer", "eva2.optimization.problems.InterfaceOptimizationProblem", "eva2.optimization.operator.terminators.InterfaceTerminator"); + ClassPreloader cp = new ClassPreloader("eva2.optimization.strategies.InterfaceOptimizer", "eva2.problems.InterfaceOptimizationProblem", "eva2.optimization.operator.terminators.InterfaceTerminator"); new Thread(cp).start(); } @@ -471,8 +471,8 @@ public class Main extends JFrame implements OptimizationStateListener { } }); - LOGGER.log(Level.INFO, "Working directory is: {0}", System.getProperty("user.dir")); - LOGGER.log(Level.INFO, "Class path is: {0}", System.getProperty("java.class.path", ".")); + LOGGER.log(Level.FINE, "Working directory is: {0}", System.getProperty("user.dir")); + LOGGER.log(Level.FINE, "Class path is: {0}", System.getProperty("java.class.path", ".")); if (!(configurationPane.isVisible())) { configurationPane.setVisible(true); @@ -529,7 +529,7 @@ public class Main extends JFrame implements OptimizationStateListener { public static void main(String[] args) { // Properties for Mac OS X support. if ((System.getProperty("mrj.version") != null) - || (System.getProperty("os.name").toLowerCase().indexOf("mac") != -1)) { + || (System.getProperty("os.name").toLowerCase().contains("mac"))) { /* * Note: the xDock name property must be set before parsing * command-line arguments! See above! @@ -545,13 +545,7 @@ public class Main extends JFrame implements OptimizationStateListener { System.setProperty("com.apple.mrj.application.live-resize", "true"); try { UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (ClassNotFoundException e) { - e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. - } catch (InstantiationException e) { - e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. - } catch (IllegalAccessException e) { - e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. - } catch (UnsupportedLookAndFeelException e) { + } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | UnsupportedLookAndFeelException e) { e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. } } else { @@ -689,7 +683,7 @@ public class Main extends JFrame implements OptimizationStateListener { }; actQuit = new ExtAction("&Quit", "Quit EvA2 workbench", - KeyStroke.getKeyStroke(KeyEvent.VK_Q, Event.CTRL_MASK)) { + KeyStroke.getKeyStroke(KeyEvent.VK_Q, InputEvent.CTRL_MASK)) { @Override public void actionPerformed(final ActionEvent event) { @@ -698,7 +692,7 @@ public class Main extends JFrame implements OptimizationStateListener { }; actPreferences = new ExtAction("&Preferences", "Show preferences dialog", - KeyStroke.getKeyStroke(KeyEvent.VK_P, Event.CTRL_MASK)) { + KeyStroke.getKeyStroke(KeyEvent.VK_P, InputEvent.CTRL_MASK)) { @Override public void actionPerformed(final ActionEvent event) { @@ -740,16 +734,6 @@ public class Main extends JFrame implements OptimizationStateListener { private void buildMenu() { JMenuBar menuBar = new JMenuBar(); setJMenuBar(menuBar); - JExtMenu menuModule = new JExtMenu("&Module"); - //menuModule.add(actModuleLoad); - - JExtMenu menuSelHosts = new JExtMenu("&Select Hosts"); - //menuSelHosts.setToolTipText("Select a host for the server application"); - //menuSelHosts.add(actHost); - //menuSelHosts.add(actAvailableHost); - //menuSelHosts.addSeparator(); - //menuSelHosts.add(actKillHost); - //menuSelHosts.add(actKillAllHosts); JExtMenu menuHelp = new JExtMenu("&Help"); menuHelp.add(actHelp); @@ -762,10 +746,6 @@ public class Main extends JFrame implements OptimizationStateListener { //menuOptions.add(menuSelHosts); menuOptions.addSeparator(); menuOptions.add(actQuit); - // this is accessible if no default module is given - //if (showLoadModules) { - // menuBar.add(menuModule); - //} menuBar.add(menuOptions); menuBar.add(((JExtDesktopPane) desktopPane).getWindowMenu()); @@ -830,7 +810,6 @@ public class Main extends JFrame implements OptimizationStateListener { return; } } else { - newModuleAdapter.setConnection(!localMode); newModuleAdapter.addOptimizationStateListener(this); try { if (withGUI) { diff --git a/src/eva2/gui/PropertyOptimizationObjectives.java b/src/eva2/gui/PropertyOptimizationObjectives.java index 79bb8a5c..30806eba 100644 --- a/src/eva2/gui/PropertyOptimizationObjectives.java +++ b/src/eva2/gui/PropertyOptimizationObjectives.java @@ -1,6 +1,6 @@ package eva2.gui; -import eva2.optimization.problems.InterfaceOptimizationObjective; +import eva2.problems.InterfaceOptimizationObjective; /** * diff --git a/src/eva2/gui/PropertyOptimizationObjectivesWithParam.java b/src/eva2/gui/PropertyOptimizationObjectivesWithParam.java index 2dc14e3c..751e3839 100644 --- a/src/eva2/gui/PropertyOptimizationObjectivesWithParam.java +++ b/src/eva2/gui/PropertyOptimizationObjectivesWithParam.java @@ -1,6 +1,6 @@ package eva2.gui; -import eva2.optimization.problems.InterfaceOptimizationObjective; +import eva2.problems.InterfaceOptimizationObjective; /** * diff --git a/src/eva2/gui/editor/GenericOptimizationObjectivesEditor.java b/src/eva2/gui/editor/GenericOptimizationObjectivesEditor.java index abedfc31..405cafc6 100644 --- a/src/eva2/gui/editor/GenericOptimizationObjectivesEditor.java +++ b/src/eva2/gui/editor/GenericOptimizationObjectivesEditor.java @@ -3,8 +3,8 @@ package eva2.gui.editor; import eva2.gui.PropertyEditorProvider; import eva2.gui.PropertyOptimizationObjectives; -import eva2.optimization.problems.InterfaceOptimizationObjective; -import eva2.optimization.problems.InterfaceOptimizationTarget; +import eva2.problems.InterfaceOptimizationObjective; +import eva2.problems.InterfaceOptimizationTarget; import eva2.optimization.tools.AbstractObjectEditor; import eva2.optimization.tools.GeneralOptimizationEditorProperty; import eva2.tools.BasicResourceLoader; diff --git a/src/eva2/gui/editor/GenericOptimizationObjectivesWithParamEditor.java b/src/eva2/gui/editor/GenericOptimizationObjectivesWithParamEditor.java index 70b87180..90f46e55 100644 --- a/src/eva2/gui/editor/GenericOptimizationObjectivesWithParamEditor.java +++ b/src/eva2/gui/editor/GenericOptimizationObjectivesWithParamEditor.java @@ -3,7 +3,7 @@ package eva2.gui.editor; import eva2.gui.PropertyEditorProvider; import eva2.gui.PropertyOptimizationObjectivesWithParam; -import eva2.optimization.problems.InterfaceOptimizationObjective; +import eva2.problems.InterfaceOptimizationObjective; import eva2.optimization.tools.AbstractObjectEditor; import eva2.optimization.tools.GeneralOptimizationEditorProperty; import eva2.tools.BasicResourceLoader; diff --git a/src/eva2/gui/plot/InterfaceDPointWithContent.java b/src/eva2/gui/plot/InterfaceDPointWithContent.java index 465cb46c..2fb19fe1 100644 --- a/src/eva2/gui/plot/InterfaceDPointWithContent.java +++ b/src/eva2/gui/plot/InterfaceDPointWithContent.java @@ -1,7 +1,7 @@ package eva2.gui.plot; import eva2.optimization.individuals.AbstractEAIndividual; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; /** * diff --git a/src/eva2/gui/plot/TopoPlot.java b/src/eva2/gui/plot/TopoPlot.java index 78d65cf7..6b9d6fcf 100644 --- a/src/eva2/gui/plot/TopoPlot.java +++ b/src/eva2/gui/plot/TopoPlot.java @@ -1,7 +1,7 @@ package eva2.gui.plot; -import eva2.optimization.problems.Interface2DBorderProblem; -import eva2.optimization.problems.InterfaceFirstOrderDerivableProblem; +import eva2.problems.Interface2DBorderProblem; +import eva2.problems.InterfaceFirstOrderDerivableProblem; import eva2.tools.chart2d.DRectangle; import eva2.tools.diagram.ColorBarCalculator; import eva2.tools.math.Mathematics; diff --git a/src/eva2/optimization/go/InterfaceNotifyOnInformers.java b/src/eva2/optimization/go/InterfaceNotifyOnInformers.java index 8656cb57..34c7d272 100644 --- a/src/eva2/optimization/go/InterfaceNotifyOnInformers.java +++ b/src/eva2/optimization/go/InterfaceNotifyOnInformers.java @@ -1,6 +1,6 @@ package eva2.optimization.go; -import eva2.optimization.problems.InterfaceAdditionalPopulationInformer; +import eva2.problems.InterfaceAdditionalPopulationInformer; import java.util.List; diff --git a/src/eva2/optimization/go/InterfaceOptimizationParameters.java b/src/eva2/optimization/go/InterfaceOptimizationParameters.java index 3a3cc04b..6690c642 100644 --- a/src/eva2/optimization/go/InterfaceOptimizationParameters.java +++ b/src/eva2/optimization/go/InterfaceOptimizationParameters.java @@ -2,8 +2,8 @@ package eva2.optimization.go; import eva2.optimization.operator.postprocess.InterfacePostProcessParams; import eva2.optimization.operator.terminators.InterfaceTerminator; -import eva2.optimization.problems.InterfaceAdditionalPopulationInformer; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceAdditionalPopulationInformer; +import eva2.problems.InterfaceOptimizationProblem; import eva2.optimization.strategies.InterfaceOptimizer; /** diff --git a/src/eva2/optimization/go/MOCCOStandalone.java b/src/eva2/optimization/go/MOCCOStandalone.java index 5e87f3d3..ca586a15 100644 --- a/src/eva2/optimization/go/MOCCOStandalone.java +++ b/src/eva2/optimization/go/MOCCOStandalone.java @@ -8,7 +8,7 @@ import eva2.optimization.operator.moso.InterfaceMOSOConverter; import eva2.optimization.operator.moso.MOSOWeightedFitness; import eva2.optimization.operator.terminators.EvaluationTerminator; import eva2.optimization.population.Population; -import eva2.optimization.problems.*; +import eva2.problems.*; import eva2.optimization.strategies.InterfaceOptimizer; import eva2.optimization.strategies.IslandModelEA; diff --git a/src/eva2/optimization/go/StandaloneOptimization.java b/src/eva2/optimization/go/StandaloneOptimization.java index e792bb7e..1970f16b 100644 --- a/src/eva2/optimization/go/StandaloneOptimization.java +++ b/src/eva2/optimization/go/StandaloneOptimization.java @@ -15,7 +15,7 @@ import eva2.optimization.operator.mutation.MutateESLocal; import eva2.optimization.operator.selection.SelectTournament; import eva2.optimization.operator.terminators.EvaluationTerminator; import eva2.optimization.population.Population; -import eva2.optimization.problems.F1Problem; +import eva2.problems.F1Problem; import eva2.optimization.strategies.EvolutionStrategies; import eva2.optimization.strategies.GeneticAlgorithm; import eva2.optimization.strategies.InterfaceOptimizer; @@ -28,7 +28,6 @@ import java.awt.event.ActionListener; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.io.*; -import java.net.InetAddress; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; diff --git a/src/eva2/optimization/individuals/AbstractEAIndividual.java b/src/eva2/optimization/individuals/AbstractEAIndividual.java index 22c2a131..ef378126 100644 --- a/src/eva2/optimization/individuals/AbstractEAIndividual.java +++ b/src/eva2/optimization/individuals/AbstractEAIndividual.java @@ -10,7 +10,7 @@ import eva2.optimization.operator.initialization.InterfaceInitialization; import eva2.optimization.operator.mutation.InterfaceMutation; import eva2.optimization.operator.mutation.NoMutation; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.EVAERROR; import eva2.tools.math.RNG; diff --git a/src/eva2/optimization/individuals/ESIndividualBinaryData.java b/src/eva2/optimization/individuals/ESIndividualBinaryData.java index f8bf15aa..151b9acb 100644 --- a/src/eva2/optimization/individuals/ESIndividualBinaryData.java +++ b/src/eva2/optimization/individuals/ESIndividualBinaryData.java @@ -3,8 +3,8 @@ package eva2.optimization.individuals; import eva2.optimization.operator.crossover.CrossoverESDefault; import eva2.optimization.operator.mutation.InterfaceMutation; import eva2.optimization.operator.mutation.MutateESGlobal; -import eva2.optimization.problems.InterfaceHasInitRange; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceHasInitRange; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import java.util.BitSet; diff --git a/src/eva2/optimization/individuals/ESIndividualDoubleData.java b/src/eva2/optimization/individuals/ESIndividualDoubleData.java index b153e92c..62f3be14 100644 --- a/src/eva2/optimization/individuals/ESIndividualDoubleData.java +++ b/src/eva2/optimization/individuals/ESIndividualDoubleData.java @@ -5,8 +5,8 @@ import eva2.optimization.enums.MutateESCrossoverTypeEnum; import eva2.optimization.operator.crossover.CrossoverESDefault; import eva2.optimization.operator.mutation.InterfaceMutation; import eva2.optimization.operator.mutation.MutateESGlobal; -import eva2.optimization.problems.InterfaceHasInitRange; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceHasInitRange; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.EVAERROR; import eva2.tools.math.Mathematics; import eva2.tools.math.RNG; diff --git a/src/eva2/optimization/individuals/ESIndividualIntegerData.java b/src/eva2/optimization/individuals/ESIndividualIntegerData.java index c9002a1c..140d0cf7 100644 --- a/src/eva2/optimization/individuals/ESIndividualIntegerData.java +++ b/src/eva2/optimization/individuals/ESIndividualIntegerData.java @@ -3,8 +3,8 @@ package eva2.optimization.individuals; import eva2.optimization.operator.crossover.CrossoverESDefault; import eva2.optimization.operator.mutation.InterfaceMutation; import eva2.optimization.operator.mutation.MutateESGlobal; -import eva2.optimization.problems.InterfaceHasInitRange; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceHasInitRange; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import eva2.util.annotation.Description; diff --git a/src/eva2/optimization/individuals/ESIndividualPermutationData.java b/src/eva2/optimization/individuals/ESIndividualPermutationData.java index 8018aec7..1581064a 100644 --- a/src/eva2/optimization/individuals/ESIndividualPermutationData.java +++ b/src/eva2/optimization/individuals/ESIndividualPermutationData.java @@ -3,8 +3,8 @@ package eva2.optimization.individuals; import eva2.optimization.operator.crossover.CrossoverESDefault; import eva2.optimization.operator.mutation.InterfaceMutation; import eva2.optimization.operator.mutation.MutateESGlobal; -import eva2.optimization.problems.InterfaceHasInitRange; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceHasInitRange; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import eva2.util.annotation.Description; diff --git a/src/eva2/optimization/individuals/GAESIndividualBinaryDoubleData.java b/src/eva2/optimization/individuals/GAESIndividualBinaryDoubleData.java index 531b45c4..bd8f1f14 100644 --- a/src/eva2/optimization/individuals/GAESIndividualBinaryDoubleData.java +++ b/src/eva2/optimization/individuals/GAESIndividualBinaryDoubleData.java @@ -3,7 +3,7 @@ package eva2.optimization.individuals; import eva2.optimization.operator.mutation.InterfaceMutation; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import eva2.util.annotation.Description; diff --git a/src/eva2/optimization/individuals/GAIndividualBinaryData.java b/src/eva2/optimization/individuals/GAIndividualBinaryData.java index bd78c5f5..7600147f 100644 --- a/src/eva2/optimization/individuals/GAIndividualBinaryData.java +++ b/src/eva2/optimization/individuals/GAIndividualBinaryData.java @@ -5,7 +5,7 @@ import eva2.optimization.operator.crossover.CrossoverGAGINPoint; import eva2.optimization.operator.crossover.InterfaceCrossover; import eva2.optimization.operator.mutation.InterfaceMutation; import eva2.optimization.operator.mutation.MutateGANBit; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import eva2.util.annotation.Description; diff --git a/src/eva2/optimization/individuals/GAIndividualDoubleData.java b/src/eva2/optimization/individuals/GAIndividualDoubleData.java index e1dba775..0bf62982 100644 --- a/src/eva2/optimization/individuals/GAIndividualDoubleData.java +++ b/src/eva2/optimization/individuals/GAIndividualDoubleData.java @@ -7,7 +7,7 @@ import eva2.optimization.operator.crossover.CrossoverGAGINPoint; import eva2.optimization.operator.crossover.InterfaceCrossover; import eva2.optimization.operator.mutation.InterfaceMutation; import eva2.optimization.operator.mutation.MutateGAUniform; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import eva2.util.annotation.Description; diff --git a/src/eva2/optimization/individuals/GAIndividualIntegerData.java b/src/eva2/optimization/individuals/GAIndividualIntegerData.java index e89cd399..e825b7b1 100644 --- a/src/eva2/optimization/individuals/GAIndividualIntegerData.java +++ b/src/eva2/optimization/individuals/GAIndividualIntegerData.java @@ -6,7 +6,7 @@ import eva2.optimization.individuals.codings.ga.InterfaceGAIntegerCoding; import eva2.optimization.operator.crossover.CrossoverGAGINPoint; import eva2.optimization.operator.mutation.InterfaceMutation; import eva2.optimization.operator.mutation.MutateGANBit; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import eva2.util.annotation.Description; diff --git a/src/eva2/optimization/individuals/GAPIndividualProgramData.java b/src/eva2/optimization/individuals/GAPIndividualProgramData.java index 0cd12779..aeb1dcd4 100644 --- a/src/eva2/optimization/individuals/GAPIndividualProgramData.java +++ b/src/eva2/optimization/individuals/GAPIndividualProgramData.java @@ -4,7 +4,7 @@ package eva2.optimization.individuals; import eva2.optimization.individuals.codings.gp.InterfaceProgram; import eva2.optimization.operator.mutation.InterfaceMutation; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** diff --git a/src/eva2/optimization/individuals/GEIndividualProgramData.java b/src/eva2/optimization/individuals/GEIndividualProgramData.java index dc5f43db..d8dd4de8 100644 --- a/src/eva2/optimization/individuals/GEIndividualProgramData.java +++ b/src/eva2/optimization/individuals/GEIndividualProgramData.java @@ -7,7 +7,7 @@ import eva2.optimization.individuals.codings.gp.InterfaceProgram; import eva2.optimization.operator.crossover.CrossoverGADefault; import eva2.optimization.operator.mutation.InterfaceMutation; import eva2.optimization.operator.mutation.MutateDefault; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import eva2.util.annotation.Description; diff --git a/src/eva2/optimization/individuals/GIIndividualIntegerData.java b/src/eva2/optimization/individuals/GIIndividualIntegerData.java index 6b6d2ae3..4d93641b 100644 --- a/src/eva2/optimization/individuals/GIIndividualIntegerData.java +++ b/src/eva2/optimization/individuals/GIIndividualIntegerData.java @@ -3,8 +3,8 @@ package eva2.optimization.individuals; import eva2.optimization.operator.crossover.CrossoverGIDefault; import eva2.optimization.operator.mutation.InterfaceMutation; import eva2.optimization.operator.mutation.MutateDefault; -import eva2.optimization.problems.InterfaceHasInitRange; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceHasInitRange; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import eva2.util.annotation.Description; diff --git a/src/eva2/optimization/individuals/GIOBGAIndividualIntegerPermutationData.java b/src/eva2/optimization/individuals/GIOBGAIndividualIntegerPermutationData.java index 388cde16..1e35d056 100644 --- a/src/eva2/optimization/individuals/GIOBGAIndividualIntegerPermutationData.java +++ b/src/eva2/optimization/individuals/GIOBGAIndividualIntegerPermutationData.java @@ -2,7 +2,7 @@ package eva2.optimization.individuals; import eva2.optimization.operator.mutation.InterfaceMutation; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import eva2.util.annotation.Description; diff --git a/src/eva2/optimization/individuals/GPIndividualProgramData.java b/src/eva2/optimization/individuals/GPIndividualProgramData.java index 228b853b..0eed79af 100644 --- a/src/eva2/optimization/individuals/GPIndividualProgramData.java +++ b/src/eva2/optimization/individuals/GPIndividualProgramData.java @@ -7,7 +7,7 @@ import eva2.optimization.individuals.codings.gp.InterfaceProgram; import eva2.optimization.operator.crossover.CrossoverGPDefault; import eva2.optimization.operator.mutation.InterfaceMutation; import eva2.optimization.operator.mutation.MutateDefault; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.EVAERROR; import eva2.tools.math.RNG; import eva2.util.annotation.Description; diff --git a/src/eva2/optimization/individuals/IndividualInterface.java b/src/eva2/optimization/individuals/IndividualInterface.java index 50b9b5e5..0467831b 100644 --- a/src/eva2/optimization/individuals/IndividualInterface.java +++ b/src/eva2/optimization/individuals/IndividualInterface.java @@ -1,6 +1,6 @@ package eva2.optimization.individuals; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; /** * Minimal interface for an EA individual. diff --git a/src/eva2/optimization/individuals/OBGAIndividualPermutationData.java b/src/eva2/optimization/individuals/OBGAIndividualPermutationData.java index a11c46a1..e53619b1 100644 --- a/src/eva2/optimization/individuals/OBGAIndividualPermutationData.java +++ b/src/eva2/optimization/individuals/OBGAIndividualPermutationData.java @@ -4,7 +4,7 @@ package eva2.optimization.individuals; import eva2.optimization.operator.crossover.CrossoverOBGAPMX; import eva2.optimization.operator.mutation.InterfaceMutation; import eva2.optimization.operator.mutation.MutateOBGAFlip; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import eva2.util.annotation.Description; diff --git a/src/eva2/optimization/individuals/codings/gp/AbstractGPNode.java b/src/eva2/optimization/individuals/codings/gp/AbstractGPNode.java index ffb2dd38..5786c5ae 100644 --- a/src/eva2/optimization/individuals/codings/gp/AbstractGPNode.java +++ b/src/eva2/optimization/individuals/codings/gp/AbstractGPNode.java @@ -3,8 +3,8 @@ package eva2.optimization.individuals.codings.gp; import eva2.gui.BeanInspector; import eva2.gui.editor.GenericObjectEditor; -import eva2.optimization.problems.GPFunctionProblem; -import eva2.optimization.problems.InterfaceProgramProblem; +import eva2.problems.GPFunctionProblem; +import eva2.problems.InterfaceProgramProblem; import eva2.tools.Pair; import eva2.tools.ReflectPackage; import eva2.tools.math.Mathematics; diff --git a/src/eva2/optimization/individuals/codings/gp/GPNodeAbs.java b/src/eva2/optimization/individuals/codings/gp/GPNodeAbs.java index 26f46d46..96c5f692 100644 --- a/src/eva2/optimization/individuals/codings/gp/GPNodeAbs.java +++ b/src/eva2/optimization/individuals/codings/gp/GPNodeAbs.java @@ -1,6 +1,6 @@ package eva2.optimization.individuals.codings.gp; -import eva2.optimization.problems.InterfaceProgramProblem; +import eva2.problems.InterfaceProgramProblem; /** diff --git a/src/eva2/optimization/individuals/codings/gp/GPNodeAdd.java b/src/eva2/optimization/individuals/codings/gp/GPNodeAdd.java index bfd74f61..0dcb17f8 100644 --- a/src/eva2/optimization/individuals/codings/gp/GPNodeAdd.java +++ b/src/eva2/optimization/individuals/codings/gp/GPNodeAdd.java @@ -1,7 +1,7 @@ package eva2.optimization.individuals.codings.gp; -import eva2.optimization.problems.InterfaceProgramProblem; +import eva2.problems.InterfaceProgramProblem; /** * A simple add node with two arguments. diff --git a/src/eva2/optimization/individuals/codings/gp/GPNodeConst.java b/src/eva2/optimization/individuals/codings/gp/GPNodeConst.java index 8ae1563d..d1be9162 100644 --- a/src/eva2/optimization/individuals/codings/gp/GPNodeConst.java +++ b/src/eva2/optimization/individuals/codings/gp/GPNodeConst.java @@ -1,6 +1,6 @@ package eva2.optimization.individuals.codings.gp; -import eva2.optimization.problems.InterfaceProgramProblem; +import eva2.problems.InterfaceProgramProblem; /** * A simple constant node with the value 1. diff --git a/src/eva2/optimization/individuals/codings/gp/GPNodeCos.java b/src/eva2/optimization/individuals/codings/gp/GPNodeCos.java index d7914903..1fe0064a 100644 --- a/src/eva2/optimization/individuals/codings/gp/GPNodeCos.java +++ b/src/eva2/optimization/individuals/codings/gp/GPNodeCos.java @@ -1,6 +1,6 @@ package eva2.optimization.individuals.codings.gp; -import eva2.optimization.problems.InterfaceProgramProblem; +import eva2.problems.InterfaceProgramProblem; /** * A cos node with on argument. diff --git a/src/eva2/optimization/individuals/codings/gp/GPNodeDiv.java b/src/eva2/optimization/individuals/codings/gp/GPNodeDiv.java index 50d58aba..27a397f7 100644 --- a/src/eva2/optimization/individuals/codings/gp/GPNodeDiv.java +++ b/src/eva2/optimization/individuals/codings/gp/GPNodeDiv.java @@ -1,6 +1,6 @@ package eva2.optimization.individuals.codings.gp; -import eva2.optimization.problems.InterfaceProgramProblem; +import eva2.problems.InterfaceProgramProblem; /** diff --git a/src/eva2/optimization/individuals/codings/gp/GPNodeExp.java b/src/eva2/optimization/individuals/codings/gp/GPNodeExp.java index fa932dc5..9c0ccebd 100644 --- a/src/eva2/optimization/individuals/codings/gp/GPNodeExp.java +++ b/src/eva2/optimization/individuals/codings/gp/GPNodeExp.java @@ -1,6 +1,6 @@ package eva2.optimization.individuals.codings.gp; -import eva2.optimization.problems.InterfaceProgramProblem; +import eva2.problems.InterfaceProgramProblem; /** * An exponent node with one argument. diff --git a/src/eva2/optimization/individuals/codings/gp/GPNodeFlowExec2.java b/src/eva2/optimization/individuals/codings/gp/GPNodeFlowExec2.java index 3f201c2c..072a0b15 100644 --- a/src/eva2/optimization/individuals/codings/gp/GPNodeFlowExec2.java +++ b/src/eva2/optimization/individuals/codings/gp/GPNodeFlowExec2.java @@ -1,6 +1,6 @@ package eva2.optimization.individuals.codings.gp; -import eva2.optimization.problems.InterfaceProgramProblem; +import eva2.problems.InterfaceProgramProblem; /** * This nodes executes both arguments. diff --git a/src/eva2/optimization/individuals/codings/gp/GPNodeFlowExec3.java b/src/eva2/optimization/individuals/codings/gp/GPNodeFlowExec3.java index bb83a893..05ee6e94 100644 --- a/src/eva2/optimization/individuals/codings/gp/GPNodeFlowExec3.java +++ b/src/eva2/optimization/individuals/codings/gp/GPNodeFlowExec3.java @@ -1,6 +1,6 @@ package eva2.optimization.individuals.codings.gp; -import eva2.optimization.problems.InterfaceProgramProblem; +import eva2.problems.InterfaceProgramProblem; /** * This node executes all three arguments. diff --git a/src/eva2/optimization/individuals/codings/gp/GPNodeInput.java b/src/eva2/optimization/individuals/codings/gp/GPNodeInput.java index 2b206d35..b6d0c717 100644 --- a/src/eva2/optimization/individuals/codings/gp/GPNodeInput.java +++ b/src/eva2/optimization/individuals/codings/gp/GPNodeInput.java @@ -1,6 +1,6 @@ package eva2.optimization.individuals.codings.gp; -import eva2.optimization.problems.InterfaceProgramProblem; +import eva2.problems.InterfaceProgramProblem; /** * diff --git a/src/eva2/optimization/individuals/codings/gp/GPNodeMult.java b/src/eva2/optimization/individuals/codings/gp/GPNodeMult.java index 4c19519c..2b9bcbb9 100644 --- a/src/eva2/optimization/individuals/codings/gp/GPNodeMult.java +++ b/src/eva2/optimization/individuals/codings/gp/GPNodeMult.java @@ -1,6 +1,6 @@ package eva2.optimization.individuals.codings.gp; -import eva2.optimization.problems.InterfaceProgramProblem; +import eva2.problems.InterfaceProgramProblem; /** diff --git a/src/eva2/optimization/individuals/codings/gp/GPNodeNeg.java b/src/eva2/optimization/individuals/codings/gp/GPNodeNeg.java index 5eb0362b..58e2fdcd 100644 --- a/src/eva2/optimization/individuals/codings/gp/GPNodeNeg.java +++ b/src/eva2/optimization/individuals/codings/gp/GPNodeNeg.java @@ -1,6 +1,6 @@ package eva2.optimization.individuals.codings.gp; -import eva2.optimization.problems.InterfaceProgramProblem; +import eva2.problems.InterfaceProgramProblem; /** diff --git a/src/eva2/optimization/individuals/codings/gp/GPNodeOutput.java b/src/eva2/optimization/individuals/codings/gp/GPNodeOutput.java index ebae30bf..2739c017 100644 --- a/src/eva2/optimization/individuals/codings/gp/GPNodeOutput.java +++ b/src/eva2/optimization/individuals/codings/gp/GPNodeOutput.java @@ -1,6 +1,6 @@ package eva2.optimization.individuals.codings.gp; -import eva2.optimization.problems.InterfaceProgramProblem; +import eva2.problems.InterfaceProgramProblem; /** * The node allows the program to give an output or to perform an action diff --git a/src/eva2/optimization/individuals/codings/gp/GPNodePow2.java b/src/eva2/optimization/individuals/codings/gp/GPNodePow2.java index 4066908b..45f2bbbf 100644 --- a/src/eva2/optimization/individuals/codings/gp/GPNodePow2.java +++ b/src/eva2/optimization/individuals/codings/gp/GPNodePow2.java @@ -1,6 +1,6 @@ package eva2.optimization.individuals.codings.gp; -import eva2.optimization.problems.InterfaceProgramProblem; +import eva2.problems.InterfaceProgramProblem; /** * This node puts the argument to the power of two. diff --git a/src/eva2/optimization/individuals/codings/gp/GPNodePow3.java b/src/eva2/optimization/individuals/codings/gp/GPNodePow3.java index c4472485..d1d2d2c6 100644 --- a/src/eva2/optimization/individuals/codings/gp/GPNodePow3.java +++ b/src/eva2/optimization/individuals/codings/gp/GPNodePow3.java @@ -1,6 +1,6 @@ package eva2.optimization.individuals.codings.gp; -import eva2.optimization.problems.InterfaceProgramProblem; +import eva2.problems.InterfaceProgramProblem; /** * This argument puts the argument to the power of three. diff --git a/src/eva2/optimization/individuals/codings/gp/GPNodeProd.java b/src/eva2/optimization/individuals/codings/gp/GPNodeProd.java index e08b3436..8365dc62 100644 --- a/src/eva2/optimization/individuals/codings/gp/GPNodeProd.java +++ b/src/eva2/optimization/individuals/codings/gp/GPNodeProd.java @@ -1,7 +1,7 @@ package eva2.optimization.individuals.codings.gp; -import eva2.optimization.problems.InterfaceProgramProblem; +import eva2.problems.InterfaceProgramProblem; import eva2.tools.math.Mathematics; /** diff --git a/src/eva2/optimization/individuals/codings/gp/GPNodeSin.java b/src/eva2/optimization/individuals/codings/gp/GPNodeSin.java index cc788c6d..66919b22 100644 --- a/src/eva2/optimization/individuals/codings/gp/GPNodeSin.java +++ b/src/eva2/optimization/individuals/codings/gp/GPNodeSin.java @@ -1,6 +1,6 @@ package eva2.optimization.individuals.codings.gp; -import eva2.optimization.problems.InterfaceProgramProblem; +import eva2.problems.InterfaceProgramProblem; /** * A sinus node taking one argument. diff --git a/src/eva2/optimization/individuals/codings/gp/GPNodeSqrt.java b/src/eva2/optimization/individuals/codings/gp/GPNodeSqrt.java index 10bd6ac4..50c9bc78 100644 --- a/src/eva2/optimization/individuals/codings/gp/GPNodeSqrt.java +++ b/src/eva2/optimization/individuals/codings/gp/GPNodeSqrt.java @@ -1,6 +1,6 @@ package eva2.optimization.individuals.codings.gp; -import eva2.optimization.problems.InterfaceProgramProblem; +import eva2.problems.InterfaceProgramProblem; /** * A square root node taking one argument. Secure operation is guaranteed diff --git a/src/eva2/optimization/individuals/codings/gp/GPNodeSub.java b/src/eva2/optimization/individuals/codings/gp/GPNodeSub.java index bef20b8d..ede7631f 100644 --- a/src/eva2/optimization/individuals/codings/gp/GPNodeSub.java +++ b/src/eva2/optimization/individuals/codings/gp/GPNodeSub.java @@ -1,6 +1,6 @@ package eva2.optimization.individuals.codings.gp; -import eva2.optimization.problems.InterfaceProgramProblem; +import eva2.problems.InterfaceProgramProblem; /** diff --git a/src/eva2/optimization/individuals/codings/gp/GPNodeSum.java b/src/eva2/optimization/individuals/codings/gp/GPNodeSum.java index 21b83fe9..dd2c788a 100644 --- a/src/eva2/optimization/individuals/codings/gp/GPNodeSum.java +++ b/src/eva2/optimization/individuals/codings/gp/GPNodeSum.java @@ -1,7 +1,7 @@ package eva2.optimization.individuals.codings.gp; -import eva2.optimization.problems.InterfaceProgramProblem; +import eva2.problems.InterfaceProgramProblem; import eva2.tools.math.Mathematics; /** diff --git a/src/eva2/optimization/individuals/codings/gp/InterfaceProgram.java b/src/eva2/optimization/individuals/codings/gp/InterfaceProgram.java index efd30aa7..25f55344 100644 --- a/src/eva2/optimization/individuals/codings/gp/InterfaceProgram.java +++ b/src/eva2/optimization/individuals/codings/gp/InterfaceProgram.java @@ -15,7 +15,7 @@ public interface InterfaceProgram { * * @param environment */ - public Object evaluate(eva2.optimization.problems.InterfaceProgramProblem environment); + public Object evaluate(eva2.problems.InterfaceProgramProblem environment); /** * This method returns a string representation of the current program. diff --git a/src/eva2/optimization/mocco/MOCCOChooseReferencePoint.java b/src/eva2/optimization/mocco/MOCCOChooseReferencePoint.java index 11540dc9..1e85b2f3 100644 --- a/src/eva2/optimization/mocco/MOCCOChooseReferencePoint.java +++ b/src/eva2/optimization/mocco/MOCCOChooseReferencePoint.java @@ -3,8 +3,8 @@ package eva2.optimization.mocco; import eva2.optimization.go.MOCCOStandalone; import eva2.optimization.mocco.paretofrontviewer.InterfaceRefPointListener; -import eva2.optimization.problems.InterfaceMultiObjectiveDeNovoProblem; -import eva2.optimization.problems.InterfaceOptimizationObjective; +import eva2.problems.InterfaceMultiObjectiveDeNovoProblem; +import eva2.problems.InterfaceOptimizationObjective; import javax.swing.*; import java.awt.*; diff --git a/src/eva2/optimization/mocco/MOCCOChooseReferenceSolution.java b/src/eva2/optimization/mocco/MOCCOChooseReferenceSolution.java index 958b8cf1..afecc31c 100644 --- a/src/eva2/optimization/mocco/MOCCOChooseReferenceSolution.java +++ b/src/eva2/optimization/mocco/MOCCOChooseReferenceSolution.java @@ -5,8 +5,8 @@ import eva2.optimization.go.MOCCOStandalone; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.mocco.paretofrontviewer.InterfaceRefSolutionListener; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceMultiObjectiveDeNovoProblem; -import eva2.optimization.problems.InterfaceOptimizationObjective; +import eva2.problems.InterfaceMultiObjectiveDeNovoProblem; +import eva2.problems.InterfaceOptimizationObjective; import javax.swing.*; import java.awt.*; diff --git a/src/eva2/optimization/mocco/MOCCOParameterizeGDF.java b/src/eva2/optimization/mocco/MOCCOParameterizeGDF.java index f93884a5..013ecf0d 100644 --- a/src/eva2/optimization/mocco/MOCCOParameterizeGDF.java +++ b/src/eva2/optimization/mocco/MOCCOParameterizeGDF.java @@ -8,9 +8,9 @@ import eva2.optimization.go.MOCCOStandalone; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.operator.moso.MOSOWeightedFitness; import eva2.optimization.operator.terminators.InterfaceTerminator; -import eva2.optimization.problems.AbstractMultiObjectiveOptimizationProblem; -import eva2.optimization.problems.InterfaceMultiObjectiveDeNovoProblem; -import eva2.optimization.problems.InterfaceOptimizationObjective; +import eva2.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.problems.InterfaceMultiObjectiveDeNovoProblem; +import eva2.problems.InterfaceOptimizationObjective; import eva2.optimization.strategies.GeneticAlgorithm; import eva2.optimization.strategies.InterfaceOptimizer; import eva2.optimization.tools.AbstractObjectEditor; diff --git a/src/eva2/optimization/mocco/MOCCOParameterizeRefPoint.java b/src/eva2/optimization/mocco/MOCCOParameterizeRefPoint.java index 11c8ddbc..f8c2e4a3 100644 --- a/src/eva2/optimization/mocco/MOCCOParameterizeRefPoint.java +++ b/src/eva2/optimization/mocco/MOCCOParameterizeRefPoint.java @@ -7,7 +7,7 @@ import eva2.optimization.go.MOCCOStandalone; import eva2.optimization.operator.migration.SOBestMigration; import eva2.optimization.operator.moso.MOSOLpMetric; import eva2.optimization.operator.terminators.InterfaceTerminator; -import eva2.optimization.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.problems.AbstractMultiObjectiveOptimizationProblem; import eva2.optimization.strategies.IslandModelEA; import eva2.optimization.tools.AbstractObjectEditor; import eva2.optimization.tools.GeneralOptimizationEditorProperty; diff --git a/src/eva2/optimization/mocco/MOCCOParameterizeSTEP.java b/src/eva2/optimization/mocco/MOCCOParameterizeSTEP.java index ee19b42a..baf4f618 100644 --- a/src/eva2/optimization/mocco/MOCCOParameterizeSTEP.java +++ b/src/eva2/optimization/mocco/MOCCOParameterizeSTEP.java @@ -8,9 +8,9 @@ import eva2.optimization.go.MOCCOStandalone; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.operator.moso.MOSOWeightedFitness; import eva2.optimization.operator.terminators.InterfaceTerminator; -import eva2.optimization.problems.AbstractMultiObjectiveOptimizationProblem; -import eva2.optimization.problems.InterfaceMultiObjectiveDeNovoProblem; -import eva2.optimization.problems.InterfaceOptimizationObjective; +import eva2.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.problems.InterfaceMultiObjectiveDeNovoProblem; +import eva2.problems.InterfaceOptimizationObjective; import eva2.optimization.strategies.GeneticAlgorithm; import eva2.optimization.strategies.InterfaceOptimizer; import eva2.optimization.tools.AbstractObjectEditor; diff --git a/src/eva2/optimization/mocco/MOCCOParameterizeTchebycheff.java b/src/eva2/optimization/mocco/MOCCOParameterizeTchebycheff.java index 477557fe..e67faeb4 100644 --- a/src/eva2/optimization/mocco/MOCCOParameterizeTchebycheff.java +++ b/src/eva2/optimization/mocco/MOCCOParameterizeTchebycheff.java @@ -7,7 +7,7 @@ import eva2.optimization.go.MOCCOStandalone; import eva2.optimization.operator.migration.SOBestMigration; import eva2.optimization.operator.moso.MOSOWeightedLPTchebycheff; import eva2.optimization.operator.terminators.InterfaceTerminator; -import eva2.optimization.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.problems.AbstractMultiObjectiveOptimizationProblem; import eva2.optimization.strategies.IslandModelEA; import eva2.optimization.tools.AbstractObjectEditor; import eva2.optimization.tools.GeneralOptimizationEditorProperty; diff --git a/src/eva2/optimization/mocco/MOCCOProblemInitialization.java b/src/eva2/optimization/mocco/MOCCOProblemInitialization.java index 27099ca9..a1557f69 100644 --- a/src/eva2/optimization/mocco/MOCCOProblemInitialization.java +++ b/src/eva2/optimization/mocco/MOCCOProblemInitialization.java @@ -2,7 +2,7 @@ package eva2.optimization.mocco; import eva2.gui.JParaPanel; import eva2.optimization.go.MOCCOStandalone; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.ReflectPackage; import javax.swing.*; @@ -53,7 +53,7 @@ public class MOCCOProblemInitialization extends MOCCOPhase implements InterfaceP Class[] altern = null; try { - altern = ReflectPackage.getAssignableClassesInPackage("eva2.optimization.problems", Class.forName("eva2.optimization.problems.InterfaceMultiObjectiveDeNovoProblem"), true, true); + altern = ReflectPackage.getAssignableClassesInPackage("eva2.problems", Class.forName("eva2.problems.InterfaceMultiObjectiveDeNovoProblem"), true, true); } catch (ClassNotFoundException e) { e.printStackTrace(); } diff --git a/src/eva2/optimization/mocco/MOCCOProblemRedefinition.java b/src/eva2/optimization/mocco/MOCCOProblemRedefinition.java index cd6ecd33..65ed0a3f 100644 --- a/src/eva2/optimization/mocco/MOCCOProblemRedefinition.java +++ b/src/eva2/optimization/mocco/MOCCOProblemRedefinition.java @@ -3,7 +3,7 @@ package eva2.optimization.mocco; import eva2.gui.JParaPanel; import eva2.optimization.go.MOCCOStandalone; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import javax.swing.*; import java.awt.*; diff --git a/src/eva2/optimization/mocco/MOCCOState.java b/src/eva2/optimization/mocco/MOCCOState.java index 007a2e0b..52983df9 100644 --- a/src/eva2/optimization/mocco/MOCCOState.java +++ b/src/eva2/optimization/mocco/MOCCOState.java @@ -5,10 +5,10 @@ import eva2.optimization.operator.archiving.ArchivingAllDominating; import eva2.optimization.operator.terminators.EvaluationTerminator; import eva2.optimization.operator.terminators.InterfaceTerminator; import eva2.optimization.population.Population; -import eva2.optimization.problems.AbstractMultiObjectiveOptimizationProblem; -import eva2.optimization.problems.InterfaceMultiObjectiveDeNovoProblem; -import eva2.optimization.problems.InterfaceOptimizationObjective; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.problems.InterfaceMultiObjectiveDeNovoProblem; +import eva2.problems.InterfaceOptimizationObjective; +import eva2.problems.InterfaceOptimizationProblem; import eva2.optimization.strategies.InterfaceOptimizer; import eva2.optimization.strategies.MultiObjectiveEA; diff --git a/src/eva2/optimization/mocco/paretofrontviewer/MOCCOViewer.java b/src/eva2/optimization/mocco/paretofrontviewer/MOCCOViewer.java index ce4c9b64..e68ea3e7 100644 --- a/src/eva2/optimization/mocco/paretofrontviewer/MOCCOViewer.java +++ b/src/eva2/optimization/mocco/paretofrontviewer/MOCCOViewer.java @@ -7,8 +7,8 @@ import eva2.gui.plot.InterfaceDPointWithContent; import eva2.optimization.go.MOCCOStandalone; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceMultiObjectiveDeNovoProblem; -import eva2.optimization.problems.InterfaceOptimizationObjective; +import eva2.problems.InterfaceMultiObjectiveDeNovoProblem; +import eva2.problems.InterfaceOptimizationObjective; import eva2.tools.chart2d.Chart2DDPointContentSelectable; import eva2.tools.chart2d.DPoint; import eva2.tools.chart2d.DPointIcon; diff --git a/src/eva2/optimization/mocco/paretofrontviewer/ParetoFrontView2D.java b/src/eva2/optimization/mocco/paretofrontviewer/ParetoFrontView2D.java index 41b3deab..4f99066b 100644 --- a/src/eva2/optimization/mocco/paretofrontviewer/ParetoFrontView2D.java +++ b/src/eva2/optimization/mocco/paretofrontviewer/ParetoFrontView2D.java @@ -5,8 +5,8 @@ import eva2.gui.plot.GraphPointSet; import eva2.gui.plot.InterfaceDPointWithContent; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceMultiObjectiveDeNovoProblem; -import eva2.optimization.problems.InterfaceOptimizationObjective; +import eva2.problems.InterfaceMultiObjectiveDeNovoProblem; +import eva2.problems.InterfaceOptimizationObjective; import eva2.tools.chart2d.*; import javax.swing.*; diff --git a/src/eva2/optimization/mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java b/src/eva2/optimization/mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java index 05bdb1a6..dd5f6226 100644 --- a/src/eva2/optimization/mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java +++ b/src/eva2/optimization/mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java @@ -6,8 +6,8 @@ import eva2.gui.plot.GraphPointSet; import eva2.gui.plot.InterfaceDPointWithContent; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceMultiObjectiveDeNovoProblem; -import eva2.optimization.problems.InterfaceOptimizationObjective; +import eva2.problems.InterfaceMultiObjectiveDeNovoProblem; +import eva2.problems.InterfaceOptimizationObjective; import eva2.tools.chart2d.Chart2DDPointContentSelectable; import eva2.tools.chart2d.DPoint; import eva2.tools.chart2d.DPointIcon; diff --git a/src/eva2/optimization/modules/AbstractModuleAdapter.java b/src/eva2/optimization/modules/AbstractModuleAdapter.java index 1c99e688..399f29e3 100644 --- a/src/eva2/optimization/modules/AbstractModuleAdapter.java +++ b/src/eva2/optimization/modules/AbstractModuleAdapter.java @@ -18,8 +18,6 @@ abstract public class AbstractModuleAdapter implements ModuleAdapter, Serializab protected int instanceNumber; protected String adapterName; protected InterfaceProcessor processor; - protected String hostName = "not defined"; - protected boolean hasConnection = true; protected ModuleAdapter remoteModuleAdapter = null; private List optimizationStateListeners; @@ -47,14 +45,6 @@ abstract public class AbstractModuleAdapter implements ModuleAdapter, Serializab processor.startOptimization(); } - /** - * Restart optimization on processor. - */ - @Override - public void restartOptimization() { - processor.restartOptimization(); - } - /** * Stop optimization on processor. */ @@ -104,11 +94,7 @@ abstract public class AbstractModuleAdapter implements ModuleAdapter, Serializab } public boolean isOptRunning() { - if ((processor != null) && (processor instanceof Processor)) { - return ((Processor) processor).isOptimizationRunning(); - } else { - return false; - } + return (processor != null) && (processor instanceof Processor) && ((Processor) processor).isOptimizationRunning(); } /** @@ -118,25 +104,6 @@ abstract public class AbstractModuleAdapter implements ModuleAdapter, Serializab public void addOptimizationStateListener(OptimizationStateListener remoteListener) { optimizationStateListeners.add(remoteListener); } - - /** - * - */ - @Override - public void setConnection(boolean flag) { - hasConnection = flag; - } - - /** - * Returns whether the module has a connection. - * - * @return true if the adapter has a connection. - */ - @Override - public boolean hasConnection() { - return hasConnection; - } - /** * */ diff --git a/src/eva2/optimization/modules/AbstractOptimizationParameters.java b/src/eva2/optimization/modules/AbstractOptimizationParameters.java index 7259dd87..344a52d9 100644 --- a/src/eva2/optimization/modules/AbstractOptimizationParameters.java +++ b/src/eva2/optimization/modules/AbstractOptimizationParameters.java @@ -7,8 +7,8 @@ import eva2.optimization.go.InterfacePopulationChangedEventListener; import eva2.optimization.operator.postprocess.InterfacePostProcessParams; import eva2.optimization.operator.postprocess.PostProcessParams; import eva2.optimization.operator.terminators.InterfaceTerminator; -import eva2.optimization.problems.InterfaceAdditionalPopulationInformer; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceAdditionalPopulationInformer; +import eva2.problems.InterfaceOptimizationProblem; import eva2.optimization.strategies.InterfaceOptimizer; import eva2.tools.Serializer; import eva2.util.annotation.Parameter; diff --git a/src/eva2/optimization/modules/DEParameters.java b/src/eva2/optimization/modules/DEParameters.java index 67e30908..20a81bb0 100644 --- a/src/eva2/optimization/modules/DEParameters.java +++ b/src/eva2/optimization/modules/DEParameters.java @@ -5,7 +5,7 @@ import eva2.optimization.enums.DETypeEnum; import eva2.optimization.go.InterfaceOptimizationParameters; import eva2.optimization.operator.terminators.EvaluationTerminator; import eva2.optimization.population.Population; -import eva2.optimization.problems.F1Problem; +import eva2.problems.F1Problem; import eva2.optimization.strategies.DifferentialEvolution; import eva2.optimization.strategies.InterfaceOptimizer; import eva2.tools.Serializer; diff --git a/src/eva2/optimization/modules/EPParameters.java b/src/eva2/optimization/modules/EPParameters.java index 4a82af5b..8c54f625 100644 --- a/src/eva2/optimization/modules/EPParameters.java +++ b/src/eva2/optimization/modules/EPParameters.java @@ -5,7 +5,7 @@ import eva2.optimization.go.InterfaceOptimizationParameters; import eva2.optimization.operator.selection.InterfaceSelection; import eva2.optimization.operator.terminators.EvaluationTerminator; import eva2.optimization.population.Population; -import eva2.optimization.problems.F1Problem; +import eva2.problems.F1Problem; import eva2.optimization.strategies.EvolutionaryProgramming; import eva2.optimization.strategies.InterfaceOptimizer; import eva2.tools.Serializer; diff --git a/src/eva2/optimization/modules/GAParameters.java b/src/eva2/optimization/modules/GAParameters.java index 9db11218..c6b01e1a 100644 --- a/src/eva2/optimization/modules/GAParameters.java +++ b/src/eva2/optimization/modules/GAParameters.java @@ -4,7 +4,7 @@ import eva2.optimization.go.InterfaceOptimizationParameters; import eva2.optimization.operator.selection.InterfaceSelection; import eva2.optimization.operator.terminators.EvaluationTerminator; import eva2.optimization.population.Population; -import eva2.optimization.problems.B1Problem; +import eva2.problems.B1Problem; import eva2.optimization.strategies.GeneticAlgorithm; import eva2.optimization.strategies.InterfaceOptimizer; import eva2.tools.Serializer; diff --git a/src/eva2/optimization/modules/HCParameters.java b/src/eva2/optimization/modules/HCParameters.java index 8202c36e..64170da6 100644 --- a/src/eva2/optimization/modules/HCParameters.java +++ b/src/eva2/optimization/modules/HCParameters.java @@ -3,7 +3,7 @@ package eva2.optimization.modules; import eva2.optimization.go.InterfaceOptimizationParameters; import eva2.optimization.operator.terminators.EvaluationTerminator; import eva2.optimization.population.Population; -import eva2.optimization.problems.B1Problem; +import eva2.problems.B1Problem; import eva2.optimization.strategies.HillClimbing; import eva2.optimization.strategies.InterfaceOptimizer; import eva2.tools.Serializer; diff --git a/src/eva2/optimization/modules/MCParameters.java b/src/eva2/optimization/modules/MCParameters.java index 8088d738..f63d99f0 100644 --- a/src/eva2/optimization/modules/MCParameters.java +++ b/src/eva2/optimization/modules/MCParameters.java @@ -3,7 +3,7 @@ package eva2.optimization.modules; import eva2.optimization.go.InterfaceOptimizationParameters; import eva2.optimization.operator.terminators.EvaluationTerminator; import eva2.optimization.population.Population; -import eva2.optimization.problems.B1Problem; +import eva2.problems.B1Problem; import eva2.optimization.strategies.InterfaceOptimizer; import eva2.optimization.strategies.MonteCarloSearch; import eva2.tools.Serializer; diff --git a/src/eva2/optimization/modules/MOEAParameters.java b/src/eva2/optimization/modules/MOEAParameters.java index c5b9f2e9..aaebf52c 100644 --- a/src/eva2/optimization/modules/MOEAParameters.java +++ b/src/eva2/optimization/modules/MOEAParameters.java @@ -5,7 +5,7 @@ import eva2.optimization.operator.archiving.InterfaceArchiving; import eva2.optimization.operator.archiving.InterfaceInformationRetrieval; import eva2.optimization.operator.terminators.EvaluationTerminator; import eva2.optimization.population.Population; -import eva2.optimization.problems.TF1Problem; +import eva2.problems.TF1Problem; import eva2.optimization.strategies.InterfaceOptimizer; import eva2.optimization.strategies.MultiObjectiveEA; import eva2.tools.Serializer; diff --git a/src/eva2/optimization/modules/ModuleAdapter.java b/src/eva2/optimization/modules/ModuleAdapter.java index 45e5afcb..b3d599ec 100644 --- a/src/eva2/optimization/modules/ModuleAdapter.java +++ b/src/eva2/optimization/modules/ModuleAdapter.java @@ -30,8 +30,6 @@ public interface ModuleAdapter extends OptimizationStateListener { */ OptimizationJob scheduleJob(); - void restartOptimization(); - void stopOptimization(); /** @@ -49,8 +47,4 @@ public interface ModuleAdapter extends OptimizationStateListener { boolean startPostProcessing(); void addOptimizationStateListener(OptimizationStateListener x); - - void setConnection(boolean flag); - - boolean hasConnection(); } \ No newline at end of file diff --git a/src/eva2/optimization/modules/OptimizationParameters.java b/src/eva2/optimization/modules/OptimizationParameters.java index b40e64af..aad1d3b4 100644 --- a/src/eva2/optimization/modules/OptimizationParameters.java +++ b/src/eva2/optimization/modules/OptimizationParameters.java @@ -3,8 +3,8 @@ package eva2.optimization.modules; import eva2.optimization.go.InterfaceOptimizationParameters; import eva2.optimization.operator.terminators.EvaluationTerminator; import eva2.optimization.operator.terminators.InterfaceTerminator; -import eva2.optimization.problems.F1Problem; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.F1Problem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.optimization.strategies.GeneticAlgorithm; import eva2.optimization.strategies.InterfaceOptimizer; import eva2.tools.Serializer; diff --git a/src/eva2/optimization/modules/PBILParameters.java b/src/eva2/optimization/modules/PBILParameters.java index 70eee77e..40d5f9b8 100644 --- a/src/eva2/optimization/modules/PBILParameters.java +++ b/src/eva2/optimization/modules/PBILParameters.java @@ -4,7 +4,7 @@ import eva2.optimization.go.InterfaceOptimizationParameters; import eva2.optimization.operator.selection.InterfaceSelection; import eva2.optimization.operator.terminators.EvaluationTerminator; import eva2.optimization.population.Population; -import eva2.optimization.problems.B1Problem; +import eva2.problems.B1Problem; import eva2.optimization.strategies.InterfaceOptimizer; import eva2.optimization.strategies.PopulationBasedIncrementalLearning; import eva2.tools.Serializer; diff --git a/src/eva2/optimization/modules/PSOParameters.java b/src/eva2/optimization/modules/PSOParameters.java index b3529d23..90404b65 100644 --- a/src/eva2/optimization/modules/PSOParameters.java +++ b/src/eva2/optimization/modules/PSOParameters.java @@ -6,7 +6,7 @@ import eva2.optimization.enums.PSOTopologyEnum; import eva2.optimization.go.InterfaceOptimizationParameters; import eva2.optimization.operator.terminators.EvaluationTerminator; import eva2.optimization.population.Population; -import eva2.optimization.problems.F1Problem; +import eva2.problems.F1Problem; import eva2.optimization.strategies.InterfaceOptimizer; import eva2.optimization.strategies.ParticleSwarmOptimization; import eva2.tools.SelectedTag; diff --git a/src/eva2/optimization/modules/Processor.java b/src/eva2/optimization/modules/Processor.java index 14b35fc1..21695b53 100644 --- a/src/eva2/optimization/modules/Processor.java +++ b/src/eva2/optimization/modules/Processor.java @@ -16,8 +16,8 @@ import eva2.optimization.operator.terminators.GenerationTerminator; import eva2.optimization.operator.terminators.InterfaceTerminator; import eva2.optimization.population.Population; import eva2.optimization.population.PopulationInterface; -import eva2.optimization.problems.AbstractOptimizationProblem; -import eva2.optimization.problems.InterfaceAdditionalPopulationInformer; +import eva2.problems.AbstractOptimizationProblem; +import eva2.problems.InterfaceAdditionalPopulationInformer; import eva2.optimization.stat.InterfaceStatistics; import eva2.optimization.stat.InterfaceTextListener; import eva2.optimization.stat.StatisticsWithGUI; diff --git a/src/eva2/optimization/modules/SAParameters.java b/src/eva2/optimization/modules/SAParameters.java index 2912794f..abe2ccd1 100644 --- a/src/eva2/optimization/modules/SAParameters.java +++ b/src/eva2/optimization/modules/SAParameters.java @@ -1,12 +1,11 @@ package eva2.optimization.modules; -import eva2.optimization.go.InterfaceOptimizationParameters; import eva2.optimization.go.InterfacePopulationChangedEventListener; import eva2.optimization.operator.terminators.EvaluationTerminator; import eva2.optimization.operator.terminators.InterfaceTerminator; import eva2.optimization.population.Population; -import eva2.optimization.problems.B1Problem; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.B1Problem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.optimization.strategies.InterfaceOptimizer; import eva2.optimization.strategies.SimulatedAnnealing; import eva2.tools.Serializer; diff --git a/src/eva2/optimization/modules/SSGAParameters.java b/src/eva2/optimization/modules/SSGAParameters.java index c65bed0e..4d9727ad 100644 --- a/src/eva2/optimization/modules/SSGAParameters.java +++ b/src/eva2/optimization/modules/SSGAParameters.java @@ -5,7 +5,7 @@ import eva2.optimization.operator.selection.InterfaceSelection; import eva2.optimization.operator.selection.replacement.InterfaceReplacement; import eva2.optimization.operator.terminators.EvaluationTerminator; import eva2.optimization.population.Population; -import eva2.optimization.problems.B1Problem; +import eva2.problems.B1Problem; import eva2.optimization.strategies.InterfaceOptimizer; import eva2.optimization.strategies.SteadyStateGA; import eva2.tools.Serializer; diff --git a/src/eva2/optimization/operator/cluster/ClusteringKMeans.java b/src/eva2/optimization/operator/cluster/ClusteringKMeans.java index 6717b820..5b2b4a5e 100644 --- a/src/eva2/optimization/operator/cluster/ClusteringKMeans.java +++ b/src/eva2/optimization/operator/cluster/ClusteringKMeans.java @@ -8,7 +8,7 @@ import eva2.optimization.individuals.InterfaceDataTypeDouble; import eva2.optimization.operator.distancemetric.EuclideanMetric; import eva2.optimization.operator.distancemetric.InterfaceDistanceMetric; import eva2.optimization.population.Population; -import eva2.optimization.problems.F1Problem; +import eva2.problems.F1Problem; import eva2.tools.chart2d.Chart2DDPointIconCircle; import eva2.tools.chart2d.Chart2DDPointIconText; import eva2.tools.chart2d.DPoint; diff --git a/src/eva2/optimization/operator/cluster/ClusteringXMeans.java b/src/eva2/optimization/operator/cluster/ClusteringXMeans.java index a396f782..133e08e9 100644 --- a/src/eva2/optimization/operator/cluster/ClusteringXMeans.java +++ b/src/eva2/optimization/operator/cluster/ClusteringXMeans.java @@ -6,7 +6,7 @@ import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.ESIndividualDoubleData; import eva2.optimization.individuals.InterfaceDataTypeDouble; import eva2.optimization.population.Population; -import eva2.optimization.problems.F1Problem; +import eva2.problems.F1Problem; import eva2.tools.chart2d.Chart2DDPointIconCircle; import eva2.tools.chart2d.Chart2DDPointIconText; import eva2.tools.chart2d.DPoint; diff --git a/src/eva2/optimization/operator/constraint/AbstractConstraint.java b/src/eva2/optimization/operator/constraint/AbstractConstraint.java index 49684849..bfbe6431 100644 --- a/src/eva2/optimization/operator/constraint/AbstractConstraint.java +++ b/src/eva2/optimization/operator/constraint/AbstractConstraint.java @@ -3,7 +3,7 @@ package eva2.optimization.operator.constraint; import eva2.gui.editor.GenericObjectEditor; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.operator.paramcontrol.*; -import eva2.optimization.problems.AbstractProblemDouble; +import eva2.problems.AbstractProblemDouble; import eva2.tools.EVAERROR; import java.io.Serializable; diff --git a/src/eva2/optimization/operator/constraint/GenericConstraint.java b/src/eva2/optimization/operator/constraint/GenericConstraint.java index d03727d6..6fde36cd 100644 --- a/src/eva2/optimization/operator/constraint/GenericConstraint.java +++ b/src/eva2/optimization/operator/constraint/GenericConstraint.java @@ -1,7 +1,7 @@ package eva2.optimization.operator.constraint; import eva2.optimization.individuals.codings.gp.AbstractGPNode; -import eva2.optimization.problems.GPFunctionProblem; +import eva2.problems.GPFunctionProblem; import eva2.tools.EVAERROR; import java.io.Serializable; diff --git a/src/eva2/optimization/operator/crossover/AdaptiveCrossoverEAMixer.java b/src/eva2/optimization/operator/crossover/AdaptiveCrossoverEAMixer.java index ebcd2693..2e5cd031 100644 --- a/src/eva2/optimization/operator/crossover/AdaptiveCrossoverEAMixer.java +++ b/src/eva2/optimization/operator/crossover/AdaptiveCrossoverEAMixer.java @@ -3,7 +3,7 @@ package eva2.optimization.operator.crossover; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.operator.mutation.InterfaceAdaptOperatorGenerational; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; /** * A modified version of the CrossoverEAMixer that adapts the weights with which the crossover-methods are chosen diff --git a/src/eva2/optimization/operator/crossover/CM1.java b/src/eva2/optimization/operator/crossover/CM1.java index 7ca0852f..7577fd38 100644 --- a/src/eva2/optimization/operator/crossover/CM1.java +++ b/src/eva2/optimization/operator/crossover/CM1.java @@ -3,7 +3,7 @@ package eva2.optimization.operator.crossover; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceDataTypeBinary; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.optimization.strategies.BinaryScatterSearch; import eva2.tools.math.RNG; diff --git a/src/eva2/optimization/operator/crossover/CM2.java b/src/eva2/optimization/operator/crossover/CM2.java index 982ad929..cb466b1e 100644 --- a/src/eva2/optimization/operator/crossover/CM2.java +++ b/src/eva2/optimization/operator/crossover/CM2.java @@ -3,7 +3,7 @@ package eva2.optimization.operator.crossover; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceDataTypeBinary; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import java.util.BitSet; diff --git a/src/eva2/optimization/operator/crossover/CM3.java b/src/eva2/optimization/operator/crossover/CM3.java index 0091c67c..f617dc8a 100644 --- a/src/eva2/optimization/operator/crossover/CM3.java +++ b/src/eva2/optimization/operator/crossover/CM3.java @@ -3,7 +3,7 @@ package eva2.optimization.operator.crossover; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceDataTypeBinary; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import java.util.BitSet; diff --git a/src/eva2/optimization/operator/crossover/CM4.java b/src/eva2/optimization/operator/crossover/CM4.java index decb5417..e2c0dc40 100644 --- a/src/eva2/optimization/operator/crossover/CM4.java +++ b/src/eva2/optimization/operator/crossover/CM4.java @@ -3,7 +3,7 @@ package eva2.optimization.operator.crossover; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceDataTypeBinary; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import java.util.BitSet; diff --git a/src/eva2/optimization/operator/crossover/CM5.java b/src/eva2/optimization/operator/crossover/CM5.java index 7ffe416e..2a7e5f0d 100644 --- a/src/eva2/optimization/operator/crossover/CM5.java +++ b/src/eva2/optimization/operator/crossover/CM5.java @@ -3,7 +3,7 @@ package eva2.optimization.operator.crossover; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceDataTypeBinary; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import java.util.BitSet; diff --git a/src/eva2/optimization/operator/crossover/CM6.java b/src/eva2/optimization/operator/crossover/CM6.java index 0a670965..b88af9e4 100644 --- a/src/eva2/optimization/operator/crossover/CM6.java +++ b/src/eva2/optimization/operator/crossover/CM6.java @@ -3,7 +3,7 @@ package eva2.optimization.operator.crossover; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceDataTypeBinary; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.optimization.strategies.BinaryScatterSearch; import eva2.tools.math.RNG; diff --git a/src/eva2/optimization/operator/crossover/CM7.java b/src/eva2/optimization/operator/crossover/CM7.java index 86d9bf86..7401fa62 100644 --- a/src/eva2/optimization/operator/crossover/CM7.java +++ b/src/eva2/optimization/operator/crossover/CM7.java @@ -3,7 +3,7 @@ package eva2.optimization.operator.crossover; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceDataTypeBinary; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import java.util.BitSet; diff --git a/src/eva2/optimization/operator/crossover/CrossoverEAMixer.java b/src/eva2/optimization/operator/crossover/CrossoverEAMixer.java index 43490d77..86b0a0a1 100644 --- a/src/eva2/optimization/operator/crossover/CrossoverEAMixer.java +++ b/src/eva2/optimization/operator/crossover/CrossoverEAMixer.java @@ -3,7 +3,7 @@ package eva2.optimization.operator.crossover; import eva2.gui.editor.GenericObjectEditor; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import eva2.util.annotation.Description; diff --git a/src/eva2/optimization/operator/crossover/CrossoverESArithmetical.java b/src/eva2/optimization/operator/crossover/CrossoverESArithmetical.java index 9e09546f..71bf51d1 100644 --- a/src/eva2/optimization/operator/crossover/CrossoverESArithmetical.java +++ b/src/eva2/optimization/operator/crossover/CrossoverESArithmetical.java @@ -3,7 +3,7 @@ package eva2.optimization.operator.crossover; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceESIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** diff --git a/src/eva2/optimization/operator/crossover/CrossoverESBLXAlpha.java b/src/eva2/optimization/operator/crossover/CrossoverESBLXAlpha.java index 79e36bd5..d1ace138 100644 --- a/src/eva2/optimization/operator/crossover/CrossoverESBLXAlpha.java +++ b/src/eva2/optimization/operator/crossover/CrossoverESBLXAlpha.java @@ -3,7 +3,7 @@ package eva2.optimization.operator.crossover; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceESIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** diff --git a/src/eva2/optimization/operator/crossover/CrossoverESDefault.java b/src/eva2/optimization/operator/crossover/CrossoverESDefault.java index d3c8e894..ab85d4a2 100644 --- a/src/eva2/optimization/operator/crossover/CrossoverESDefault.java +++ b/src/eva2/optimization/operator/crossover/CrossoverESDefault.java @@ -3,7 +3,7 @@ package eva2.optimization.operator.crossover; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceESIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import eva2.util.annotation.Description; diff --git a/src/eva2/optimization/operator/crossover/CrossoverESFlat.java b/src/eva2/optimization/operator/crossover/CrossoverESFlat.java index 2ecde84c..85691e6a 100644 --- a/src/eva2/optimization/operator/crossover/CrossoverESFlat.java +++ b/src/eva2/optimization/operator/crossover/CrossoverESFlat.java @@ -4,7 +4,7 @@ package eva2.optimization.operator.crossover; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceESIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** diff --git a/src/eva2/optimization/operator/crossover/CrossoverESIntermediate.java b/src/eva2/optimization/operator/crossover/CrossoverESIntermediate.java index 8cfc8ad1..d0a16d00 100644 --- a/src/eva2/optimization/operator/crossover/CrossoverESIntermediate.java +++ b/src/eva2/optimization/operator/crossover/CrossoverESIntermediate.java @@ -3,7 +3,7 @@ package eva2.optimization.operator.crossover; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceESIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/optimization/operator/crossover/CrossoverESNPointDiscrete.java b/src/eva2/optimization/operator/crossover/CrossoverESNPointDiscrete.java index 0aa46902..435dcf34 100644 --- a/src/eva2/optimization/operator/crossover/CrossoverESNPointDiscrete.java +++ b/src/eva2/optimization/operator/crossover/CrossoverESNPointDiscrete.java @@ -3,7 +3,7 @@ package eva2.optimization.operator.crossover; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceESIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** diff --git a/src/eva2/optimization/operator/crossover/CrossoverESNPointDiscreteDislocation.java b/src/eva2/optimization/operator/crossover/CrossoverESNPointDiscreteDislocation.java index f36f0a02..936b6e85 100644 --- a/src/eva2/optimization/operator/crossover/CrossoverESNPointDiscreteDislocation.java +++ b/src/eva2/optimization/operator/crossover/CrossoverESNPointDiscreteDislocation.java @@ -3,7 +3,7 @@ package eva2.optimization.operator.crossover; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceESIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** diff --git a/src/eva2/optimization/operator/crossover/CrossoverESPCX.java b/src/eva2/optimization/operator/crossover/CrossoverESPCX.java index 183ac4eb..0808e460 100644 --- a/src/eva2/optimization/operator/crossover/CrossoverESPCX.java +++ b/src/eva2/optimization/operator/crossover/CrossoverESPCX.java @@ -6,8 +6,8 @@ import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.ESIndividualDoubleData; import eva2.optimization.individuals.InterfaceESIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.F1Problem; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.F1Problem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.Mathematics; import eva2.tools.math.RNG; diff --git a/src/eva2/optimization/operator/crossover/CrossoverESSBX.java b/src/eva2/optimization/operator/crossover/CrossoverESSBX.java index eedbd319..76efe71d 100644 --- a/src/eva2/optimization/operator/crossover/CrossoverESSBX.java +++ b/src/eva2/optimization/operator/crossover/CrossoverESSBX.java @@ -5,8 +5,8 @@ import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.ESIndividualDoubleData; import eva2.optimization.individuals.InterfaceESIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.F1Problem; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.F1Problem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** diff --git a/src/eva2/optimization/operator/crossover/CrossoverESSPX.java b/src/eva2/optimization/operator/crossover/CrossoverESSPX.java index e7d14379..29ec785c 100644 --- a/src/eva2/optimization/operator/crossover/CrossoverESSPX.java +++ b/src/eva2/optimization/operator/crossover/CrossoverESSPX.java @@ -5,8 +5,8 @@ import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.ESIndividualDoubleData; import eva2.optimization.individuals.InterfaceESIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.F1Problem; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.F1Problem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.Mathematics; import eva2.tools.math.RNG; diff --git a/src/eva2/optimization/operator/crossover/CrossoverESUNDX.java b/src/eva2/optimization/operator/crossover/CrossoverESUNDX.java index 7ca5c6d4..6dd4eb71 100644 --- a/src/eva2/optimization/operator/crossover/CrossoverESUNDX.java +++ b/src/eva2/optimization/operator/crossover/CrossoverESUNDX.java @@ -6,8 +6,8 @@ import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.ESIndividualDoubleData; import eva2.optimization.individuals.InterfaceESIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.F1Problem; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.F1Problem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.Mathematics; import eva2.tools.math.RNG; diff --git a/src/eva2/optimization/operator/crossover/CrossoverESUniformDiscrete.java b/src/eva2/optimization/operator/crossover/CrossoverESUniformDiscrete.java index 89dcf484..7d09bde5 100644 --- a/src/eva2/optimization/operator/crossover/CrossoverESUniformDiscrete.java +++ b/src/eva2/optimization/operator/crossover/CrossoverESUniformDiscrete.java @@ -3,7 +3,7 @@ package eva2.optimization.operator.crossover; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceESIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** diff --git a/src/eva2/optimization/operator/crossover/CrossoverGABitSimulated.java b/src/eva2/optimization/operator/crossover/CrossoverGABitSimulated.java index c784e3bb..873c18dc 100644 --- a/src/eva2/optimization/operator/crossover/CrossoverGABitSimulated.java +++ b/src/eva2/optimization/operator/crossover/CrossoverGABitSimulated.java @@ -4,7 +4,7 @@ package eva2.optimization.operator.crossover; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceGAIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import java.util.BitSet; diff --git a/src/eva2/optimization/operator/crossover/CrossoverGADefault.java b/src/eva2/optimization/operator/crossover/CrossoverGADefault.java index 996d02ce..4a5d5779 100644 --- a/src/eva2/optimization/operator/crossover/CrossoverGADefault.java +++ b/src/eva2/optimization/operator/crossover/CrossoverGADefault.java @@ -4,7 +4,7 @@ package eva2.optimization.operator.crossover; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceGAIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import java.util.BitSet; diff --git a/src/eva2/optimization/operator/crossover/CrossoverGAGINPoint.java b/src/eva2/optimization/operator/crossover/CrossoverGAGINPoint.java index 96cacc0c..bcf63477 100644 --- a/src/eva2/optimization/operator/crossover/CrossoverGAGINPoint.java +++ b/src/eva2/optimization/operator/crossover/CrossoverGAGINPoint.java @@ -6,7 +6,7 @@ import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceGAIndividual; import eva2.optimization.individuals.InterfaceGIIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import java.util.BitSet; diff --git a/src/eva2/optimization/operator/crossover/CrossoverGAUniform.java b/src/eva2/optimization/operator/crossover/CrossoverGAUniform.java index 26a96461..29057eeb 100644 --- a/src/eva2/optimization/operator/crossover/CrossoverGAUniform.java +++ b/src/eva2/optimization/operator/crossover/CrossoverGAUniform.java @@ -4,7 +4,7 @@ package eva2.optimization.operator.crossover; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceGAIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import java.util.BitSet; diff --git a/src/eva2/optimization/operator/crossover/CrossoverGIDefault.java b/src/eva2/optimization/operator/crossover/CrossoverGIDefault.java index d01f9ebf..df36de8b 100644 --- a/src/eva2/optimization/operator/crossover/CrossoverGIDefault.java +++ b/src/eva2/optimization/operator/crossover/CrossoverGIDefault.java @@ -3,7 +3,7 @@ package eva2.optimization.operator.crossover; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceGIIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** diff --git a/src/eva2/optimization/operator/crossover/CrossoverGINPoint.java b/src/eva2/optimization/operator/crossover/CrossoverGINPoint.java index f07194c0..29df0214 100644 --- a/src/eva2/optimization/operator/crossover/CrossoverGINPoint.java +++ b/src/eva2/optimization/operator/crossover/CrossoverGINPoint.java @@ -3,7 +3,7 @@ package eva2.optimization.operator.crossover; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceGIIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** diff --git a/src/eva2/optimization/operator/crossover/CrossoverGINPointVL.java b/src/eva2/optimization/operator/crossover/CrossoverGINPointVL.java index 57475f36..2995199e 100644 --- a/src/eva2/optimization/operator/crossover/CrossoverGINPointVL.java +++ b/src/eva2/optimization/operator/crossover/CrossoverGINPointVL.java @@ -3,7 +3,7 @@ package eva2.optimization.operator.crossover; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceGIIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import java.util.BitSet; diff --git a/src/eva2/optimization/operator/crossover/CrossoverGIUniform.java b/src/eva2/optimization/operator/crossover/CrossoverGIUniform.java index 72c120fa..e46c05af 100644 --- a/src/eva2/optimization/operator/crossover/CrossoverGIUniform.java +++ b/src/eva2/optimization/operator/crossover/CrossoverGIUniform.java @@ -4,7 +4,7 @@ package eva2.optimization.operator.crossover; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceGIIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** diff --git a/src/eva2/optimization/operator/crossover/CrossoverGPDefault.java b/src/eva2/optimization/operator/crossover/CrossoverGPDefault.java index dc9f18b3..c1b1ba43 100644 --- a/src/eva2/optimization/operator/crossover/CrossoverGPDefault.java +++ b/src/eva2/optimization/operator/crossover/CrossoverGPDefault.java @@ -6,7 +6,7 @@ import eva2.optimization.individuals.GPIndividualProgramData; import eva2.optimization.individuals.InterfaceGPIndividual; import eva2.optimization.individuals.codings.gp.AbstractGPNode; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** diff --git a/src/eva2/optimization/operator/crossover/CrossoverOBGAPMX.java b/src/eva2/optimization/operator/crossover/CrossoverOBGAPMX.java index 1040b4eb..67f33ac8 100644 --- a/src/eva2/optimization/operator/crossover/CrossoverOBGAPMX.java +++ b/src/eva2/optimization/operator/crossover/CrossoverOBGAPMX.java @@ -3,7 +3,7 @@ package eva2.optimization.operator.crossover; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceOBGAIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** diff --git a/src/eva2/optimization/operator/crossover/CrossoverOBGAPMXUniform.java b/src/eva2/optimization/operator/crossover/CrossoverOBGAPMXUniform.java index 9605be36..49d87f21 100644 --- a/src/eva2/optimization/operator/crossover/CrossoverOBGAPMXUniform.java +++ b/src/eva2/optimization/operator/crossover/CrossoverOBGAPMXUniform.java @@ -3,7 +3,7 @@ package eva2.optimization.operator.crossover; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceOBGAIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** diff --git a/src/eva2/optimization/operator/crossover/InterfaceCrossover.java b/src/eva2/optimization/operator/crossover/InterfaceCrossover.java index 5c27063d..3f7f68dc 100644 --- a/src/eva2/optimization/operator/crossover/InterfaceCrossover.java +++ b/src/eva2/optimization/operator/crossover/InterfaceCrossover.java @@ -2,7 +2,7 @@ package eva2.optimization.operator.crossover; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; /** diff --git a/src/eva2/optimization/operator/crossover/NoCrossover.java b/src/eva2/optimization/operator/crossover/NoCrossover.java index 25493ac2..a742c2fb 100644 --- a/src/eva2/optimization/operator/crossover/NoCrossover.java +++ b/src/eva2/optimization/operator/crossover/NoCrossover.java @@ -2,7 +2,7 @@ package eva2.optimization.operator.crossover; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; /** * diff --git a/src/eva2/optimization/operator/crossover/TestESCrossover.java b/src/eva2/optimization/operator/crossover/TestESCrossover.java index eba54558..19fd76a7 100644 --- a/src/eva2/optimization/operator/crossover/TestESCrossover.java +++ b/src/eva2/optimization/operator/crossover/TestESCrossover.java @@ -7,8 +7,8 @@ import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.ESIndividualDoubleData; import eva2.optimization.individuals.InterfaceDataTypeDouble; import eva2.optimization.population.Population; -import eva2.optimization.problems.F1Problem; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.F1Problem; +import eva2.problems.InterfaceOptimizationProblem; import javax.swing.*; import java.awt.*; diff --git a/src/eva2/optimization/operator/initialization/DefaultInitialization.java b/src/eva2/optimization/operator/initialization/DefaultInitialization.java index 309cfc90..7a7b4a97 100644 --- a/src/eva2/optimization/operator/initialization/DefaultInitialization.java +++ b/src/eva2/optimization/operator/initialization/DefaultInitialization.java @@ -1,7 +1,7 @@ package eva2.optimization.operator.initialization; import eva2.optimization.individuals.AbstractEAIndividual; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; /** * A dummy initialization method which only calls the default init method of the individual. diff --git a/src/eva2/optimization/operator/initialization/GAGIInitializeSegmentwise.java b/src/eva2/optimization/operator/initialization/GAGIInitializeSegmentwise.java index 1473a181..9f369e74 100644 --- a/src/eva2/optimization/operator/initialization/GAGIInitializeSegmentwise.java +++ b/src/eva2/optimization/operator/initialization/GAGIInitializeSegmentwise.java @@ -3,7 +3,7 @@ package eva2.optimization.operator.initialization; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceGAIndividual; import eva2.optimization.individuals.InterfaceGIIndividual; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.EVAERROR; import eva2.tools.math.RNG; diff --git a/src/eva2/optimization/operator/initialization/InterfaceInitialization.java b/src/eva2/optimization/operator/initialization/InterfaceInitialization.java index aa1dbb12..09e2dd7f 100644 --- a/src/eva2/optimization/operator/initialization/InterfaceInitialization.java +++ b/src/eva2/optimization/operator/initialization/InterfaceInitialization.java @@ -1,7 +1,7 @@ package eva2.optimization.operator.initialization; import eva2.optimization.individuals.AbstractEAIndividual; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; /** * An abstraction over individual initialization methods in analogy diff --git a/src/eva2/optimization/operator/migration/MOClusteringSeparation.java b/src/eva2/optimization/operator/migration/MOClusteringSeparation.java index b4c2dad6..7593d29f 100644 --- a/src/eva2/optimization/operator/migration/MOClusteringSeparation.java +++ b/src/eva2/optimization/operator/migration/MOClusteringSeparation.java @@ -9,8 +9,8 @@ import eva2.optimization.operator.constraint.ConstBelongsToDifferentClass; import eva2.optimization.operator.selection.InterfaceSelection; import eva2.optimization.operator.selection.SelectRandom; import eva2.optimization.population.Population; -import eva2.optimization.problems.AbstractMultiObjectiveOptimizationProblem; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.optimization.strategies.InterfaceOptimizer; import eva2.tools.chart2d.Chart2DDPointIconCircle; import eva2.tools.chart2d.Chart2DDPointIconText; diff --git a/src/eva2/optimization/operator/migration/MOConeSeparation.java b/src/eva2/optimization/operator/migration/MOConeSeparation.java index 7b1a8d92..a2f2e6a2 100644 --- a/src/eva2/optimization/operator/migration/MOConeSeparation.java +++ b/src/eva2/optimization/operator/migration/MOConeSeparation.java @@ -12,8 +12,8 @@ import eva2.optimization.operator.constraint.ConstObjectivesInEqualitySmallerTha import eva2.optimization.operator.selection.InterfaceSelection; import eva2.optimization.operator.selection.SelectRandom; import eva2.optimization.population.Population; -import eva2.optimization.problems.AbstractMultiObjectiveOptimizationProblem; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.optimization.strategies.InterfaceOptimizer; import eva2.tools.chart2d.Chart2DDPointIconCircle; import eva2.tools.chart2d.Chart2DDPointIconText; diff --git a/src/eva2/optimization/operator/migration/MOXMeansSeparation.java b/src/eva2/optimization/operator/migration/MOXMeansSeparation.java index dd786429..f09820f1 100644 --- a/src/eva2/optimization/operator/migration/MOXMeansSeparation.java +++ b/src/eva2/optimization/operator/migration/MOXMeansSeparation.java @@ -10,8 +10,8 @@ import eva2.optimization.operator.constraint.ConstBelongsToDifferentClass; import eva2.optimization.operator.selection.InterfaceSelection; import eva2.optimization.operator.selection.SelectRandom; import eva2.optimization.population.Population; -import eva2.optimization.problems.AbstractMultiObjectiveOptimizationProblem; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.optimization.strategies.InterfaceOptimizer; import eva2.tools.chart2d.Chart2DDPointIconCircle; import eva2.tools.chart2d.Chart2DDPointIconText; diff --git a/src/eva2/optimization/operator/mutation/InterfaceMutation.java b/src/eva2/optimization/operator/mutation/InterfaceMutation.java index f73876ff..708555f8 100644 --- a/src/eva2/optimization/operator/mutation/InterfaceMutation.java +++ b/src/eva2/optimization/operator/mutation/InterfaceMutation.java @@ -2,7 +2,7 @@ package eva2.optimization.operator.mutation; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; /** diff --git a/src/eva2/optimization/operator/mutation/MutateDefault.java b/src/eva2/optimization/operator/mutation/MutateDefault.java index 9df552c1..59b95c3d 100644 --- a/src/eva2/optimization/operator/mutation/MutateDefault.java +++ b/src/eva2/optimization/operator/mutation/MutateDefault.java @@ -3,7 +3,7 @@ package eva2.optimization.operator.mutation; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.IndividualInterface; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; /** diff --git a/src/eva2/optimization/operator/mutation/MutateEAMixer.java b/src/eva2/optimization/operator/mutation/MutateEAMixer.java index 9e2c4430..f253038b 100644 --- a/src/eva2/optimization/operator/mutation/MutateEAMixer.java +++ b/src/eva2/optimization/operator/mutation/MutateEAMixer.java @@ -3,7 +3,7 @@ package eva2.optimization.operator.mutation; import eva2.gui.editor.GenericObjectEditor; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import java.util.ArrayList; diff --git a/src/eva2/optimization/operator/mutation/MutateESCorrVector.java b/src/eva2/optimization/operator/mutation/MutateESCorrVector.java index 18e33687..b7d5628d 100644 --- a/src/eva2/optimization/operator/mutation/MutateESCorrVector.java +++ b/src/eva2/optimization/operator/mutation/MutateESCorrVector.java @@ -4,7 +4,7 @@ import eva2.gui.BeanInspector; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceESIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.Mathematics; import eva2.tools.math.RNG; diff --git a/src/eva2/optimization/operator/mutation/MutateESCorrolated.java b/src/eva2/optimization/operator/mutation/MutateESCorrolated.java index a95cb184..be03b4dc 100644 --- a/src/eva2/optimization/operator/mutation/MutateESCorrolated.java +++ b/src/eva2/optimization/operator/mutation/MutateESCorrolated.java @@ -3,7 +3,7 @@ package eva2.optimization.operator.mutation; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceESIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** diff --git a/src/eva2/optimization/operator/mutation/MutateESCovarianceMatrixAdaption.java b/src/eva2/optimization/operator/mutation/MutateESCovarianceMatrixAdaption.java index 0ba9c67f..cc76c8bc 100644 --- a/src/eva2/optimization/operator/mutation/MutateESCovarianceMatrixAdaption.java +++ b/src/eva2/optimization/operator/mutation/MutateESCovarianceMatrixAdaption.java @@ -3,7 +3,7 @@ package eva2.optimization.operator.mutation; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceESIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.Jama.EigenvalueDecomposition; import eva2.tools.math.Jama.Matrix; import eva2.tools.math.Mathematics; diff --git a/src/eva2/optimization/operator/mutation/MutateESCovarianceMatrixAdaptionPlus.java b/src/eva2/optimization/operator/mutation/MutateESCovarianceMatrixAdaptionPlus.java index 0a79dacd..be23b44c 100644 --- a/src/eva2/optimization/operator/mutation/MutateESCovarianceMatrixAdaptionPlus.java +++ b/src/eva2/optimization/operator/mutation/MutateESCovarianceMatrixAdaptionPlus.java @@ -3,7 +3,7 @@ package eva2.optimization.operator.mutation; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceESIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.Jama.Matrix; public class MutateESCovarianceMatrixAdaptionPlus extends diff --git a/src/eva2/optimization/operator/mutation/MutateESFixedStepSize.java b/src/eva2/optimization/operator/mutation/MutateESFixedStepSize.java index fabbe133..67db896b 100644 --- a/src/eva2/optimization/operator/mutation/MutateESFixedStepSize.java +++ b/src/eva2/optimization/operator/mutation/MutateESFixedStepSize.java @@ -3,7 +3,7 @@ package eva2.optimization.operator.mutation; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceESIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** diff --git a/src/eva2/optimization/operator/mutation/MutateESGlobal.java b/src/eva2/optimization/operator/mutation/MutateESGlobal.java index 66fbf7c5..d1a51746 100644 --- a/src/eva2/optimization/operator/mutation/MutateESGlobal.java +++ b/src/eva2/optimization/operator/mutation/MutateESGlobal.java @@ -5,8 +5,8 @@ import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceESIndividual; import eva2.optimization.population.Population; import eva2.optimization.population.PopulationInterface; -import eva2.optimization.problems.InterfaceAdditionalPopulationInformer; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceAdditionalPopulationInformer; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import java.util.ArrayList; @@ -283,7 +283,7 @@ public class MutateESGlobal implements InterfaceMutation, java.io.Serializable, /* * (non-Javadoc) - * @see eva2.optimization.problems.InterfaceAdditionalPopulationInformer#getAdditionalDataHeader() + * @see eva2.problems.InterfaceAdditionalPopulationInformer#getAdditionalDataHeader() */ @Override public String[] getAdditionalDataHeader() { @@ -292,7 +292,7 @@ public class MutateESGlobal implements InterfaceMutation, java.io.Serializable, /* * (non-Javadoc) - * @see eva2.optimization.problems.InterfaceAdditionalPopulationInformer#getAdditionalDataInfo() + * @see eva2.problems.InterfaceAdditionalPopulationInformer#getAdditionalDataInfo() */ @Override public String[] getAdditionalDataInfo() { @@ -301,7 +301,7 @@ public class MutateESGlobal implements InterfaceMutation, java.io.Serializable, /* * (non-Javadoc) - * @see eva2.optimization.problems.InterfaceAdditionalPopulationInformer#getAdditionalDataValue(eva2.optimization.PopulationInterface) + * @see eva2.problems.InterfaceAdditionalPopulationInformer#getAdditionalDataValue(eva2.optimization.PopulationInterface) */ @Override public Object[] getAdditionalDataValue(PopulationInterface pop) { diff --git a/src/eva2/optimization/operator/mutation/MutateESLocal.java b/src/eva2/optimization/operator/mutation/MutateESLocal.java index 34f75d45..3e0a5463 100644 --- a/src/eva2/optimization/operator/mutation/MutateESLocal.java +++ b/src/eva2/optimization/operator/mutation/MutateESLocal.java @@ -5,8 +5,8 @@ import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceESIndividual; import eva2.optimization.population.Population; import eva2.optimization.population.PopulationInterface; -import eva2.optimization.problems.InterfaceAdditionalPopulationInformer; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceAdditionalPopulationInformer; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.SelectedTag; import eva2.tools.Tag; import eva2.tools.math.RNG; @@ -340,7 +340,7 @@ public class MutateESLocal implements InterfaceMutation, InterfaceAdditionalPopu /* * (non-Javadoc) - * @see eva2.optimization.problems.InterfaceAdditionalPopulationInformer#getAdditionalDataHeader() + * @see eva2.problems.InterfaceAdditionalPopulationInformer#getAdditionalDataHeader() */ @Override public String[] getAdditionalDataHeader() { @@ -349,7 +349,7 @@ public class MutateESLocal implements InterfaceMutation, InterfaceAdditionalPopu /* * (non-Javadoc) - * @see eva2.optimization.problems.InterfaceAdditionalPopulationInformer#getAdditionalDataInfo() + * @see eva2.problems.InterfaceAdditionalPopulationInformer#getAdditionalDataInfo() */ @Override public String[] getAdditionalDataInfo() { @@ -358,7 +358,7 @@ public class MutateESLocal implements InterfaceMutation, InterfaceAdditionalPopu /* * (non-Javadoc) - * @see eva2.optimization.problems.InterfaceAdditionalPopulationInformer#getAdditionalDataValue(eva2.optimization.PopulationInterface) + * @see eva2.problems.InterfaceAdditionalPopulationInformer#getAdditionalDataValue(eva2.optimization.PopulationInterface) */ @Override public Object[] getAdditionalDataValue(PopulationInterface pop) { diff --git a/src/eva2/optimization/operator/mutation/MutateESMainVectorAdaption.java b/src/eva2/optimization/operator/mutation/MutateESMainVectorAdaption.java index 039ce10d..8b8f3968 100644 --- a/src/eva2/optimization/operator/mutation/MutateESMainVectorAdaption.java +++ b/src/eva2/optimization/operator/mutation/MutateESMainVectorAdaption.java @@ -3,7 +3,7 @@ package eva2.optimization.operator.mutation; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceESIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.Mathematics; import eva2.tools.math.RNG; diff --git a/src/eva2/optimization/operator/mutation/MutateESMutativeStepSizeControl.java b/src/eva2/optimization/operator/mutation/MutateESMutativeStepSizeControl.java index 21053967..1af1c696 100644 --- a/src/eva2/optimization/operator/mutation/MutateESMutativeStepSizeControl.java +++ b/src/eva2/optimization/operator/mutation/MutateESMutativeStepSizeControl.java @@ -3,7 +3,7 @@ package eva2.optimization.operator.mutation; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceESIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** diff --git a/src/eva2/optimization/operator/mutation/MutateESPathLengthAdaption.java b/src/eva2/optimization/operator/mutation/MutateESPathLengthAdaption.java index 2de3067f..cccfea04 100644 --- a/src/eva2/optimization/operator/mutation/MutateESPathLengthAdaption.java +++ b/src/eva2/optimization/operator/mutation/MutateESPathLengthAdaption.java @@ -3,7 +3,7 @@ package eva2.optimization.operator.mutation; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceESIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.Mathematics; import eva2.tools.math.RNG; diff --git a/src/eva2/optimization/operator/mutation/MutateESPolynomial.java b/src/eva2/optimization/operator/mutation/MutateESPolynomial.java index 59dbb2de..c734fb24 100644 --- a/src/eva2/optimization/operator/mutation/MutateESPolynomial.java +++ b/src/eva2/optimization/operator/mutation/MutateESPolynomial.java @@ -3,7 +3,7 @@ package eva2.optimization.operator.mutation; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceESIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** diff --git a/src/eva2/optimization/operator/mutation/MutateESRankMuCMA.java b/src/eva2/optimization/operator/mutation/MutateESRankMuCMA.java index e91c919f..15f028f3 100644 --- a/src/eva2/optimization/operator/mutation/MutateESRankMuCMA.java +++ b/src/eva2/optimization/operator/mutation/MutateESRankMuCMA.java @@ -8,7 +8,7 @@ import eva2.optimization.individuals.AbstractEAIndividualComparator; import eva2.optimization.individuals.InterfaceDataTypeDouble; import eva2.optimization.operator.distancemetric.EuclideanMetric; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.optimization.strategies.EvolutionStrategies; import eva2.tools.EVAERROR; import eva2.tools.Pair; diff --git a/src/eva2/optimization/operator/mutation/MutateESStandard.java b/src/eva2/optimization/operator/mutation/MutateESStandard.java index 2b663d22..0e725d4a 100644 --- a/src/eva2/optimization/operator/mutation/MutateESStandard.java +++ b/src/eva2/optimization/operator/mutation/MutateESStandard.java @@ -6,7 +6,7 @@ package eva2.optimization.operator.mutation; //import eva2.optimization.individuals.InterfaceDataTypeDouble; //import eva2.optimization.individuals.InterfaceESIndividual; //import eva2.optimization.populations.Population; -//import eva2.optimization.problems.InterfaceOptimizationProblem; +//import eva2.problems.InterfaceOptimizationProblem; //import eva2.tools.math.RNG; // ///** diff --git a/src/eva2/optimization/operator/mutation/MutateGAAdaptive.java b/src/eva2/optimization/operator/mutation/MutateGAAdaptive.java index f53f5cf0..c06d3089 100644 --- a/src/eva2/optimization/operator/mutation/MutateGAAdaptive.java +++ b/src/eva2/optimization/operator/mutation/MutateGAAdaptive.java @@ -4,7 +4,7 @@ package eva2.optimization.operator.mutation; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceGAIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import java.util.BitSet; diff --git a/src/eva2/optimization/operator/mutation/MutateGAGISwapBits.java b/src/eva2/optimization/operator/mutation/MutateGAGISwapBits.java index 944c4940..68ad4152 100644 --- a/src/eva2/optimization/operator/mutation/MutateGAGISwapBits.java +++ b/src/eva2/optimization/operator/mutation/MutateGAGISwapBits.java @@ -4,7 +4,7 @@ import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceGAIndividual; import eva2.optimization.individuals.InterfaceGIIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import java.util.BitSet; diff --git a/src/eva2/optimization/operator/mutation/MutateGAInvertBits.java b/src/eva2/optimization/operator/mutation/MutateGAInvertBits.java index 833177a0..1e79dcba 100644 --- a/src/eva2/optimization/operator/mutation/MutateGAInvertBits.java +++ b/src/eva2/optimization/operator/mutation/MutateGAInvertBits.java @@ -3,7 +3,7 @@ package eva2.optimization.operator.mutation; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceGAIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import java.util.BitSet; diff --git a/src/eva2/optimization/operator/mutation/MutateGANBit.java b/src/eva2/optimization/operator/mutation/MutateGANBit.java index bfdb558f..9fb41551 100644 --- a/src/eva2/optimization/operator/mutation/MutateGANBit.java +++ b/src/eva2/optimization/operator/mutation/MutateGANBit.java @@ -3,7 +3,7 @@ package eva2.optimization.operator.mutation; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceGAIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import java.util.BitSet; diff --git a/src/eva2/optimization/operator/mutation/MutateGAShiftSubstring.java b/src/eva2/optimization/operator/mutation/MutateGAShiftSubstring.java index 4d440ef8..4e9c2288 100644 --- a/src/eva2/optimization/operator/mutation/MutateGAShiftSubstring.java +++ b/src/eva2/optimization/operator/mutation/MutateGAShiftSubstring.java @@ -4,7 +4,7 @@ package eva2.optimization.operator.mutation; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceGAIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import java.util.BitSet; diff --git a/src/eva2/optimization/operator/mutation/MutateGASwapBitsSegmentwise.java b/src/eva2/optimization/operator/mutation/MutateGASwapBitsSegmentwise.java index 8104ce16..542a9f8b 100644 --- a/src/eva2/optimization/operator/mutation/MutateGASwapBitsSegmentwise.java +++ b/src/eva2/optimization/operator/mutation/MutateGASwapBitsSegmentwise.java @@ -4,7 +4,7 @@ package eva2.optimization.operator.mutation; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceGAIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.EVAERROR; import eva2.tools.math.RNG; diff --git a/src/eva2/optimization/operator/mutation/MutateGAUniform.java b/src/eva2/optimization/operator/mutation/MutateGAUniform.java index 3c82efca..96222563 100644 --- a/src/eva2/optimization/operator/mutation/MutateGAUniform.java +++ b/src/eva2/optimization/operator/mutation/MutateGAUniform.java @@ -4,7 +4,7 @@ import eva2.gui.editor.GenericObjectEditor; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceGAIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.EVAERROR; import eva2.tools.math.RNG; diff --git a/src/eva2/optimization/operator/mutation/MutateGIInsertDelete.java b/src/eva2/optimization/operator/mutation/MutateGIInsertDelete.java index d237b63e..375dcf19 100644 --- a/src/eva2/optimization/operator/mutation/MutateGIInsertDelete.java +++ b/src/eva2/optimization/operator/mutation/MutateGIInsertDelete.java @@ -3,7 +3,7 @@ package eva2.optimization.operator.mutation; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceGIIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** diff --git a/src/eva2/optimization/operator/mutation/MutateGIInvert.java b/src/eva2/optimization/operator/mutation/MutateGIInvert.java index c5059631..0241bb66 100644 --- a/src/eva2/optimization/operator/mutation/MutateGIInvert.java +++ b/src/eva2/optimization/operator/mutation/MutateGIInvert.java @@ -3,7 +3,7 @@ package eva2.optimization.operator.mutation; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceGIIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** diff --git a/src/eva2/optimization/operator/mutation/MutateGINominal.java b/src/eva2/optimization/operator/mutation/MutateGINominal.java index 9e6748b1..5cda28b9 100644 --- a/src/eva2/optimization/operator/mutation/MutateGINominal.java +++ b/src/eva2/optimization/operator/mutation/MutateGINominal.java @@ -3,7 +3,7 @@ package eva2.optimization.operator.mutation; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceGIIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** diff --git a/src/eva2/optimization/operator/mutation/MutateGIOrdinal.java b/src/eva2/optimization/operator/mutation/MutateGIOrdinal.java index e5a82a4c..8d92d191 100644 --- a/src/eva2/optimization/operator/mutation/MutateGIOrdinal.java +++ b/src/eva2/optimization/operator/mutation/MutateGIOrdinal.java @@ -3,7 +3,7 @@ package eva2.optimization.operator.mutation; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceGIIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** diff --git a/src/eva2/optimization/operator/mutation/MutateGISubset.java b/src/eva2/optimization/operator/mutation/MutateGISubset.java index 380ae596..8290fcc5 100644 --- a/src/eva2/optimization/operator/mutation/MutateGISubset.java +++ b/src/eva2/optimization/operator/mutation/MutateGISubset.java @@ -4,7 +4,7 @@ import eva2.gui.BeanInspector; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceGIIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.EVAERROR; import eva2.tools.math.RNG; diff --git a/src/eva2/optimization/operator/mutation/MutateGITranslocate.java b/src/eva2/optimization/operator/mutation/MutateGITranslocate.java index e5fc472d..55ec0d5a 100644 --- a/src/eva2/optimization/operator/mutation/MutateGITranslocate.java +++ b/src/eva2/optimization/operator/mutation/MutateGITranslocate.java @@ -3,7 +3,7 @@ package eva2.optimization.operator.mutation; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceGIIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; diff --git a/src/eva2/optimization/operator/mutation/MutateGPAdaptive.java b/src/eva2/optimization/operator/mutation/MutateGPAdaptive.java index a0d725c9..2731611a 100644 --- a/src/eva2/optimization/operator/mutation/MutateGPAdaptive.java +++ b/src/eva2/optimization/operator/mutation/MutateGPAdaptive.java @@ -5,7 +5,7 @@ import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.IndividualInterface; import eva2.optimization.individuals.InterfaceGPIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** diff --git a/src/eva2/optimization/operator/mutation/MutateGPSingleNode.java b/src/eva2/optimization/operator/mutation/MutateGPSingleNode.java index 33ed67e3..bcb2307f 100644 --- a/src/eva2/optimization/operator/mutation/MutateGPSingleNode.java +++ b/src/eva2/optimization/operator/mutation/MutateGPSingleNode.java @@ -6,7 +6,7 @@ import eva2.optimization.individuals.InterfaceGPIndividual; import eva2.optimization.individuals.codings.gp.AbstractGPNode; import eva2.optimization.individuals.codings.gp.GPArea; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import java.util.ArrayList; diff --git a/src/eva2/optimization/operator/mutation/MutateOBGAFlip.java b/src/eva2/optimization/operator/mutation/MutateOBGAFlip.java index f705dcec..ca696289 100644 --- a/src/eva2/optimization/operator/mutation/MutateOBGAFlip.java +++ b/src/eva2/optimization/operator/mutation/MutateOBGAFlip.java @@ -3,7 +3,7 @@ package eva2.optimization.operator.mutation; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceOBGAIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; diff --git a/src/eva2/optimization/operator/mutation/MutateOBGAInversion.java b/src/eva2/optimization/operator/mutation/MutateOBGAInversion.java index a78f1219..222948bd 100644 --- a/src/eva2/optimization/operator/mutation/MutateOBGAInversion.java +++ b/src/eva2/optimization/operator/mutation/MutateOBGAInversion.java @@ -4,7 +4,7 @@ import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceDataTypePermutation; import eva2.optimization.individuals.InterfaceOBGAIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; diff --git a/src/eva2/optimization/operator/mutation/NoMutation.java b/src/eva2/optimization/operator/mutation/NoMutation.java index def3add1..14ed9d43 100644 --- a/src/eva2/optimization/operator/mutation/NoMutation.java +++ b/src/eva2/optimization/operator/mutation/NoMutation.java @@ -3,7 +3,7 @@ package eva2.optimization.operator.mutation; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/optimization/operator/paretofrontmetrics/InterfaceParetoFrontMetric.java b/src/eva2/optimization/operator/paretofrontmetrics/InterfaceParetoFrontMetric.java index e95d3d10..04fb8c73 100644 --- a/src/eva2/optimization/operator/paretofrontmetrics/InterfaceParetoFrontMetric.java +++ b/src/eva2/optimization/operator/paretofrontmetrics/InterfaceParetoFrontMetric.java @@ -1,7 +1,7 @@ package eva2.optimization.operator.paretofrontmetrics; import eva2.optimization.population.Population; -import eva2.optimization.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.problems.AbstractMultiObjectiveOptimizationProblem; /** * Interface for general Pareto front methods. diff --git a/src/eva2/optimization/operator/paretofrontmetrics/MetricD1ApproxParetoFront.java b/src/eva2/optimization/operator/paretofrontmetrics/MetricD1ApproxParetoFront.java index 317e8d4c..a18f4182 100644 --- a/src/eva2/optimization/operator/paretofrontmetrics/MetricD1ApproxParetoFront.java +++ b/src/eva2/optimization/operator/paretofrontmetrics/MetricD1ApproxParetoFront.java @@ -5,7 +5,7 @@ import eva2.gui.PropertyFilePath; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.operator.archiving.ArchivingAllDominating; import eva2.optimization.population.Population; -import eva2.optimization.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.problems.AbstractMultiObjectiveOptimizationProblem; import eva2.optimization.tools.FileTools; import java.util.ArrayList; diff --git a/src/eva2/optimization/operator/paretofrontmetrics/MetricD1TrueParetoFront.java b/src/eva2/optimization/operator/paretofrontmetrics/MetricD1TrueParetoFront.java index 5f21749a..bad69a53 100644 --- a/src/eva2/optimization/operator/paretofrontmetrics/MetricD1TrueParetoFront.java +++ b/src/eva2/optimization/operator/paretofrontmetrics/MetricD1TrueParetoFront.java @@ -5,7 +5,7 @@ import eva2.gui.PropertyFilePath; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.operator.archiving.ArchivingAllDominating; import eva2.optimization.population.Population; -import eva2.optimization.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.problems.AbstractMultiObjectiveOptimizationProblem; import eva2.optimization.tools.FileTools; import java.util.ArrayList; diff --git a/src/eva2/optimization/operator/paretofrontmetrics/MetricErrorRatio.java b/src/eva2/optimization/operator/paretofrontmetrics/MetricErrorRatio.java index 92986ab0..32b20ce6 100644 --- a/src/eva2/optimization/operator/paretofrontmetrics/MetricErrorRatio.java +++ b/src/eva2/optimization/operator/paretofrontmetrics/MetricErrorRatio.java @@ -5,7 +5,7 @@ import eva2.gui.PropertyFilePath; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.operator.archiving.ArchivingAllDominating; import eva2.optimization.population.Population; -import eva2.optimization.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.problems.AbstractMultiObjectiveOptimizationProblem; import eva2.optimization.tools.FileTools; import java.util.ArrayList; diff --git a/src/eva2/optimization/operator/paretofrontmetrics/MetricMaximumParetoFrontError.java b/src/eva2/optimization/operator/paretofrontmetrics/MetricMaximumParetoFrontError.java index 233f0ab0..869445b8 100644 --- a/src/eva2/optimization/operator/paretofrontmetrics/MetricMaximumParetoFrontError.java +++ b/src/eva2/optimization/operator/paretofrontmetrics/MetricMaximumParetoFrontError.java @@ -5,7 +5,7 @@ import eva2.gui.PropertyFilePath; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.operator.archiving.ArchivingAllDominating; import eva2.optimization.population.Population; -import eva2.optimization.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.problems.AbstractMultiObjectiveOptimizationProblem; import eva2.optimization.tools.FileTools; import java.util.ArrayList; diff --git a/src/eva2/optimization/operator/paretofrontmetrics/MetricOverallNonDominatedVectors.java b/src/eva2/optimization/operator/paretofrontmetrics/MetricOverallNonDominatedVectors.java index a52ff6ed..44639612 100644 --- a/src/eva2/optimization/operator/paretofrontmetrics/MetricOverallNonDominatedVectors.java +++ b/src/eva2/optimization/operator/paretofrontmetrics/MetricOverallNonDominatedVectors.java @@ -3,7 +3,7 @@ package eva2.optimization.operator.paretofrontmetrics; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.operator.archiving.ArchivingAllDominating; import eva2.optimization.population.Population; -import eva2.optimization.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.problems.AbstractMultiObjectiveOptimizationProblem; /** * Overall Non-Dom. Vector Generation calculates simply the number of diff --git a/src/eva2/optimization/operator/paretofrontmetrics/MetricS.java b/src/eva2/optimization/operator/paretofrontmetrics/MetricS.java index 027d3b9c..939ee332 100644 --- a/src/eva2/optimization/operator/paretofrontmetrics/MetricS.java +++ b/src/eva2/optimization/operator/paretofrontmetrics/MetricS.java @@ -5,7 +5,7 @@ import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.ESIndividualDoubleData; import eva2.optimization.operator.archiving.ArchivingAllDominating; import eva2.optimization.population.Population; -import eva2.optimization.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.problems.AbstractMultiObjectiveOptimizationProblem; /** * S-Metric calculates the hyper-volume covered between the current solutions and a reference point. diff --git a/src/eva2/optimization/operator/paretofrontmetrics/MetricSWithReference.java b/src/eva2/optimization/operator/paretofrontmetrics/MetricSWithReference.java index 1cb975e6..eee544ec 100644 --- a/src/eva2/optimization/operator/paretofrontmetrics/MetricSWithReference.java +++ b/src/eva2/optimization/operator/paretofrontmetrics/MetricSWithReference.java @@ -6,7 +6,7 @@ import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.ESIndividualDoubleData; import eva2.optimization.operator.archiving.ArchivingAllDominating; import eva2.optimization.population.Population; -import eva2.optimization.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.problems.AbstractMultiObjectiveOptimizationProblem; import eva2.optimization.tools.FileTools; import java.util.ArrayList; diff --git a/src/eva2/optimization/operator/postprocess/PostProcess.java b/src/eva2/optimization/operator/postprocess/PostProcess.java index a39d3074..ffcb3d43 100644 --- a/src/eva2/optimization/operator/postprocess/PostProcess.java +++ b/src/eva2/optimization/operator/postprocess/PostProcess.java @@ -23,7 +23,7 @@ import eva2.optimization.operator.selection.SelectBestIndividuals; import eva2.optimization.operator.terminators.EvaluationTerminator; import eva2.optimization.operator.terminators.InterfaceTerminator; import eva2.optimization.population.Population; -import eva2.optimization.problems.*; +import eva2.problems.*; import eva2.optimization.stat.InterfaceTextListener; import eva2.optimization.stat.StatisticsParameter; import eva2.optimization.strategies.EvolutionStrategies; diff --git a/src/eva2/optimization/operator/postprocess/SolutionHistogram.java b/src/eva2/optimization/operator/postprocess/SolutionHistogram.java index 22c861c8..141fa9b7 100644 --- a/src/eva2/optimization/operator/postprocess/SolutionHistogram.java +++ b/src/eva2/optimization/operator/postprocess/SolutionHistogram.java @@ -2,8 +2,8 @@ package eva2.optimization.operator.postprocess; import eva2.gui.BeanInspector; import eva2.optimization.population.Population; -import eva2.optimization.problems.AbstractOptimizationProblem; -import eva2.optimization.problems.InterfaceInterestingHistogram; +import eva2.problems.AbstractOptimizationProblem; +import eva2.problems.InterfaceInterestingHistogram; import eva2.tools.math.Mathematics; import java.util.Arrays; diff --git a/src/eva2/optimization/operator/terminators/CombinedTerminator.java b/src/eva2/optimization/operator/terminators/CombinedTerminator.java index 85b96fff..377452f4 100644 --- a/src/eva2/optimization/operator/terminators/CombinedTerminator.java +++ b/src/eva2/optimization/operator/terminators/CombinedTerminator.java @@ -2,7 +2,7 @@ package eva2.optimization.operator.terminators; import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.PopulationInterface; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.SelectedTag; import eva2.util.annotation.Description; diff --git a/src/eva2/optimization/operator/terminators/EvaluationTerminator.java b/src/eva2/optimization/operator/terminators/EvaluationTerminator.java index 35a0d7ab..aeb9bd45 100644 --- a/src/eva2/optimization/operator/terminators/EvaluationTerminator.java +++ b/src/eva2/optimization/operator/terminators/EvaluationTerminator.java @@ -2,7 +2,7 @@ package eva2.optimization.operator.terminators; import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.PopulationInterface; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.util.annotation.Description; import java.io.Serializable; diff --git a/src/eva2/optimization/operator/terminators/FitnessValueTerminator.java b/src/eva2/optimization/operator/terminators/FitnessValueTerminator.java index 06f81d0c..a09f2f4e 100644 --- a/src/eva2/optimization/operator/terminators/FitnessValueTerminator.java +++ b/src/eva2/optimization/operator/terminators/FitnessValueTerminator.java @@ -3,7 +3,7 @@ package eva2.optimization.operator.terminators; import eva2.gui.BeanInspector; import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.PopulationInterface; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import java.io.Serializable; diff --git a/src/eva2/optimization/operator/terminators/GenerationTerminator.java b/src/eva2/optimization/operator/terminators/GenerationTerminator.java index e050ac09..7ca8350d 100644 --- a/src/eva2/optimization/operator/terminators/GenerationTerminator.java +++ b/src/eva2/optimization/operator/terminators/GenerationTerminator.java @@ -2,7 +2,7 @@ package eva2.optimization.operator.terminators; import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.PopulationInterface; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.util.annotation.Description; import java.io.Serializable; diff --git a/src/eva2/optimization/operator/terminators/HistoryConvergenceTerminator.java b/src/eva2/optimization/operator/terminators/HistoryConvergenceTerminator.java index b0c3fc42..fc5f80a4 100644 --- a/src/eva2/optimization/operator/terminators/HistoryConvergenceTerminator.java +++ b/src/eva2/optimization/operator/terminators/HistoryConvergenceTerminator.java @@ -6,7 +6,7 @@ import eva2.optimization.operator.distancemetric.ObjectiveSpaceMetric; import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.Population; import eva2.optimization.population.PopulationInterface; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import java.io.Serializable; import java.util.List; diff --git a/src/eva2/optimization/operator/terminators/InterfaceTerminator.java b/src/eva2/optimization/operator/terminators/InterfaceTerminator.java index d07ef590..f339f754 100644 --- a/src/eva2/optimization/operator/terminators/InterfaceTerminator.java +++ b/src/eva2/optimization/operator/terminators/InterfaceTerminator.java @@ -2,7 +2,7 @@ package eva2.optimization.operator.terminators; import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.PopulationInterface; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; /** * Interface for a termination criterion. diff --git a/src/eva2/optimization/operator/terminators/KnownOptimaFoundTerminator.java b/src/eva2/optimization/operator/terminators/KnownOptimaFoundTerminator.java index 4536d164..0fc3cddc 100644 --- a/src/eva2/optimization/operator/terminators/KnownOptimaFoundTerminator.java +++ b/src/eva2/optimization/operator/terminators/KnownOptimaFoundTerminator.java @@ -3,8 +3,8 @@ package eva2.optimization.operator.terminators; import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.Population; import eva2.optimization.population.PopulationInterface; -import eva2.optimization.problems.InterfaceMultimodalProblemKnown; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceMultimodalProblemKnown; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.EVAERROR; import java.io.Serializable; diff --git a/src/eva2/optimization/operator/terminators/ParetoMetricTerminator.java b/src/eva2/optimization/operator/terminators/ParetoMetricTerminator.java index ef4e2844..f2c5b83e 100644 --- a/src/eva2/optimization/operator/terminators/ParetoMetricTerminator.java +++ b/src/eva2/optimization/operator/terminators/ParetoMetricTerminator.java @@ -5,8 +5,8 @@ import eva2.optimization.operator.paretofrontmetrics.InterfaceParetoFrontMetric; import eva2.optimization.operator.paretofrontmetrics.MetricS; import eva2.optimization.population.Population; import eva2.optimization.population.PopulationInterface; -import eva2.optimization.problems.AbstractMultiObjectiveOptimizationProblem; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.EVAERROR; import java.io.Serializable; diff --git a/src/eva2/optimization/operator/terminators/PhenotypeConvergenceTerminator.java b/src/eva2/optimization/operator/terminators/PhenotypeConvergenceTerminator.java index a5ab1612..2e0c8d73 100644 --- a/src/eva2/optimization/operator/terminators/PhenotypeConvergenceTerminator.java +++ b/src/eva2/optimization/operator/terminators/PhenotypeConvergenceTerminator.java @@ -3,7 +3,7 @@ package eva2.optimization.operator.terminators; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.operator.distancemetric.PhenotypeMetric; import eva2.optimization.population.PopulationInterface; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; public class PhenotypeConvergenceTerminator extends PopulationMeasureTerminator implements InterfaceTerminator { AbstractEAIndividual oldIndy = null; diff --git a/src/eva2/optimization/operator/terminators/PopulationMeasureTerminator.java b/src/eva2/optimization/operator/terminators/PopulationMeasureTerminator.java index 47dcb24f..d0144fa9 100644 --- a/src/eva2/optimization/operator/terminators/PopulationMeasureTerminator.java +++ b/src/eva2/optimization/operator/terminators/PopulationMeasureTerminator.java @@ -3,7 +3,7 @@ package eva2.optimization.operator.terminators; import eva2.gui.BeanInspector; import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.PopulationInterface; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import java.io.Serializable; diff --git a/src/eva2/optimization/problems/package-info.java b/src/eva2/optimization/problems/package-info.java deleted file mode 100644 index 8d54470b..00000000 --- a/src/eva2/optimization/problems/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package eva2.optimization.problems; \ No newline at end of file diff --git a/src/eva2/optimization/problems/regression/package-info.java b/src/eva2/optimization/problems/regression/package-info.java deleted file mode 100644 index b28ca4e3..00000000 --- a/src/eva2/optimization/problems/regression/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package eva2.optimization.problems.regression; diff --git a/src/eva2/optimization/stat/AbstractStatistics.java b/src/eva2/optimization/stat/AbstractStatistics.java index 7d5b4c21..d3a5ea2e 100644 --- a/src/eva2/optimization/stat/AbstractStatistics.java +++ b/src/eva2/optimization/stat/AbstractStatistics.java @@ -6,7 +6,7 @@ import eva2.optimization.individuals.IndividualInterface; import eva2.optimization.operator.distancemetric.InterfaceDistanceMetric; import eva2.optimization.population.Population; import eva2.optimization.population.PopulationInterface; -import eva2.optimization.problems.InterfaceAdditionalPopulationInformer; +import eva2.problems.InterfaceAdditionalPopulationInformer; import eva2.optimization.strategies.InterfaceOptimizer; import eva2.tools.Pair; import eva2.tools.StringSelection; diff --git a/src/eva2/optimization/stat/InterfaceStatistics.java b/src/eva2/optimization/stat/InterfaceStatistics.java index 9394d573..d8f01527 100644 --- a/src/eva2/optimization/stat/InterfaceStatistics.java +++ b/src/eva2/optimization/stat/InterfaceStatistics.java @@ -3,7 +3,7 @@ package eva2.optimization.stat; import eva2.optimization.individuals.IndividualInterface; import eva2.optimization.population.Population; import eva2.optimization.population.PopulationInterface; -import eva2.optimization.problems.InterfaceAdditionalPopulationInformer; +import eva2.problems.InterfaceAdditionalPopulationInformer; import eva2.optimization.strategies.InterfaceOptimizer; import java.util.List; diff --git a/src/eva2/optimization/stat/StatisticsDummy.java b/src/eva2/optimization/stat/StatisticsDummy.java index a8794d32..a05a42b9 100644 --- a/src/eva2/optimization/stat/StatisticsDummy.java +++ b/src/eva2/optimization/stat/StatisticsDummy.java @@ -4,7 +4,7 @@ import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.IndividualInterface; import eva2.optimization.population.Population; import eva2.optimization.population.PopulationInterface; -import eva2.optimization.problems.InterfaceAdditionalPopulationInformer; +import eva2.problems.InterfaceAdditionalPopulationInformer; import eva2.optimization.strategies.InterfaceOptimizer; import java.util.List; diff --git a/src/eva2/optimization/stat/StatisticsParameter.java b/src/eva2/optimization/stat/StatisticsParameter.java index 3bee47e6..12ac7aa4 100644 --- a/src/eva2/optimization/stat/StatisticsParameter.java +++ b/src/eva2/optimization/stat/StatisticsParameter.java @@ -3,7 +3,7 @@ package eva2.optimization.stat; import eva2.gui.BeanInspector; import eva2.gui.editor.GenericObjectEditor; import eva2.optimization.go.InterfaceNotifyOnInformers; -import eva2.optimization.problems.InterfaceAdditionalPopulationInformer; +import eva2.problems.InterfaceAdditionalPopulationInformer; import eva2.tools.EVAERROR; import eva2.tools.SelectedTag; import eva2.tools.Serializer; diff --git a/src/eva2/optimization/stat/StatisticsStandalone.java b/src/eva2/optimization/stat/StatisticsStandalone.java index d7a31196..69e32293 100644 --- a/src/eva2/optimization/stat/StatisticsStandalone.java +++ b/src/eva2/optimization/stat/StatisticsStandalone.java @@ -1,7 +1,7 @@ package eva2.optimization.stat; import eva2.optimization.population.PopulationInterface; -import eva2.optimization.problems.InterfaceAdditionalPopulationInformer; +import eva2.problems.InterfaceAdditionalPopulationInformer; import java.io.Serializable; import java.util.ArrayList; diff --git a/src/eva2/optimization/stat/StatisticsWithGUI.java b/src/eva2/optimization/stat/StatisticsWithGUI.java index 4218f4e8..dd9821dc 100644 --- a/src/eva2/optimization/stat/StatisticsWithGUI.java +++ b/src/eva2/optimization/stat/StatisticsWithGUI.java @@ -8,7 +8,7 @@ import eva2.gui.plot.GraphWindow; import eva2.gui.plot.Plot; import eva2.gui.plot.PlotInterface; import eva2.optimization.population.PopulationInterface; -import eva2.optimization.problems.InterfaceAdditionalPopulationInformer; +import eva2.problems.InterfaceAdditionalPopulationInformer; import eva2.tools.EVAERROR; import eva2.tools.Pair; diff --git a/src/eva2/optimization/strategies/ANPSO.java b/src/eva2/optimization/strategies/ANPSO.java index 20574cc0..8a8d1c1f 100644 --- a/src/eva2/optimization/strategies/ANPSO.java +++ b/src/eva2/optimization/strategies/ANPSO.java @@ -13,9 +13,9 @@ import eva2.optimization.operator.terminators.EvaluationTerminator; import eva2.optimization.operator.terminators.InterfaceTerminator; import eva2.optimization.population.Population; import eva2.optimization.population.PopulationInterface; -import eva2.optimization.problems.AbstractOptimizationProblem; -import eva2.optimization.problems.Interface2DBorderProblem; -import eva2.optimization.problems.InterfaceAdditionalPopulationInformer; +import eva2.problems.AbstractOptimizationProblem; +import eva2.problems.Interface2DBorderProblem; +import eva2.problems.InterfaceAdditionalPopulationInformer; import eva2.tools.ToolBox; import eva2.tools.chart2d.DPoint; import eva2.tools.chart2d.DPointSet; diff --git a/src/eva2/optimization/strategies/ArtificialBeeColony.java b/src/eva2/optimization/strategies/ArtificialBeeColony.java index a9085aab..3dcd547b 100644 --- a/src/eva2/optimization/strategies/ArtificialBeeColony.java +++ b/src/eva2/optimization/strategies/ArtificialBeeColony.java @@ -3,9 +3,9 @@ package eva2.optimization.strategies; import eva2.optimization.go.InterfacePopulationChangedEventListener; import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.Population; -import eva2.optimization.problems.AbstractOptimizationProblem; -import eva2.optimization.problems.F1Problem; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.AbstractOptimizationProblem; +import eva2.problems.F1Problem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.util.annotation.Description; /** diff --git a/src/eva2/optimization/strategies/BOA.java b/src/eva2/optimization/strategies/BOA.java index baa3c0b3..d153e7bb 100644 --- a/src/eva2/optimization/strategies/BOA.java +++ b/src/eva2/optimization/strategies/BOA.java @@ -10,9 +10,9 @@ import eva2.optimization.individuals.InterfaceGAIndividual; import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.Population; import eva2.optimization.population.SolutionSet; -import eva2.optimization.problems.AbstractOptimizationProblem; -import eva2.optimization.problems.BKnapsackProblem; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.AbstractOptimizationProblem; +import eva2.problems.BKnapsackProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.Pair; import eva2.tools.math.BayNet; import eva2.tools.math.RNG; diff --git a/src/eva2/optimization/strategies/BinaryScatterSearch.java b/src/eva2/optimization/strategies/BinaryScatterSearch.java index cdcf96f8..da5dc382 100644 --- a/src/eva2/optimization/strategies/BinaryScatterSearch.java +++ b/src/eva2/optimization/strategies/BinaryScatterSearch.java @@ -10,9 +10,9 @@ import eva2.optimization.operator.distancemetric.GenotypeMetricBitSet; import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.Population; import eva2.optimization.population.SolutionSet; -import eva2.optimization.problems.AbstractOptimizationProblem; -import eva2.optimization.problems.B1Problem; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.AbstractOptimizationProblem; +import eva2.problems.B1Problem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.Pair; import eva2.tools.math.RNG; import eva2.util.annotation.Description; diff --git a/src/eva2/optimization/strategies/CBNPSO.java b/src/eva2/optimization/strategies/CBNPSO.java index f3a06a42..011cbb7b 100644 --- a/src/eva2/optimization/strategies/CBNPSO.java +++ b/src/eva2/optimization/strategies/CBNPSO.java @@ -10,10 +10,10 @@ import eva2.optimization.operator.paramcontrol.SinusoidalParamAdaption; import eva2.optimization.population.Population; import eva2.optimization.population.PopulationInterface; import eva2.optimization.population.SolutionSet; -import eva2.optimization.problems.AbstractProblemDouble; -import eva2.optimization.problems.InterfaceInterestingHistogram; -import eva2.optimization.problems.InterfaceOptimizationProblem; -import eva2.optimization.problems.InterfaceProblemDouble; +import eva2.problems.AbstractProblemDouble; +import eva2.problems.InterfaceInterestingHistogram; +import eva2.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceProblemDouble; import eva2.tools.EVAERROR; import eva2.tools.ToolBox; import eva2.util.annotation.Description; diff --git a/src/eva2/optimization/strategies/CHCAdaptiveSearchAlgorithm.java b/src/eva2/optimization/strategies/CHCAdaptiveSearchAlgorithm.java index 1eaa23b1..274f2a1a 100644 --- a/src/eva2/optimization/strategies/CHCAdaptiveSearchAlgorithm.java +++ b/src/eva2/optimization/strategies/CHCAdaptiveSearchAlgorithm.java @@ -9,8 +9,8 @@ import eva2.optimization.operator.selection.SelectRandom; import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.Population; import eva2.optimization.population.SolutionSet; -import eva2.optimization.problems.B1Problem; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.B1Problem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import java.util.BitSet; diff --git a/src/eva2/optimization/strategies/ClusterBasedNichingEA.java b/src/eva2/optimization/strategies/ClusterBasedNichingEA.java index 947aa307..8b8ba1e7 100644 --- a/src/eva2/optimization/strategies/ClusterBasedNichingEA.java +++ b/src/eva2/optimization/strategies/ClusterBasedNichingEA.java @@ -22,7 +22,7 @@ import eva2.optimization.operator.terminators.InterfaceTerminator; import eva2.optimization.population.Population; import eva2.optimization.population.PopulationInterface; import eva2.optimization.population.SolutionSet; -import eva2.optimization.problems.*; +import eva2.problems.*; import eva2.tools.EVAERROR; import eva2.tools.chart2d.*; import eva2.tools.math.Mathematics; diff --git a/src/eva2/optimization/strategies/ClusteringHillClimbing.java b/src/eva2/optimization/strategies/ClusteringHillClimbing.java index ba3095f7..1fa57dcc 100644 --- a/src/eva2/optimization/strategies/ClusteringHillClimbing.java +++ b/src/eva2/optimization/strategies/ClusteringHillClimbing.java @@ -9,10 +9,10 @@ import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.Population; import eva2.optimization.population.PopulationInterface; import eva2.optimization.population.SolutionSet; -import eva2.optimization.problems.AbstractOptimizationProblem; -import eva2.optimization.problems.F1Problem; -import eva2.optimization.problems.InterfaceAdditionalPopulationInformer; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.AbstractOptimizationProblem; +import eva2.problems.F1Problem; +import eva2.problems.InterfaceAdditionalPopulationInformer; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.Pair; import eva2.util.annotation.Description; diff --git a/src/eva2/optimization/strategies/DifferentialEvolution.java b/src/eva2/optimization/strategies/DifferentialEvolution.java index c31b4722..74159e80 100644 --- a/src/eva2/optimization/strategies/DifferentialEvolution.java +++ b/src/eva2/optimization/strategies/DifferentialEvolution.java @@ -11,10 +11,10 @@ import eva2.optimization.operator.selection.replacement.ReplacementNondominatedS import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.Population; import eva2.optimization.population.SolutionSet; -import eva2.optimization.problems.AbstractMultiObjectiveOptimizationProblem; -import eva2.optimization.problems.AbstractOptimizationProblem; -import eva2.optimization.problems.F1Problem; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.problems.AbstractOptimizationProblem; +import eva2.problems.F1Problem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.EVAERROR; import eva2.tools.math.Mathematics; import eva2.tools.math.RNG; diff --git a/src/eva2/optimization/strategies/DynamicParticleSwarmOptimization.java b/src/eva2/optimization/strategies/DynamicParticleSwarmOptimization.java index 8a6a8040..aa5e5428 100644 --- a/src/eva2/optimization/strategies/DynamicParticleSwarmOptimization.java +++ b/src/eva2/optimization/strategies/DynamicParticleSwarmOptimization.java @@ -5,8 +5,8 @@ import eva2.gui.plot.Plot; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceDataTypeDouble; import eva2.optimization.population.Population; -import eva2.optimization.problems.AbstractOptimizationProblem; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.AbstractOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.SelectedTag; import eva2.tools.math.Mathematics; import eva2.tools.math.RNG; diff --git a/src/eva2/optimization/strategies/EsDpiNiching.java b/src/eva2/optimization/strategies/EsDpiNiching.java index 97bc616c..162b3fa8 100644 --- a/src/eva2/optimization/strategies/EsDpiNiching.java +++ b/src/eva2/optimization/strategies/EsDpiNiching.java @@ -19,9 +19,9 @@ import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.Population; import eva2.optimization.population.PopulationInterface; import eva2.optimization.population.SolutionSet; -import eva2.optimization.problems.Interface2DBorderProblem; -import eva2.optimization.problems.InterfaceAdditionalPopulationInformer; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.Interface2DBorderProblem; +import eva2.problems.InterfaceAdditionalPopulationInformer; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.Mathematics; import eva2.tools.math.RNG; import eva2.util.annotation.Description; diff --git a/src/eva2/optimization/strategies/EvolutionStrategies.java b/src/eva2/optimization/strategies/EvolutionStrategies.java index 0e1d5a5a..17a3325c 100644 --- a/src/eva2/optimization/strategies/EvolutionStrategies.java +++ b/src/eva2/optimization/strategies/EvolutionStrategies.java @@ -9,8 +9,8 @@ import eva2.optimization.operator.selection.SelectRandom; import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.Population; import eva2.optimization.population.SolutionSet; -import eva2.optimization.problems.B1Problem; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.B1Problem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.util.annotation.Description; import eva2.util.annotation.Parameter; diff --git a/src/eva2/optimization/strategies/EvolutionStrategyIPOP.java b/src/eva2/optimization/strategies/EvolutionStrategyIPOP.java index 5d51b205..cbc307c6 100644 --- a/src/eva2/optimization/strategies/EvolutionStrategyIPOP.java +++ b/src/eva2/optimization/strategies/EvolutionStrategyIPOP.java @@ -12,7 +12,7 @@ import eva2.optimization.operator.terminators.PopulationMeasureTerminator.Stagna import eva2.optimization.population.Population; import eva2.optimization.population.PopulationInterface; import eva2.optimization.population.SolutionSet; -import eva2.optimization.problems.InterfaceAdditionalPopulationInformer; +import eva2.problems.InterfaceAdditionalPopulationInformer; import eva2.util.annotation.Description; import java.util.Arrays; @@ -396,7 +396,7 @@ public class EvolutionStrategyIPOP extends EvolutionStrategies implements Interf /* * (non-Javadoc) - * @see eva2.optimization.problems.InterfaceAdditionalPopulationInformer#getAdditionalDataHeader() + * @see eva2.problems.InterfaceAdditionalPopulationInformer#getAdditionalDataHeader() */ @Override public String[] getAdditionalDataHeader() { @@ -405,7 +405,7 @@ public class EvolutionStrategyIPOP extends EvolutionStrategies implements Interf /* * (non-Javadoc) - * @see eva2.optimization.problems.InterfaceAdditionalPopulationInformer#getAdditionalDataInfo() + * @see eva2.problems.InterfaceAdditionalPopulationInformer#getAdditionalDataInfo() */ @Override public String[] getAdditionalDataInfo() { @@ -414,7 +414,7 @@ public class EvolutionStrategyIPOP extends EvolutionStrategies implements Interf /* * (non-Javadoc) - * @see eva2.optimization.problems.InterfaceAdditionalPopulationInformer#getAdditionalDataValue(eva2.optimization.PopulationInterface) + * @see eva2.problems.InterfaceAdditionalPopulationInformer#getAdditionalDataValue(eva2.optimization.PopulationInterface) */ @Override public Object[] getAdditionalDataValue(PopulationInterface pop) { diff --git a/src/eva2/optimization/strategies/EvolutionaryProgramming.java b/src/eva2/optimization/strategies/EvolutionaryProgramming.java index 6e94f75d..22be4a36 100644 --- a/src/eva2/optimization/strategies/EvolutionaryProgramming.java +++ b/src/eva2/optimization/strategies/EvolutionaryProgramming.java @@ -7,8 +7,8 @@ import eva2.optimization.operator.selection.SelectEPTournaments; import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.Population; import eva2.optimization.population.SolutionSet; -import eva2.optimization.problems.F1Problem; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.F1Problem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.util.annotation.Description; import java.util.ArrayList; diff --git a/src/eva2/optimization/strategies/FloodAlgorithm.java b/src/eva2/optimization/strategies/FloodAlgorithm.java index 9c998c1a..6ab01bd5 100644 --- a/src/eva2/optimization/strategies/FloodAlgorithm.java +++ b/src/eva2/optimization/strategies/FloodAlgorithm.java @@ -6,8 +6,8 @@ import eva2.optimization.individuals.GAIndividualBinaryData; import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.Population; import eva2.optimization.population.SolutionSet; -import eva2.optimization.problems.B1Problem; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.B1Problem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.util.annotation.Description; /** diff --git a/src/eva2/optimization/strategies/GeneticAlgorithm.java b/src/eva2/optimization/strategies/GeneticAlgorithm.java index 92dfdb94..4ce54499 100644 --- a/src/eva2/optimization/strategies/GeneticAlgorithm.java +++ b/src/eva2/optimization/strategies/GeneticAlgorithm.java @@ -9,8 +9,8 @@ import eva2.optimization.operator.selection.SelectXProbRouletteWheel; import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.Population; import eva2.optimization.population.SolutionSet; -import eva2.optimization.problems.F1Problem; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.F1Problem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.util.annotation.Description; import java.util.Vector; diff --git a/src/eva2/optimization/strategies/GradientDescentAlgorithm.java b/src/eva2/optimization/strategies/GradientDescentAlgorithm.java index a3ce6dd6..042f1ee2 100644 --- a/src/eva2/optimization/strategies/GradientDescentAlgorithm.java +++ b/src/eva2/optimization/strategies/GradientDescentAlgorithm.java @@ -7,9 +7,9 @@ import eva2.optimization.individuals.InterfaceDataTypeDouble; import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.Population; import eva2.optimization.population.SolutionSet; -import eva2.optimization.problems.F1Problem; -import eva2.optimization.problems.InterfaceFirstOrderDerivableProblem; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.F1Problem; +import eva2.problems.InterfaceFirstOrderDerivableProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.EVAERROR; import eva2.tools.ReflectPackage; import eva2.util.annotation.Description; diff --git a/src/eva2/optimization/strategies/HillClimbing.java b/src/eva2/optimization/strategies/HillClimbing.java index f503eb9d..dc64424e 100644 --- a/src/eva2/optimization/strategies/HillClimbing.java +++ b/src/eva2/optimization/strategies/HillClimbing.java @@ -6,8 +6,8 @@ import eva2.optimization.operator.mutation.InterfaceMutation; import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.Population; import eva2.optimization.population.SolutionSet; -import eva2.optimization.problems.B1Problem; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.B1Problem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.util.annotation.Description; /** diff --git a/src/eva2/optimization/strategies/InterfaceOptimizer.java b/src/eva2/optimization/strategies/InterfaceOptimizer.java index 4bd20685..45ba07ae 100644 --- a/src/eva2/optimization/strategies/InterfaceOptimizer.java +++ b/src/eva2/optimization/strategies/InterfaceOptimizer.java @@ -3,7 +3,7 @@ package eva2.optimization.strategies; import eva2.optimization.go.InterfacePopulationChangedEventListener; import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; /** diff --git a/src/eva2/optimization/strategies/IslandModelEA.java b/src/eva2/optimization/strategies/IslandModelEA.java index cc2b71b8..175e9a83 100644 --- a/src/eva2/optimization/strategies/IslandModelEA.java +++ b/src/eva2/optimization/strategies/IslandModelEA.java @@ -8,10 +8,10 @@ import eva2.optimization.operator.migration.*; import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.Population; import eva2.optimization.population.SolutionSet; -import eva2.optimization.problems.F1Problem; -import eva2.optimization.problems.F8Problem; -import eva2.optimization.problems.InterfaceOptimizationProblem; -import eva2.optimization.problems.TF1Problem; +import eva2.problems.F1Problem; +import eva2.problems.F8Problem; +import eva2.problems.InterfaceOptimizationProblem; +import eva2.problems.TF1Problem; import eva2.util.annotation.Description; /** diff --git a/src/eva2/optimization/strategies/LTGA.java b/src/eva2/optimization/strategies/LTGA.java index d9d55e02..fdc3b6b9 100644 --- a/src/eva2/optimization/strategies/LTGA.java +++ b/src/eva2/optimization/strategies/LTGA.java @@ -8,9 +8,9 @@ import eva2.optimization.individuals.InterfaceGAIndividual; import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.Population; import eva2.optimization.population.SolutionSet; -import eva2.optimization.problems.AbstractOptimizationProblem; -import eva2.optimization.problems.BKnapsackProblem; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.AbstractOptimizationProblem; +import eva2.problems.BKnapsackProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.Pair; import eva2.tools.math.SpecialFunction; import eva2.util.annotation.Description; diff --git a/src/eva2/optimization/strategies/MLTGA.java b/src/eva2/optimization/strategies/MLTGA.java index 117c9e83..5bc774b0 100644 --- a/src/eva2/optimization/strategies/MLTGA.java +++ b/src/eva2/optimization/strategies/MLTGA.java @@ -8,9 +8,9 @@ import eva2.optimization.individuals.InterfaceGAIndividual; import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.Population; import eva2.optimization.population.SolutionSet; -import eva2.optimization.problems.AbstractOptimizationProblem; -import eva2.optimization.problems.BKnapsackProblem; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.AbstractOptimizationProblem; +import eva2.problems.BKnapsackProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.Pair; import eva2.tools.math.SpecialFunction; diff --git a/src/eva2/optimization/strategies/MemeticAlgorithm.java b/src/eva2/optimization/strategies/MemeticAlgorithm.java index 74e642d7..be02c7c9 100644 --- a/src/eva2/optimization/strategies/MemeticAlgorithm.java +++ b/src/eva2/optimization/strategies/MemeticAlgorithm.java @@ -7,9 +7,9 @@ import eva2.optimization.operator.selection.SelectBestIndividuals; import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.Population; import eva2.optimization.population.SolutionSet; -import eva2.optimization.problems.F1Problem; -import eva2.optimization.problems.InterfaceLocalSearchable; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.F1Problem; +import eva2.problems.InterfaceLocalSearchable; +import eva2.problems.InterfaceOptimizationProblem; import eva2.util.annotation.Description; import java.util.Hashtable; diff --git a/src/eva2/optimization/strategies/MonteCarloSearch.java b/src/eva2/optimization/strategies/MonteCarloSearch.java index 1c46974e..b8f6a003 100644 --- a/src/eva2/optimization/strategies/MonteCarloSearch.java +++ b/src/eva2/optimization/strategies/MonteCarloSearch.java @@ -6,8 +6,8 @@ import eva2.optimization.individuals.GAIndividualBinaryData; import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.Population; import eva2.optimization.population.SolutionSet; -import eva2.optimization.problems.B1Problem; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.B1Problem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.util.annotation.Description; /** diff --git a/src/eva2/optimization/strategies/MultiObjectiveCMAES.java b/src/eva2/optimization/strategies/MultiObjectiveCMAES.java index 0eb1915f..11a9edb1 100644 --- a/src/eva2/optimization/strategies/MultiObjectiveCMAES.java +++ b/src/eva2/optimization/strategies/MultiObjectiveCMAES.java @@ -9,8 +9,8 @@ import eva2.optimization.operator.mutation.MutateESCovarianceMatrixAdaptionPlus; import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.Population; import eva2.optimization.population.SolutionSet; -import eva2.optimization.problems.AbstractOptimizationProblem; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.AbstractOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.util.annotation.Description; import java.io.Serializable; diff --git a/src/eva2/optimization/strategies/MultiObjectiveEA.java b/src/eva2/optimization/strategies/MultiObjectiveEA.java index 5ef254a0..3c094f25 100644 --- a/src/eva2/optimization/strategies/MultiObjectiveEA.java +++ b/src/eva2/optimization/strategies/MultiObjectiveEA.java @@ -11,9 +11,9 @@ import eva2.optimization.operator.selection.SelectMONonDominated; import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.Population; import eva2.optimization.population.SolutionSet; -import eva2.optimization.problems.AbstractOptimizationProblem; -import eva2.optimization.problems.FM0Problem; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.AbstractOptimizationProblem; +import eva2.problems.FM0Problem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.util.annotation.Description; /** diff --git a/src/eva2/optimization/strategies/NelderMeadSimplex.java b/src/eva2/optimization/strategies/NelderMeadSimplex.java index 0551506d..b9449ee5 100644 --- a/src/eva2/optimization/strategies/NelderMeadSimplex.java +++ b/src/eva2/optimization/strategies/NelderMeadSimplex.java @@ -7,9 +7,9 @@ import eva2.optimization.individuals.InterfaceDataTypeDouble; import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.Population; import eva2.optimization.population.SolutionSet; -import eva2.optimization.problems.AbstractOptimizationProblem; -import eva2.optimization.problems.AbstractProblemDouble; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.AbstractOptimizationProblem; +import eva2.problems.AbstractProblemDouble; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.Mathematics; import eva2.util.annotation.Description; diff --git a/src/eva2/optimization/strategies/NichePSO.java b/src/eva2/optimization/strategies/NichePSO.java index e8e79b67..49d74d75 100644 --- a/src/eva2/optimization/strategies/NichePSO.java +++ b/src/eva2/optimization/strategies/NichePSO.java @@ -26,7 +26,7 @@ import eva2.optimization.operator.terminators.InterfaceTerminator; import eva2.optimization.population.Population; import eva2.optimization.population.PopulationInterface; import eva2.optimization.population.SolutionSet; -import eva2.optimization.problems.*; +import eva2.problems.*; import eva2.tools.SelectedTag; import eva2.tools.chart2d.*; import eva2.util.annotation.Description; diff --git a/src/eva2/optimization/strategies/ParticleFilterOptimization.java b/src/eva2/optimization/strategies/ParticleFilterOptimization.java index 6f87ab28..f3bc7ed8 100644 --- a/src/eva2/optimization/strategies/ParticleFilterOptimization.java +++ b/src/eva2/optimization/strategies/ParticleFilterOptimization.java @@ -14,9 +14,9 @@ import eva2.optimization.operator.selection.SelectParticleWheel; import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.Population; import eva2.optimization.population.SolutionSet; -import eva2.optimization.problems.AbstractOptimizationProblem; -import eva2.optimization.problems.F1Problem; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.AbstractOptimizationProblem; +import eva2.problems.F1Problem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.util.annotation.Description; /** diff --git a/src/eva2/optimization/strategies/ParticleSubSwarmOptimization.java b/src/eva2/optimization/strategies/ParticleSubSwarmOptimization.java index 36af6239..b19f11db 100644 --- a/src/eva2/optimization/strategies/ParticleSubSwarmOptimization.java +++ b/src/eva2/optimization/strategies/ParticleSubSwarmOptimization.java @@ -6,8 +6,8 @@ import eva2.optimization.individuals.IndividualInterface; import eva2.optimization.individuals.InterfaceDataTypeDouble; import eva2.optimization.operator.distancemetric.EuclideanMetric; import eva2.optimization.population.Population; -import eva2.optimization.problems.AbstractOptimizationProblem; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.AbstractOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.Mathematics; import java.util.Vector; diff --git a/src/eva2/optimization/strategies/ParticleSwarmOptimization.java b/src/eva2/optimization/strategies/ParticleSwarmOptimization.java index 21e89ff3..af733b32 100644 --- a/src/eva2/optimization/strategies/ParticleSwarmOptimization.java +++ b/src/eva2/optimization/strategies/ParticleSwarmOptimization.java @@ -16,7 +16,7 @@ import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.Population; import eva2.optimization.population.PopulationInterface; import eva2.optimization.population.SolutionSet; -import eva2.optimization.problems.*; +import eva2.problems.*; import eva2.tools.SelectedTag; import eva2.tools.chart2d.DPoint; import eva2.tools.chart2d.DPointSet; diff --git a/src/eva2/optimization/strategies/PopulationBasedIncrementalLearning.java b/src/eva2/optimization/strategies/PopulationBasedIncrementalLearning.java index 96ed4485..00746d3d 100644 --- a/src/eva2/optimization/strategies/PopulationBasedIncrementalLearning.java +++ b/src/eva2/optimization/strategies/PopulationBasedIncrementalLearning.java @@ -9,9 +9,9 @@ import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.PBILPopulation; import eva2.optimization.population.Population; import eva2.optimization.population.SolutionSet; -import eva2.optimization.problems.AbstractOptimizationProblem; -import eva2.optimization.problems.B1Problem; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.AbstractOptimizationProblem; +import eva2.problems.B1Problem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.util.annotation.Description; /** diff --git a/src/eva2/optimization/strategies/ScatterSearch.java b/src/eva2/optimization/strategies/ScatterSearch.java index 9c97374d..f5ad2bbd 100644 --- a/src/eva2/optimization/strategies/ScatterSearch.java +++ b/src/eva2/optimization/strategies/ScatterSearch.java @@ -15,9 +15,9 @@ import eva2.optimization.operator.terminators.InterfaceTerminator; import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.Population; import eva2.optimization.population.SolutionSet; -import eva2.optimization.problems.AbstractOptimizationProblem; -import eva2.optimization.problems.F1Problem; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.AbstractOptimizationProblem; +import eva2.problems.F1Problem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.Pair; import eva2.tools.SelectedTag; import eva2.tools.math.Mathematics; diff --git a/src/eva2/optimization/strategies/SimulatedAnnealing.java b/src/eva2/optimization/strategies/SimulatedAnnealing.java index ec5e4e74..8061de8a 100644 --- a/src/eva2/optimization/strategies/SimulatedAnnealing.java +++ b/src/eva2/optimization/strategies/SimulatedAnnealing.java @@ -6,8 +6,8 @@ import eva2.optimization.individuals.GAIndividualBinaryData; import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.Population; import eva2.optimization.population.SolutionSet; -import eva2.optimization.problems.B1Problem; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.B1Problem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import eva2.util.annotation.Description; diff --git a/src/eva2/optimization/strategies/SteadyStateGA.java b/src/eva2/optimization/strategies/SteadyStateGA.java index f115af05..20e37a6d 100644 --- a/src/eva2/optimization/strategies/SteadyStateGA.java +++ b/src/eva2/optimization/strategies/SteadyStateGA.java @@ -10,8 +10,8 @@ import eva2.optimization.operator.selection.replacement.ReplaceWorst; import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.Population; import eva2.optimization.population.SolutionSet; -import eva2.optimization.problems.B1Problem; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.B1Problem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.util.annotation.Description; /** diff --git a/src/eva2/optimization/strategies/ThresholdAlgorithm.java b/src/eva2/optimization/strategies/ThresholdAlgorithm.java index 84932650..3600f590 100644 --- a/src/eva2/optimization/strategies/ThresholdAlgorithm.java +++ b/src/eva2/optimization/strategies/ThresholdAlgorithm.java @@ -6,8 +6,8 @@ import eva2.optimization.individuals.GAIndividualBinaryData; import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.Population; import eva2.optimization.population.SolutionSet; -import eva2.optimization.problems.B1Problem; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.B1Problem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.util.annotation.Description; /** diff --git a/src/eva2/optimization/strategies/Tribes.java b/src/eva2/optimization/strategies/Tribes.java index 839e8756..77f5aeed 100644 --- a/src/eva2/optimization/strategies/Tribes.java +++ b/src/eva2/optimization/strategies/Tribes.java @@ -8,9 +8,9 @@ import eva2.optimization.individuals.InterfaceDataTypeDouble; import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.Population; import eva2.optimization.population.SolutionSet; -import eva2.optimization.problems.AbstractOptimizationProblem; -import eva2.optimization.problems.InterfaceHasInitRange; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.AbstractOptimizationProblem; +import eva2.problems.InterfaceHasInitRange; +import eva2.problems.InterfaceOptimizationProblem; import eva2.optimization.strategies.tribes.TribesExplorer; import eva2.optimization.strategies.tribes.TribesParam; import eva2.optimization.strategies.tribes.TribesPosition; diff --git a/src/eva2/optimization/strategies/WingedMultiObjectiveEA.java b/src/eva2/optimization/strategies/WingedMultiObjectiveEA.java index edcdc56c..99c7d8df 100644 --- a/src/eva2/optimization/strategies/WingedMultiObjectiveEA.java +++ b/src/eva2/optimization/strategies/WingedMultiObjectiveEA.java @@ -7,9 +7,9 @@ import eva2.optimization.operator.moso.MOSOWeightedFitness; import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.Population; import eva2.optimization.population.SolutionSet; -import eva2.optimization.problems.AbstractMultiObjectiveOptimizationProblem; -import eva2.optimization.problems.FM0Problem; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.problems.FM0Problem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.util.annotation.Description; /** diff --git a/src/eva2/optimization/strategies/tribes/Tribe.java b/src/eva2/optimization/strategies/tribes/Tribe.java index 9253d730..a748de57 100644 --- a/src/eva2/optimization/strategies/tribes/Tribe.java +++ b/src/eva2/optimization/strategies/tribes/Tribe.java @@ -1,6 +1,6 @@ package eva2.optimization.strategies.tribes; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.optimization.strategies.Tribes; import eva2.tools.math.RNG; diff --git a/src/eva2/optimization/strategies/tribes/TribesExplorer.java b/src/eva2/optimization/strategies/tribes/TribesExplorer.java index 10252fa3..a9973f7a 100644 --- a/src/eva2/optimization/strategies/tribes/TribesExplorer.java +++ b/src/eva2/optimization/strategies/tribes/TribesExplorer.java @@ -3,7 +3,7 @@ package eva2.optimization.strategies.tribes; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceDataTypeDouble; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.optimization.strategies.Tribes; import eva2.tools.math.RNG; diff --git a/src/eva2/optimization/strategies/tribes/TribesSwarm.java b/src/eva2/optimization/strategies/tribes/TribesSwarm.java index 65cd15db..e70869f1 100644 --- a/src/eva2/optimization/strategies/tribes/TribesSwarm.java +++ b/src/eva2/optimization/strategies/tribes/TribesSwarm.java @@ -1,7 +1,7 @@ package eva2.optimization.strategies.tribes; import eva2.optimization.population.Population; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import eva2.optimization.strategies.Tribes; import eva2.tools.math.RNG; diff --git a/src/eva2/optimization/problems/AbstractDynTransProblem.java b/src/eva2/problems/AbstractDynTransProblem.java similarity index 96% rename from src/eva2/optimization/problems/AbstractDynTransProblem.java rename to src/eva2/problems/AbstractDynTransProblem.java index 3b77733a..b1d42f34 100644 --- a/src/eva2/optimization/problems/AbstractDynTransProblem.java +++ b/src/eva2/problems/AbstractDynTransProblem.java @@ -1,189 +1,189 @@ -package eva2.optimization.problems; - -import eva2.gui.plot.Plot; -import eva2.optimization.individuals.AbstractEAIndividual; -import eva2.optimization.individuals.InterfaceDataTypeDouble; -import eva2.optimization.population.Population; -import eva2.optimization.strategies.InterfaceOptimizer; - -import java.util.Random; - - -public abstract class AbstractDynTransProblem extends AbstractSynchronousOptimizationProblem { - - private static final long serialVersionUID = 2361612076300958044L; - - protected InterfaceOptimizationProblem prob; - protected AbstractEAIndividual bestIndividual = null; - - - /* for the random number generator, so that every solution is traceable */ - protected int seed = 1; - protected Random rand = new Random(seed); - protected int problemDimension; - protected double[][] range; - - public AbstractDynTransProblem() { - super(); - setProblem(new F1Problem()); - setFrequencyRelative(true); - } - - /** - * Returns the instance of the object. - * - * @return the problem instance of the object. - */ - protected AbstractOptimizationProblem getInstance() { - return this; - } - - /** - * Evaluate the function at the individuals position using an arbitrary translation which may be dynamically changing. - * - * @param individual the individual to be evaluated - * @param t timestamp of the evaluation - */ - @Override - public void evaluateAt(AbstractEAIndividual individual, double time) { - /* the fitness ist set by the evaluate function */ - AbstractEAIndividual tussy = (AbstractEAIndividual) individual.clone(); - transform(tussy, time); - getProblem().evaluate(tussy); - individual.setFitness(tussy.getFitness()); - } - - /** - * Override population evaluation to do some data output. - */ - @Override - public void evaluatePopulationEnd(Population population) { - double delta = transLength(getCurrentProblemTime()); - if (isExtraPlot() == true) { - if (myplot != null) { - // myplot.addGraph(0, 1); - myplot.jump(); - } else { - double[] tmpD = new double[2]; - tmpD[0] = 0; - tmpD[1] = 0; - // im not really certain about what tmpD is required for - this.myplot = new Plot("population measures", "x1", "x2", tmpD, tmpD); - } - myplot.setConnectedPoint(population.getFunctionCalls(), delta, 0); - //myplot.setUnconnectedPoint(population.getFunctionCalls(), population.getPopulationMeasures()[2], 2); - } else { - myplot = null; - } - } - - private double transLength(double time) { - double ret = 0.; - for (int i = 0; i < getProblemDimension(); i++) { - ret += Math.pow(getTranslation(i, time), 2.); - } - return Math.sqrt(ret); - } - - /** - * Returns the translation in the given dimension at the given time. - * - * @param dim the dimension - * @param time the simulation time - * @return the translation in the given dimension at the given time - */ - protected abstract double getTranslation(int dim, double time); - - protected void transform(AbstractEAIndividual individual, double time) { - double[] indyData = ((InterfaceDataTypeDouble) individual).getDoubleData(); - for (int i = 0; i < indyData.length; ++i) { - /* individuum moves towords untranslated problem */ - indyData[i] -= getTranslation(i, time); - } - ((InterfaceDataTypeDouble) individual).setDoubleGenotype(indyData); - } - - /* - * Initializes the underlying problem in the problem class - */ - @Override - public void initializeProblem() { - super.initializeProblem(); - bestIndividual = null; - getProblem().initializeProblem(); - } - - - /** - * Whenever the environment (or the time, primarily) has changed, some problem - * properties (like stored individual fitness) may require updating. - * - * @param severity the severity of the change (time measure) - */ - @Override - public void resetProblem(double severity) { - if ((prob != null) && (bestIndividual != null)) { - this.evaluateAt(bestIndividual, getCurrentProblemTime()); - } - } - - /* inits the population in the problem itself - * - */ - @Override - public void initPopulationAt(Population population, double time) { - getProblem().initializePopulation(population); - for (Object individuum : population) { - ((AbstractEAIndividual) individuum).setAge(0); - } - } - - public int getProblemDimension() { - return problemDimension; - } - - /** - * *************************************************************************** - * These are for the GUI - */ - @Override - public String getStringRepresentationForProblem(InterfaceOptimizer opt) { - return "DynTransProblem"; - } - - /** - * This is for the Scroll Box: - * in JParaPanel.java package eva2.gui - * in installActions() - * PropertyEditorManager.registerEditor(AbstractOptimizationProblem.class, GenericObjectEditor.class); - * don't forget the import statement - */ - public InterfaceOptimizationProblem getProblem() { - return prob; - } - - public void setProblem(InterfaceOptimizationProblem prob) { - this.prob = prob; - /* to get the right values for problemDimension and Range */ - Population pop = new Population(); - pop.setTargetSize(1); - prob.initializePopulation(pop); - AbstractEAIndividual indy = (AbstractEAIndividual) pop.get(0); - if (indy instanceof InterfaceDataTypeDouble) { - problemDimension = ((InterfaceDataTypeDouble) indy).getDoubleRange().length; - range = ((InterfaceDataTypeDouble) indy).getDoubleRange(); - } else { - System.out.println("Wrong Problem"); - } - pop.clear(); - } - - public int getSeed() { - return seed; - } - - public void setSeed(int seed) { - this.seed = seed; - this.rand = new Random(seed); - } -} +package eva2.problems; + +import eva2.gui.plot.Plot; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceDataTypeDouble; +import eva2.optimization.population.Population; +import eva2.optimization.strategies.InterfaceOptimizer; + +import java.util.Random; + + +public abstract class AbstractDynTransProblem extends AbstractSynchronousOptimizationProblem { + + private static final long serialVersionUID = 2361612076300958044L; + + protected InterfaceOptimizationProblem prob; + protected AbstractEAIndividual bestIndividual = null; + + + /* for the random number generator, so that every solution is traceable */ + protected int seed = 1; + protected Random rand = new Random(seed); + protected int problemDimension; + protected double[][] range; + + public AbstractDynTransProblem() { + super(); + setProblem(new F1Problem()); + setFrequencyRelative(true); + } + + /** + * Returns the instance of the object. + * + * @return the problem instance of the object. + */ + protected AbstractOptimizationProblem getInstance() { + return this; + } + + /** + * Evaluate the function at the individuals position using an arbitrary translation which may be dynamically changing. + * + * @param individual the individual to be evaluated + * @param t timestamp of the evaluation + */ + @Override + public void evaluateAt(AbstractEAIndividual individual, double time) { + /* the fitness ist set by the evaluate function */ + AbstractEAIndividual tussy = (AbstractEAIndividual) individual.clone(); + transform(tussy, time); + getProblem().evaluate(tussy); + individual.setFitness(tussy.getFitness()); + } + + /** + * Override population evaluation to do some data output. + */ + @Override + public void evaluatePopulationEnd(Population population) { + double delta = transLength(getCurrentProblemTime()); + if (isExtraPlot() == true) { + if (myplot != null) { + // myplot.addGraph(0, 1); + myplot.jump(); + } else { + double[] tmpD = new double[2]; + tmpD[0] = 0; + tmpD[1] = 0; + // im not really certain about what tmpD is required for + this.myplot = new Plot("population measures", "x1", "x2", tmpD, tmpD); + } + myplot.setConnectedPoint(population.getFunctionCalls(), delta, 0); + //myplot.setUnconnectedPoint(population.getFunctionCalls(), population.getPopulationMeasures()[2], 2); + } else { + myplot = null; + } + } + + private double transLength(double time) { + double ret = 0.; + for (int i = 0; i < getProblemDimension(); i++) { + ret += Math.pow(getTranslation(i, time), 2.); + } + return Math.sqrt(ret); + } + + /** + * Returns the translation in the given dimension at the given time. + * + * @param dim the dimension + * @param time the simulation time + * @return the translation in the given dimension at the given time + */ + protected abstract double getTranslation(int dim, double time); + + protected void transform(AbstractEAIndividual individual, double time) { + double[] indyData = ((InterfaceDataTypeDouble) individual).getDoubleData(); + for (int i = 0; i < indyData.length; ++i) { + /* individuum moves towords untranslated problem */ + indyData[i] -= getTranslation(i, time); + } + ((InterfaceDataTypeDouble) individual).setDoubleGenotype(indyData); + } + + /* + * Initializes the underlying problem in the problem class + */ + @Override + public void initializeProblem() { + super.initializeProblem(); + bestIndividual = null; + getProblem().initializeProblem(); + } + + + /** + * Whenever the environment (or the time, primarily) has changed, some problem + * properties (like stored individual fitness) may require updating. + * + * @param severity the severity of the change (time measure) + */ + @Override + public void resetProblem(double severity) { + if ((prob != null) && (bestIndividual != null)) { + this.evaluateAt(bestIndividual, getCurrentProblemTime()); + } + } + + /* inits the population in the problem itself + * + */ + @Override + public void initPopulationAt(Population population, double time) { + getProblem().initializePopulation(population); + for (Object individuum : population) { + ((AbstractEAIndividual) individuum).setAge(0); + } + } + + public int getProblemDimension() { + return problemDimension; + } + + /** + * *************************************************************************** + * These are for the GUI + */ + @Override + public String getStringRepresentationForProblem(InterfaceOptimizer opt) { + return "DynTransProblem"; + } + + /** + * This is for the Scroll Box: + * in JParaPanel.java package eva2.gui + * in installActions() + * PropertyEditorManager.registerEditor(AbstractOptimizationProblem.class, GenericObjectEditor.class); + * don't forget the import statement + */ + public InterfaceOptimizationProblem getProblem() { + return prob; + } + + public void setProblem(InterfaceOptimizationProblem prob) { + this.prob = prob; + /* to get the right values for problemDimension and Range */ + Population pop = new Population(); + pop.setTargetSize(1); + prob.initializePopulation(pop); + AbstractEAIndividual indy = (AbstractEAIndividual) pop.get(0); + if (indy instanceof InterfaceDataTypeDouble) { + problemDimension = ((InterfaceDataTypeDouble) indy).getDoubleRange().length; + range = ((InterfaceDataTypeDouble) indy).getDoubleRange(); + } else { + System.out.println("Wrong Problem"); + } + pop.clear(); + } + + public int getSeed() { + return seed; + } + + public void setSeed(int seed) { + this.seed = seed; + this.rand = new Random(seed); + } +} diff --git a/src/eva2/optimization/problems/AbstractDynamicOptimizationProblem.java b/src/eva2/problems/AbstractDynamicOptimizationProblem.java similarity index 99% rename from src/eva2/optimization/problems/AbstractDynamicOptimizationProblem.java rename to src/eva2/problems/AbstractDynamicOptimizationProblem.java index 49e38572..2d9c7b4d 100644 --- a/src/eva2/optimization/problems/AbstractDynamicOptimizationProblem.java +++ b/src/eva2/problems/AbstractDynamicOptimizationProblem.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.gui.plot.Plot; import eva2.optimization.individuals.AbstractEAIndividual; diff --git a/src/eva2/optimization/problems/AbstractMultiModalProblemKnown.java b/src/eva2/problems/AbstractMultiModalProblemKnown.java similarity index 99% rename from src/eva2/optimization/problems/AbstractMultiModalProblemKnown.java rename to src/eva2/problems/AbstractMultiModalProblemKnown.java index 89edf25d..291fbcb3 100644 --- a/src/eva2/optimization/problems/AbstractMultiModalProblemKnown.java +++ b/src/eva2/problems/AbstractMultiModalProblemKnown.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.ESIndividualDoubleData; diff --git a/src/eva2/optimization/problems/AbstractMultiObjectiveOptimizationProblem.java b/src/eva2/problems/AbstractMultiObjectiveOptimizationProblem.java similarity index 98% rename from src/eva2/optimization/problems/AbstractMultiObjectiveOptimizationProblem.java rename to src/eva2/problems/AbstractMultiObjectiveOptimizationProblem.java index 2f3d80da..424bec1f 100644 --- a/src/eva2/optimization/problems/AbstractMultiObjectiveOptimizationProblem.java +++ b/src/eva2/problems/AbstractMultiObjectiveOptimizationProblem.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.gui.plot.GraphPointSet; import eva2.gui.plot.Plot; @@ -560,7 +560,7 @@ public abstract class AbstractMultiObjectiveOptimizationProblem extends Abstract /* * (non-Javadoc) - * @see eva2.optimization.problems.AbstractOptimizationProblem#getAdditionalDataInfo(eva2.optimization.PopulationInterface) + * @see eva2.problems.AbstractOptimizationProblem#getAdditionalDataInfo(eva2.optimization.PopulationInterface) */ @Override public String[] getAdditionalDataInfo() { @@ -571,7 +571,7 @@ public abstract class AbstractMultiObjectiveOptimizationProblem extends Abstract /* * (non-Javadoc) - * @see eva2.optimization.problems.InterfaceOptimizationProblem#getStringRepresentationForProblem(eva2.optimization.strategies.InterfaceOptimizer) + * @see eva2.problems.InterfaceOptimizationProblem#getStringRepresentationForProblem(eva2.optimization.strategies.InterfaceOptimizer) */ @Override public String getStringRepresentationForProblem(InterfaceOptimizer opt) { diff --git a/src/eva2/optimization/problems/AbstractOptimizationProblem.java b/src/eva2/problems/AbstractOptimizationProblem.java similarity index 99% rename from src/eva2/optimization/problems/AbstractOptimizationProblem.java rename to src/eva2/problems/AbstractOptimizationProblem.java index 8fa65dd5..04ad8d65 100644 --- a/src/eva2/optimization/problems/AbstractOptimizationProblem.java +++ b/src/eva2/problems/AbstractOptimizationProblem.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.optimization.enums.PostProcessMethod; import eva2.optimization.individuals.AbstractEAIndividual; diff --git a/src/eva2/optimization/problems/AbstractParallelOptimizationProblem.java b/src/eva2/problems/AbstractParallelOptimizationProblem.java similarity index 97% rename from src/eva2/optimization/problems/AbstractParallelOptimizationProblem.java rename to src/eva2/problems/AbstractParallelOptimizationProblem.java index df42d439..28f22262 100644 --- a/src/eva2/optimization/problems/AbstractParallelOptimizationProblem.java +++ b/src/eva2/problems/AbstractParallelOptimizationProblem.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; /** * This class is under construction. diff --git a/src/eva2/optimization/problems/AbstractProblemBinary.java b/src/eva2/problems/AbstractProblemBinary.java similarity index 99% rename from src/eva2/optimization/problems/AbstractProblemBinary.java rename to src/eva2/problems/AbstractProblemBinary.java index 8765d518..1196e572 100644 --- a/src/eva2/optimization/problems/AbstractProblemBinary.java +++ b/src/eva2/problems/AbstractProblemBinary.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.GAIndividualBinaryData; diff --git a/src/eva2/optimization/problems/AbstractProblemDouble.java b/src/eva2/problems/AbstractProblemDouble.java similarity index 99% rename from src/eva2/optimization/problems/AbstractProblemDouble.java rename to src/eva2/problems/AbstractProblemDouble.java index cbd5265f..d3c104c5 100644 --- a/src/eva2/optimization/problems/AbstractProblemDouble.java +++ b/src/eva2/problems/AbstractProblemDouble.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.gui.editor.GenericObjectEditor; import eva2.gui.plot.TopoPlot; diff --git a/src/eva2/optimization/problems/AbstractProblemDoubleOffset.java b/src/eva2/problems/AbstractProblemDoubleOffset.java similarity index 98% rename from src/eva2/optimization/problems/AbstractProblemDoubleOffset.java rename to src/eva2/problems/AbstractProblemDoubleOffset.java index 8031dc16..a9f28158 100644 --- a/src/eva2/optimization/problems/AbstractProblemDoubleOffset.java +++ b/src/eva2/problems/AbstractProblemDoubleOffset.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; /** * diff --git a/src/eva2/optimization/problems/AbstractProblemInteger.java b/src/eva2/problems/AbstractProblemInteger.java similarity index 99% rename from src/eva2/optimization/problems/AbstractProblemInteger.java rename to src/eva2/problems/AbstractProblemInteger.java index b2394de5..7eb5695a 100644 --- a/src/eva2/optimization/problems/AbstractProblemInteger.java +++ b/src/eva2/problems/AbstractProblemInteger.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.GIIndividualIntegerData; diff --git a/src/eva2/optimization/problems/AbstractSynchronousOptimizationProblem.java b/src/eva2/problems/AbstractSynchronousOptimizationProblem.java similarity index 99% rename from src/eva2/optimization/problems/AbstractSynchronousOptimizationProblem.java rename to src/eva2/problems/AbstractSynchronousOptimizationProblem.java index dd12a89c..1e0ef2a6 100644 --- a/src/eva2/optimization/problems/AbstractSynchronousOptimizationProblem.java +++ b/src/eva2/problems/AbstractSynchronousOptimizationProblem.java @@ -1,7 +1,7 @@ /** * */ -package eva2.optimization.problems; +package eva2.problems; import eva2.optimization.population.Population; diff --git a/src/eva2/optimization/problems/B1Problem.java b/src/eva2/problems/B1Problem.java similarity index 99% rename from src/eva2/optimization/problems/B1Problem.java rename to src/eva2/problems/B1Problem.java index 62a22ab7..a616cc86 100644 --- a/src/eva2/optimization/problems/B1Problem.java +++ b/src/eva2/problems/B1Problem.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.optimization.individuals.AbstractEAIndividual; diff --git a/src/eva2/optimization/problems/BKnapsackProblem.java b/src/eva2/problems/BKnapsackProblem.java similarity index 99% rename from src/eva2/optimization/problems/BKnapsackProblem.java rename to src/eva2/problems/BKnapsackProblem.java index 2b3db71b..251bf8fd 100644 --- a/src/eva2/optimization/problems/BKnapsackProblem.java +++ b/src/eva2/problems/BKnapsackProblem.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.optimization.individuals.AbstractEAIndividual; diff --git a/src/eva2/optimization/problems/ConstrHimmelblauProblem.java b/src/eva2/problems/ConstrHimmelblauProblem.java similarity index 98% rename from src/eva2/optimization/problems/ConstrHimmelblauProblem.java rename to src/eva2/problems/ConstrHimmelblauProblem.java index 5cec83a1..a9981742 100644 --- a/src/eva2/optimization/problems/ConstrHimmelblauProblem.java +++ b/src/eva2/problems/ConstrHimmelblauProblem.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.optimization.operator.constraint.AbstractConstraint; import eva2.optimization.operator.constraint.ConstraintCollection; diff --git a/src/eva2/optimization/problems/ConstrPressureVessel.java b/src/eva2/problems/ConstrPressureVessel.java similarity index 99% rename from src/eva2/optimization/problems/ConstrPressureVessel.java rename to src/eva2/problems/ConstrPressureVessel.java index ada77853..d4f988ef 100644 --- a/src/eva2/optimization/problems/ConstrPressureVessel.java +++ b/src/eva2/problems/ConstrPressureVessel.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.gui.editor.GenericObjectEditor; import eva2.optimization.individuals.AbstractEAIndividual; diff --git a/src/eva2/optimization/problems/DynJumpProblem.java b/src/eva2/problems/DynJumpProblem.java similarity index 100% rename from src/eva2/optimization/problems/DynJumpProblem.java rename to src/eva2/problems/DynJumpProblem.java diff --git a/src/eva2/optimization/problems/ERPStarter.java b/src/eva2/problems/ERPStarter.java similarity index 99% rename from src/eva2/optimization/problems/ERPStarter.java rename to src/eva2/problems/ERPStarter.java index a2701888..71041d9c 100644 --- a/src/eva2/optimization/problems/ERPStarter.java +++ b/src/eva2/problems/ERPStarter.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.OptimizerFactory; import eva2.OptimizerRunnable; diff --git a/src/eva2/optimization/problems/ExternalRuntimeProblem.java b/src/eva2/problems/ExternalRuntimeProblem.java similarity index 96% rename from src/eva2/optimization/problems/ExternalRuntimeProblem.java rename to src/eva2/problems/ExternalRuntimeProblem.java index 218742a0..a79a3605 100644 --- a/src/eva2/optimization/problems/ExternalRuntimeProblem.java +++ b/src/eva2/problems/ExternalRuntimeProblem.java @@ -1,506 +1,506 @@ -package eva2.optimization.problems; - -import eva2.gui.BeanInspector; -import eva2.gui.PropertyDoubleArray; -import eva2.optimization.individuals.AbstractEAIndividual; -import eva2.optimization.individuals.ESIndividualDoubleData; -import eva2.optimization.individuals.InterfaceDataTypeDouble; -import eva2.optimization.operator.moso.InterfaceMOSOConverter; -import eva2.optimization.operator.moso.MOSONoConvert; -import eva2.optimization.population.Population; -import eva2.optimization.strategies.InterfaceOptimizer; -import eva2.tools.math.Mathematics; -import eva2.util.annotation.Description; - -import java.io.*; -import java.util.ArrayList; -import java.util.List; - -/** - * Use an external command as target function. - */ -@Description("Use an external command as target function.") -public class ExternalRuntimeProblem extends AbstractOptimizationProblem - implements Interface2DBorderProblem, InterfaceProblemDouble, InterfaceHasInitRange { - - protected AbstractEAIndividual bestIndividuum = null; - protected int problemDimension = 10; - protected String command = ""; - protected String workingDir = ""; - PropertyDoubleArray range = new PropertyDoubleArray(problemDimension, 2, -10, 10); - PropertyDoubleArray initializationRange = new PropertyDoubleArray(problemDimension, 2, -10, 10); - private String additionalArg = ""; - protected InterfaceMOSOConverter mosoConverter = new MOSONoConvert(); - - // Private Subclass to redirect Streams within an extra Thread to avoid dead - // locks - private static class MonitorInputStreamThread extends Thread { - private Reader reader; - private Writer writer; - - public MonitorInputStreamThread(InputStream in) { - reader = new InputStreamReader(new BufferedInputStream(in)); - writer = new OutputStreamWriter(System.err); - setDaemon(true); - } - - @Override - public void run() { - try { - int c; - while ((c = reader.read()) != -1) { - writer.write(c); - writer.flush(); - } -// System.out.println("monitor-thread finished!"); - } catch (IOException ioe) { - System.err.println("IOException in MonitorInputStreamThread/ExternalRuntimeProblem: " + ioe.getMessage()); - ioe.printStackTrace(System.err); - } finally { - try { - reader.close(); - writer.close(); - } catch (IOException e) { - System.err.println("IOException in MonitorInputStreamThread/ExternalRuntimeProblem: " + e.getMessage()); - e.printStackTrace(); - } - } - } - } - - public ExternalRuntimeProblem() { - this.template = new ESIndividualDoubleData(); - ((ESIndividualDoubleData) this.template).setDoubleDataLength(problemDimension); - ((ESIndividualDoubleData) this.template).setDoubleRange(makeRange()); - } - - public ExternalRuntimeProblem(ExternalRuntimeProblem b) { - //AbstractOptimizationProblem - if (b.template != null) { - this.template = (AbstractEAIndividual) ((AbstractEAIndividual) b.template).clone(); - } - //ExternalRuntimeProblem - if (b.bestIndividuum != null) { - this.bestIndividuum = (AbstractEAIndividual) ((AbstractEAIndividual) b.bestIndividuum).clone(); - } - this.problemDimension = b.problemDimension; - this.command = b.command; - if (b.range != null) { - this.range = (PropertyDoubleArray) b.range.clone(); - } else { - this.range = null; - } - if (b.initializationRange != null) { - this.initializationRange = (PropertyDoubleArray) b.initializationRange.clone(); - } else { - this.initializationRange = null; - } - if (b.mosoConverter != null) { - this.mosoConverter = (InterfaceMOSOConverter) b.mosoConverter.clone(); - } else { - this.mosoConverter = null; - } - this.workingDir = b.workingDir; - } - - /** - * This method returns a deep clone of the problem. - * - * @return the clone - */ - @Override - public Object clone() { - return (Object) new ExternalRuntimeProblem(this); - } - - /** - * This method inits the Problem to log multiruns - */ - @Override - public void initializeProblem() { - this.bestIndividuum = null; - File f = new File(command); - if (f.exists()) { - command = f.getAbsolutePath(); - } else { - String sep = System.getProperty("file.separator"); - if (workingDir.endsWith(sep)) { - f = new File(workingDir + command); - } else { - f = new File(workingDir + sep + command); - } - if (f.exists()) { - command = f.getAbsolutePath(); - } else { - System.err.println("Warning, " + this.getClass() + " could not find command " + command + " in " + workingDir); - } - } - } - - /** - * This method inits a given population - * - * @param population The populations that is to be inited - */ - @Override - public void initializePopulation(Population population) { - this.bestIndividuum = null; - - ((InterfaceDataTypeDouble) this.template).setDoubleDataLength(this.problemDimension); - ((InterfaceDataTypeDouble) this.template).setDoubleRange(makeRange()); - - AbstractOptimizationProblem.defaultInitPopulation(population, template, this); - } - - @Override - public double[][] makeRange() { - if (range == null) { - System.err.println("Warning, range not set in ExternalRuntimeProblem.makeRange!"); - } - if (range.getNumRows() != getProblemDimension()) { - System.err.println("Warning, problem dimension and range dimension dont match in ExternalRuntimeProblem.makeRange!"); - } - return range.getDoubleArrayShallow().clone(); - } - - public void setRange(double[][] range) { - PropertyDoubleArray pRange = new PropertyDoubleArray(range); - this.setRange(pRange); - } - - /** - * Set the internal problem range to the given array. - * - * @param range - */ - public void setRange(PropertyDoubleArray range) { - if (range.getNumRows() < this.problemDimension) { - System.err.println("Warning, expected range of dimension " + problemDimension + " in setRange!"); - } - this.range.setDoubleArray(range.getDoubleArrayShallow()); - } - - public PropertyDoubleArray getRange() { - return range; - } - - public String rangeTipText() { - return "The domain bounds for the problem"; - } - - @Override - public double getRangeLowerBound(int dim) { - return range.getValue(dim, 0); - } - - @Override - public double getRangeUpperBound(int dim) { - return range.getValue(dim, 1); - } - - - /** - * This method evaluate a single individual and sets the fitness values - * - * @param individual The individual that is to be evaluatated - */ - @Override - public void evaluate(AbstractEAIndividual individual) { - double[] x; -// double[] fitness; - - x = getXVector(individual); - - double[] fit = evaluate(x); - individual.setFitness(fit); - - if ((this.bestIndividuum == null) || (this.bestIndividuum.getFitness(0) > individual.getFitness(0))) { - this.bestIndividuum = (AbstractEAIndividual) individual.clone(); - } - } - - @Override - public void evaluatePopulationEnd(Population population) { - super.evaluatePopulationEnd(population); - if (mosoConverter != null) { - mosoConverter.convertMultiObjective2SingleObjective(population); - } - } - - protected double[] getXVector(AbstractEAIndividual individual) { - double[] x; - x = new double[((InterfaceDataTypeDouble) individual).getDoubleData().length]; - System.arraycopy(((InterfaceDataTypeDouble) individual).getDoubleData(), 0, x, 0, x.length); - return x; - } - - public static List runProcess(String[] parameters, String workingDir) { - List params = new ArrayList(parameters.length); - for (String str : parameters) { - params.add(str); - } - return runProcess(params, workingDir); - } - - /** - * Parse the output values of a process by line and by whitespace characters and some others - * returning a string list. - * - * @param parameters - * @param workingDir - * @return - */ - public static List runProcess(List parameters, String workingDir) { - String colSepRegExp = "[\\s;:|]"; // \s for whitespaces, double quoting necessary! - Process process; - ProcessBuilder pb; - List results = new ArrayList(); - try { - pb = new ProcessBuilder(parameters); - pb.directory(new File(workingDir)); - process = pb.start(); - BufferedReader br = new BufferedReader(new InputStreamReader(process.getInputStream())); - Thread thread = new MonitorInputStreamThread(process.getErrorStream());//grab the Error Stream - thread.start(); - String line; - while ((line = br.readLine()) != null) { - line = line.trim(); - String[] parts = line.split(colSepRegExp); - for (String str : parts) { - results.add(str); - } -// results.add(line); - } - br.close(); - } catch (IOException e) { - String msg = "IO Error when calling external command! Invalid command for ExternalRuntimeProblem?"; - System.err.println(msg); - e.printStackTrace(); - throw new RuntimeException(msg); - } - return results; - } - - @Override - public double[] evaluate(double[] x) { - if (x == null) { - throw new RuntimeException("Error, x=null value received in ExternalRuntimeProblem.evaluate"); - } - ArrayList fitList = new ArrayList(); - - List parameters = new ArrayList(); - parameters.add(this.command); - if (additionalArg != null && (additionalArg.length() > 0)) { - parameters.add(additionalArg); - } - for (int i = 0; i < this.problemDimension; i++) { - String p = prepareParameter(x, i); - parameters.add(p); - } - - List res = runProcess(parameters, workingDir); - try { - for (String str : res) { - fitList.add(new Double(str)); - } - } catch (NumberFormatException e) { - System.err.println("Error: " + command + " delivered malformatted output for " + BeanInspector.toString(x)); - e.printStackTrace(); - } - double[] fit = new double[fitList.size()]; - for (int i = 0; i < fit.length; i++) { - fit[i] = fitList.get(i); - } - return fit; - } - - /** - * How to prepare a given parameter within a double array to present it - * to the external program. - * - * @param x - * @param i - * @return - */ - protected String prepareParameter(double[] x, int i) { - return new String("" + x[i]); - } - - /** - * This method returns a string describing the optimization problem. - * - * @param opt The Optimizer that is used or had been used. - * @return The description. - */ - @Override - public String getStringRepresentationForProblem(InterfaceOptimizer opt) { - StringBuffer sb = new StringBuffer(200); - sb.append("External Runtime Problem:\n"); - sb.append("Here the individual codes a vector of real number x is to be minimized on a user given external problem.\nParameters:\n"); - sb.append("Dimension : "); - sb.append(this.problemDimension); - - return sb.toString(); - } - - /** - * This method allows the CommonJavaObjectEditorPanel to read the - * name to the current object. - * - * @return The name. - */ - @Override - public String getName() { - return "External Runtime Problem"; - } - - public String[] getGOEPropertyUpdateLinks() { - return new String[]{"problemDimension", "initialRange", "problemDimension", "range"}; - } - - /** - * Length of the x vector that is to be optimized. Be sure to keep - * the ranges fit in length. - * - * @param t Length of the x vector that is to be optimized - */ - public void setProblemDimension(int t) { - this.problemDimension = t; - this.range.adaptRowCount(t); - this.initializationRange.adaptRowCount(t); - } - - @Override - public int getProblemDimension() { - return this.problemDimension; - } - - public String problemDimensionTipText() { - return "Domain dimension of the problem"; - } - - /** - * Length of the x vector at is to be optimized - * - * @param t Length of the x vector at is to be optimized - */ - public void setCommand(String t) { - this.command = t; - } - - public String getCommand() { - return this.command; - } - - public String commandTipText() { - return "External command to be called for evaluation"; - } - - /** - * Working dir of the external runtime - * - * @param t working directory - */ - public void setWorkingDirectory(String t) { - this.workingDir = t; - } - - public String getWorkingDirectory() { - return this.workingDir; - } - - public String workingDirectoryTipText() { - return "The working directory"; - } - - public InterfaceMOSOConverter getMosoConverter() { - return mosoConverter; - } - - public void setMosoConverter(InterfaceMOSOConverter mMosoConverter) { - mosoConverter = mMosoConverter; - } - - public String mosoConverterTipText() { - return "Possible conversion of multi-objective fitness to single objective fitness."; - } - - /** - * This method allows you to choose the EA individual - * - * @param indy The EAIndividual type - */ - public void setEAIndividual(InterfaceDataTypeDouble indy) { - this.template = (AbstractEAIndividual) indy; - } - - @Override - public InterfaceDataTypeDouble getEAIndividual() { - return (InterfaceDataTypeDouble) this.template; - } - - @Override - public double functionValue(double[] point) { - return evaluate(project2DPoint(point))[0]; - } - - @Override - public double[] project2DPoint(double[] point) { - return Mathematics.expandVector(point, getProblemDimension(), 0.); - } - - @Override - public double[][] get2DBorder() { - return getRange().getDoubleArrayShallow(); - } - - public String additionalArgumentTipText() { - return "Optionally define an additional (first) argument for the command line command."; - } - - public String getAdditionalArgument() { - return additionalArg; - } - - public void setAdditionalArgument(String additionalArg) { - this.additionalArg = additionalArg; - } - - // @Override - @Override - public Object getInitRange() { - if (initializationRange == null) { - if (range == null) { - System.err.println("Warning, neither range nor initRange has been set in ExternalRuntimeProblem!"); - } - return range.getDoubleArrayShallow(); - } else { - return initializationRange.getDoubleArrayShallow(); - } - } - - public void setInitialRange(double[][] range) { - PropertyDoubleArray pRange = new PropertyDoubleArray(range); - this.setInitialRange(pRange); - } - - public void setInitialRange(PropertyDoubleArray range) { - if (range.getNumRows() < this.problemDimension) { - System.err.println("Warning, expected range of dimension " + problemDimension + " in setInitRange!"); - } - initializationRange = new PropertyDoubleArray(range); - } - - public PropertyDoubleArray getInitialRange() { - return initializationRange; - } - - public String initialRangeTipText() { - return "Initialization range for the problem"; - } - - public String[] customPropertyOrder() { - return new String[]{"workingDirectory", "command", "additionalArgument", "problemDimension", "initialRange", "range"}; - } - -} +package eva2.problems; + +import eva2.gui.BeanInspector; +import eva2.gui.PropertyDoubleArray; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.ESIndividualDoubleData; +import eva2.optimization.individuals.InterfaceDataTypeDouble; +import eva2.optimization.operator.moso.InterfaceMOSOConverter; +import eva2.optimization.operator.moso.MOSONoConvert; +import eva2.optimization.population.Population; +import eva2.optimization.strategies.InterfaceOptimizer; +import eva2.tools.math.Mathematics; +import eva2.util.annotation.Description; + +import java.io.*; +import java.util.ArrayList; +import java.util.List; + +/** + * Use an external command as target function. + */ +@Description("Use an external command as target function.") +public class ExternalRuntimeProblem extends AbstractOptimizationProblem + implements Interface2DBorderProblem, InterfaceProblemDouble, InterfaceHasInitRange { + + protected AbstractEAIndividual bestIndividuum = null; + protected int problemDimension = 10; + protected String command = ""; + protected String workingDir = ""; + PropertyDoubleArray range = new PropertyDoubleArray(problemDimension, 2, -10, 10); + PropertyDoubleArray initializationRange = new PropertyDoubleArray(problemDimension, 2, -10, 10); + private String additionalArg = ""; + protected InterfaceMOSOConverter mosoConverter = new MOSONoConvert(); + + // Private Subclass to redirect Streams within an extra Thread to avoid dead + // locks + private static class MonitorInputStreamThread extends Thread { + private Reader reader; + private Writer writer; + + public MonitorInputStreamThread(InputStream in) { + reader = new InputStreamReader(new BufferedInputStream(in)); + writer = new OutputStreamWriter(System.err); + setDaemon(true); + } + + @Override + public void run() { + try { + int c; + while ((c = reader.read()) != -1) { + writer.write(c); + writer.flush(); + } +// System.out.println("monitor-thread finished!"); + } catch (IOException ioe) { + System.err.println("IOException in MonitorInputStreamThread/ExternalRuntimeProblem: " + ioe.getMessage()); + ioe.printStackTrace(System.err); + } finally { + try { + reader.close(); + writer.close(); + } catch (IOException e) { + System.err.println("IOException in MonitorInputStreamThread/ExternalRuntimeProblem: " + e.getMessage()); + e.printStackTrace(); + } + } + } + } + + public ExternalRuntimeProblem() { + this.template = new ESIndividualDoubleData(); + ((ESIndividualDoubleData) this.template).setDoubleDataLength(problemDimension); + ((ESIndividualDoubleData) this.template).setDoubleRange(makeRange()); + } + + public ExternalRuntimeProblem(ExternalRuntimeProblem b) { + //AbstractOptimizationProblem + if (b.template != null) { + this.template = (AbstractEAIndividual) ((AbstractEAIndividual) b.template).clone(); + } + //ExternalRuntimeProblem + if (b.bestIndividuum != null) { + this.bestIndividuum = (AbstractEAIndividual) ((AbstractEAIndividual) b.bestIndividuum).clone(); + } + this.problemDimension = b.problemDimension; + this.command = b.command; + if (b.range != null) { + this.range = (PropertyDoubleArray) b.range.clone(); + } else { + this.range = null; + } + if (b.initializationRange != null) { + this.initializationRange = (PropertyDoubleArray) b.initializationRange.clone(); + } else { + this.initializationRange = null; + } + if (b.mosoConverter != null) { + this.mosoConverter = (InterfaceMOSOConverter) b.mosoConverter.clone(); + } else { + this.mosoConverter = null; + } + this.workingDir = b.workingDir; + } + + /** + * This method returns a deep clone of the problem. + * + * @return the clone + */ + @Override + public Object clone() { + return (Object) new ExternalRuntimeProblem(this); + } + + /** + * This method inits the Problem to log multiruns + */ + @Override + public void initializeProblem() { + this.bestIndividuum = null; + File f = new File(command); + if (f.exists()) { + command = f.getAbsolutePath(); + } else { + String sep = System.getProperty("file.separator"); + if (workingDir.endsWith(sep)) { + f = new File(workingDir + command); + } else { + f = new File(workingDir + sep + command); + } + if (f.exists()) { + command = f.getAbsolutePath(); + } else { + System.err.println("Warning, " + this.getClass() + " could not find command " + command + " in " + workingDir); + } + } + } + + /** + * This method inits a given population + * + * @param population The populations that is to be inited + */ + @Override + public void initializePopulation(Population population) { + this.bestIndividuum = null; + + ((InterfaceDataTypeDouble) this.template).setDoubleDataLength(this.problemDimension); + ((InterfaceDataTypeDouble) this.template).setDoubleRange(makeRange()); + + AbstractOptimizationProblem.defaultInitPopulation(population, template, this); + } + + @Override + public double[][] makeRange() { + if (range == null) { + System.err.println("Warning, range not set in ExternalRuntimeProblem.makeRange!"); + } + if (range.getNumRows() != getProblemDimension()) { + System.err.println("Warning, problem dimension and range dimension dont match in ExternalRuntimeProblem.makeRange!"); + } + return range.getDoubleArrayShallow().clone(); + } + + public void setRange(double[][] range) { + PropertyDoubleArray pRange = new PropertyDoubleArray(range); + this.setRange(pRange); + } + + /** + * Set the internal problem range to the given array. + * + * @param range + */ + public void setRange(PropertyDoubleArray range) { + if (range.getNumRows() < this.problemDimension) { + System.err.println("Warning, expected range of dimension " + problemDimension + " in setRange!"); + } + this.range.setDoubleArray(range.getDoubleArrayShallow()); + } + + public PropertyDoubleArray getRange() { + return range; + } + + public String rangeTipText() { + return "The domain bounds for the problem"; + } + + @Override + public double getRangeLowerBound(int dim) { + return range.getValue(dim, 0); + } + + @Override + public double getRangeUpperBound(int dim) { + return range.getValue(dim, 1); + } + + + /** + * This method evaluate a single individual and sets the fitness values + * + * @param individual The individual that is to be evaluatated + */ + @Override + public void evaluate(AbstractEAIndividual individual) { + double[] x; +// double[] fitness; + + x = getXVector(individual); + + double[] fit = evaluate(x); + individual.setFitness(fit); + + if ((this.bestIndividuum == null) || (this.bestIndividuum.getFitness(0) > individual.getFitness(0))) { + this.bestIndividuum = (AbstractEAIndividual) individual.clone(); + } + } + + @Override + public void evaluatePopulationEnd(Population population) { + super.evaluatePopulationEnd(population); + if (mosoConverter != null) { + mosoConverter.convertMultiObjective2SingleObjective(population); + } + } + + protected double[] getXVector(AbstractEAIndividual individual) { + double[] x; + x = new double[((InterfaceDataTypeDouble) individual).getDoubleData().length]; + System.arraycopy(((InterfaceDataTypeDouble) individual).getDoubleData(), 0, x, 0, x.length); + return x; + } + + public static List runProcess(String[] parameters, String workingDir) { + List params = new ArrayList(parameters.length); + for (String str : parameters) { + params.add(str); + } + return runProcess(params, workingDir); + } + + /** + * Parse the output values of a process by line and by whitespace characters and some others + * returning a string list. + * + * @param parameters + * @param workingDir + * @return + */ + public static List runProcess(List parameters, String workingDir) { + String colSepRegExp = "[\\s;:|]"; // \s for whitespaces, double quoting necessary! + Process process; + ProcessBuilder pb; + List results = new ArrayList(); + try { + pb = new ProcessBuilder(parameters); + pb.directory(new File(workingDir)); + process = pb.start(); + BufferedReader br = new BufferedReader(new InputStreamReader(process.getInputStream())); + Thread thread = new MonitorInputStreamThread(process.getErrorStream());//grab the Error Stream + thread.start(); + String line; + while ((line = br.readLine()) != null) { + line = line.trim(); + String[] parts = line.split(colSepRegExp); + for (String str : parts) { + results.add(str); + } +// results.add(line); + } + br.close(); + } catch (IOException e) { + String msg = "IO Error when calling external command! Invalid command for ExternalRuntimeProblem?"; + System.err.println(msg); + e.printStackTrace(); + throw new RuntimeException(msg); + } + return results; + } + + @Override + public double[] evaluate(double[] x) { + if (x == null) { + throw new RuntimeException("Error, x=null value received in ExternalRuntimeProblem.evaluate"); + } + ArrayList fitList = new ArrayList(); + + List parameters = new ArrayList(); + parameters.add(this.command); + if (additionalArg != null && (additionalArg.length() > 0)) { + parameters.add(additionalArg); + } + for (int i = 0; i < this.problemDimension; i++) { + String p = prepareParameter(x, i); + parameters.add(p); + } + + List res = runProcess(parameters, workingDir); + try { + for (String str : res) { + fitList.add(new Double(str)); + } + } catch (NumberFormatException e) { + System.err.println("Error: " + command + " delivered malformatted output for " + BeanInspector.toString(x)); + e.printStackTrace(); + } + double[] fit = new double[fitList.size()]; + for (int i = 0; i < fit.length; i++) { + fit[i] = fitList.get(i); + } + return fit; + } + + /** + * How to prepare a given parameter within a double array to present it + * to the external program. + * + * @param x + * @param i + * @return + */ + protected String prepareParameter(double[] x, int i) { + return new String("" + x[i]); + } + + /** + * This method returns a string describing the optimization problem. + * + * @param opt The Optimizer that is used or had been used. + * @return The description. + */ + @Override + public String getStringRepresentationForProblem(InterfaceOptimizer opt) { + StringBuffer sb = new StringBuffer(200); + sb.append("External Runtime Problem:\n"); + sb.append("Here the individual codes a vector of real number x is to be minimized on a user given external problem.\nParameters:\n"); + sb.append("Dimension : "); + sb.append(this.problemDimension); + + return sb.toString(); + } + + /** + * This method allows the CommonJavaObjectEditorPanel to read the + * name to the current object. + * + * @return The name. + */ + @Override + public String getName() { + return "External Runtime Problem"; + } + + public String[] getGOEPropertyUpdateLinks() { + return new String[]{"problemDimension", "initialRange", "problemDimension", "range"}; + } + + /** + * Length of the x vector that is to be optimized. Be sure to keep + * the ranges fit in length. + * + * @param t Length of the x vector that is to be optimized + */ + public void setProblemDimension(int t) { + this.problemDimension = t; + this.range.adaptRowCount(t); + this.initializationRange.adaptRowCount(t); + } + + @Override + public int getProblemDimension() { + return this.problemDimension; + } + + public String problemDimensionTipText() { + return "Domain dimension of the problem"; + } + + /** + * Length of the x vector at is to be optimized + * + * @param t Length of the x vector at is to be optimized + */ + public void setCommand(String t) { + this.command = t; + } + + public String getCommand() { + return this.command; + } + + public String commandTipText() { + return "External command to be called for evaluation"; + } + + /** + * Working dir of the external runtime + * + * @param t working directory + */ + public void setWorkingDirectory(String t) { + this.workingDir = t; + } + + public String getWorkingDirectory() { + return this.workingDir; + } + + public String workingDirectoryTipText() { + return "The working directory"; + } + + public InterfaceMOSOConverter getMosoConverter() { + return mosoConverter; + } + + public void setMosoConverter(InterfaceMOSOConverter mMosoConverter) { + mosoConverter = mMosoConverter; + } + + public String mosoConverterTipText() { + return "Possible conversion of multi-objective fitness to single objective fitness."; + } + + /** + * This method allows you to choose the EA individual + * + * @param indy The EAIndividual type + */ + public void setEAIndividual(InterfaceDataTypeDouble indy) { + this.template = (AbstractEAIndividual) indy; + } + + @Override + public InterfaceDataTypeDouble getEAIndividual() { + return (InterfaceDataTypeDouble) this.template; + } + + @Override + public double functionValue(double[] point) { + return evaluate(project2DPoint(point))[0]; + } + + @Override + public double[] project2DPoint(double[] point) { + return Mathematics.expandVector(point, getProblemDimension(), 0.); + } + + @Override + public double[][] get2DBorder() { + return getRange().getDoubleArrayShallow(); + } + + public String additionalArgumentTipText() { + return "Optionally define an additional (first) argument for the command line command."; + } + + public String getAdditionalArgument() { + return additionalArg; + } + + public void setAdditionalArgument(String additionalArg) { + this.additionalArg = additionalArg; + } + + // @Override + @Override + public Object getInitRange() { + if (initializationRange == null) { + if (range == null) { + System.err.println("Warning, neither range nor initRange has been set in ExternalRuntimeProblem!"); + } + return range.getDoubleArrayShallow(); + } else { + return initializationRange.getDoubleArrayShallow(); + } + } + + public void setInitialRange(double[][] range) { + PropertyDoubleArray pRange = new PropertyDoubleArray(range); + this.setInitialRange(pRange); + } + + public void setInitialRange(PropertyDoubleArray range) { + if (range.getNumRows() < this.problemDimension) { + System.err.println("Warning, expected range of dimension " + problemDimension + " in setInitRange!"); + } + initializationRange = new PropertyDoubleArray(range); + } + + public PropertyDoubleArray getInitialRange() { + return initializationRange; + } + + public String initialRangeTipText() { + return "Initialization range for the problem"; + } + + public String[] customPropertyOrder() { + return new String[]{"workingDirectory", "command", "additionalArgument", "problemDimension", "initialRange", "range"}; + } + +} diff --git a/src/eva2/optimization/problems/F10Problem.java b/src/eva2/problems/F10Problem.java similarity index 99% rename from src/eva2/optimization/problems/F10Problem.java rename to src/eva2/problems/F10Problem.java index 5bee6c4b..0d1e4a23 100644 --- a/src/eva2/optimization/problems/F10Problem.java +++ b/src/eva2/problems/F10Problem.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.optimization.individuals.ESIndividualDoubleData; import eva2.util.annotation.Description; diff --git a/src/eva2/optimization/problems/F11Problem.java b/src/eva2/problems/F11Problem.java similarity index 98% rename from src/eva2/optimization/problems/F11Problem.java rename to src/eva2/problems/F11Problem.java index 83c12c5a..55f3064e 100644 --- a/src/eva2/optimization/problems/F11Problem.java +++ b/src/eva2/problems/F11Problem.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.optimization.individuals.ESIndividualDoubleData; import eva2.util.annotation.Description; diff --git a/src/eva2/optimization/problems/F12Problem.java b/src/eva2/problems/F12Problem.java similarity index 98% rename from src/eva2/optimization/problems/F12Problem.java rename to src/eva2/problems/F12Problem.java index 789d70f9..13327ad6 100644 --- a/src/eva2/optimization/problems/F12Problem.java +++ b/src/eva2/problems/F12Problem.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.util.annotation.Description; diff --git a/src/eva2/optimization/problems/F13Problem.java b/src/eva2/problems/F13Problem.java similarity index 99% rename from src/eva2/optimization/problems/F13Problem.java rename to src/eva2/problems/F13Problem.java index 1d7c4478..f9963cf9 100644 --- a/src/eva2/optimization/problems/F13Problem.java +++ b/src/eva2/problems/F13Problem.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.gui.editor.GenericObjectEditor; import eva2.optimization.individuals.ESIndividualDoubleData; diff --git a/src/eva2/optimization/problems/F14Problem.java b/src/eva2/problems/F14Problem.java similarity index 98% rename from src/eva2/optimization/problems/F14Problem.java rename to src/eva2/problems/F14Problem.java index d975638f..b40b8404 100644 --- a/src/eva2/optimization/problems/F14Problem.java +++ b/src/eva2/problems/F14Problem.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.optimization.individuals.ESIndividualDoubleData; import eva2.util.annotation.Description; diff --git a/src/eva2/optimization/problems/F15Problem.java b/src/eva2/problems/F15Problem.java similarity index 98% rename from src/eva2/optimization/problems/F15Problem.java rename to src/eva2/problems/F15Problem.java index 7b42452e..1df168e1 100644 --- a/src/eva2/optimization/problems/F15Problem.java +++ b/src/eva2/problems/F15Problem.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.optimization.operator.postprocess.SolutionHistogram; import eva2.util.annotation.Description; diff --git a/src/eva2/optimization/problems/F16Problem.java b/src/eva2/problems/F16Problem.java similarity index 98% rename from src/eva2/optimization/problems/F16Problem.java rename to src/eva2/problems/F16Problem.java index 893eb94e..3d211f04 100644 --- a/src/eva2/optimization/problems/F16Problem.java +++ b/src/eva2/problems/F16Problem.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.optimization.operator.postprocess.SolutionHistogram; import eva2.util.annotation.Description; diff --git a/src/eva2/optimization/problems/F17Problem.java b/src/eva2/problems/F17Problem.java similarity index 98% rename from src/eva2/optimization/problems/F17Problem.java rename to src/eva2/problems/F17Problem.java index 7c92030c..a395813c 100644 --- a/src/eva2/optimization/problems/F17Problem.java +++ b/src/eva2/problems/F17Problem.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.optimization.operator.postprocess.SolutionHistogram; import eva2.util.annotation.Description; diff --git a/src/eva2/optimization/problems/F18Problem.java b/src/eva2/problems/F18Problem.java similarity index 97% rename from src/eva2/optimization/problems/F18Problem.java rename to src/eva2/problems/F18Problem.java index b2c933b6..0cb7fb34 100644 --- a/src/eva2/optimization/problems/F18Problem.java +++ b/src/eva2/problems/F18Problem.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.util.annotation.Description; diff --git a/src/eva2/optimization/problems/F19Problem.java b/src/eva2/problems/F19Problem.java similarity index 99% rename from src/eva2/optimization/problems/F19Problem.java rename to src/eva2/problems/F19Problem.java index 77371c8e..7b6a9cf9 100644 --- a/src/eva2/optimization/problems/F19Problem.java +++ b/src/eva2/problems/F19Problem.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.optimization.operator.postprocess.SolutionHistogram; import eva2.tools.math.RNG; diff --git a/src/eva2/optimization/problems/F1Problem.java b/src/eva2/problems/F1Problem.java similarity index 99% rename from src/eva2/optimization/problems/F1Problem.java rename to src/eva2/problems/F1Problem.java index 391f44e7..1583ced2 100644 --- a/src/eva2/optimization/problems/F1Problem.java +++ b/src/eva2/problems/F1Problem.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.optimization.strategies.InterfaceOptimizer; import eva2.tools.math.Mathematics; diff --git a/src/eva2/optimization/problems/F20Problem.java b/src/eva2/problems/F20Problem.java similarity index 99% rename from src/eva2/optimization/problems/F20Problem.java rename to src/eva2/problems/F20Problem.java index 2c22ea16..8e810687 100644 --- a/src/eva2/optimization/problems/F20Problem.java +++ b/src/eva2/problems/F20Problem.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.optimization.operator.postprocess.SolutionHistogram; import eva2.util.annotation.Description; diff --git a/src/eva2/optimization/problems/F21Problem.java b/src/eva2/problems/F21Problem.java similarity index 93% rename from src/eva2/optimization/problems/F21Problem.java rename to src/eva2/problems/F21Problem.java index 99d3bd19..190f5657 100644 --- a/src/eva2/optimization/problems/F21Problem.java +++ b/src/eva2/problems/F21Problem.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.optimization.operator.postprocess.SolutionHistogram; import eva2.util.annotation.Description; @@ -91,7 +91,7 @@ public class F21Problem extends AbstractProblemDouble implements InterfaceMultim /* * (non-Javadoc) - * @see eva2.optimization.problems.AbstractOptimizationProblem#clone() + * @see eva2.problems.AbstractOptimizationProblem#clone() */ @Override public Object clone() { @@ -100,7 +100,7 @@ public class F21Problem extends AbstractProblemDouble implements InterfaceMultim /* * (non-Javadoc) - * @see eva2.optimization.problems.InterfaceInterestingHistogram#getHistogram() + * @see eva2.problems.InterfaceInterestingHistogram#getHistogram() */ @Override public SolutionHistogram getHistogram() { diff --git a/src/eva2/optimization/problems/F2Problem.java b/src/eva2/problems/F2Problem.java similarity index 99% rename from src/eva2/optimization/problems/F2Problem.java rename to src/eva2/problems/F2Problem.java index 57ce8498..6cf6df87 100644 --- a/src/eva2/optimization/problems/F2Problem.java +++ b/src/eva2/problems/F2Problem.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.optimization.individuals.ESIndividualDoubleData; import eva2.optimization.population.Population; diff --git a/src/eva2/optimization/problems/F3Problem.java b/src/eva2/problems/F3Problem.java similarity index 98% rename from src/eva2/optimization/problems/F3Problem.java rename to src/eva2/problems/F3Problem.java index ae877333..dc77822c 100644 --- a/src/eva2/optimization/problems/F3Problem.java +++ b/src/eva2/problems/F3Problem.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.optimization.individuals.ESIndividualDoubleData; import eva2.util.annotation.Description; diff --git a/src/eva2/optimization/problems/F4Problem.java b/src/eva2/problems/F4Problem.java similarity index 98% rename from src/eva2/optimization/problems/F4Problem.java rename to src/eva2/problems/F4Problem.java index 3b7d7950..51f4fee9 100644 --- a/src/eva2/optimization/problems/F4Problem.java +++ b/src/eva2/problems/F4Problem.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.util.annotation.Description; diff --git a/src/eva2/optimization/problems/F5Problem.java b/src/eva2/problems/F5Problem.java similarity index 98% rename from src/eva2/optimization/problems/F5Problem.java rename to src/eva2/problems/F5Problem.java index ff10262d..24a93879 100644 --- a/src/eva2/optimization/problems/F5Problem.java +++ b/src/eva2/problems/F5Problem.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.util.annotation.Description; diff --git a/src/eva2/optimization/problems/F6Problem.java b/src/eva2/problems/F6Problem.java similarity index 99% rename from src/eva2/optimization/problems/F6Problem.java rename to src/eva2/problems/F6Problem.java index 0d0050e2..e399d52f 100644 --- a/src/eva2/optimization/problems/F6Problem.java +++ b/src/eva2/problems/F6Problem.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.optimization.individuals.ESIndividualDoubleData; import eva2.optimization.operator.postprocess.SolutionHistogram; diff --git a/src/eva2/optimization/problems/F7Problem.java b/src/eva2/problems/F7Problem.java similarity index 99% rename from src/eva2/optimization/problems/F7Problem.java rename to src/eva2/problems/F7Problem.java index fe6903c3..bdb9d172 100644 --- a/src/eva2/optimization/problems/F7Problem.java +++ b/src/eva2/problems/F7Problem.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.ESIndividualDoubleData; diff --git a/src/eva2/optimization/problems/F8Problem.java b/src/eva2/problems/F8Problem.java similarity index 99% rename from src/eva2/optimization/problems/F8Problem.java rename to src/eva2/problems/F8Problem.java index 49ea3382..ffc60888 100644 --- a/src/eva2/optimization/problems/F8Problem.java +++ b/src/eva2/problems/F8Problem.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.operator.distancemetric.EuclideanMetric; diff --git a/src/eva2/optimization/problems/F9Problem.java b/src/eva2/problems/F9Problem.java similarity index 98% rename from src/eva2/optimization/problems/F9Problem.java rename to src/eva2/problems/F9Problem.java index 7e0594bc..1fbc900c 100644 --- a/src/eva2/optimization/problems/F9Problem.java +++ b/src/eva2/problems/F9Problem.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.optimization.individuals.ESIndividualDoubleData; import eva2.util.annotation.Description; diff --git a/src/eva2/optimization/problems/FLensProblem.java b/src/eva2/problems/FLensProblem.java similarity index 99% rename from src/eva2/optimization/problems/FLensProblem.java rename to src/eva2/problems/FLensProblem.java index f4dad671..a5497c11 100644 --- a/src/eva2/optimization/problems/FLensProblem.java +++ b/src/eva2/problems/FLensProblem.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.optimization.go.StandaloneOptimization; @@ -616,7 +616,7 @@ public class FLensProblem extends AbstractOptimizationProblem /* * (non-Javadoc) - * @see eva2.optimization.problems.InterfaceHasSolutionViewer#getSolutionViewer() + * @see eva2.problems.InterfaceHasSolutionViewer#getSolutionViewer() */ @Override public InterfaceSolutionViewer getSolutionViewer() { diff --git a/src/eva2/optimization/problems/FM0Problem.java b/src/eva2/problems/FM0Problem.java similarity index 98% rename from src/eva2/optimization/problems/FM0Problem.java rename to src/eva2/problems/FM0Problem.java index ed040826..45857843 100644 --- a/src/eva2/optimization/problems/FM0Problem.java +++ b/src/eva2/problems/FM0Problem.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.optimization.individuals.ESIndividualDoubleData; import eva2.util.annotation.Description; diff --git a/src/eva2/optimization/problems/GPFunctionProblem.java b/src/eva2/problems/GPFunctionProblem.java similarity index 99% rename from src/eva2/optimization/problems/GPFunctionProblem.java rename to src/eva2/problems/GPFunctionProblem.java index 73727ce7..9463f835 100644 --- a/src/eva2/optimization/problems/GPFunctionProblem.java +++ b/src/eva2/problems/GPFunctionProblem.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.optimization.individuals.ESIndividualDoubleData; import eva2.optimization.individuals.codings.gp.GPArea; diff --git a/src/eva2/optimization/problems/I1Problem.java b/src/eva2/problems/I1Problem.java similarity index 98% rename from src/eva2/optimization/problems/I1Problem.java rename to src/eva2/problems/I1Problem.java index 0c4e29ea..1b1bc235 100644 --- a/src/eva2/optimization/problems/I1Problem.java +++ b/src/eva2/problems/I1Problem.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.optimization.strategies.InterfaceOptimizer; diff --git a/src/eva2/optimization/problems/Interface2DBorderProblem.java b/src/eva2/problems/Interface2DBorderProblem.java similarity index 96% rename from src/eva2/optimization/problems/Interface2DBorderProblem.java rename to src/eva2/problems/Interface2DBorderProblem.java index 559a2d68..8191dcbc 100644 --- a/src/eva2/optimization/problems/Interface2DBorderProblem.java +++ b/src/eva2/problems/Interface2DBorderProblem.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; /** * An interface refactored from InterfaceMultiModalProblem, having only methods used for diff --git a/src/eva2/optimization/problems/InterfaceAdditionalPopulationInformer.java b/src/eva2/problems/InterfaceAdditionalPopulationInformer.java similarity index 96% rename from src/eva2/optimization/problems/InterfaceAdditionalPopulationInformer.java rename to src/eva2/problems/InterfaceAdditionalPopulationInformer.java index cee60d85..965c820a 100644 --- a/src/eva2/optimization/problems/InterfaceAdditionalPopulationInformer.java +++ b/src/eva2/problems/InterfaceAdditionalPopulationInformer.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.optimization.population.PopulationInterface; diff --git a/src/eva2/optimization/problems/InterfaceFirstOrderDerivableProblem.java b/src/eva2/problems/InterfaceFirstOrderDerivableProblem.java similarity index 94% rename from src/eva2/optimization/problems/InterfaceFirstOrderDerivableProblem.java rename to src/eva2/problems/InterfaceFirstOrderDerivableProblem.java index 66d39a17..468a94ad 100644 --- a/src/eva2/optimization/problems/InterfaceFirstOrderDerivableProblem.java +++ b/src/eva2/problems/InterfaceFirstOrderDerivableProblem.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; /** * An interface for first-order derivable problems which can be used for gradient descent. diff --git a/src/eva2/optimization/problems/InterfaceHasInitRange.java b/src/eva2/problems/InterfaceHasInitRange.java similarity index 95% rename from src/eva2/optimization/problems/InterfaceHasInitRange.java rename to src/eva2/problems/InterfaceHasInitRange.java index 6afd88ee..eb345983 100644 --- a/src/eva2/optimization/problems/InterfaceHasInitRange.java +++ b/src/eva2/problems/InterfaceHasInitRange.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; /** * An interface for optimization problems having an extra initial range diff --git a/src/eva2/optimization/problems/InterfaceHasSolutionViewer.java b/src/eva2/problems/InterfaceHasSolutionViewer.java similarity index 84% rename from src/eva2/optimization/problems/InterfaceHasSolutionViewer.java rename to src/eva2/problems/InterfaceHasSolutionViewer.java index 35f3d001..2433a4d9 100644 --- a/src/eva2/optimization/problems/InterfaceHasSolutionViewer.java +++ b/src/eva2/problems/InterfaceHasSolutionViewer.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; /** * An interface for problems which have a specific viewer. diff --git a/src/eva2/optimization/problems/InterfaceInterestingHistogram.java b/src/eva2/problems/InterfaceInterestingHistogram.java similarity index 92% rename from src/eva2/optimization/problems/InterfaceInterestingHistogram.java rename to src/eva2/problems/InterfaceInterestingHistogram.java index d56bdfd9..a929ce04 100644 --- a/src/eva2/optimization/problems/InterfaceInterestingHistogram.java +++ b/src/eva2/problems/InterfaceInterestingHistogram.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.optimization.operator.postprocess.SolutionHistogram; diff --git a/src/eva2/optimization/problems/InterfaceLocalSearchable.java b/src/eva2/problems/InterfaceLocalSearchable.java similarity index 93% rename from src/eva2/optimization/problems/InterfaceLocalSearchable.java rename to src/eva2/problems/InterfaceLocalSearchable.java index adb3897d..eeca5fdd 100644 --- a/src/eva2/optimization/problems/InterfaceLocalSearchable.java +++ b/src/eva2/problems/InterfaceLocalSearchable.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.optimization.population.Population; diff --git a/src/eva2/optimization/problems/InterfaceMultiObjectiveDeNovoProblem.java b/src/eva2/problems/InterfaceMultiObjectiveDeNovoProblem.java similarity index 97% rename from src/eva2/optimization/problems/InterfaceMultiObjectiveDeNovoProblem.java rename to src/eva2/problems/InterfaceMultiObjectiveDeNovoProblem.java index 5e57d5be..cc5a61ae 100644 --- a/src/eva2/optimization/problems/InterfaceMultiObjectiveDeNovoProblem.java +++ b/src/eva2/problems/InterfaceMultiObjectiveDeNovoProblem.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.optimization.mocco.paretofrontviewer.InterfaceParetoFrontView; import eva2.optimization.mocco.paretofrontviewer.MOCCOViewer; diff --git a/src/eva2/optimization/problems/InterfaceMultimodalProblem.java b/src/eva2/problems/InterfaceMultimodalProblem.java similarity index 81% rename from src/eva2/optimization/problems/InterfaceMultimodalProblem.java rename to src/eva2/problems/InterfaceMultimodalProblem.java index 59ca7679..6782de65 100644 --- a/src/eva2/optimization/problems/InterfaceMultimodalProblem.java +++ b/src/eva2/problems/InterfaceMultimodalProblem.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; /** * An interface to tag possibly multimodal problems, but without diff --git a/src/eva2/optimization/problems/InterfaceMultimodalProblemKnown.java b/src/eva2/problems/InterfaceMultimodalProblemKnown.java similarity index 97% rename from src/eva2/optimization/problems/InterfaceMultimodalProblemKnown.java rename to src/eva2/problems/InterfaceMultimodalProblemKnown.java index 128f60be..f0837c0b 100644 --- a/src/eva2/optimization/problems/InterfaceMultimodalProblemKnown.java +++ b/src/eva2/problems/InterfaceMultimodalProblemKnown.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.optimization.population.Population; diff --git a/src/eva2/optimization/problems/InterfaceOptimizationObjective.java b/src/eva2/problems/InterfaceOptimizationObjective.java similarity index 97% rename from src/eva2/optimization/problems/InterfaceOptimizationObjective.java rename to src/eva2/problems/InterfaceOptimizationObjective.java index 697d354f..210ec2b4 100644 --- a/src/eva2/optimization/problems/InterfaceOptimizationObjective.java +++ b/src/eva2/problems/InterfaceOptimizationObjective.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/optimization/problems/InterfaceOptimizationProblem.java b/src/eva2/problems/InterfaceOptimizationProblem.java similarity index 98% rename from src/eva2/optimization/problems/InterfaceOptimizationProblem.java rename to src/eva2/problems/InterfaceOptimizationProblem.java index bd950365..cfc73d07 100644 --- a/src/eva2/optimization/problems/InterfaceOptimizationProblem.java +++ b/src/eva2/problems/InterfaceOptimizationProblem.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.population.Population; diff --git a/src/eva2/optimization/problems/InterfaceOptimizationTarget.java b/src/eva2/problems/InterfaceOptimizationTarget.java similarity index 87% rename from src/eva2/optimization/problems/InterfaceOptimizationTarget.java rename to src/eva2/problems/InterfaceOptimizationTarget.java index 7206ded4..d23632c0 100644 --- a/src/eva2/optimization/problems/InterfaceOptimizationTarget.java +++ b/src/eva2/problems/InterfaceOptimizationTarget.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; /** * diff --git a/src/eva2/optimization/problems/InterfaceProblemDouble.java b/src/eva2/problems/InterfaceProblemDouble.java similarity index 97% rename from src/eva2/optimization/problems/InterfaceProblemDouble.java rename to src/eva2/problems/InterfaceProblemDouble.java index 01469477..cb3f43f3 100644 --- a/src/eva2/optimization/problems/InterfaceProblemDouble.java +++ b/src/eva2/problems/InterfaceProblemDouble.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.optimization.individuals.InterfaceDataTypeDouble; diff --git a/src/eva2/optimization/problems/InterfaceProgramProblem.java b/src/eva2/problems/InterfaceProgramProblem.java similarity index 96% rename from src/eva2/optimization/problems/InterfaceProgramProblem.java rename to src/eva2/problems/InterfaceProgramProblem.java index a33c3a4f..edb10f43 100644 --- a/src/eva2/optimization/problems/InterfaceProgramProblem.java +++ b/src/eva2/problems/InterfaceProgramProblem.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.optimization.individuals.codings.gp.GPArea; diff --git a/src/eva2/optimization/problems/InterfaceSolutionViewer.java b/src/eva2/problems/InterfaceSolutionViewer.java similarity index 94% rename from src/eva2/optimization/problems/InterfaceSolutionViewer.java rename to src/eva2/problems/InterfaceSolutionViewer.java index dd3d6128..c5439634 100644 --- a/src/eva2/optimization/problems/InterfaceSolutionViewer.java +++ b/src/eva2/problems/InterfaceSolutionViewer.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.optimization.population.Population; diff --git a/src/eva2/optimization/problems/MatlabEvalMediator.java b/src/eva2/problems/MatlabEvalMediator.java similarity index 99% rename from src/eva2/optimization/problems/MatlabEvalMediator.java rename to src/eva2/problems/MatlabEvalMediator.java index bc4cc5ab..5e3c80ab 100644 --- a/src/eva2/optimization/problems/MatlabEvalMediator.java +++ b/src/eva2/problems/MatlabEvalMediator.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.gui.BeanInspector; diff --git a/src/eva2/optimization/problems/MatlabProblem.java b/src/eva2/problems/MatlabProblem.java similarity index 99% rename from src/eva2/optimization/problems/MatlabProblem.java rename to src/eva2/problems/MatlabProblem.java index 3e2c3d95..447945fd 100644 --- a/src/eva2/optimization/problems/MatlabProblem.java +++ b/src/eva2/problems/MatlabProblem.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.OptimizerFactory; import eva2.OptimizerRunnable; diff --git a/src/eva2/optimization/problems/MatlabProblemDataTypeEnum.java b/src/eva2/problems/MatlabProblemDataTypeEnum.java similarity index 67% rename from src/eva2/optimization/problems/MatlabProblemDataTypeEnum.java rename to src/eva2/problems/MatlabProblemDataTypeEnum.java index 3de5b044..08678a24 100644 --- a/src/eva2/optimization/problems/MatlabProblemDataTypeEnum.java +++ b/src/eva2/problems/MatlabProblemDataTypeEnum.java @@ -1,5 +1,5 @@ -package eva2.optimization.problems; - -public enum MatlabProblemDataTypeEnum { - typeDouble, typeBinary, typeInteger; -} +package eva2.problems; + +public enum MatlabProblemDataTypeEnum { + typeDouble, typeBinary, typeInteger; +} diff --git a/src/eva2/optimization/problems/PSymbolicRegression.java b/src/eva2/problems/PSymbolicRegression.java similarity index 99% rename from src/eva2/optimization/problems/PSymbolicRegression.java rename to src/eva2/problems/PSymbolicRegression.java index b19765f4..d950e895 100644 --- a/src/eva2/optimization/problems/PSymbolicRegression.java +++ b/src/eva2/problems/PSymbolicRegression.java @@ -1,12 +1,12 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.gui.plot.Plot; import eva2.optimization.individuals.*; import eva2.optimization.individuals.codings.gp.*; import eva2.optimization.population.Population; import eva2.optimization.population.PopulationInterface; -import eva2.optimization.problems.regression.InterfaceRegressionFunction; -import eva2.optimization.problems.regression.RFKoza_GPI_7_3; +import eva2.problems.regression.InterfaceRegressionFunction; +import eva2.problems.regression.RFKoza_GPI_7_3; import eva2.optimization.strategies.InterfaceOptimizer; import eva2.tools.EVAERROR; import eva2.tools.ToolBox; diff --git a/src/eva2/optimization/problems/SimpleProblemWrapper.java b/src/eva2/problems/SimpleProblemWrapper.java similarity index 97% rename from src/eva2/optimization/problems/SimpleProblemWrapper.java rename to src/eva2/problems/SimpleProblemWrapper.java index a8bd903a..90936aa6 100644 --- a/src/eva2/optimization/problems/SimpleProblemWrapper.java +++ b/src/eva2/problems/SimpleProblemWrapper.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.gui.BeanInspector; import eva2.gui.editor.GenericObjectEditor; @@ -8,10 +8,10 @@ import eva2.optimization.population.Population; import eva2.optimization.strategies.InterfaceOptimizer; import eva2.tools.math.RNG; import eva2.util.annotation.Description; -import simpleprobs.InterfaceSimpleProblem; -import simpleprobs.SimpleF1; -import simpleprobs.SimpleProblemBinary; -import simpleprobs.SimpleProblemDouble; +import eva2.problems.simple.InterfaceSimpleProblem; +import eva2.problems.simple.SimpleF1; +import eva2.problems.simple.SimpleProblemBinary; +import eva2.problems.simple.SimpleProblemDouble; import java.util.BitSet; diff --git a/src/eva2/optimization/problems/TF1Problem.java b/src/eva2/problems/TF1Problem.java similarity index 99% rename from src/eva2/optimization/problems/TF1Problem.java rename to src/eva2/problems/TF1Problem.java index 4539db7b..da334a3c 100644 --- a/src/eva2/optimization/problems/TF1Problem.java +++ b/src/eva2/problems/TF1Problem.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.gui.PropertyFilePath; import eva2.gui.plot.Plot; diff --git a/src/eva2/optimization/problems/WaitForEvARunnable.java b/src/eva2/problems/WaitForEvARunnable.java similarity index 98% rename from src/eva2/optimization/problems/WaitForEvARunnable.java rename to src/eva2/problems/WaitForEvARunnable.java index 937f10ca..7b3aba82 100644 --- a/src/eva2/optimization/problems/WaitForEvARunnable.java +++ b/src/eva2/problems/WaitForEvARunnable.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems; +package eva2.problems; import eva2.OptimizerRunnable; import eva2.gui.BeanInspector; diff --git a/src/eva2/problems/package-info.java b/src/eva2/problems/package-info.java new file mode 100644 index 00000000..238a611c --- /dev/null +++ b/src/eva2/problems/package-info.java @@ -0,0 +1 @@ +package eva2.problems; \ No newline at end of file diff --git a/src/eva2/optimization/problems/regression/InterfaceRegressionFunction.java b/src/eva2/problems/regression/InterfaceRegressionFunction.java similarity index 91% rename from src/eva2/optimization/problems/regression/InterfaceRegressionFunction.java rename to src/eva2/problems/regression/InterfaceRegressionFunction.java index 410074bd..2089a8a7 100644 --- a/src/eva2/optimization/problems/regression/InterfaceRegressionFunction.java +++ b/src/eva2/problems/regression/InterfaceRegressionFunction.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems.regression; +package eva2.problems.regression; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/optimization/problems/regression/RFKoza_GPI_10_1.java b/src/eva2/problems/regression/RFKoza_GPI_10_1.java similarity index 96% rename from src/eva2/optimization/problems/regression/RFKoza_GPI_10_1.java rename to src/eva2/problems/regression/RFKoza_GPI_10_1.java index e4b2eef7..646a3467 100644 --- a/src/eva2/optimization/problems/regression/RFKoza_GPI_10_1.java +++ b/src/eva2/problems/regression/RFKoza_GPI_10_1.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems.regression; +package eva2.problems.regression; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/optimization/problems/regression/RFKoza_GPI_10_2.java b/src/eva2/problems/regression/RFKoza_GPI_10_2.java similarity index 96% rename from src/eva2/optimization/problems/regression/RFKoza_GPI_10_2.java rename to src/eva2/problems/regression/RFKoza_GPI_10_2.java index a9675558..c09813cb 100644 --- a/src/eva2/optimization/problems/regression/RFKoza_GPI_10_2.java +++ b/src/eva2/problems/regression/RFKoza_GPI_10_2.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems.regression; +package eva2.problems.regression; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/optimization/problems/regression/RFKoza_GPI_7_3.java b/src/eva2/problems/regression/RFKoza_GPI_7_3.java similarity index 96% rename from src/eva2/optimization/problems/regression/RFKoza_GPI_7_3.java rename to src/eva2/problems/regression/RFKoza_GPI_7_3.java index a1ecb1f0..50e980d9 100644 --- a/src/eva2/optimization/problems/regression/RFKoza_GPI_7_3.java +++ b/src/eva2/problems/regression/RFKoza_GPI_7_3.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems.regression; +package eva2.problems.regression; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/optimization/problems/regression/RFKoza_GPI_7_3_extended.java b/src/eva2/problems/regression/RFKoza_GPI_7_3_extended.java similarity index 97% rename from src/eva2/optimization/problems/regression/RFKoza_GPI_7_3_extended.java rename to src/eva2/problems/regression/RFKoza_GPI_7_3_extended.java index 6f6a3c88..b7b7da48 100644 --- a/src/eva2/optimization/problems/regression/RFKoza_GPI_7_3_extended.java +++ b/src/eva2/problems/regression/RFKoza_GPI_7_3_extended.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems.regression; +package eva2.problems.regression; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/optimization/problems/regression/RFRaidl_F1.java b/src/eva2/problems/regression/RFRaidl_F1.java similarity index 96% rename from src/eva2/optimization/problems/regression/RFRaidl_F1.java rename to src/eva2/problems/regression/RFRaidl_F1.java index b2f77808..c58f1145 100644 --- a/src/eva2/optimization/problems/regression/RFRaidl_F1.java +++ b/src/eva2/problems/regression/RFRaidl_F1.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems.regression; +package eva2.problems.regression; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/optimization/problems/regression/RFRaidl_F2.java b/src/eva2/problems/regression/RFRaidl_F2.java similarity index 96% rename from src/eva2/optimization/problems/regression/RFRaidl_F2.java rename to src/eva2/problems/regression/RFRaidl_F2.java index 83f8d5e2..1a7b86e4 100644 --- a/src/eva2/optimization/problems/regression/RFRaidl_F2.java +++ b/src/eva2/problems/regression/RFRaidl_F2.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems.regression; +package eva2.problems.regression; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/optimization/problems/regression/RFRaidl_F3.java b/src/eva2/problems/regression/RFRaidl_F3.java similarity index 96% rename from src/eva2/optimization/problems/regression/RFRaidl_F3.java rename to src/eva2/problems/regression/RFRaidl_F3.java index 26af6926..b1b2bf3d 100644 --- a/src/eva2/optimization/problems/regression/RFRaidl_F3.java +++ b/src/eva2/problems/regression/RFRaidl_F3.java @@ -1,4 +1,4 @@ -package eva2.optimization.problems.regression; +package eva2.problems.regression; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/problems/regression/package-info.java b/src/eva2/problems/regression/package-info.java new file mode 100644 index 00000000..fb4fd86f --- /dev/null +++ b/src/eva2/problems/regression/package-info.java @@ -0,0 +1 @@ +package eva2.problems.regression; diff --git a/src/simpleprobs/InterfaceSimpleProblem.java b/src/eva2/problems/simple/InterfaceSimpleProblem.java similarity index 94% rename from src/simpleprobs/InterfaceSimpleProblem.java rename to src/eva2/problems/simple/InterfaceSimpleProblem.java index 8f1c7bdb..f901396c 100644 --- a/src/simpleprobs/InterfaceSimpleProblem.java +++ b/src/eva2/problems/simple/InterfaceSimpleProblem.java @@ -1,10 +1,8 @@ -package simpleprobs; +package eva2.problems.simple; /** * A simple interface to easily include new optimization problems in Java into the * EvA framework. - * - * @author mkron */ public interface InterfaceSimpleProblem { diff --git a/src/simpleprobs/SimpleB1.java b/src/eva2/problems/simple/SimpleB1.java similarity index 95% rename from src/simpleprobs/SimpleB1.java rename to src/eva2/problems/simple/SimpleB1.java index 11900e7d..4f8f6fb4 100644 --- a/src/simpleprobs/SimpleB1.java +++ b/src/eva2/problems/simple/SimpleB1.java @@ -1,4 +1,4 @@ -package simpleprobs; +package eva2.problems.simple; import java.util.BitSet; diff --git a/src/simpleprobs/SimpleF1.java b/src/eva2/problems/simple/SimpleF1.java similarity index 96% rename from src/simpleprobs/SimpleF1.java rename to src/eva2/problems/simple/SimpleF1.java index e8806e33..f0dd555d 100644 --- a/src/simpleprobs/SimpleF1.java +++ b/src/eva2/problems/simple/SimpleF1.java @@ -1,4 +1,4 @@ -package simpleprobs; +package eva2.problems.simple; public class SimpleF1 extends SimpleProblemDouble { diff --git a/src/simpleprobs/SimpleProblemBinary.java b/src/eva2/problems/simple/SimpleProblemBinary.java similarity index 90% rename from src/simpleprobs/SimpleProblemBinary.java rename to src/eva2/problems/simple/SimpleProblemBinary.java index 9df41bdb..9bccb8ad 100644 --- a/src/simpleprobs/SimpleProblemBinary.java +++ b/src/eva2/problems/simple/SimpleProblemBinary.java @@ -1,4 +1,4 @@ -package simpleprobs; +package eva2.problems.simple; import java.io.Serializable; import java.util.BitSet; diff --git a/src/simpleprobs/SimpleProblemDouble.java b/src/eva2/problems/simple/SimpleProblemDouble.java similarity index 90% rename from src/simpleprobs/SimpleProblemDouble.java rename to src/eva2/problems/simple/SimpleProblemDouble.java index c9d60dbb..65ee7fe4 100644 --- a/src/simpleprobs/SimpleProblemDouble.java +++ b/src/eva2/problems/simple/SimpleProblemDouble.java @@ -1,4 +1,4 @@ -package simpleprobs; +package eva2.problems.simple; import java.io.Serializable; diff --git a/src/eva2/problems/simple/package-info.java b/src/eva2/problems/simple/package-info.java new file mode 100644 index 00000000..a4285c0c --- /dev/null +++ b/src/eva2/problems/simple/package-info.java @@ -0,0 +1 @@ +package eva2.problems.simple; \ No newline at end of file diff --git a/src/eva2/tools/ReflectPackage.java b/src/eva2/tools/ReflectPackage.java index 1bf07e20..ac2ba42d 100644 --- a/src/eva2/tools/ReflectPackage.java +++ b/src/eva2/tools/ReflectPackage.java @@ -428,7 +428,7 @@ public class ReflectPackage { /** * Retrieve assignable classes of the given package from classpath given by full class and package String, - * such as eva2.optimization.problems.AbstractOptimizationProblem. + * such as eva2.problems.AbstractOptimizationProblem. * * @param pckg String denoting the package * @param reqSuperCls diff --git a/src/eva2/tools/chart2d/Chart2DDPointContentSelectable.java b/src/eva2/tools/chart2d/Chart2DDPointContentSelectable.java index d0afd6ef..d4540932 100644 --- a/src/eva2/tools/chart2d/Chart2DDPointContentSelectable.java +++ b/src/eva2/tools/chart2d/Chart2DDPointContentSelectable.java @@ -5,7 +5,7 @@ import eva2.gui.InterfaceSelectablePointIcon; import eva2.gui.plot.InterfaceDPointWithContent; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.mocco.paretofrontviewer.InterfaceRefSolutionListener; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import javax.swing.*; import java.awt.*; diff --git a/src/eva2/tools/chart2d/Chart2DDPointIconContent.java b/src/eva2/tools/chart2d/Chart2DDPointIconContent.java index 9333c012..a30ea84b 100644 --- a/src/eva2/tools/chart2d/Chart2DDPointIconContent.java +++ b/src/eva2/tools/chart2d/Chart2DDPointIconContent.java @@ -3,7 +3,7 @@ package eva2.tools.chart2d; import eva2.gui.plot.InterfaceDPointWithContent; import eva2.optimization.individuals.AbstractEAIndividual; -import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.problems.InterfaceOptimizationProblem; import javax.swing.*; import java.awt.*; diff --git a/src/eva2/tools/math/StatisticUtils.java b/src/eva2/tools/math/StatisticUtils.java index 90201fcd..619057db 100644 --- a/src/eva2/tools/math/StatisticUtils.java +++ b/src/eva2/tools/math/StatisticUtils.java @@ -1,6 +1,6 @@ package eva2.tools.math; -import eva2.optimization.problems.AbstractProblemDouble; +import eva2.problems.AbstractProblemDouble; import eva2.tools.math.Jama.Matrix; import java.util.ArrayList; diff --git a/src/simpleprobs/package-info.java b/src/simpleprobs/package-info.java deleted file mode 100644 index d5158608..00000000 --- a/src/simpleprobs/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package simpleprobs; \ No newline at end of file