From 9a8efc403eb8603604096581abd0b5123cd878b1 Mon Sep 17 00:00:00 2001 From: Fabian Becker Date: Fri, 31 Oct 2014 19:05:38 +0100 Subject: [PATCH] Move InterfacePopulationChangedEventListener to eva2.optimization.population. --- src/eva2/OptimizerFactory.java | 10 +++++----- src/eva2/OptimizerRunnable.java | 2 +- src/eva2/cli/Main.java | 3 +-- src/eva2/examples/TestingCbnPostProc.java | 2 +- src/eva2/examples/TestingPlusCmaEs.java | 2 +- src/eva2/gui/editor/GenericDoubleArrayEditor.java | 2 +- src/eva2/optimization/go/MOCCOStandalone.java | 1 + src/eva2/optimization/go/StandaloneOptimization.java | 5 +++-- .../individuals/ESIndividualBinaryData.java | 2 +- .../individuals/ESIndividualDoubleData.java | 2 +- .../individuals/ESIndividualIntegerData.java | 2 +- .../individuals/GAIndividualBinaryData.java | 4 ++-- .../individuals/GAIndividualDoubleData.java | 2 +- .../individuals/GAIndividualIntegerData.java | 2 +- .../individuals/GEIndividualProgramData.java | 2 +- .../individuals/GIIndividualIntegerData.java | 2 +- .../individuals/GPIndividualProgramData.java | 2 +- .../individuals/codings/ga/GAGrayCodingDouble.java | 2 +- .../individuals/codings/ga/GAStandardCodingDouble.java | 2 +- .../optimization/individuals/codings/gp/GPNodeAdd.java | 2 +- .../individuals/codings/gp/GPNodeConst.java | 2 +- .../optimization/individuals/codings/gp/GPNodeOne.java | 2 +- .../optimization/individuals/codings/gp/GPNodePi.java | 2 +- .../individuals/codings/gp/GPNodeProd.java | 2 +- .../optimization/individuals/codings/gp/GPNodeSum.java | 2 +- .../mocco/paretofrontviewer/MOCCOViewer.java | 2 +- .../mocco/paretofrontviewer/ParetoFrontView2D.java | 2 +- .../modules/AbstractOptimizationParameters.java | 2 +- src/eva2/optimization/modules/Processor.java | 2 +- .../operator/archiving/ArchivingAllDominating.java | 2 +- .../operator/archiving/ArchivingMaxiMin.java | 2 +- .../ClassificationSelfOrganizingMaps.java | 2 +- .../optimization/operator/mutation/CMAParamSet.java | 2 +- .../selection/probability/SelProbStandard.java | 2 +- .../selection/probability/SelProbStandardScaling.java | 2 +- .../InterfacePopulationChangedEventListener.java | 8 ++------ src/eva2/optimization/population/Population.java | 3 +-- .../optimization/statistics/AbstractStatistics.java | 6 +++--- .../optimization/statistics/InterfaceTextListener.java | 2 +- .../optimization/statistics/StatisticsStandalone.java | 2 +- .../optimization/strategies/AbstractOptimizer.java | 2 +- .../strategies/AdaptiveDifferentialEvolution.java | 6 +----- .../optimization/strategies/BinaryScatterSearch.java | 3 +-- .../strategies/CHCAdaptiveSearchAlgorithm.java | 2 -- .../optimization/strategies/ClusterBasedNichingEA.java | 2 +- .../strategies/ClusteringHillClimbing.java | 2 +- .../optimization/strategies/DifferentialEvolution.java | 3 --- src/eva2/optimization/strategies/EsDpiNiching.java | 2 +- .../optimization/strategies/EvolutionStrategyIPOP.java | 2 +- .../strategies/EvolutionaryProgramming.java | 3 +-- src/eva2/optimization/strategies/FloodAlgorithm.java | 4 +--- src/eva2/optimization/strategies/GeneticAlgorithm.java | 3 +-- src/eva2/optimization/strategies/HillClimbing.java | 2 +- .../optimization/strategies/InterfaceOptimizer.java | 2 +- src/eva2/optimization/strategies/IslandModelEA.java | 2 +- src/eva2/optimization/strategies/LTGA.java | 3 +-- src/eva2/optimization/strategies/MLTGA.java | 2 +- src/eva2/optimization/strategies/MemeticAlgorithm.java | 2 +- src/eva2/optimization/strategies/MonteCarloSearch.java | 6 ++---- .../optimization/strategies/MultiObjectiveCMAES.java | 2 -- src/eva2/optimization/strategies/MultiObjectiveEA.java | 2 +- .../optimization/strategies/NelderMeadSimplex.java | 3 +-- src/eva2/optimization/strategies/NichePSO.java | 1 - .../strategies/ParticleFilterOptimization.java | 2 -- .../strategies/ParticleSwarmOptimization.java | 2 +- .../strategies/PopulationBasedIncrementalLearning.java | 6 +++--- src/eva2/optimization/strategies/ScatterSearch.java | 2 +- .../optimization/strategies/SimulatedAnnealing.java | 4 ++-- src/eva2/optimization/strategies/SteadyStateGA.java | 2 +- .../optimization/strategies/ThresholdAlgorithm.java | 4 +--- src/eva2/optimization/strategies/Tribes.java | 2 +- .../strategies/WingedMultiObjectiveEA.java | 2 -- src/eva2/problems/AbstractMultiModalProblemKnown.java | 2 +- src/eva2/problems/AbstractProblemInteger.java | 2 +- src/eva2/problems/B1Problem.java | 2 +- src/eva2/problems/BKnapsackProblem.java | 2 +- src/eva2/problems/ConstrHimmelblauProblem.java | 2 +- src/eva2/problems/F1Problem.java | 2 +- src/eva2/problems/F22Problem.java | 2 +- src/eva2/problems/FLensProblem.java | 2 +- src/eva2/problems/I1Problem.java | 2 +- src/eva2/problems/TF1Problem.java | 2 +- src/eva2/problems/simple/InterfaceSimpleProblem.java | 2 +- src/eva2/tools/MultirunRefiner.java | 2 +- src/eva2/tools/TXTFileFilter.java | 2 +- src/eva2/tools/chart2d/DPointIcon.java | 2 +- src/eva2/tools/matlab/JMatLink.java | 2 +- test/eva2/tools/SerializerTest.java | 4 ++-- 88 files changed, 97 insertions(+), 128 deletions(-) rename src/eva2/optimization/{go => population}/InterfacePopulationChangedEventListener.java (67%) diff --git a/src/eva2/OptimizerFactory.java b/src/eva2/OptimizerFactory.java index cff8f34c..9fda3a73 100644 --- a/src/eva2/OptimizerFactory.java +++ b/src/eva2/OptimizerFactory.java @@ -4,7 +4,7 @@ import eva2.optimization.enums.DEType; import eva2.optimization.enums.MutateESCrossoverType; import eva2.optimization.enums.PSOTopology; import eva2.optimization.enums.PostProcessMethod; -import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.population.InterfacePopulationChangedEventListener; import eva2.optimization.individuals.*; import eva2.optimization.modules.OptimizationParameters; import eva2.optimization.operator.archiving.ArchivingNSGAII; @@ -572,7 +572,7 @@ public class OptimizerFactory { } /** - * Return a simple String showing the accessible optimizers. For external + * Return a eva2.problems.simple String showing the accessible optimizers. For external * access." * * @return a String listing the accessible optimizers @@ -1303,7 +1303,7 @@ public class OptimizerFactory { } /** - * Create a standard clustering hill climbing employing simple ES mutation + * Create a standard clustering hill climbing employing eva2.problems.simple ES mutation * with adaptive step size, starting in parallel 100 local searches and * clustering intermediate populations to avoid optima being found several * times by the same population (density based clustering with sigma = @@ -1338,9 +1338,9 @@ public class OptimizerFactory { } /** - * Create a custom clustering hillclimber using ES mutation (simple or CMA) + * Create a custom clustering hillclimber using ES mutation (eva2.problems.simple or CMA) * or nelder mead. The parameters hcInitialStep and hcStepThresh are only - * relevant for the simple mutation based hc method. + * relevant for the eva2.problems.simple mutation based hc method. * * @param problem * @param evalCycle diff --git a/src/eva2/OptimizerRunnable.java b/src/eva2/OptimizerRunnable.java index 6a575080..52fe1070 100644 --- a/src/eva2/OptimizerRunnable.java +++ b/src/eva2/OptimizerRunnable.java @@ -20,7 +20,7 @@ import java.util.BitSet; /** - * This Runnable class just encapsulates the Processor class with some simple ways to access a solution. + * This Runnable class just encapsulates the Processor class with some eva2.problems.simple ways to access a solution. * * @author mkron */ diff --git a/src/eva2/cli/Main.java b/src/eva2/cli/Main.java index 6250e286..b951db4b 100644 --- a/src/eva2/cli/Main.java +++ b/src/eva2/cli/Main.java @@ -5,7 +5,7 @@ import eva2.OptimizerFactory; import eva2.optimization.OptimizationStateListener; import eva2.optimization.enums.DEType; import eva2.optimization.enums.PSOTopology; -import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.population.InterfacePopulationChangedEventListener; import eva2.optimization.modules.OptimizationParameters; import eva2.optimization.operator.crossover.CrossoverESDefault; import eva2.optimization.operator.crossover.InterfaceCrossover; @@ -29,7 +29,6 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; import java.util.logging.Level; -import java.util.logging.LogManager; import java.util.logging.Logger; /** diff --git a/src/eva2/examples/TestingCbnPostProc.java b/src/eva2/examples/TestingCbnPostProc.java index 6cba2a58..a2c98575 100644 --- a/src/eva2/examples/TestingCbnPostProc.java +++ b/src/eva2/examples/TestingCbnPostProc.java @@ -11,7 +11,7 @@ import java.util.List; public class TestingCbnPostProc { public static void main(String[] args) { - // a simple bimodal target function, two optima near (1.7,0) and (-1.44/0) + // a eva2.problems.simple bimodal target function, two optima near (1.7,0) and (-1.44/0) FM0Problem fm0 = new FM0Problem(); AbstractEAIndividual best; List ppSols; diff --git a/src/eva2/examples/TestingPlusCmaEs.java b/src/eva2/examples/TestingPlusCmaEs.java index 1e1b7669..6d9399ac 100644 --- a/src/eva2/examples/TestingPlusCmaEs.java +++ b/src/eva2/examples/TestingPlusCmaEs.java @@ -12,7 +12,7 @@ import eva2.optimization.strategies.EvolutionStrategies; public class TestingPlusCmaEs { public static void main(String[] args) { - // a simple bimodal target function, two optima near (1.7,0) and (-1.44/0) + // a eva2.problems.simple bimodal target function, two optima near (1.7,0) and (-1.44/0) FM0Problem fm0 = new FM0Problem(); AbstractEAIndividual bestIndy; // create standard ES parameters diff --git a/src/eva2/gui/editor/GenericDoubleArrayEditor.java b/src/eva2/gui/editor/GenericDoubleArrayEditor.java index 5e20d428..bd8e0797 100644 --- a/src/eva2/gui/editor/GenericDoubleArrayEditor.java +++ b/src/eva2/gui/editor/GenericDoubleArrayEditor.java @@ -10,7 +10,7 @@ import java.beans.PropertyChangeSupport; import java.beans.PropertyEditor; /** - * A simple focus listener with an object ID and callback. + * A eva2.problems.simple focus listener with an object ID and callback. * * @author mkron */ diff --git a/src/eva2/optimization/go/MOCCOStandalone.java b/src/eva2/optimization/go/MOCCOStandalone.java index 2efa2795..8ef7f3e3 100644 --- a/src/eva2/optimization/go/MOCCOStandalone.java +++ b/src/eva2/optimization/go/MOCCOStandalone.java @@ -7,6 +7,7 @@ import eva2.optimization.mocco.paretofrontviewer.MOCCOViewer; import eva2.optimization.operator.moso.InterfaceMOSOConverter; import eva2.optimization.operator.moso.MOSOWeightedFitness; import eva2.optimization.operator.terminators.EvaluationTerminator; +import eva2.optimization.population.InterfacePopulationChangedEventListener; import eva2.optimization.population.Population; import eva2.problems.*; import eva2.optimization.strategies.InterfaceOptimizer; diff --git a/src/eva2/optimization/go/StandaloneOptimization.java b/src/eva2/optimization/go/StandaloneOptimization.java index 548fe86e..0094a952 100644 --- a/src/eva2/optimization/go/StandaloneOptimization.java +++ b/src/eva2/optimization/go/StandaloneOptimization.java @@ -14,6 +14,7 @@ import eva2.optimization.operator.mutation.MutateESFixedStepSize; import eva2.optimization.operator.mutation.MutateESLocal; import eva2.optimization.operator.selection.SelectTournament; import eva2.optimization.operator.terminators.EvaluationTerminator; +import eva2.optimization.population.InterfacePopulationChangedEventListener; import eva2.optimization.population.Population; import eva2.problems.F1Problem; import eva2.optimization.strategies.EvolutionStrategies; @@ -135,7 +136,7 @@ public class StandaloneOptimization implements InterfaceStandaloneOptimization, // build the Options Panel JParaPanel paraPanel = new JParaPanel(this, "MyGUI"); Class object = null, editor = null; - String tmp = "eva2.optimization.go.Tools.InterfaceTest"; + String tmp = "eva2.optimization.tools.InterfaceTest"; try { object = Class.forName(tmp); } catch (java.lang.ClassNotFoundException e) { @@ -316,7 +317,7 @@ public class StandaloneOptimization implements InterfaceStandaloneOptimization, break; } case 1: { - // use the simple ES Local + // use the eva2.problems.simple ES Local this.outputFileName = "X360_StandardES"; EvolutionStrategies es = new EvolutionStrategies(); this.optimizationParameters.setOptimizer(es); diff --git a/src/eva2/optimization/individuals/ESIndividualBinaryData.java b/src/eva2/optimization/individuals/ESIndividualBinaryData.java index e489e5e9..6ab795d3 100644 --- a/src/eva2/optimization/individuals/ESIndividualBinaryData.java +++ b/src/eva2/optimization/individuals/ESIndividualBinaryData.java @@ -288,7 +288,7 @@ public class ESIndividualBinaryData extends AbstractEAIndividual implements Inte } /** - * This method performs a simple one element mutation on the double vector + * This method performs a eva2.problems.simple one element mutation on the double vector */ @Override public void defaultMutate() { diff --git a/src/eva2/optimization/individuals/ESIndividualDoubleData.java b/src/eva2/optimization/individuals/ESIndividualDoubleData.java index ae8dd218..56caa43c 100644 --- a/src/eva2/optimization/individuals/ESIndividualDoubleData.java +++ b/src/eva2/optimization/individuals/ESIndividualDoubleData.java @@ -348,7 +348,7 @@ public class ESIndividualDoubleData extends AbstractEAIndividual implements Inte } /** - * This method performs a simple one element mutation on the double vector + * This method performs a eva2.problems.simple one element mutation on the double vector */ @Override public void defaultMutate() { diff --git a/src/eva2/optimization/individuals/ESIndividualIntegerData.java b/src/eva2/optimization/individuals/ESIndividualIntegerData.java index 8a9b641a..45a53e13 100644 --- a/src/eva2/optimization/individuals/ESIndividualIntegerData.java +++ b/src/eva2/optimization/individuals/ESIndividualIntegerData.java @@ -303,7 +303,7 @@ public class ESIndividualIntegerData extends AbstractEAIndividual implements Int } /** - * This method performs a simple one element mutation on the double vector + * This method performs a eva2.problems.simple one element mutation on the double vector */ @Override public void defaultMutate() { diff --git a/src/eva2/optimization/individuals/GAIndividualBinaryData.java b/src/eva2/optimization/individuals/GAIndividualBinaryData.java index aba42880..f67868d8 100644 --- a/src/eva2/optimization/individuals/GAIndividualBinaryData.java +++ b/src/eva2/optimization/individuals/GAIndividualBinaryData.java @@ -88,7 +88,7 @@ public class GAIndividualBinaryData extends AbstractEAIndividual implements Inte } /** - * This method evaluates the GAIndividual as simple minimize number + * This method evaluates the GAIndividual as eva2.problems.simple minimize number * of bits problem. * * @return The number of true bits @@ -218,7 +218,7 @@ public class GAIndividualBinaryData extends AbstractEAIndividual implements Inte } /** - * This method performs a simple one point mutation in the genotype + * This method performs a eva2.problems.simple one point mutation in the genotype */ @Override public void defaultMutate() { diff --git a/src/eva2/optimization/individuals/GAIndividualDoubleData.java b/src/eva2/optimization/individuals/GAIndividualDoubleData.java index 3b3215cc..21770a5d 100644 --- a/src/eva2/optimization/individuals/GAIndividualDoubleData.java +++ b/src/eva2/optimization/individuals/GAIndividualDoubleData.java @@ -342,7 +342,7 @@ public class GAIndividualDoubleData extends AbstractEAIndividual implements Inte } /** - * This method performs a simple one point mutation in the genotype + * This method performs a eva2.problems.simple one point mutation in the genotype */ @Override public void defaultMutate() { diff --git a/src/eva2/optimization/individuals/GAIndividualIntegerData.java b/src/eva2/optimization/individuals/GAIndividualIntegerData.java index 8578db1c..cca662b7 100644 --- a/src/eva2/optimization/individuals/GAIndividualIntegerData.java +++ b/src/eva2/optimization/individuals/GAIndividualIntegerData.java @@ -398,7 +398,7 @@ public class GAIndividualIntegerData extends AbstractEAIndividual implements Int } /** - * This method performs a simple one point mutation in the genotype + * This method performs a eva2.problems.simple one point mutation in the genotype */ @Override public void defaultMutate() { diff --git a/src/eva2/optimization/individuals/GEIndividualProgramData.java b/src/eva2/optimization/individuals/GEIndividualProgramData.java index 106199c9..037d6a5b 100644 --- a/src/eva2/optimization/individuals/GEIndividualProgramData.java +++ b/src/eva2/optimization/individuals/GEIndividualProgramData.java @@ -674,7 +674,7 @@ public class GEIndividualProgramData extends AbstractEAIndividual implements Int } /** - * This method performs a simple one point mutation in the genotype + * This method performs a eva2.problems.simple one point mutation in the genotype */ @Override public void defaultMutate() { diff --git a/src/eva2/optimization/individuals/GIIndividualIntegerData.java b/src/eva2/optimization/individuals/GIIndividualIntegerData.java index 714234a4..3e436885 100644 --- a/src/eva2/optimization/individuals/GIIndividualIntegerData.java +++ b/src/eva2/optimization/individuals/GIIndividualIntegerData.java @@ -317,7 +317,7 @@ public class GIIndividualIntegerData extends AbstractEAIndividual implements Int } /** - * This method performs a simple one point mutation in the genotype + * This method performs a eva2.problems.simple one point mutation in the genotype */ @Override public void defaultMutate() { diff --git a/src/eva2/optimization/individuals/GPIndividualProgramData.java b/src/eva2/optimization/individuals/GPIndividualProgramData.java index 5ce00d89..33982c6b 100644 --- a/src/eva2/optimization/individuals/GPIndividualProgramData.java +++ b/src/eva2/optimization/individuals/GPIndividualProgramData.java @@ -313,7 +313,7 @@ public class GPIndividualProgramData extends AbstractEAIndividual implements Int } /** - * This method performs a simple one element mutation on the program + * This method performs a eva2.problems.simple one element mutation on the program */ @Override public void defaultMutate() { diff --git a/src/eva2/optimization/individuals/codings/ga/GAGrayCodingDouble.java b/src/eva2/optimization/individuals/codings/ga/GAGrayCodingDouble.java index 7b12579c..c1088e4e 100644 --- a/src/eva2/optimization/individuals/codings/ga/GAGrayCodingDouble.java +++ b/src/eva2/optimization/individuals/codings/ga/GAGrayCodingDouble.java @@ -85,7 +85,7 @@ public class GAGrayCodingDouble implements InterfaceGADoubleCoding, java.io.Seri } /** - * A simple test method + * A eva2.problems.simple test method * * @param args no args needed */ diff --git a/src/eva2/optimization/individuals/codings/ga/GAStandardCodingDouble.java b/src/eva2/optimization/individuals/codings/ga/GAStandardCodingDouble.java index aa18a114..c2fbe9a6 100644 --- a/src/eva2/optimization/individuals/codings/ga/GAStandardCodingDouble.java +++ b/src/eva2/optimization/individuals/codings/ga/GAStandardCodingDouble.java @@ -135,7 +135,7 @@ public class GAStandardCodingDouble implements InterfaceGADoubleCoding, java.io. } /** - * A simple test function without arguments + * A eva2.problems.simple test function without arguments * * @param args */ diff --git a/src/eva2/optimization/individuals/codings/gp/GPNodeAdd.java b/src/eva2/optimization/individuals/codings/gp/GPNodeAdd.java index d8fadd37..58bd709e 100644 --- a/src/eva2/optimization/individuals/codings/gp/GPNodeAdd.java +++ b/src/eva2/optimization/individuals/codings/gp/GPNodeAdd.java @@ -4,7 +4,7 @@ package eva2.optimization.individuals.codings.gp; import eva2.problems.InterfaceProgramProblem; /** - * A simple add node with two arguments. + * A eva2.problems.simple add node with two arguments. * Created by IntelliJ IDEA. * User: streiche * Date: 04.04.2003 diff --git a/src/eva2/optimization/individuals/codings/gp/GPNodeConst.java b/src/eva2/optimization/individuals/codings/gp/GPNodeConst.java index d1be9162..54770ddc 100644 --- a/src/eva2/optimization/individuals/codings/gp/GPNodeConst.java +++ b/src/eva2/optimization/individuals/codings/gp/GPNodeConst.java @@ -3,7 +3,7 @@ package eva2.optimization.individuals.codings.gp; import eva2.problems.InterfaceProgramProblem; /** - * A simple constant node with the value 1. + * A eva2.problems.simple constant node with the value 1. */ public class GPNodeConst extends AbstractGPNode implements java.io.Serializable { double value = 1.; diff --git a/src/eva2/optimization/individuals/codings/gp/GPNodeOne.java b/src/eva2/optimization/individuals/codings/gp/GPNodeOne.java index a343f249..9689a39a 100644 --- a/src/eva2/optimization/individuals/codings/gp/GPNodeOne.java +++ b/src/eva2/optimization/individuals/codings/gp/GPNodeOne.java @@ -2,7 +2,7 @@ package eva2.optimization.individuals.codings.gp; /** - * A simple constant node with the value 1. + * A eva2.problems.simple constant node with the value 1. */ public class GPNodeOne extends GPNodeConst implements java.io.Serializable { public GPNodeOne() { diff --git a/src/eva2/optimization/individuals/codings/gp/GPNodePi.java b/src/eva2/optimization/individuals/codings/gp/GPNodePi.java index 5b404ce2..b7c5ec85 100644 --- a/src/eva2/optimization/individuals/codings/gp/GPNodePi.java +++ b/src/eva2/optimization/individuals/codings/gp/GPNodePi.java @@ -2,7 +2,7 @@ package eva2.optimization.individuals.codings.gp; /** - * A simple constant node with the value 1. + * A eva2.problems.simple constant node with the value 1. */ public class GPNodePi extends GPNodeConst implements java.io.Serializable { public GPNodePi() { diff --git a/src/eva2/optimization/individuals/codings/gp/GPNodeProd.java b/src/eva2/optimization/individuals/codings/gp/GPNodeProd.java index dd3403c4..380db9e2 100644 --- a/src/eva2/optimization/individuals/codings/gp/GPNodeProd.java +++ b/src/eva2/optimization/individuals/codings/gp/GPNodeProd.java @@ -5,7 +5,7 @@ import eva2.problems.InterfaceProgramProblem; import eva2.tools.math.Mathematics; /** - * A simple product node with a single, possibly vectorial (array), argument. + * A eva2.problems.simple product node with a single, possibly vectorial (array), argument. */ public class GPNodeProd extends AbstractGPNode implements java.io.Serializable { diff --git a/src/eva2/optimization/individuals/codings/gp/GPNodeSum.java b/src/eva2/optimization/individuals/codings/gp/GPNodeSum.java index 5e4f8221..22ea9980 100644 --- a/src/eva2/optimization/individuals/codings/gp/GPNodeSum.java +++ b/src/eva2/optimization/individuals/codings/gp/GPNodeSum.java @@ -5,7 +5,7 @@ import eva2.problems.InterfaceProgramProblem; import eva2.tools.math.Mathematics; /** - * A simple sum node with a single, possibly vectorial (array), argument. + * A eva2.problems.simple sum node with a single, possibly vectorial (array), argument. */ public class GPNodeSum extends AbstractGPNode implements java.io.Serializable { diff --git a/src/eva2/optimization/mocco/paretofrontviewer/MOCCOViewer.java b/src/eva2/optimization/mocco/paretofrontviewer/MOCCOViewer.java index e68ea3e7..ff160510 100644 --- a/src/eva2/optimization/mocco/paretofrontviewer/MOCCOViewer.java +++ b/src/eva2/optimization/mocco/paretofrontviewer/MOCCOViewer.java @@ -351,7 +351,7 @@ public class MOCCOViewer extends JPanel implements InterfaceRefSolutionListener, } /** - * This method will plot a simple fitness plot, using the iterations a x-axis + * This method will plot a eva2.problems.simple fitness plot, using the iterations a x-axis */ public void plot1DFitnessPlot() { double xmin = 0, ymin = Double.POSITIVE_INFINITY, xmax = Double.NEGATIVE_INFINITY, ymax = Double.NEGATIVE_INFINITY, fitness; diff --git a/src/eva2/optimization/mocco/paretofrontviewer/ParetoFrontView2D.java b/src/eva2/optimization/mocco/paretofrontviewer/ParetoFrontView2D.java index 7903bdb8..30bb1e86 100644 --- a/src/eva2/optimization/mocco/paretofrontviewer/ParetoFrontView2D.java +++ b/src/eva2/optimization/mocco/paretofrontviewer/ParetoFrontView2D.java @@ -176,7 +176,7 @@ public class ParetoFrontView2D extends JPanel implements InterfaceParetoFrontVie } /** - * This method will plot a simple fitness plot, using the iterations a x-axis + * This method will plot a eva2.problems.simple fitness plot, using the iterations a x-axis */ public void plot2DParetoFront() { double xmin = Double.POSITIVE_INFINITY, ymin = Double.POSITIVE_INFINITY, xmax = Double.NEGATIVE_INFINITY, ymax = Double.NEGATIVE_INFINITY; diff --git a/src/eva2/optimization/modules/AbstractOptimizationParameters.java b/src/eva2/optimization/modules/AbstractOptimizationParameters.java index 5061cc40..c71f25c7 100644 --- a/src/eva2/optimization/modules/AbstractOptimizationParameters.java +++ b/src/eva2/optimization/modules/AbstractOptimizationParameters.java @@ -3,7 +3,7 @@ package eva2.optimization.modules; import eva2.gui.BeanInspector; import eva2.optimization.go.InterfaceNotifyOnInformers; import eva2.optimization.go.InterfaceOptimizationParameters; -import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.population.InterfacePopulationChangedEventListener; import eva2.optimization.operator.postprocess.InterfacePostProcessParams; import eva2.optimization.operator.postprocess.PostProcessParams; import eva2.optimization.operator.terminators.InterfaceTerminator; diff --git a/src/eva2/optimization/modules/Processor.java b/src/eva2/optimization/modules/Processor.java index ec95abc3..bb249e18 100644 --- a/src/eva2/optimization/modules/Processor.java +++ b/src/eva2/optimization/modules/Processor.java @@ -4,7 +4,7 @@ import eva2.gui.BeanInspector; import eva2.optimization.OptimizationStateListener; import eva2.optimization.go.InterfaceNotifyOnInformers; import eva2.optimization.go.InterfaceOptimizationParameters; -import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.population.InterfacePopulationChangedEventListener; import eva2.optimization.operator.paramcontrol.ConstantParameters; import eva2.optimization.operator.paramcontrol.InterfaceParameterControl; import eva2.optimization.operator.postprocess.PostProcess; diff --git a/src/eva2/optimization/operator/archiving/ArchivingAllDominating.java b/src/eva2/optimization/operator/archiving/ArchivingAllDominating.java index 083b3d8c..76da0a42 100644 --- a/src/eva2/optimization/operator/archiving/ArchivingAllDominating.java +++ b/src/eva2/optimization/operator/archiving/ArchivingAllDominating.java @@ -6,7 +6,7 @@ import eva2.optimization.population.Population; import eva2.util.annotation.Description; /** - * This simple strategy simply archives all Pareto optimal solutions. This method is + * This eva2.problems.simple strategy simply archives all Pareto optimal solutions. This method is * very prone to OutOfMemory errors! */ @Description("This is a straightforward strategy, which selects all dominating individuals (very prone to generate OutOfMemory errors).") diff --git a/src/eva2/optimization/operator/archiving/ArchivingMaxiMin.java b/src/eva2/optimization/operator/archiving/ArchivingMaxiMin.java index a79d57be..5d8ebe82 100644 --- a/src/eva2/optimization/operator/archiving/ArchivingMaxiMin.java +++ b/src/eva2/optimization/operator/archiving/ArchivingMaxiMin.java @@ -11,7 +11,7 @@ import eva2.util.annotation.Description; /** - * Another simple archiving strategy not based on dominance but on the MaxiMin + * Another eva2.problems.simple archiving strategy not based on dominance but on the MaxiMin * criterion. Doesn't work well on non-convex Pareto fronts. */ @Description("Maxi Min Archiving.") diff --git a/src/eva2/optimization/operator/classification/ClassificationSelfOrganizingMaps.java b/src/eva2/optimization/operator/classification/ClassificationSelfOrganizingMaps.java index dbc7de1b..1086b872 100644 --- a/src/eva2/optimization/operator/classification/ClassificationSelfOrganizingMaps.java +++ b/src/eva2/optimization/operator/classification/ClassificationSelfOrganizingMaps.java @@ -10,7 +10,7 @@ import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; /** - * Self-organizing maps, a simple, but easy to visualize method + * Self-organizing maps, a eva2.problems.simple, but easy to visualize method * for classification. The Dikel flag is an undocumented extension, * which seems to work but is not published. */ diff --git a/src/eva2/optimization/operator/mutation/CMAParamSet.java b/src/eva2/optimization/operator/mutation/CMAParamSet.java index f1ec4e8d..8624bfee 100644 --- a/src/eva2/optimization/operator/mutation/CMAParamSet.java +++ b/src/eva2/optimization/operator/mutation/CMAParamSet.java @@ -1,6 +1,6 @@ package eva2.optimization.operator.mutation; -import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.population.InterfacePopulationChangedEventListener; import eva2.optimization.individuals.InterfaceDataTypeDouble; import eva2.optimization.population.Population; import eva2.optimization.strategies.EvolutionStrategies; diff --git a/src/eva2/optimization/operator/selection/probability/SelProbStandard.java b/src/eva2/optimization/operator/selection/probability/SelProbStandard.java index fbe35993..8aa0451a 100644 --- a/src/eva2/optimization/operator/selection/probability/SelProbStandard.java +++ b/src/eva2/optimization/operator/selection/probability/SelProbStandard.java @@ -5,7 +5,7 @@ import eva2.optimization.population.Population; import eva2.util.annotation.Description; /** - * A simple sum to calculate the selection probability. + * A eva2.problems.simple sum to calculate the selection probability. *

* p(i is selected) = exp(-fitness(i))/sum_j(exp(-fitness(j))) */ diff --git a/src/eva2/optimization/operator/selection/probability/SelProbStandardScaling.java b/src/eva2/optimization/operator/selection/probability/SelProbStandardScaling.java index bdfdd768..521465eb 100644 --- a/src/eva2/optimization/operator/selection/probability/SelProbStandardScaling.java +++ b/src/eva2/optimization/operator/selection/probability/SelProbStandardScaling.java @@ -5,7 +5,7 @@ import eva2.optimization.population.Population; import eva2.util.annotation.Description; /** - * A simple sum with a scaling factor. + * A eva2.problems.simple sum with a scaling factor. */ @Description("This is a standard normation method with scaling.") public class SelProbStandardScaling extends AbstractSelProb implements java.io.Serializable { diff --git a/src/eva2/optimization/go/InterfacePopulationChangedEventListener.java b/src/eva2/optimization/population/InterfacePopulationChangedEventListener.java similarity index 67% rename from src/eva2/optimization/go/InterfacePopulationChangedEventListener.java rename to src/eva2/optimization/population/InterfacePopulationChangedEventListener.java index ad2223ad..1bd89b88 100644 --- a/src/eva2/optimization/go/InterfacePopulationChangedEventListener.java +++ b/src/eva2/optimization/population/InterfacePopulationChangedEventListener.java @@ -1,12 +1,8 @@ -package eva2.optimization.go; +package eva2.optimization.population; /** - * Created by IntelliJ IDEA. - * User: streiche - * Date: 24.04.2003 - * Time: 18:09:47 - * To change this template use Options | File Templates. + * */ public interface InterfacePopulationChangedEventListener { diff --git a/src/eva2/optimization/population/Population.java b/src/eva2/optimization/population/Population.java index f225166b..89e5732c 100644 --- a/src/eva2/optimization/population/Population.java +++ b/src/eva2/optimization/population/Population.java @@ -1,7 +1,6 @@ package eva2.optimization.population; import eva2.gui.editor.GenericObjectEditor; -import eva2.optimization.go.InterfacePopulationChangedEventListener; import eva2.optimization.individuals.*; import eva2.optimization.operator.distancemetric.EuclideanMetric; import eva2.optimization.operator.distancemetric.InterfaceDistanceMetric; @@ -2191,7 +2190,7 @@ public class Population extends ArrayList implements PopulationInterface, Clonea /** * Calculate the average of the distance of each individual to its closest * neighbor in the population. The boolean parameter switches between - * range-normalized and simple euclidian distance. If calcVariance is true, + * range-normalized and eva2.problems.simple euclidian distance. If calcVariance is true, * the variance is calculated and returned as second entry * * @param normalizedPhenoMetric diff --git a/src/eva2/optimization/statistics/AbstractStatistics.java b/src/eva2/optimization/statistics/AbstractStatistics.java index c35f1b56..cdc80287 100644 --- a/src/eva2/optimization/statistics/AbstractStatistics.java +++ b/src/eva2/optimization/statistics/AbstractStatistics.java @@ -27,7 +27,7 @@ import java.util.*; * The method plotCurrentResults should be implemented to plot further results per iteration. *

* All displayable data is now routed through a single pipeline, which consists in a - * list of Objects assembled in the getOutputValues method. This allows all simple data types which are + * list of Objects assembled in the getOutputValues method. This allows all eva2.problems.simple data types which are * provided by the external informer instances to be handled uniformly to the internally collected data, and * thus they can be plotted and text-dumped in the same manner. * Basic fields are identified by the enum GraphSelectionEnum and are available independently of additional @@ -221,7 +221,7 @@ public abstract class AbstractStatistics implements InterfaceTextListener, Inter } /** - * Return a simple String describing the current date and time. + * Return a eva2.problems.simple String describing the current date and time. * * @return */ @@ -807,7 +807,7 @@ public abstract class AbstractStatistics implements InterfaceTextListener, Inter } /** - * Return all simple data fields collected internally. This must correspond to the + * Return all eva2.problems.simple data fields collected internally. This must correspond to the * method {@link #getSimpleOutputHeader()}. * * @return diff --git a/src/eva2/optimization/statistics/InterfaceTextListener.java b/src/eva2/optimization/statistics/InterfaceTextListener.java index 2871b855..e389afc6 100644 --- a/src/eva2/optimization/statistics/InterfaceTextListener.java +++ b/src/eva2/optimization/statistics/InterfaceTextListener.java @@ -1,7 +1,7 @@ package eva2.optimization.statistics; /** - * A very simple interface class to receive raw String data. + * A very eva2.problems.simple interface class to receive raw String data. * * @author mkron */ diff --git a/src/eva2/optimization/statistics/StatisticsStandalone.java b/src/eva2/optimization/statistics/StatisticsStandalone.java index a69adf01..d8721c59 100644 --- a/src/eva2/optimization/statistics/StatisticsStandalone.java +++ b/src/eva2/optimization/statistics/StatisticsStandalone.java @@ -8,7 +8,7 @@ import java.util.ArrayList; import java.util.List; /** - * This simple statistics implementation can collect all Object data available during runs. + * This eva2.problems.simple statistics implementation can collect all Object data available during runs. * Be aware that the memory requirements can be excessive depending on the data produced by * the additional informers, and depending on the selected fields to be collected. * Therefore, the default is not to log the data but just print it using the super class. diff --git a/src/eva2/optimization/strategies/AbstractOptimizer.java b/src/eva2/optimization/strategies/AbstractOptimizer.java index 49eabb5d..f9bbe927 100644 --- a/src/eva2/optimization/strategies/AbstractOptimizer.java +++ b/src/eva2/optimization/strategies/AbstractOptimizer.java @@ -1,6 +1,6 @@ package eva2.optimization.strategies; -import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.population.InterfacePopulationChangedEventListener; import eva2.optimization.population.Population; import eva2.problems.F1Problem; import eva2.problems.InterfaceOptimizationProblem; diff --git a/src/eva2/optimization/strategies/AdaptiveDifferentialEvolution.java b/src/eva2/optimization/strategies/AdaptiveDifferentialEvolution.java index d53e25f2..48b71a1c 100644 --- a/src/eva2/optimization/strategies/AdaptiveDifferentialEvolution.java +++ b/src/eva2/optimization/strategies/AdaptiveDifferentialEvolution.java @@ -1,15 +1,11 @@ package eva2.optimization.strategies; -import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.population.InterfacePopulationChangedEventListener; import eva2.optimization.individuals.AbstractEAIndividual; -import eva2.optimization.operator.selection.replacement.ReplacementNondominatedSortingDistanceCrowding; import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.Population; -import eva2.problems.AbstractMultiObjectiveOptimizationProblem; import eva2.problems.AbstractOptimizationProblem; import eva2.problems.F1Problem; -import eva2.problems.InterfaceOptimizationProblem; -import eva2.tools.math.RNG; import eva2.util.annotation.Description; import eva2.util.annotation.Parameter; diff --git a/src/eva2/optimization/strategies/BinaryScatterSearch.java b/src/eva2/optimization/strategies/BinaryScatterSearch.java index 446cd526..0647b426 100644 --- a/src/eva2/optimization/strategies/BinaryScatterSearch.java +++ b/src/eva2/optimization/strategies/BinaryScatterSearch.java @@ -1,7 +1,7 @@ package eva2.optimization.strategies; import eva2.gui.BeanInspector; -import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.population.InterfacePopulationChangedEventListener; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceDataTypeBinary; import eva2.optimization.individuals.InterfaceGAIndividual; @@ -12,7 +12,6 @@ import eva2.optimization.population.Population; import eva2.optimization.population.SolutionSet; 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/CHCAdaptiveSearchAlgorithm.java b/src/eva2/optimization/strategies/CHCAdaptiveSearchAlgorithm.java index 2615adb3..14eb4033 100644 --- a/src/eva2/optimization/strategies/CHCAdaptiveSearchAlgorithm.java +++ b/src/eva2/optimization/strategies/CHCAdaptiveSearchAlgorithm.java @@ -1,6 +1,5 @@ package eva2.optimization.strategies; -import eva2.optimization.go.InterfacePopulationChangedEventListener; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceGAIndividual; import eva2.optimization.operator.selection.InterfaceSelection; @@ -9,7 +8,6 @@ import eva2.optimization.operator.selection.SelectRandom; import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.Population; import eva2.optimization.population.SolutionSet; -import eva2.problems.B1Problem; import eva2.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; diff --git a/src/eva2/optimization/strategies/ClusterBasedNichingEA.java b/src/eva2/optimization/strategies/ClusterBasedNichingEA.java index e04780db..d09e19cf 100644 --- a/src/eva2/optimization/strategies/ClusterBasedNichingEA.java +++ b/src/eva2/optimization/strategies/ClusterBasedNichingEA.java @@ -5,7 +5,7 @@ import eva2.gui.editor.GenericObjectEditor; import eva2.gui.plot.GraphPointSet; import eva2.gui.plot.Plot; import eva2.gui.plot.TopoPlot; -import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.population.InterfacePopulationChangedEventListener; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.EAIndividualComparator; import eva2.optimization.individuals.InterfaceDataTypeDouble; diff --git a/src/eva2/optimization/strategies/ClusteringHillClimbing.java b/src/eva2/optimization/strategies/ClusteringHillClimbing.java index e2b38ae5..e1123b2a 100644 --- a/src/eva2/optimization/strategies/ClusteringHillClimbing.java +++ b/src/eva2/optimization/strategies/ClusteringHillClimbing.java @@ -2,7 +2,7 @@ package eva2.optimization.strategies; import eva2.gui.editor.GenericObjectEditor; import eva2.optimization.enums.PostProcessMethod; -import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.population.InterfacePopulationChangedEventListener; import eva2.optimization.operator.mutation.MutateESFixedStepSize; import eva2.optimization.operator.postprocess.PostProcess; import eva2.optimization.population.InterfaceSolutionSet; diff --git a/src/eva2/optimization/strategies/DifferentialEvolution.java b/src/eva2/optimization/strategies/DifferentialEvolution.java index c6c09256..f746d322 100644 --- a/src/eva2/optimization/strategies/DifferentialEvolution.java +++ b/src/eva2/optimization/strategies/DifferentialEvolution.java @@ -2,7 +2,6 @@ package eva2.optimization.strategies; import eva2.gui.BeanInspector; import eva2.gui.editor.GenericObjectEditor; -import eva2.optimization.go.InterfacePopulationChangedEventListener; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceDataTypeDouble; import eva2.optimization.operator.selection.replacement.ReplacementCrowding; @@ -12,8 +11,6 @@ import eva2.optimization.population.Population; import eva2.optimization.population.SolutionSet; 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/EsDpiNiching.java b/src/eva2/optimization/strategies/EsDpiNiching.java index 739557a7..51448af9 100644 --- a/src/eva2/optimization/strategies/EsDpiNiching.java +++ b/src/eva2/optimization/strategies/EsDpiNiching.java @@ -2,7 +2,7 @@ package eva2.optimization.strategies; import eva2.gui.editor.GenericObjectEditor; import eva2.gui.plot.TopoPlot; -import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.population.InterfacePopulationChangedEventListener; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceDataTypeDouble; import eva2.optimization.operator.cluster.ClusteringDynPeakIdent; diff --git a/src/eva2/optimization/strategies/EvolutionStrategyIPOP.java b/src/eva2/optimization/strategies/EvolutionStrategyIPOP.java index b2b396f0..5f64ad75 100644 --- a/src/eva2/optimization/strategies/EvolutionStrategyIPOP.java +++ b/src/eva2/optimization/strategies/EvolutionStrategyIPOP.java @@ -1,7 +1,7 @@ package eva2.optimization.strategies; import eva2.gui.editor.GenericObjectEditor; -import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.population.InterfacePopulationChangedEventListener; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.operator.mutation.MutateESRankMuCMA; import eva2.optimization.operator.terminators.FitnessConvergenceTerminator; diff --git a/src/eva2/optimization/strategies/EvolutionaryProgramming.java b/src/eva2/optimization/strategies/EvolutionaryProgramming.java index fbe2c02c..a25134b3 100644 --- a/src/eva2/optimization/strategies/EvolutionaryProgramming.java +++ b/src/eva2/optimization/strategies/EvolutionaryProgramming.java @@ -1,13 +1,12 @@ package eva2.optimization.strategies; -import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.population.InterfacePopulationChangedEventListener; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.operator.selection.InterfaceSelection; import eva2.optimization.operator.selection.SelectEPTournaments; import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.Population; import eva2.optimization.population.SolutionSet; -import eva2.problems.F1Problem; import eva2.problems.InterfaceOptimizationProblem; import eva2.util.annotation.Description; diff --git a/src/eva2/optimization/strategies/FloodAlgorithm.java b/src/eva2/optimization/strategies/FloodAlgorithm.java index 968b3558..027dc3fe 100644 --- a/src/eva2/optimization/strategies/FloodAlgorithm.java +++ b/src/eva2/optimization/strategies/FloodAlgorithm.java @@ -1,12 +1,10 @@ package eva2.optimization.strategies; -import eva2.optimization.go.InterfacePopulationChangedEventListener; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.GAIndividualBinaryData; import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.Population; import eva2.optimization.population.SolutionSet; -import eva2.problems.B1Problem; import eva2.problems.InterfaceOptimizationProblem; import eva2.util.annotation.Description; import eva2.util.annotation.Parameter; @@ -148,7 +146,7 @@ public class FloodAlgorithm extends AbstractOptimizer implements java.io.Seriali } /** - * This main method will start a simple hillclimber. No arguments necessary. + * This main method will start a eva2.problems.simple hillclimber. No arguments necessary. * * @param args */ diff --git a/src/eva2/optimization/strategies/GeneticAlgorithm.java b/src/eva2/optimization/strategies/GeneticAlgorithm.java index c79e6489..6c61366c 100644 --- a/src/eva2/optimization/strategies/GeneticAlgorithm.java +++ b/src/eva2/optimization/strategies/GeneticAlgorithm.java @@ -1,6 +1,6 @@ package eva2.optimization.strategies; -import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.population.InterfacePopulationChangedEventListener; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.operator.mutation.InterfaceAdaptOperatorGenerational; import eva2.optimization.operator.selection.InterfaceSelection; @@ -9,7 +9,6 @@ import eva2.optimization.operator.selection.SelectXProbRouletteWheel; import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.Population; import eva2.optimization.population.SolutionSet; -import eva2.problems.F1Problem; import eva2.problems.InterfaceOptimizationProblem; import eva2.util.annotation.Description; diff --git a/src/eva2/optimization/strategies/HillClimbing.java b/src/eva2/optimization/strategies/HillClimbing.java index 72889c38..2276ec1f 100644 --- a/src/eva2/optimization/strategies/HillClimbing.java +++ b/src/eva2/optimization/strategies/HillClimbing.java @@ -16,7 +16,7 @@ import eva2.util.annotation.Description; */ @Description("The Hill Climber uses the default EA mutation and initializing operators. If the population size is bigger than one a multi-start Hill Climber is performed.") public class HillClimbing extends AbstractOptimizer implements java.io.Serializable { - // These variables are necessary for the simple testcase + // These variables are necessary for the eva2.problems.simple testcase private InterfaceOptimizationProblem optimizationProblem = new B1Problem(); private InterfaceMutation mutator = null; diff --git a/src/eva2/optimization/strategies/InterfaceOptimizer.java b/src/eva2/optimization/strategies/InterfaceOptimizer.java index f83ba563..6da38ff7 100644 --- a/src/eva2/optimization/strategies/InterfaceOptimizer.java +++ b/src/eva2/optimization/strategies/InterfaceOptimizer.java @@ -1,6 +1,6 @@ package eva2.optimization.strategies; -import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.population.InterfacePopulationChangedEventListener; import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.Population; import eva2.problems.InterfaceOptimizationProblem; diff --git a/src/eva2/optimization/strategies/IslandModelEA.java b/src/eva2/optimization/strategies/IslandModelEA.java index 92a268b0..b4d6276a 100644 --- a/src/eva2/optimization/strategies/IslandModelEA.java +++ b/src/eva2/optimization/strategies/IslandModelEA.java @@ -1,7 +1,7 @@ package eva2.optimization.strategies; import eva2.gui.plot.Plot; -import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.population.InterfacePopulationChangedEventListener; import eva2.optimization.individuals.ESIndividualDoubleData; import eva2.optimization.operator.migration.*; import eva2.optimization.population.InterfaceSolutionSet; diff --git a/src/eva2/optimization/strategies/LTGA.java b/src/eva2/optimization/strategies/LTGA.java index fd941ce2..56fe051c 100644 --- a/src/eva2/optimization/strategies/LTGA.java +++ b/src/eva2/optimization/strategies/LTGA.java @@ -1,7 +1,7 @@ package eva2.optimization.strategies; import eva2.gui.BeanInspector; -import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.population.InterfacePopulationChangedEventListener; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceDataTypeBinary; import eva2.optimization.individuals.InterfaceGAIndividual; @@ -10,7 +10,6 @@ import eva2.optimization.population.Population; import eva2.optimization.population.SolutionSet; 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 fc3bfb77..ddd45ae2 100644 --- a/src/eva2/optimization/strategies/MLTGA.java +++ b/src/eva2/optimization/strategies/MLTGA.java @@ -1,7 +1,7 @@ package eva2.optimization.strategies; import eva2.gui.BeanInspector; -import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.population.InterfacePopulationChangedEventListener; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceDataTypeBinary; import eva2.optimization.individuals.InterfaceGAIndividual; diff --git a/src/eva2/optimization/strategies/MemeticAlgorithm.java b/src/eva2/optimization/strategies/MemeticAlgorithm.java index 418d075c..ab65126c 100644 --- a/src/eva2/optimization/strategies/MemeticAlgorithm.java +++ b/src/eva2/optimization/strategies/MemeticAlgorithm.java @@ -1,6 +1,6 @@ package eva2.optimization.strategies; -import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.population.InterfacePopulationChangedEventListener; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.operator.selection.InterfaceSelection; import eva2.optimization.operator.selection.SelectBestIndividuals; diff --git a/src/eva2/optimization/strategies/MonteCarloSearch.java b/src/eva2/optimization/strategies/MonteCarloSearch.java index 55ff78ea..f9c50225 100644 --- a/src/eva2/optimization/strategies/MonteCarloSearch.java +++ b/src/eva2/optimization/strategies/MonteCarloSearch.java @@ -1,17 +1,15 @@ package eva2.optimization.strategies; -import eva2.optimization.go.InterfacePopulationChangedEventListener; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.GAIndividualBinaryData; import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.Population; import eva2.optimization.population.SolutionSet; -import eva2.problems.B1Problem; import eva2.problems.InterfaceOptimizationProblem; import eva2.util.annotation.Description; /** - * The simple random or Monte-Carlo search, simple but useful to evaluate the + * The eva2.problems.simple random or Monte-Carlo search, eva2.problems.simple but useful to evaluate the * complexity of the search space. This implements a Random Walk Search using * the initialization method of the problem instance, meaning that the random * characteristics may be problem dependent. @@ -118,7 +116,7 @@ public class MonteCarloSearch extends AbstractOptimizer implements java.io.Seria } /** - * This main method will start a simple hillclimber. No arguments necessary. + * This main method will start a eva2.problems.simple hillclimber. No arguments necessary. * * @param args */ diff --git a/src/eva2/optimization/strategies/MultiObjectiveCMAES.java b/src/eva2/optimization/strategies/MultiObjectiveCMAES.java index a96468e0..b5ab0ad2 100644 --- a/src/eva2/optimization/strategies/MultiObjectiveCMAES.java +++ b/src/eva2/optimization/strategies/MultiObjectiveCMAES.java @@ -1,7 +1,6 @@ package eva2.optimization.strategies; import eva2.gui.editor.GenericObjectEditor; -import eva2.optimization.go.InterfacePopulationChangedEventListener; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.operator.archiving.ArchivingNSGAII; import eva2.optimization.operator.archiving.ArchivingNSGAIISMeasure; @@ -10,7 +9,6 @@ import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.Population; import eva2.optimization.population.SolutionSet; 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 a6e90ecb..5fba3487 100644 --- a/src/eva2/optimization/strategies/MultiObjectiveEA.java +++ b/src/eva2/optimization/strategies/MultiObjectiveEA.java @@ -1,6 +1,6 @@ package eva2.optimization.strategies; -import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.population.InterfacePopulationChangedEventListener; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.EAIndividualComparator; import eva2.optimization.operator.archiving.ArchivingNSGAII; diff --git a/src/eva2/optimization/strategies/NelderMeadSimplex.java b/src/eva2/optimization/strategies/NelderMeadSimplex.java index 6204dc29..b4c085c2 100644 --- a/src/eva2/optimization/strategies/NelderMeadSimplex.java +++ b/src/eva2/optimization/strategies/NelderMeadSimplex.java @@ -1,7 +1,7 @@ package eva2.optimization.strategies; import eva2.gui.BeanInspector; -import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.population.InterfacePopulationChangedEventListener; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceDataTypeDouble; import eva2.optimization.population.InterfaceSolutionSet; @@ -14,7 +14,6 @@ import eva2.tools.math.Mathematics; import eva2.util.annotation.Description; import java.io.Serializable; -import java.util.Vector; /** * Nelder-Mead-Simplex does not guarantee an equal number of evaluations within diff --git a/src/eva2/optimization/strategies/NichePSO.java b/src/eva2/optimization/strategies/NichePSO.java index f1931a66..e01772af 100644 --- a/src/eva2/optimization/strategies/NichePSO.java +++ b/src/eva2/optimization/strategies/NichePSO.java @@ -4,7 +4,6 @@ import eva2.OptimizerFactory; import eva2.gui.editor.GenericObjectEditor; import eva2.gui.plot.TopoPlot; import eva2.optimization.enums.PSOTopology; -import eva2.optimization.go.InterfacePopulationChangedEventListener; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceDataTypeDouble; import eva2.optimization.modules.OptimizationParameters; diff --git a/src/eva2/optimization/strategies/ParticleFilterOptimization.java b/src/eva2/optimization/strategies/ParticleFilterOptimization.java index 74d96d7b..379a536a 100644 --- a/src/eva2/optimization/strategies/ParticleFilterOptimization.java +++ b/src/eva2/optimization/strategies/ParticleFilterOptimization.java @@ -2,7 +2,6 @@ package eva2.optimization.strategies; import eva2.gui.editor.GenericObjectEditor; import eva2.gui.plot.Plot; -import eva2.optimization.go.InterfacePopulationChangedEventListener; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceDataTypeDouble; import eva2.optimization.operator.mutation.MutateESCorrVector; @@ -13,7 +12,6 @@ import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.Population; import eva2.optimization.population.SolutionSet; import eva2.problems.AbstractOptimizationProblem; -import eva2.problems.F1Problem; import eva2.problems.InterfaceOptimizationProblem; import eva2.util.annotation.Description; import eva2.util.annotation.Hidden; diff --git a/src/eva2/optimization/strategies/ParticleSwarmOptimization.java b/src/eva2/optimization/strategies/ParticleSwarmOptimization.java index b3dc47b5..46e09540 100644 --- a/src/eva2/optimization/strategies/ParticleSwarmOptimization.java +++ b/src/eva2/optimization/strategies/ParticleSwarmOptimization.java @@ -5,7 +5,7 @@ import eva2.gui.editor.GenericObjectEditor; import eva2.gui.plot.Plot; import eva2.gui.plot.TopoPlot; import eva2.optimization.enums.PSOTopology; -import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.population.InterfacePopulationChangedEventListener; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.EAIndividualComparator; import eva2.optimization.individuals.InterfaceDataTypeDouble; diff --git a/src/eva2/optimization/strategies/PopulationBasedIncrementalLearning.java b/src/eva2/optimization/strategies/PopulationBasedIncrementalLearning.java index 25581f03..2127c108 100644 --- a/src/eva2/optimization/strategies/PopulationBasedIncrementalLearning.java +++ b/src/eva2/optimization/strategies/PopulationBasedIncrementalLearning.java @@ -1,6 +1,6 @@ package eva2.optimization.strategies; -import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.population.InterfacePopulationChangedEventListener; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceGAIndividual; import eva2.optimization.operator.selection.InterfaceSelection; @@ -20,7 +20,7 @@ import java.util.logging.Logger; /** * Population based incremental learning in the PSM by Monmarche version with * also allows to simulate ant systems due to the flexible update rule of V. But - * both are limited to binary genotypes. This is a simple implementation of + * both are limited to binary genotypes. This is a eva2.problems.simple implementation of * Population Based Incremental Learning. *

* Nicolas Monmarché , Eric Ramat , Guillaume Dromel , Mohamed Slimane , Gilles @@ -31,7 +31,7 @@ import java.util.logging.Logger; public class PopulationBasedIncrementalLearning extends AbstractOptimizer implements java.io.Serializable { private final static Logger LOGGER = Logger.getLogger(PopulationBasedIncrementalLearning.class.getName()); - // These variables are necessary for the simple testcase + // These variables are necessary for the eva2.problems.simple testcase private InterfaceOptimizationProblem optimizationProblem = new B1Problem(); private boolean useElitism = true; private InterfaceSelection selectionOperator = new SelectBestIndividuals(); diff --git a/src/eva2/optimization/strategies/ScatterSearch.java b/src/eva2/optimization/strategies/ScatterSearch.java index 95b6270e..5c619453 100644 --- a/src/eva2/optimization/strategies/ScatterSearch.java +++ b/src/eva2/optimization/strategies/ScatterSearch.java @@ -4,7 +4,7 @@ import eva2.OptimizerFactory; import eva2.OptimizerRunnable; import eva2.gui.BeanInspector; import eva2.gui.editor.GenericObjectEditor; -import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.population.InterfacePopulationChangedEventListener; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceDataTypeDouble; import eva2.optimization.modules.OptimizationParameters; diff --git a/src/eva2/optimization/strategies/SimulatedAnnealing.java b/src/eva2/optimization/strategies/SimulatedAnnealing.java index fc4e18da..e79fd726 100644 --- a/src/eva2/optimization/strategies/SimulatedAnnealing.java +++ b/src/eva2/optimization/strategies/SimulatedAnnealing.java @@ -10,7 +10,7 @@ import eva2.tools.math.RNG; import eva2.util.annotation.Description; /** - * Simulated Annealing by Nelder and Mead, a simple yet efficient local search + * Simulated Annealing by Nelder and Mead, a eva2.problems.simple yet efficient local search * method. But to become less prone to premature convergence the cooling rate * has to be tuned to the optimization problem at hand. Again the population * size gives the number of multi-starts. @@ -149,7 +149,7 @@ public class SimulatedAnnealing extends AbstractOptimizer implements java.io.Ser } /** - * This main method will start a simple hillclimber. No arguments necessary. + * This main method will start a eva2.problems.simple hillclimber. No arguments necessary. * * @param args */ diff --git a/src/eva2/optimization/strategies/SteadyStateGA.java b/src/eva2/optimization/strategies/SteadyStateGA.java index 37873c45..e8530bc5 100644 --- a/src/eva2/optimization/strategies/SteadyStateGA.java +++ b/src/eva2/optimization/strategies/SteadyStateGA.java @@ -14,7 +14,7 @@ import eva2.problems.InterfaceOptimizationProblem; import eva2.util.annotation.Description; /** - * A simple implementation of the steady-state GA with variable replacement + * A eva2.problems.simple implementation of the steady-state GA with variable replacement * schemes. To reduce the logging effort population.size() optimization steps * are performed each time optimize() is called. */ diff --git a/src/eva2/optimization/strategies/ThresholdAlgorithm.java b/src/eva2/optimization/strategies/ThresholdAlgorithm.java index 176ae8aa..95a994a4 100644 --- a/src/eva2/optimization/strategies/ThresholdAlgorithm.java +++ b/src/eva2/optimization/strategies/ThresholdAlgorithm.java @@ -1,12 +1,10 @@ package eva2.optimization.strategies; -import eva2.optimization.go.InterfacePopulationChangedEventListener; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.GAIndividualBinaryData; import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.Population; import eva2.optimization.population.SolutionSet; -import eva2.problems.B1Problem; import eva2.problems.InterfaceOptimizationProblem; import eva2.util.annotation.Description; @@ -142,7 +140,7 @@ public class ThresholdAlgorithm extends AbstractOptimizer implements java.io.Ser } /** - * This main method will start a simple hillclimber. No arguments necessary. + * This main method will start a eva2.problems.simple hillclimber. No arguments necessary. * * @param args */ diff --git a/src/eva2/optimization/strategies/Tribes.java b/src/eva2/optimization/strategies/Tribes.java index 112f54bc..31729405 100644 --- a/src/eva2/optimization/strategies/Tribes.java +++ b/src/eva2/optimization/strategies/Tribes.java @@ -2,7 +2,7 @@ package eva2.optimization.strategies; import eva2.gui.editor.GenericObjectEditor; import eva2.gui.plot.Plot; -import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.population.InterfacePopulationChangedEventListener; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceDataTypeDouble; import eva2.optimization.population.InterfaceSolutionSet; diff --git a/src/eva2/optimization/strategies/WingedMultiObjectiveEA.java b/src/eva2/optimization/strategies/WingedMultiObjectiveEA.java index e6b248a2..cac15e6c 100644 --- a/src/eva2/optimization/strategies/WingedMultiObjectiveEA.java +++ b/src/eva2/optimization/strategies/WingedMultiObjectiveEA.java @@ -1,14 +1,12 @@ package eva2.optimization.strategies; import eva2.gui.PropertyDoubleArray; -import eva2.optimization.go.InterfacePopulationChangedEventListener; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.operator.moso.MOSOWeightedFitness; import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.Population; import eva2.optimization.population.SolutionSet; import eva2.problems.AbstractMultiObjectiveOptimizationProblem; -import eva2.problems.FM0Problem; import eva2.problems.InterfaceOptimizationProblem; import eva2.util.annotation.Description; diff --git a/src/eva2/problems/AbstractMultiModalProblemKnown.java b/src/eva2/problems/AbstractMultiModalProblemKnown.java index 2a3985f9..c05714d1 100644 --- a/src/eva2/problems/AbstractMultiModalProblemKnown.java +++ b/src/eva2/problems/AbstractMultiModalProblemKnown.java @@ -82,7 +82,7 @@ public abstract class AbstractMultiModalProblemKnown extends AbstractProblemDoub } /** - * Ths method allows you to evaluate a simple bit string to determine the fitness + * Ths method allows you to evaluate a eva2.problems.simple bit string to determine the fitness * * @param x The n-dimensional input vector * @return The m-dimensional output vector. diff --git a/src/eva2/problems/AbstractProblemInteger.java b/src/eva2/problems/AbstractProblemInteger.java index dd1fd754..d2b3f198 100644 --- a/src/eva2/problems/AbstractProblemInteger.java +++ b/src/eva2/problems/AbstractProblemInteger.java @@ -70,7 +70,7 @@ public abstract class AbstractProblemInteger extends AbstractOptimizationProblem } /** - * Evaluate a simple integer array to determine the fitness. + * Evaluate a eva2.problems.simple integer array to determine the fitness. * * @param x The n-dimensional input vector * @return The m-dimensional output vector. diff --git a/src/eva2/problems/B1Problem.java b/src/eva2/problems/B1Problem.java index 760643ab..1b347c6b 100644 --- a/src/eva2/problems/B1Problem.java +++ b/src/eva2/problems/B1Problem.java @@ -40,7 +40,7 @@ public class B1Problem extends AbstractProblemBinary implements java.io.Serializ } /** - * This is a simple method that evaluates a given Individual. The fitness + * This is a eva2.problems.simple method that evaluates a given Individual. The fitness * values of the individual will be set inside this method. * * @param b The BitSet that is to be evaluated. diff --git a/src/eva2/problems/BKnapsackProblem.java b/src/eva2/problems/BKnapsackProblem.java index f6b9c8dc..bea94ccc 100644 --- a/src/eva2/problems/BKnapsackProblem.java +++ b/src/eva2/problems/BKnapsackProblem.java @@ -258,7 +258,7 @@ public class BKnapsackProblem extends AbstractProblemBinary implements java.io.S } /** - * This is a simple method that evaluates a given Individual. The fitness + * This is a eva2.problems.simple method that evaluates a given Individual. The fitness * values of the individual will be set inside this method. * * @param b The BitSet that is to be evaluated. diff --git a/src/eva2/problems/ConstrHimmelblauProblem.java b/src/eva2/problems/ConstrHimmelblauProblem.java index 02d6587d..e764e445 100644 --- a/src/eva2/problems/ConstrHimmelblauProblem.java +++ b/src/eva2/problems/ConstrHimmelblauProblem.java @@ -9,7 +9,7 @@ import java.io.Serializable; import java.util.Vector; /** - * Himmelblau's nonlinear optimization problem with 5 simple boundary constraints and 3 nonlinear boundary constraints. + * Himmelblau's nonlinear optimization problem with 5 eva2.problems.simple boundary constraints and 3 nonlinear boundary constraints. */ @Description("Himmelblau's nonlinear optimization problem") public class ConstrHimmelblauProblem extends AbstractProblemDouble implements Serializable { diff --git a/src/eva2/problems/F1Problem.java b/src/eva2/problems/F1Problem.java index 0d9d3b70..418c4cf3 100644 --- a/src/eva2/problems/F1Problem.java +++ b/src/eva2/problems/F1Problem.java @@ -41,7 +41,7 @@ public class F1Problem extends AbstractProblemDoubleOffset implements Interface2 } /** - * This method allows you to evaluate a simple bit string to determine the fitness + * This method allows you to evaluate a eva2.problems.simple bit string to determine the fitness * * @param x The n-dimensional input vector * @return The m-dimensional output vector. diff --git a/src/eva2/problems/F22Problem.java b/src/eva2/problems/F22Problem.java index ab8d629a..85cbe11a 100644 --- a/src/eva2/problems/F22Problem.java +++ b/src/eva2/problems/F22Problem.java @@ -40,7 +40,7 @@ public class F22Problem extends AbstractProblemDoubleOffset implements Interface } /** - * This method allows you to evaluate a simple bit string to determine the fitness + * This method allows you to evaluate a eva2.problems.simple bit string to determine the fitness * * @param x The n-dimensional input vector * @return The m-dimensional output vector. diff --git a/src/eva2/problems/FLensProblem.java b/src/eva2/problems/FLensProblem.java index 944b4e48..d01542b1 100644 --- a/src/eva2/problems/FLensProblem.java +++ b/src/eva2/problems/FLensProblem.java @@ -327,7 +327,7 @@ public class FLensProblem extends AbstractOptimizationProblem } /** - * Ths method allows you to evaluate a simple bit string to determine the fitness + * Ths method allows you to evaluate a eva2.problems.simple bit string to determine the fitness * * @param x The n-dimensional input vector * @return The m-dimensional output vector. diff --git a/src/eva2/problems/I1Problem.java b/src/eva2/problems/I1Problem.java index aad09162..26d2c205 100644 --- a/src/eva2/problems/I1Problem.java +++ b/src/eva2/problems/I1Problem.java @@ -28,7 +28,7 @@ public class I1Problem extends AbstractProblemInteger implements java.io.Seriali } /** - * Ths method allows you to evaluate a simple bit string to determine the fitness + * Ths method allows you to evaluate a eva2.problems.simple bit string to determine the fitness * * @param x The n-dimensional input vector * @return The m-dimensional output vector. diff --git a/src/eva2/problems/TF1Problem.java b/src/eva2/problems/TF1Problem.java index 8f2c47e3..9308c80c 100644 --- a/src/eva2/problems/TF1Problem.java +++ b/src/eva2/problems/TF1Problem.java @@ -152,7 +152,7 @@ public class TF1Problem extends AbstractMultiObjectiveOptimizationProblem implem } /** - * Ths method allows you to evaluate a simple bit string to determine the fitness + * Ths method allows you to evaluate a eva2.problems.simple bit string to determine the fitness * * @param x The n-dimensional input vector * @return The m-dimensional output vector. diff --git a/src/eva2/problems/simple/InterfaceSimpleProblem.java b/src/eva2/problems/simple/InterfaceSimpleProblem.java index 4c419518..e96ecbae 100644 --- a/src/eva2/problems/simple/InterfaceSimpleProblem.java +++ b/src/eva2/problems/simple/InterfaceSimpleProblem.java @@ -1,7 +1,7 @@ package eva2.problems.simple; /** - * A simple interface to easily include new optimization problems in Java into the + * A eva2.problems.simple interface to easily include new optimization problems in Java into the * EvA framework. */ public interface InterfaceSimpleProblem { diff --git a/src/eva2/tools/MultirunRefiner.java b/src/eva2/tools/MultirunRefiner.java index fcbef9b1..80e739b4 100644 --- a/src/eva2/tools/MultirunRefiner.java +++ b/src/eva2/tools/MultirunRefiner.java @@ -332,7 +332,7 @@ public class MultirunRefiner { // } /** - * A simple method to read doubles from a string. + * A eva2.problems.simple method to read doubles from a string. * * @param searchme The string to be searched. * @return The array of doubles found. diff --git a/src/eva2/tools/TXTFileFilter.java b/src/eva2/tools/TXTFileFilter.java index 79cc66eb..efd29e94 100644 --- a/src/eva2/tools/TXTFileFilter.java +++ b/src/eva2/tools/TXTFileFilter.java @@ -8,7 +8,7 @@ package eva2.tools; import javax.swing.filechooser.FileFilter; -/**A simple File Filter for *.txt files. +/**A eva2.problems.simple File Filter for *.txt files. */ public class TXTFileFilter extends FileFilter { diff --git a/src/eva2/tools/chart2d/DPointIcon.java b/src/eva2/tools/chart2d/DPointIcon.java index b8dcb1de..e0b71278 100644 --- a/src/eva2/tools/chart2d/DPointIcon.java +++ b/src/eva2/tools/chart2d/DPointIcon.java @@ -3,7 +3,7 @@ package eva2.tools.chart2d; import java.awt.*; /** - * A simple interface which can be used to paint certain icons at DPoints + * A eva2.problems.simple interface which can be used to paint certain icons at DPoints * ( @see chart2d.DPoint.setIcon or chart2d.DPointSet.setIcon ). * Different points may be easier recognized in a complex graph. * The container does not guarantee that the whole icon is visible in the graph diff --git a/src/eva2/tools/matlab/JMatLink.java b/src/eva2/tools/matlab/JMatLink.java index 5b31d748..7cb63202 100644 --- a/src/eva2/tools/matlab/JMatLink.java +++ b/src/eva2/tools/matlab/JMatLink.java @@ -1710,7 +1710,7 @@ public class JMatLink extends Thread { // this is a concurrent situation. - // The solution is simple: I always use a locking-mechanism to wait for the + // The solution is eva2.problems.simple: I always use a locking-mechanism to wait for the // data. The main thread will release the lock and the calling method can diff --git a/test/eva2/tools/SerializerTest.java b/test/eva2/tools/SerializerTest.java index b31fd39f..23bcaa28 100644 --- a/test/eva2/tools/SerializerTest.java +++ b/test/eva2/tools/SerializerTest.java @@ -22,7 +22,7 @@ public class SerializerTest { @Before public void setUp() { - // Create a simple object graph + // Create a eva2.problems.simple object graph dataStructObject = new ExampleDataStruct(); dataStructObject.message = "hello world"; dataStructObject.data = new int[]{1, 2, 3, 4}; @@ -90,7 +90,7 @@ public class SerializerTest { } /** - * This is a simple serializable data structure that we use below for testing the methods above + * This is a eva2.problems.simple serializable data structure that we use below for testing the methods above * */ class ExampleDataStruct implements Serializable {