halfdan/eva2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of gitlab.cs.uni-tuebingen.de:eva2/eva2

Browse Source 
Conflicts:
	src/eva2/problems/DynJumpProblem.java
This commit is contained in:
Fabian Becker 2014-10-07 15:45:15 +02:00
commit 5b1f696fa4
318 changed files with 1135 additions and 1199 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/eva2/OptimizerFactory.java
View File

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

6
src/eva2/cli/Main.java
View File

@ -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<String, Class<? extends AbstractProblemDoubleOffset>> createProblemList() {
Map<String, Class<? extends AbstractProblemDoubleOffset>> problemList = new TreeMap<String, Class<? extends AbstractProblemDoubleOffset>>();
Reflections reflections = new Reflections("eva2.optimization.problems");
Reflections reflections = new Reflections("eva2.problems");
Set<Class<? extends AbstractProblemDoubleOffset>> problems = reflections.getSubTypesOf(AbstractProblemDoubleOffset.class);
for (Class<? extends AbstractProblemDoubleOffset> problem : problems) {
// We only want instantiable classes

2
src/eva2/examples/TerminatorExample.java
View File

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

2
src/eva2/examples/TestingCbnPostProc.java
View File

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

2
src/eva2/examples/TestingF1PSO.java
View File

@ -1,7 +1,7 @@
package eva2.examples;
import eva2.OptimizerFactory;
import eva2.optimization.problems.F1Problem;
import eva2.problems.F1Problem;
public class TestingF1PSO {

2
src/eva2/examples/TestingGAB1.java
View File

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

2
src/eva2/examples/TestingPlusCmaEs.java
View File

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

2
src/eva2/gui/EvATabbedFrameMaker.java
View File

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

37
src/eva2/gui/Main.java
View File

@ -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) {

2
src/eva2/gui/PropertyOptimizationObjectives.java
View File

@ -1,6 +1,6 @@
package eva2.gui;
import eva2.optimization.problems.InterfaceOptimizationObjective;
import eva2.problems.InterfaceOptimizationObjective;
/**
*

2
src/eva2/gui/PropertyOptimizationObjectivesWithParam.java
View File

@ -1,6 +1,6 @@
package eva2.gui;
import eva2.optimization.problems.InterfaceOptimizationObjective;
import eva2.problems.InterfaceOptimizationObjective;
/**
*

4
src/eva2/gui/editor/GenericOptimizationObjectivesEditor.java
View File

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

2
src/eva2/gui/editor/GenericOptimizationObjectivesWithParamEditor.java
View File

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

2
src/eva2/gui/plot/InterfaceDPointWithContent.java
View File

@ -1,7 +1,7 @@
package eva2.gui.plot;
import eva2.optimization.individuals.AbstractEAIndividual;
import eva2.optimization.problems.InterfaceOptimizationProblem;
import eva2.problems.InterfaceOptimizationProblem;
/**
*

4
src/eva2/gui/plot/TopoPlot.java
View File

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

2
src/eva2/optimization/go/InterfaceNotifyOnInformers.java
View File

@ -1,6 +1,6 @@
package eva2.optimization.go;
import eva2.optimization.problems.InterfaceAdditionalPopulationInformer;
import eva2.problems.InterfaceAdditionalPopulationInformer;
import java.util.List;

4
src/eva2/optimization/go/InterfaceOptimizationParameters.java
View File

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

2
src/eva2/optimization/go/MOCCOStandalone.java
View File

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

3
src/eva2/optimization/go/StandaloneOptimization.java
View File

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

2
src/eva2/optimization/individuals/AbstractEAIndividual.java
View File

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

4
src/eva2/optimization/individuals/ESIndividualBinaryData.java
View File

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

4
src/eva2/optimization/individuals/ESIndividualDoubleData.java
View File

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

4
src/eva2/optimization/individuals/ESIndividualIntegerData.java
View File

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

4
src/eva2/optimization/individuals/ESIndividualPermutationData.java
View File

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

2
src/eva2/optimization/individuals/GAESIndividualBinaryDoubleData.java
View File

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

2
src/eva2/optimization/individuals/GAIndividualBinaryData.java
View File

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

2
src/eva2/optimization/individuals/GAIndividualDoubleData.java
View File

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

2
src/eva2/optimization/individuals/GAIndividualIntegerData.java
View File

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

2
src/eva2/optimization/individuals/GAPIndividualProgramData.java
View File

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

2
src/eva2/optimization/individuals/GEIndividualProgramData.java
View File

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

4
src/eva2/optimization/individuals/GIIndividualIntegerData.java
View File

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

2
src/eva2/optimization/individuals/GIOBGAIndividualIntegerPermutationData.java
View File

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

2
src/eva2/optimization/individuals/GPIndividualProgramData.java
View File

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

2
src/eva2/optimization/individuals/IndividualInterface.java
View File

@ -1,6 +1,6 @@
package eva2.optimization.individuals;
import eva2.optimization.problems.InterfaceOptimizationProblem;
import eva2.problems.InterfaceOptimizationProblem;
/**
* Minimal interface for an EA individual.

2
src/eva2/optimization/individuals/OBGAIndividualPermutationData.java
View File

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

4
src/eva2/optimization/individuals/codings/gp/AbstractGPNode.java
View File

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

2
src/eva2/optimization/individuals/codings/gp/GPNodeAbs.java
View File

@ -1,6 +1,6 @@
package eva2.optimization.individuals.codings.gp;
import eva2.optimization.problems.InterfaceProgramProblem;
import eva2.problems.InterfaceProgramProblem;
/**

2
src/eva2/optimization/individuals/codings/gp/GPNodeAdd.java
View File

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

2
src/eva2/optimization/individuals/codings/gp/GPNodeConst.java
View File

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

2
src/eva2/optimization/individuals/codings/gp/GPNodeCos.java
View File

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

2
src/eva2/optimization/individuals/codings/gp/GPNodeDiv.java
View File

@ -1,6 +1,6 @@
package eva2.optimization.individuals.codings.gp;
import eva2.optimization.problems.InterfaceProgramProblem;
import eva2.problems.InterfaceProgramProblem;
/**

2
src/eva2/optimization/individuals/codings/gp/GPNodeExp.java
View File

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

2
src/eva2/optimization/individuals/codings/gp/GPNodeFlowExec2.java
View File

@ -1,6 +1,6 @@
package eva2.optimization.individuals.codings.gp;
import eva2.optimization.problems.InterfaceProgramProblem;
import eva2.problems.InterfaceProgramProblem;
/**
* This nodes executes both arguments.

2
src/eva2/optimization/individuals/codings/gp/GPNodeFlowExec3.java
View File

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

2
src/eva2/optimization/individuals/codings/gp/GPNodeInput.java
View File

@ -1,6 +1,6 @@
package eva2.optimization.individuals.codings.gp;
import eva2.optimization.problems.InterfaceProgramProblem;
import eva2.problems.InterfaceProgramProblem;
/**
*

2
src/eva2/optimization/individuals/codings/gp/GPNodeMult.java
View File

@ -1,6 +1,6 @@
package eva2.optimization.individuals.codings.gp;
import eva2.optimization.problems.InterfaceProgramProblem;
import eva2.problems.InterfaceProgramProblem;
/**

2
src/eva2/optimization/individuals/codings/gp/GPNodeNeg.java
View File

@ -1,6 +1,6 @@
package eva2.optimization.individuals.codings.gp;
import eva2.optimization.problems.InterfaceProgramProblem;
import eva2.problems.InterfaceProgramProblem;
/**

2
src/eva2/optimization/individuals/codings/gp/GPNodeOutput.java
View File

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

2
src/eva2/optimization/individuals/codings/gp/GPNodePow2.java
View File

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

2
src/eva2/optimization/individuals/codings/gp/GPNodePow3.java
View File

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

2
src/eva2/optimization/individuals/codings/gp/GPNodeProd.java
View File

@ -1,7 +1,7 @@
package eva2.optimization.individuals.codings.gp;
import eva2.optimization.problems.InterfaceProgramProblem;
import eva2.problems.InterfaceProgramProblem;
import eva2.tools.math.Mathematics;
/**

2
src/eva2/optimization/individuals/codings/gp/GPNodeSin.java
View File

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

2
src/eva2/optimization/individuals/codings/gp/GPNodeSqrt.java
View File

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

2
src/eva2/optimization/individuals/codings/gp/GPNodeSub.java
View File

@ -1,6 +1,6 @@
package eva2.optimization.individuals.codings.gp;
import eva2.optimization.problems.InterfaceProgramProblem;
import eva2.problems.InterfaceProgramProblem;
/**

2
src/eva2/optimization/individuals/codings/gp/GPNodeSum.java
View File

@ -1,7 +1,7 @@
package eva2.optimization.individuals.codings.gp;
import eva2.optimization.problems.InterfaceProgramProblem;
import eva2.problems.InterfaceProgramProblem;
import eva2.tools.math.Mathematics;
/**

2
src/eva2/optimization/individuals/codings/gp/InterfaceProgram.java
View File

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

4
src/eva2/optimization/mocco/MOCCOChooseReferencePoint.java
View File

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

4
src/eva2/optimization/mocco/MOCCOChooseReferenceSolution.java
View File

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

6
src/eva2/optimization/mocco/MOCCOParameterizeGDF.java
View File

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

2
src/eva2/optimization/mocco/MOCCOParameterizeRefPoint.java
View File

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

6
src/eva2/optimization/mocco/MOCCOParameterizeSTEP.java
View File

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

2
src/eva2/optimization/mocco/MOCCOParameterizeTchebycheff.java
View File

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

4
src/eva2/optimization/mocco/MOCCOProblemInitialization.java
View File

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

2
src/eva2/optimization/mocco/MOCCOProblemRedefinition.java
View File

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

8
src/eva2/optimization/mocco/MOCCOState.java
View File

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

4
src/eva2/optimization/mocco/paretofrontviewer/MOCCOViewer.java
View File

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

4
src/eva2/optimization/mocco/paretofrontviewer/ParetoFrontView2D.java
View File

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

4
src/eva2/optimization/mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java
View File

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

35
src/eva2/optimization/modules/AbstractModuleAdapter.java
View File

@ -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<OptimizationStateListener> 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;
}
/**
*
*/

4
src/eva2/optimization/modules/AbstractOptimizationParameters.java
View File

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

2
src/eva2/optimization/modules/DEParameters.java
View File

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

2
src/eva2/optimization/modules/EPParameters.java
View File

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

2
src/eva2/optimization/modules/GAParameters.java
View File

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

2
src/eva2/optimization/modules/HCParameters.java
View File

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

2
src/eva2/optimization/modules/MCParameters.java
View File

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

2
src/eva2/optimization/modules/MOEAParameters.java
View File

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

6
src/eva2/optimization/modules/ModuleAdapter.java
View File

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

4
src/eva2/optimization/modules/OptimizationParameters.java
View File

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

2
src/eva2/optimization/modules/PBILParameters.java
View File

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

2
src/eva2/optimization/modules/PSOParameters.java
View File

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

4
src/eva2/optimization/modules/Processor.java
View File

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

5
src/eva2/optimization/modules/SAParameters.java
View File

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

2
src/eva2/optimization/modules/SSGAParameters.java
View File

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

2
src/eva2/optimization/operator/cluster/ClusteringKMeans.java
View File

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

2
src/eva2/optimization/operator/cluster/ClusteringXMeans.java
View File

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

2
src/eva2/optimization/operator/constraint/AbstractConstraint.java
View File

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

2
src/eva2/optimization/operator/constraint/GenericConstraint.java
View File

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

2
src/eva2/optimization/operator/crossover/AdaptiveCrossoverEAMixer.java
View File

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

2
src/eva2/optimization/operator/crossover/CM1.java
View File

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

2
src/eva2/optimization/operator/crossover/CM2.java
View File

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

2
src/eva2/optimization/operator/crossover/CM3.java
View File

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

2
src/eva2/optimization/operator/crossover/CM4.java
View File

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

2
src/eva2/optimization/operator/crossover/CM5.java
View File

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

2
src/eva2/optimization/operator/crossover/CM6.java
View File

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

2
src/eva2/optimization/operator/crossover/CM7.java
View File

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

2
src/eva2/optimization/operator/crossover/CrossoverEAMixer.java
View File

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

2
src/eva2/optimization/operator/crossover/CrossoverESArithmetical.java
View File

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

2
src/eva2/optimization/operator/crossover/CrossoverESBLXAlpha.java
View File

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

2
src/eva2/optimization/operator/crossover/CrossoverESDefault.java
View File

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

2
src/eva2/optimization/operator/crossover/CrossoverESFlat.java
View File

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

Some files were not shown because too many files have changed in this diff Show More