diff --git a/src/eva2/OptimizerFactory.java b/src/eva2/OptimizerFactory.java index 26f02827..c6af76eb 100644 --- a/src/eva2/OptimizerFactory.java +++ b/src/eva2/OptimizerFactory.java @@ -1,39 +1,61 @@ package eva2; -import eva2.server.go.IndividualInterface; -import eva2.server.go.InterfacePopulationChangedEventListener; -import eva2.server.go.InterfaceTerminator; -import eva2.server.go.enums.DETypeEnum; -import eva2.server.go.enums.MutateESCrossoverTypeEnum; -import eva2.server.go.enums.PSOTopologyEnum; -import eva2.server.go.enums.PostProcessMethod; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceDataTypeBinary; -import eva2.server.go.individuals.InterfaceDataTypeDouble; -import eva2.server.go.individuals.InterfaceESIndividual; -import eva2.server.go.operators.archiving.ArchivingNSGAII; -import eva2.server.go.operators.archiving.InformationRetrievalInserting; -import eva2.server.go.operators.archiving.InterfaceArchiving; -import eva2.server.go.operators.archiving.InterfaceInformationRetrieval; -import eva2.server.go.operators.cluster.ClusteringDensityBased; -import eva2.server.go.operators.cluster.InterfaceClustering; -import eva2.server.go.operators.crossover.CrossoverESDefault; -import eva2.server.go.operators.crossover.InterfaceCrossover; -import eva2.server.go.operators.crossover.NoCrossover; -import eva2.server.go.operators.distancemetric.IndividualDataMetric; -import eva2.server.go.operators.mutation.*; -import eva2.server.go.operators.postprocess.InterfacePostProcessParams; -import eva2.server.go.operators.postprocess.PostProcessParams; -import eva2.server.go.operators.selection.InterfaceSelection; -import eva2.server.go.operators.selection.SelectBestIndividuals; -import eva2.server.go.operators.terminators.CombinedTerminator; -import eva2.server.go.operators.terminators.EvaluationTerminator; -import eva2.server.go.populations.PBILPopulation; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.AbstractOptimizationProblem; -import eva2.server.go.strategies.*; -import eva2.server.modules.GOParameters; -import eva2.server.stat.InterfaceStatistics; +import eva2.optimization.operators.mutation.InterfaceMutation; +import eva2.optimization.operators.mutation.NoMutation; +import eva2.optimization.operators.mutation.MutateESFixedStepSize; +import eva2.optimization.operators.mutation.MutateESCovarianceMatrixAdaption; +import eva2.optimization.operators.mutation.MutateESGlobal; +import eva2.optimization.operators.mutation.MutateESRankMuCMA; +import eva2.optimization.strategies.ParticleSwarmOptimization; +import eva2.optimization.strategies.EvolutionStrategyIPOP; +import eva2.optimization.strategies.GradientDescentAlgorithm; +import eva2.optimization.strategies.NelderMeadSimplex; +import eva2.optimization.strategies.DifferentialEvolution; +import eva2.optimization.strategies.EsDpiNiching; +import eva2.optimization.strategies.HillClimbing; +import eva2.optimization.strategies.EvolutionStrategies; +import eva2.optimization.strategies.PopulationBasedIncrementalLearning; +import eva2.optimization.strategies.EsDpiNichingCma; +import eva2.optimization.strategies.MultiObjectiveEA; +import eva2.optimization.strategies.GeneticAlgorithm; +import eva2.optimization.strategies.InterfaceOptimizer; +import eva2.optimization.strategies.Tribes; +import eva2.optimization.strategies.SimulatedAnnealing; +import eva2.optimization.strategies.ClusteringHillClimbing; +import eva2.optimization.strategies.ClusterBasedNichingEA; +import eva2.optimization.strategies.MonteCarloSearch; +import eva2.optimization.go.IndividualInterface; +import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.go.InterfaceTerminator; +import eva2.optimization.enums.DETypeEnum; +import eva2.optimization.enums.MutateESCrossoverTypeEnum; +import eva2.optimization.enums.PSOTopologyEnum; +import eva2.optimization.enums.PostProcessMethod; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceDataTypeBinary; +import eva2.optimization.individuals.InterfaceDataTypeDouble; +import eva2.optimization.individuals.InterfaceESIndividual; +import eva2.optimization.operators.archiving.ArchivingNSGAII; +import eva2.optimization.operators.archiving.InformationRetrievalInserting; +import eva2.optimization.operators.archiving.InterfaceArchiving; +import eva2.optimization.operators.archiving.InterfaceInformationRetrieval; +import eva2.optimization.operators.cluster.ClusteringDensityBased; +import eva2.optimization.operators.cluster.InterfaceClustering; +import eva2.optimization.operators.crossover.CrossoverESDefault; +import eva2.optimization.operators.crossover.InterfaceCrossover; +import eva2.optimization.operators.crossover.NoCrossover; +import eva2.optimization.operators.distancemetric.IndividualDataMetric; +import eva2.optimization.operators.postprocess.InterfacePostProcessParams; +import eva2.optimization.operators.postprocess.PostProcessParams; +import eva2.optimization.operators.selection.InterfaceSelection; +import eva2.optimization.operators.selection.SelectBestIndividuals; +import eva2.optimization.operators.terminators.CombinedTerminator; +import eva2.optimization.operators.terminators.EvaluationTerminator; +import eva2.optimization.populations.PBILPopulation; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.AbstractOptimizationProblem; +import eva2.optimization.modules.GOParameters; +import eva2.optimization.stat.InterfaceStatistics; import eva2.tools.math.RNG; import java.util.ArrayList; import java.util.BitSet; diff --git a/src/eva2/OptimizerRunnable.java b/src/eva2/OptimizerRunnable.java index ceae6919..b83c370f 100644 --- a/src/eva2/OptimizerRunnable.java +++ b/src/eva2/OptimizerRunnable.java @@ -1,19 +1,24 @@ package eva2; +import eva2.optimization.stat.StatisticsDummy; +import eva2.optimization.stat.InterfaceStatistics; +import eva2.optimization.stat.StatisticsParameter; +import eva2.optimization.stat.AbstractStatistics; +import eva2.optimization.stat.StatisticsStandalone; +import eva2.optimization.stat.InterfaceTextListener; import eva2.optimization.OptimizationStateListener; -import eva2.server.go.IndividualInterface; -import eva2.server.go.InterfaceGOParameters; -import eva2.server.go.InterfaceTerminator; -import eva2.server.go.individuals.InterfaceDataTypeBinary; -import eva2.server.go.individuals.InterfaceDataTypeDouble; -import eva2.server.go.individuals.InterfaceDataTypeInteger; -import eva2.server.go.operators.postprocess.InterfacePostProcessParams; -import eva2.server.go.operators.postprocess.PostProcessParams; -import eva2.server.go.populations.Population; -import eva2.server.go.populations.SolutionSet; -import eva2.server.modules.GOParameters; -import eva2.server.modules.Processor; -import eva2.server.stat.*; +import eva2.optimization.go.IndividualInterface; +import eva2.optimization.go.InterfaceGOParameters; +import eva2.optimization.go.InterfaceTerminator; +import eva2.optimization.individuals.InterfaceDataTypeBinary; +import eva2.optimization.individuals.InterfaceDataTypeDouble; +import eva2.optimization.individuals.InterfaceDataTypeInteger; +import eva2.optimization.operators.postprocess.InterfacePostProcessParams; +import eva2.optimization.operators.postprocess.PostProcessParams; +import eva2.optimization.populations.Population; +import eva2.optimization.populations.SolutionSet; +import eva2.optimization.modules.GOParameters; +import eva2.optimization.modules.Processor; import java.io.PrintWriter; import java.io.StringWriter; import java.util.BitSet; diff --git a/src/eva2/client/ClassPreloader.java b/src/eva2/client/ClassPreloader.java index 8ce2b4ea..5c480543 100644 --- a/src/eva2/client/ClassPreloader.java +++ b/src/eva2/client/ClassPreloader.java @@ -3,38 +3,38 @@ package eva2.client; import eva2.gui.GenericObjectEditor; /** - * This Runnable just requests a number of classes as does the GenericObjectEditor - * so that they are loaded into the system cache. It can be done at startup time and - * accelerates later reloading. - * + * This Runnable just requests a number of classes as does the + * GenericObjectEditor so that they are loaded into the system cache. It can be + * done at startup time and accelerates later reloading. + * * @author mkron * */ public class ClassPreloader implements Runnable { + /** * List of classes to load when ClassPreloader is started. */ private String[] classNames = null; - + /* Creates a new ClassPreloader and sets the * list of classes to load. * * @param classes List of classes to load */ - public ClassPreloader(final String ... classes) { - this.classNames = classes; - } + public ClassPreloader(final String... classes) { + this.classNames = classes; + } /** * Load classes via GenericObjectEditor in a thread. */ @Override - public void run() { - if (classNames != null) { - for (int i = 0; i < classNames.length; i++) { - GenericObjectEditor.getClassesFromClassPath(classNames[i], null); - } - } - } - + public void run() { + if (classNames != null) { + for (int i = 0; i < classNames.length; i++) { + GenericObjectEditor.getClassesFromClassPath(classNames[i], null); + } + } + } } diff --git a/src/eva2/client/EvAClient.java b/src/eva2/client/EvAClient.java index 31ace0ca..74d714aa 100644 --- a/src/eva2/client/EvAClient.java +++ b/src/eva2/client/EvAClient.java @@ -14,14 +14,14 @@ package eva2.client; import eva2.EvAInfo; import eva2.gui.*; import eva2.optimization.OptimizationStateListener; -import eva2.server.go.InterfaceGOParameters; -import eva2.server.modules.AbstractModuleAdapter; -import eva2.server.modules.GOParameters; -import eva2.server.modules.GenericModuleAdapter; -import eva2.server.modules.ModuleAdapter; -import eva2.server.stat.AbstractStatistics; -import eva2.server.stat.InterfaceStatisticsListener; -import eva2.server.stat.InterfaceStatisticsParameter; +import eva2.optimization.go.InterfaceGOParameters; +import eva2.optimization.modules.AbstractModuleAdapter; +import eva2.optimization.modules.GOParameters; +import eva2.optimization.modules.GenericModuleAdapter; +import eva2.optimization.modules.ModuleAdapter; +import eva2.optimization.stat.AbstractStatistics; +import eva2.optimization.stat.InterfaceStatisticsListener; +import eva2.optimization.stat.InterfaceStatisticsParameter; import eva2.tools.BasicResourceLoader; import eva2.tools.EVAERROR; import eva2.tools.ReflectPackage; diff --git a/src/eva2/client/EvAComAdapter.java b/src/eva2/client/EvAComAdapter.java index 43ad2aea..7dc5fb6c 100644 --- a/src/eva2/client/EvAComAdapter.java +++ b/src/eva2/client/EvAComAdapter.java @@ -12,10 +12,10 @@ package eva2.client; */ import eva2.EvAInfo; import eva2.gui.LoggingPanel; -import eva2.server.EvAMainAdapter; -import eva2.server.EvAMainAdapterImpl; -import eva2.server.go.InterfaceGOParameters; -import eva2.server.modules.ModuleAdapter; +import eva2.optimization.EvAMainAdapter; +import eva2.optimization.EvAMainAdapterImpl; +import eva2.optimization.go.InterfaceGOParameters; +import eva2.optimization.modules.ModuleAdapter; import java.rmi.RemoteException; /** diff --git a/src/eva2/examples/TerminatorExample.java b/src/eva2/examples/TerminatorExample.java index 14e3f828..781b9b9a 100644 --- a/src/eva2/examples/TerminatorExample.java +++ b/src/eva2/examples/TerminatorExample.java @@ -1,14 +1,14 @@ package eva2.examples; import eva2.OptimizerFactory; -import eva2.server.go.operators.terminators.CombinedTerminator; -import eva2.server.go.operators.terminators.EvaluationTerminator; -import eva2.server.go.operators.terminators.FitnessConvergenceTerminator; -import eva2.server.go.operators.terminators.PhenotypeConvergenceTerminator; -import eva2.server.go.operators.terminators.PopulationMeasureTerminator.ChangeTypeEnum; -import eva2.server.go.operators.terminators.PopulationMeasureTerminator.DirectionTypeEnum; -import eva2.server.go.operators.terminators.PopulationMeasureTerminator.StagnationTypeEnum; -import eva2.server.go.problems.F1Problem; +import eva2.optimization.operators.terminators.CombinedTerminator; +import eva2.optimization.operators.terminators.EvaluationTerminator; +import eva2.optimization.operators.terminators.FitnessConvergenceTerminator; +import eva2.optimization.operators.terminators.PhenotypeConvergenceTerminator; +import eva2.optimization.operators.terminators.PopulationMeasureTerminator.ChangeTypeEnum; +import eva2.optimization.operators.terminators.PopulationMeasureTerminator.DirectionTypeEnum; +import eva2.optimization.operators.terminators.PopulationMeasureTerminator.StagnationTypeEnum; +import eva2.optimization.problems.F1Problem; public class TerminatorExample { public static void main(String[] args) { diff --git a/src/eva2/examples/TestingCbnPostProc.java b/src/eva2/examples/TestingCbnPostProc.java index 16b2cc57..faf0f670 100644 --- a/src/eva2/examples/TestingCbnPostProc.java +++ b/src/eva2/examples/TestingCbnPostProc.java @@ -1,10 +1,10 @@ package eva2.examples; import eva2.OptimizerFactory; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.postprocess.PostProcessParams; -import eva2.server.go.operators.terminators.EvaluationTerminator; -import eva2.server.go.problems.FM0Problem; -import eva2.server.modules.GOParameters; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.operators.postprocess.PostProcessParams; +import eva2.optimization.operators.terminators.EvaluationTerminator; +import eva2.optimization.problems.FM0Problem; +import eva2.optimization.modules.GOParameters; import java.util.List; public class TestingCbnPostProc { diff --git a/src/eva2/examples/TestingF1PSO.java b/src/eva2/examples/TestingF1PSO.java index 9e93644d..31072017 100644 --- a/src/eva2/examples/TestingF1PSO.java +++ b/src/eva2/examples/TestingF1PSO.java @@ -1,6 +1,6 @@ package eva2.examples; import eva2.OptimizerFactory; -import eva2.server.go.problems.F1Problem; +import eva2.optimization.problems.F1Problem; public class TestingF1PSO { public static void main(String[] args) { diff --git a/src/eva2/examples/TestingGAB1.java b/src/eva2/examples/TestingGAB1.java index 541428d2..6e0998df 100644 --- a/src/eva2/examples/TestingGAB1.java +++ b/src/eva2/examples/TestingGAB1.java @@ -1,11 +1,11 @@ package eva2.examples; import eva2.OptimizerFactory; -import eva2.server.go.operators.selection.SelectXProbRouletteWheel; -import eva2.server.go.operators.terminators.EvaluationTerminator; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.B1Problem; -import eva2.server.go.strategies.GeneticAlgorithm; -import eva2.server.modules.GOParameters; +import eva2.optimization.operators.selection.SelectXProbRouletteWheel; +import eva2.optimization.operators.terminators.EvaluationTerminator; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.B1Problem; +import eva2.optimization.strategies.GeneticAlgorithm; +import eva2.optimization.modules.GOParameters; import java.util.BitSet; public class TestingGAB1 { diff --git a/src/eva2/examples/TestingPlusCmaEs.java b/src/eva2/examples/TestingPlusCmaEs.java index a24999d0..5bb68abd 100644 --- a/src/eva2/examples/TestingPlusCmaEs.java +++ b/src/eva2/examples/TestingPlusCmaEs.java @@ -1,12 +1,12 @@ package eva2.examples; import eva2.OptimizerFactory; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.crossover.CrossoverESDefault; -import eva2.server.go.operators.mutation.MutateESCovarianceMatrixAdaption; -import eva2.server.go.operators.terminators.EvaluationTerminator; -import eva2.server.go.problems.FM0Problem; -import eva2.server.go.strategies.EvolutionStrategies; -import eva2.server.modules.GOParameters; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.operators.crossover.CrossoverESDefault; +import eva2.optimization.operators.mutation.MutateESCovarianceMatrixAdaption; +import eva2.optimization.operators.terminators.EvaluationTerminator; +import eva2.optimization.problems.FM0Problem; +import eva2.optimization.strategies.EvolutionStrategies; +import eva2.optimization.modules.GOParameters; public class TestingPlusCmaEs { public static void main(String[] args) { diff --git a/src/eva2/gui/BeanInspector.java b/src/eva2/gui/BeanInspector.java index 859c8336..87bbbb84 100644 --- a/src/eva2/gui/BeanInspector.java +++ b/src/eva2/gui/BeanInspector.java @@ -1,8 +1,8 @@ package eva2.gui; import eva2.client.EvAClient; -import eva2.server.go.populations.Population; -import eva2.server.go.strategies.GeneticAlgorithm; +import eva2.optimization.populations.Population; +import eva2.optimization.strategies.GeneticAlgorithm; import eva2.tools.Pair; import eva2.tools.SelectedTag; import eva2.tools.StringTools; diff --git a/src/eva2/gui/EvAModuleButtonPanelMaker.java b/src/eva2/gui/EvAModuleButtonPanelMaker.java index 622a5392..c77eb5e7 100644 --- a/src/eva2/gui/EvAModuleButtonPanelMaker.java +++ b/src/eva2/gui/EvAModuleButtonPanelMaker.java @@ -10,8 +10,8 @@ package eva2.gui; * $Author: mkron $ */ import eva2.optimization.OptimizationStateListener; -import eva2.server.modules.ModuleAdapter; -import eva2.server.stat.EvAJob; +import eva2.optimization.modules.ModuleAdapter; +import eva2.optimization.stat.EvAJob; import eva2.tools.ToolBoxGui; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; diff --git a/src/eva2/gui/EvATabbedFrameMaker.java b/src/eva2/gui/EvATabbedFrameMaker.java index cbb20382..9500c7be 100644 --- a/src/eva2/gui/EvATabbedFrameMaker.java +++ b/src/eva2/gui/EvATabbedFrameMaker.java @@ -5,8 +5,8 @@ package eva2.gui; * $ $Date: 2007-11-21 18:06:36 +0100 (Wed, 21 Nov 2007) $ $Author: mkron $ */ -import eva2.server.go.InterfaceNotifyOnInformers; -import eva2.server.go.problems.InterfaceAdditionalPopulationInformer; +import eva2.optimization.go.InterfaceNotifyOnInformers; +import eva2.optimization.problems.InterfaceAdditionalPopulationInformer; import java.awt.*; import java.awt.event.*; import java.io.Serializable; diff --git a/src/eva2/gui/FunctionArea.java b/src/eva2/gui/FunctionArea.java index 010e70ec..0922e884 100644 --- a/src/eva2/gui/FunctionArea.java +++ b/src/eva2/gui/FunctionArea.java @@ -11,8 +11,8 @@ package eva2.gui; * IMPORTS *========================================================================== */ -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.mocco.paretofrontviewer.InterfaceRefPointListener; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.mocco.paretofrontviewer.InterfaceRefPointListener; import eva2.tools.ToolBoxGui; import eva2.tools.chart2d.Chart2DDPointIconCircle; import eva2.tools.chart2d.Chart2DDPointIconContent; diff --git a/src/eva2/gui/GOEPanel.java b/src/eva2/gui/GOEPanel.java index 133773f9..2ba71265 100644 --- a/src/eva2/gui/GOEPanel.java +++ b/src/eva2/gui/GOEPanel.java @@ -1,6 +1,6 @@ package eva2.gui; -import eva2.server.go.tools.FileTools; +import eva2.optimization.tools.FileTools; import eva2.tools.BasicResourceLoader; import eva2.tools.EVAHELP; import eva2.tools.SerializedObject; diff --git a/src/eva2/gui/GenericAreaEditor.java b/src/eva2/gui/GenericAreaEditor.java index 3e54389e..31477a19 100644 --- a/src/eva2/gui/GenericAreaEditor.java +++ b/src/eva2/gui/GenericAreaEditor.java @@ -1,7 +1,7 @@ package eva2.gui; -import eva2.server.go.individuals.codings.gp.AbstractGPNode; -import eva2.server.go.individuals.codings.gp.GPArea; +import eva2.optimization.individuals.codings.gp.AbstractGPNode; +import eva2.optimization.individuals.codings.gp.GPArea; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/gui/GenericOptimizationObjectivesEditor.java b/src/eva2/gui/GenericOptimizationObjectivesEditor.java index 42292462..2e445d69 100644 --- a/src/eva2/gui/GenericOptimizationObjectivesEditor.java +++ b/src/eva2/gui/GenericOptimizationObjectivesEditor.java @@ -1,10 +1,10 @@ package eva2.gui; -import eva2.server.go.problems.InterfaceOptimizationObjective; -import eva2.server.go.problems.InterfaceOptimizationTarget; -import eva2.server.go.tools.AbstractObjectEditor; -import eva2.server.go.tools.GeneralGOEProperty; +import eva2.optimization.problems.InterfaceOptimizationObjective; +import eva2.optimization.problems.InterfaceOptimizationTarget; +import eva2.optimization.tools.AbstractObjectEditor; +import eva2.optimization.tools.GeneralGOEProperty; import eva2.tools.BasicResourceLoader; import java.awt.BorderLayout; import java.awt.Component; diff --git a/src/eva2/gui/GenericOptimizationObjectivesWithParamEditor.java b/src/eva2/gui/GenericOptimizationObjectivesWithParamEditor.java index d98806ff..37386c08 100644 --- a/src/eva2/gui/GenericOptimizationObjectivesWithParamEditor.java +++ b/src/eva2/gui/GenericOptimizationObjectivesWithParamEditor.java @@ -1,9 +1,9 @@ package eva2.gui; -import eva2.server.go.problems.InterfaceOptimizationObjective; -import eva2.server.go.tools.AbstractObjectEditor; -import eva2.server.go.tools.GeneralGOEProperty; +import eva2.optimization.problems.InterfaceOptimizationObjective; +import eva2.optimization.tools.AbstractObjectEditor; +import eva2.optimization.tools.GeneralGOEProperty; import eva2.tools.BasicResourceLoader; import java.awt.BorderLayout; import java.awt.Component; diff --git a/src/eva2/gui/InterfaceDPointWithContent.java b/src/eva2/gui/InterfaceDPointWithContent.java index 3a9aefad..7c173f1d 100644 --- a/src/eva2/gui/InterfaceDPointWithContent.java +++ b/src/eva2/gui/InterfaceDPointWithContent.java @@ -1,7 +1,7 @@ package eva2.gui; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.problems.InterfaceOptimizationProblem; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/gui/InterfaceSelectablePointIcon.java b/src/eva2/gui/InterfaceSelectablePointIcon.java index ba28457c..15f66cb5 100644 --- a/src/eva2/gui/InterfaceSelectablePointIcon.java +++ b/src/eva2/gui/InterfaceSelectablePointIcon.java @@ -1,7 +1,7 @@ package eva2.gui; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.mocco.paretofrontviewer.InterfaceRefSolutionListener; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.mocco.paretofrontviewer.InterfaceRefSolutionListener; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/gui/JParaPanel.java b/src/eva2/gui/JParaPanel.java index edd0d3e4..acd1cfa3 100644 --- a/src/eva2/gui/JParaPanel.java +++ b/src/eva2/gui/JParaPanel.java @@ -8,7 +8,7 @@ package eva2.gui; * @author Holger Ulmer, Felix Streichert, Hannes Planatscher */ -import eva2.server.stat.EvAJobList; +import eva2.optimization.stat.EvAJobList; import java.beans.PropertyEditor; import java.beans.PropertyEditorManager; import java.io.Serializable; diff --git a/src/eva2/gui/JTextoutputFrame.java b/src/eva2/gui/JTextoutputFrame.java index f37bf8b4..418f6e95 100644 --- a/src/eva2/gui/JTextoutputFrame.java +++ b/src/eva2/gui/JTextoutputFrame.java @@ -6,7 +6,7 @@ package eva2.gui; */ import eva2.EvAInfo; -import eva2.server.go.tools.FileTools; +import eva2.optimization.tools.FileTools; import eva2.tools.BasicResourceLoader; import java.awt.BorderLayout; import java.awt.Point; diff --git a/src/eva2/gui/JTextoutputFrameInterface.java b/src/eva2/gui/JTextoutputFrameInterface.java index a640a124..0d0f008a 100644 --- a/src/eva2/gui/JTextoutputFrameInterface.java +++ b/src/eva2/gui/JTextoutputFrameInterface.java @@ -1,6 +1,6 @@ package eva2.gui; -import eva2.server.stat.InterfaceTextListener; +import eva2.optimization.stat.InterfaceTextListener; /* * Title: EvA2 diff --git a/src/eva2/gui/Plot.java b/src/eva2/gui/Plot.java index 11a25b07..25ef7d65 100644 --- a/src/eva2/gui/Plot.java +++ b/src/eva2/gui/Plot.java @@ -7,8 +7,8 @@ package eva2.gui; * +0100 (Tue, 11 Dec 2007) $ $Author: mkron $ */ import eva2.EvAInfo; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; import eva2.tools.BasicResourceLoader; import eva2.tools.chart2d.DPointSet; import java.awt.*; diff --git a/src/eva2/gui/PropertyEditorProvider.java b/src/eva2/gui/PropertyEditorProvider.java index 5fcaa62f..d3c7b124 100644 --- a/src/eva2/gui/PropertyEditorProvider.java +++ b/src/eva2/gui/PropertyEditorProvider.java @@ -1,7 +1,7 @@ package eva2.gui; -import eva2.server.go.InterfaceTerminator; -import eva2.server.go.individuals.codings.gp.GPArea; +import eva2.optimization.go.InterfaceTerminator; +import eva2.optimization.individuals.codings.gp.GPArea; import eva2.tools.SelectedTag; import eva2.tools.StringSelection; import java.beans.PropertyDescriptor; diff --git a/src/eva2/gui/PropertyOptimizationObjectives.java b/src/eva2/gui/PropertyOptimizationObjectives.java index c95a8c78..cc7ee722 100644 --- a/src/eva2/gui/PropertyOptimizationObjectives.java +++ b/src/eva2/gui/PropertyOptimizationObjectives.java @@ -1,6 +1,6 @@ package eva2.gui; -import eva2.server.go.problems.InterfaceOptimizationObjective; +import eva2.optimization.problems.InterfaceOptimizationObjective; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/gui/PropertyOptimizationObjectivesWithParam.java b/src/eva2/gui/PropertyOptimizationObjectivesWithParam.java index 779b3c9a..68627892 100644 --- a/src/eva2/gui/PropertyOptimizationObjectivesWithParam.java +++ b/src/eva2/gui/PropertyOptimizationObjectivesWithParam.java @@ -1,6 +1,6 @@ package eva2.gui; -import eva2.server.go.problems.InterfaceOptimizationObjective; +import eva2.optimization.problems.InterfaceOptimizationObjective; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/gui/StatisticsEditor.java b/src/eva2/gui/StatisticsEditor.java index 2ca5673e..5e37b6ed 100644 --- a/src/eva2/gui/StatisticsEditor.java +++ b/src/eva2/gui/StatisticsEditor.java @@ -9,7 +9,7 @@ package eva2.gui; * $Date: 2007-10-23 13:43:24 +0200 (Tue, 23 Oct 2007) $ * $Author: mkron $ */ -import eva2.server.stat.GenericStatistics; +import eva2.optimization.stat.GenericStatistics; import java.awt.*; import java.beans.*; import javax.swing.*; diff --git a/src/eva2/gui/TopoPlot.java b/src/eva2/gui/TopoPlot.java index 4242e072..64806475 100644 --- a/src/eva2/gui/TopoPlot.java +++ b/src/eva2/gui/TopoPlot.java @@ -12,8 +12,8 @@ package eva2.gui; /*==========================================================================* * IMPORTS *==========================================================================*/ -import eva2.server.go.problems.Interface2DBorderProblem; -import eva2.server.go.problems.InterfaceFirstOrderDerivableProblem; +import eva2.optimization.problems.Interface2DBorderProblem; +import eva2.optimization.problems.InterfaceFirstOrderDerivableProblem; import eva2.tools.chart2d.DRectangle; import eva2.tools.diagram.ColorBarCalculator; import eva2.tools.math.Mathematics; diff --git a/src/eva2/server/EvAMainAdapter.java b/src/eva2/optimization/EvAMainAdapter.java similarity index 83% rename from src/eva2/server/EvAMainAdapter.java rename to src/eva2/optimization/EvAMainAdapter.java index 784b157d..d4d3e23d 100644 --- a/src/eva2/server/EvAMainAdapter.java +++ b/src/eva2/optimization/EvAMainAdapter.java @@ -1,4 +1,4 @@ -package eva2.server; +package eva2.optimization; /** * Title: EvA2 * Description: API for distributed and parallel computing. @@ -8,8 +8,8 @@ package eva2.server; * $Date: 2007-11-16 17:25:09 +0100 (Fri, 16 Nov 2007) $ * $Author: mkron $ */ -import eva2.server.go.InterfaceGOParameters; -import eva2.server.modules.ModuleAdapter; +import eva2.optimization.go.InterfaceGOParameters; +import eva2.optimization.modules.ModuleAdapter; /** * */ diff --git a/src/eva2/server/EvAMainAdapterImpl.java b/src/eva2/optimization/EvAMainAdapterImpl.java similarity index 89% rename from src/eva2/server/EvAMainAdapterImpl.java rename to src/eva2/optimization/EvAMainAdapterImpl.java index 7fc58ad1..f3673c05 100644 --- a/src/eva2/server/EvAMainAdapterImpl.java +++ b/src/eva2/optimization/EvAMainAdapterImpl.java @@ -1,4 +1,4 @@ -package eva2.server; +package eva2.optimization; /** * Title: The JProxy Framework @@ -10,8 +10,8 @@ package eva2.server; * $Author: mkron $ */ import eva2.EvAInfo; -import eva2.server.go.InterfaceGOParameters; -import eva2.server.modules.ModuleAdapter; +import eva2.optimization.go.InterfaceGOParameters; +import eva2.optimization.modules.ModuleAdapter; /** * */ diff --git a/src/eva2/server/ModuleServer.java b/src/eva2/optimization/ModuleServer.java similarity index 97% rename from src/eva2/server/ModuleServer.java rename to src/eva2/optimization/ModuleServer.java index e53be0f7..7d0de47a 100644 --- a/src/eva2/server/ModuleServer.java +++ b/src/eva2/optimization/ModuleServer.java @@ -1,4 +1,4 @@ -package eva2.server; +package eva2.optimization; /* * Title: EvA2 @@ -10,9 +10,9 @@ package eva2.server; * $Date: 2007-12-06 16:05:11 +0100 (Thu, 06 Dec 2007) $ * $Author: mkron $ */ -import eva2.server.go.InterfaceGOParameters; -import eva2.server.modules.GOModuleAdapter; -import eva2.server.modules.ModuleAdapter; +import eva2.optimization.go.InterfaceGOParameters; +import eva2.optimization.modules.GOModuleAdapter; +import eva2.optimization.modules.ModuleAdapter; import eva2.tools.EVAERROR; import eva2.tools.ReflectPackage; import java.lang.reflect.Constructor; diff --git a/src/eva2/server/go/enums/BOAScoringMethods.java b/src/eva2/optimization/enums/BOAScoringMethods.java similarity index 86% rename from src/eva2/server/go/enums/BOAScoringMethods.java rename to src/eva2/optimization/enums/BOAScoringMethods.java index d23f00ab..9e9fdc81 100644 --- a/src/eva2/server/go/enums/BOAScoringMethods.java +++ b/src/eva2/optimization/enums/BOAScoringMethods.java @@ -1,4 +1,4 @@ -package eva2.server.go.enums; +package eva2.optimization.enums; public enum BOAScoringMethods { BDM, K2, BIC; diff --git a/src/eva2/server/go/enums/DETypeEnum.java b/src/eva2/optimization/enums/DETypeEnum.java similarity index 84% rename from src/eva2/server/go/enums/DETypeEnum.java rename to src/eva2/optimization/enums/DETypeEnum.java index d49e1536..7a9dc8ea 100644 --- a/src/eva2/server/go/enums/DETypeEnum.java +++ b/src/eva2/optimization/enums/DETypeEnum.java @@ -1,4 +1,4 @@ -package eva2.server.go.enums; +package eva2.optimization.enums; public enum DETypeEnum { DE1_Rand_1, DE2_CurrentToBest, DE_Best_2, TrigonometricDE,DE_CurrentToRand; diff --git a/src/eva2/server/go/enums/ESMutationInitialSigma.java b/src/eva2/optimization/enums/ESMutationInitialSigma.java similarity index 75% rename from src/eva2/server/go/enums/ESMutationInitialSigma.java rename to src/eva2/optimization/enums/ESMutationInitialSigma.java index 21e6e537..1e1504e7 100644 --- a/src/eva2/server/go/enums/ESMutationInitialSigma.java +++ b/src/eva2/optimization/enums/ESMutationInitialSigma.java @@ -1,4 +1,4 @@ -package eva2.server.go.enums; +package eva2.optimization.enums; public enum ESMutationInitialSigma { halfRange, quarterRange, avgInitialDistance, userDefined; diff --git a/src/eva2/server/go/enums/MutateESCrossoverTypeEnum.java b/src/eva2/optimization/enums/MutateESCrossoverTypeEnum.java similarity index 69% rename from src/eva2/server/go/enums/MutateESCrossoverTypeEnum.java rename to src/eva2/optimization/enums/MutateESCrossoverTypeEnum.java index bac3ed20..3308e9b7 100644 --- a/src/eva2/server/go/enums/MutateESCrossoverTypeEnum.java +++ b/src/eva2/optimization/enums/MutateESCrossoverTypeEnum.java @@ -1,4 +1,4 @@ -package eva2.server.go.enums; +package eva2.optimization.enums; public enum MutateESCrossoverTypeEnum { none, intermediate, discrete; diff --git a/src/eva2/server/go/enums/PSOTopologyEnum.java b/src/eva2/optimization/enums/PSOTopologyEnum.java similarity index 95% rename from src/eva2/server/go/enums/PSOTopologyEnum.java rename to src/eva2/optimization/enums/PSOTopologyEnum.java index 34d70c3b..7e96932c 100644 --- a/src/eva2/server/go/enums/PSOTopologyEnum.java +++ b/src/eva2/optimization/enums/PSOTopologyEnum.java @@ -1,4 +1,4 @@ -package eva2.server.go.enums; +package eva2.optimization.enums; public enum PSOTopologyEnum { /** diff --git a/src/eva2/server/go/enums/PostProcessMethod.java b/src/eva2/optimization/enums/PostProcessMethod.java similarity index 67% rename from src/eva2/server/go/enums/PostProcessMethod.java rename to src/eva2/optimization/enums/PostProcessMethod.java index d5603fc6..ca0ddd59 100644 --- a/src/eva2/server/go/enums/PostProcessMethod.java +++ b/src/eva2/optimization/enums/PostProcessMethod.java @@ -1,4 +1,4 @@ -package eva2.server.go.enums; +package eva2.optimization.enums; public enum PostProcessMethod { hillClimber, nelderMead, cmaES; diff --git a/src/eva2/server/go/GOStandaloneVersion.java b/src/eva2/optimization/go/GOStandaloneVersion.java similarity index 97% rename from src/eva2/server/go/GOStandaloneVersion.java rename to src/eva2/optimization/go/GOStandaloneVersion.java index 35c9047a..69b53141 100644 --- a/src/eva2/server/go/GOStandaloneVersion.java +++ b/src/eva2/optimization/go/GOStandaloneVersion.java @@ -1,23 +1,23 @@ -package eva2.server.go; +package eva2.optimization.go; import eva2.gui.BeanInspector; import eva2.gui.JParaPanel; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.ESIndividualDoubleData; -import eva2.server.go.individuals.GAIndividualDoubleData; -import eva2.server.go.individuals.InterfaceDataTypeDouble; -import eva2.server.go.operators.crossover.CrossoverGAGINPoint; -import eva2.server.go.operators.mutation.InterfaceMutation; -import eva2.server.go.operators.mutation.MutateESFixedStepSize; -import eva2.server.go.operators.mutation.MutateESLocal; -import eva2.server.go.operators.selection.SelectTournament; -import eva2.server.go.operators.terminators.EvaluationTerminator; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.F1Problem; -import eva2.server.go.strategies.EvolutionStrategies; -import eva2.server.go.strategies.GeneticAlgorithm; -import eva2.server.go.strategies.InterfaceOptimizer; -import eva2.server.modules.GOParameters; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.ESIndividualDoubleData; +import eva2.optimization.individuals.GAIndividualDoubleData; +import eva2.optimization.individuals.InterfaceDataTypeDouble; +import eva2.optimization.operators.crossover.CrossoverGAGINPoint; +import eva2.optimization.operators.mutation.InterfaceMutation; +import eva2.optimization.operators.mutation.MutateESFixedStepSize; +import eva2.optimization.operators.mutation.MutateESLocal; +import eva2.optimization.operators.selection.SelectTournament; +import eva2.optimization.operators.terminators.EvaluationTerminator; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.F1Problem; +import eva2.optimization.strategies.EvolutionStrategies; +import eva2.optimization.strategies.GeneticAlgorithm; +import eva2.optimization.strategies.InterfaceOptimizer; +import eva2.optimization.modules.GOParameters; import eva2.tools.math.RNG; import java.awt.BorderLayout; import java.awt.List; diff --git a/src/eva2/server/go/IndividualInterface.java b/src/eva2/optimization/go/IndividualInterface.java similarity index 95% rename from src/eva2/server/go/IndividualInterface.java rename to src/eva2/optimization/go/IndividualInterface.java index b5ee7b83..186806bc 100644 --- a/src/eva2/server/go/IndividualInterface.java +++ b/src/eva2/optimization/go/IndividualInterface.java @@ -1,6 +1,6 @@ -package eva2.server.go; +package eva2.optimization.go; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.problems.InterfaceOptimizationProblem; /* * Title: EvA2 diff --git a/src/eva2/server/go/InterfaceGOParameters.java b/src/eva2/optimization/go/InterfaceGOParameters.java similarity index 88% rename from src/eva2/server/go/InterfaceGOParameters.java rename to src/eva2/optimization/go/InterfaceGOParameters.java index 9691bc27..d80dda40 100644 --- a/src/eva2/server/go/InterfaceGOParameters.java +++ b/src/eva2/optimization/go/InterfaceGOParameters.java @@ -1,9 +1,9 @@ -package eva2.server.go; +package eva2.optimization.go; -import eva2.server.go.operators.postprocess.InterfacePostProcessParams; -import eva2.server.go.problems.InterfaceAdditionalPopulationInformer; -import eva2.server.go.problems.InterfaceOptimizationProblem; -import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.optimization.operators.postprocess.InterfacePostProcessParams; +import eva2.optimization.problems.InterfaceAdditionalPopulationInformer; +import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.optimization.strategies.InterfaceOptimizer; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/InterfaceGOStandalone.java b/src/eva2/optimization/go/InterfaceGOStandalone.java similarity index 89% rename from src/eva2/server/go/InterfaceGOStandalone.java rename to src/eva2/optimization/go/InterfaceGOStandalone.java index 1e597eac..7a9115c1 100644 --- a/src/eva2/server/go/InterfaceGOStandalone.java +++ b/src/eva2/optimization/go/InterfaceGOStandalone.java @@ -1,4 +1,4 @@ -package eva2.server.go; +package eva2.optimization.go; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/InterfaceNotifyOnInformers.java b/src/eva2/optimization/go/InterfaceNotifyOnInformers.java similarity index 67% rename from src/eva2/server/go/InterfaceNotifyOnInformers.java rename to src/eva2/optimization/go/InterfaceNotifyOnInformers.java index efa1d15d..0f3bf7e1 100644 --- a/src/eva2/server/go/InterfaceNotifyOnInformers.java +++ b/src/eva2/optimization/go/InterfaceNotifyOnInformers.java @@ -1,6 +1,6 @@ -package eva2.server.go; +package eva2.optimization.go; -import eva2.server.go.problems.InterfaceAdditionalPopulationInformer; +import eva2.optimization.problems.InterfaceAdditionalPopulationInformer; import java.util.List; public interface InterfaceNotifyOnInformers { diff --git a/src/eva2/server/go/InterfacePopulationChangedEventListener.java b/src/eva2/optimization/go/InterfacePopulationChangedEventListener.java similarity index 94% rename from src/eva2/server/go/InterfacePopulationChangedEventListener.java rename to src/eva2/optimization/go/InterfacePopulationChangedEventListener.java index 4d22f838..881c6265 100644 --- a/src/eva2/server/go/InterfacePopulationChangedEventListener.java +++ b/src/eva2/optimization/go/InterfacePopulationChangedEventListener.java @@ -1,4 +1,4 @@ -package eva2.server.go; +package eva2.optimization.go; /** diff --git a/src/eva2/server/go/InterfaceProcessor.java b/src/eva2/optimization/go/InterfaceProcessor.java similarity index 95% rename from src/eva2/server/go/InterfaceProcessor.java rename to src/eva2/optimization/go/InterfaceProcessor.java index 292da26c..58f7a6d5 100644 --- a/src/eva2/server/go/InterfaceProcessor.java +++ b/src/eva2/optimization/go/InterfaceProcessor.java @@ -1,4 +1,4 @@ -package eva2.server.go; +package eva2.optimization.go; import eva2.optimization.OptimizationStateListener; diff --git a/src/eva2/server/go/InterfaceTerminator.java b/src/eva2/optimization/go/InterfaceTerminator.java similarity index 79% rename from src/eva2/server/go/InterfaceTerminator.java rename to src/eva2/optimization/go/InterfaceTerminator.java index 06d37fe5..2fa3ed05 100644 --- a/src/eva2/server/go/InterfaceTerminator.java +++ b/src/eva2/optimization/go/InterfaceTerminator.java @@ -1,7 +1,7 @@ -package eva2.server.go; +package eva2.optimization.go; -import eva2.server.go.populations.InterfaceSolutionSet; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.populations.InterfaceSolutionSet; +import eva2.optimization.problems.InterfaceOptimizationProblem; /** * Interface for a termination criterion. diff --git a/src/eva2/server/go/MOCCOStandalone.java b/src/eva2/optimization/go/MOCCOStandalone.java similarity index 93% rename from src/eva2/server/go/MOCCOStandalone.java rename to src/eva2/optimization/go/MOCCOStandalone.java index 47496fbc..21b2794b 100644 --- a/src/eva2/server/go/MOCCOStandalone.java +++ b/src/eva2/optimization/go/MOCCOStandalone.java @@ -1,17 +1,34 @@ -package eva2.server.go; +package eva2.optimization.go; +import eva2.optimization.mocco.MOCCOState; +import eva2.optimization.mocco.MOCCOParameterizeGDF; +import eva2.optimization.mocco.MOCCOParameterizeTchebycheff; +import eva2.optimization.mocco.MOCCOParameterizeRefPoint; +import eva2.optimization.mocco.MOCCOChooseReferenceSolution; +import eva2.optimization.mocco.MOCCOChooseReferencePoint; +import eva2.optimization.mocco.MOCCOParameterizeSTEP; +import eva2.optimization.mocco.MOCCOProblemInitialization; +import eva2.optimization.mocco.MOCCOProblemRedefinition; +import eva2.optimization.mocco.MOCCOParameterizeMO; +import eva2.optimization.mocco.MOCCOChooseMOStrategy; +import eva2.optimization.mocco.MOCCOInitialPopulationSize; +import eva2.optimization.mocco.MOCCOParameterizeSO; +import eva2.optimization.mocco.InterfaceProcessElement; +import eva2.optimization.problems.InterfaceMultiObjectiveDeNovoProblem; +import eva2.optimization.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.optimization.problems.TF1Problem; +import eva2.optimization.problems.InterfaceOptimizationObjective; import eva2.gui.JParaPanel; import eva2.gui.PropertyDoubleArray; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.mocco.*; -import eva2.server.go.mocco.paretofrontviewer.MOCCOViewer; -import eva2.server.go.operators.moso.InterfaceMOSOConverter; -import eva2.server.go.operators.moso.MOSOWeightedFitness; -import eva2.server.go.operators.terminators.EvaluationTerminator; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.*; -import eva2.server.go.strategies.InterfaceOptimizer; -import eva2.server.go.strategies.IslandModelEA; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.mocco.paretofrontviewer.MOCCOViewer; +import eva2.optimization.operators.moso.InterfaceMOSOConverter; +import eva2.optimization.operators.moso.MOSOWeightedFitness; +import eva2.optimization.operators.terminators.EvaluationTerminator; +import eva2.optimization.populations.Population; +import eva2.optimization.strategies.InterfaceOptimizer; +import eva2.optimization.strategies.IslandModelEA; import java.awt.BorderLayout; import java.awt.Dimension; import java.awt.GridLayout; diff --git a/src/eva2/server/go/PopulationInterface.java b/src/eva2/optimization/go/PopulationInterface.java similarity index 98% rename from src/eva2/server/go/PopulationInterface.java rename to src/eva2/optimization/go/PopulationInterface.java index 32152428..a1f2ce9a 100644 --- a/src/eva2/server/go/PopulationInterface.java +++ b/src/eva2/optimization/go/PopulationInterface.java @@ -1,4 +1,4 @@ -package eva2.server.go; +package eva2.optimization.go; /* * Title: EvA2 * Description: diff --git a/src/eva2/server/go/SwingWorker.java b/src/eva2/optimization/go/SwingWorker.java similarity index 99% rename from src/eva2/server/go/SwingWorker.java rename to src/eva2/optimization/go/SwingWorker.java index 10c3d286..0a9540db 100644 --- a/src/eva2/server/go/SwingWorker.java +++ b/src/eva2/optimization/go/SwingWorker.java @@ -1,4 +1,4 @@ -package eva2.server.go; +package eva2.optimization.go; import javax.swing.SwingUtilities; /** diff --git a/src/eva2/server/go/individuals/AbstractEAIndividual.java b/src/eva2/optimization/individuals/AbstractEAIndividual.java similarity index 98% rename from src/eva2/server/go/individuals/AbstractEAIndividual.java rename to src/eva2/optimization/individuals/AbstractEAIndividual.java index 84c2ef6e..caa97a60 100644 --- a/src/eva2/server/go/individuals/AbstractEAIndividual.java +++ b/src/eva2/optimization/individuals/AbstractEAIndividual.java @@ -1,17 +1,17 @@ -package eva2.server.go.individuals; +package eva2.optimization.individuals; import eva2.gui.BeanInspector; -import eva2.server.go.IndividualInterface; -import eva2.server.go.individuals.codings.gp.InterfaceProgram; -import eva2.server.go.operators.constraint.InterfaceConstraint; -import eva2.server.go.operators.crossover.InterfaceCrossover; -import eva2.server.go.operators.crossover.NoCrossover; -import eva2.server.go.operators.initialization.DefaultInitialization; -import eva2.server.go.operators.initialization.InterfaceInitialization; -import eva2.server.go.operators.mutation.InterfaceMutation; -import eva2.server.go.operators.mutation.NoMutation; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.go.IndividualInterface; +import eva2.optimization.individuals.codings.gp.InterfaceProgram; +import eva2.optimization.operators.constraint.InterfaceConstraint; +import eva2.optimization.operators.crossover.InterfaceCrossover; +import eva2.optimization.operators.crossover.NoCrossover; +import eva2.optimization.operators.initialization.DefaultInitialization; +import eva2.optimization.operators.initialization.InterfaceInitialization; +import eva2.optimization.operators.mutation.InterfaceMutation; +import eva2.optimization.operators.mutation.NoMutation; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.EVAERROR; import eva2.tools.math.RNG; import java.util.*; diff --git a/src/eva2/server/go/individuals/AbstractEAIndividualComparator.java b/src/eva2/optimization/individuals/AbstractEAIndividualComparator.java similarity index 99% rename from src/eva2/server/go/individuals/AbstractEAIndividualComparator.java rename to src/eva2/optimization/individuals/AbstractEAIndividualComparator.java index 2628bf45..51e1f23b 100644 --- a/src/eva2/server/go/individuals/AbstractEAIndividualComparator.java +++ b/src/eva2/optimization/individuals/AbstractEAIndividualComparator.java @@ -1,4 +1,4 @@ -package eva2.server.go.individuals; +package eva2.optimization.individuals; import java.io.Serializable; import java.util.Comparator; diff --git a/src/eva2/server/go/individuals/ESIndividualBinaryData.java b/src/eva2/optimization/individuals/ESIndividualBinaryData.java similarity index 97% rename from src/eva2/server/go/individuals/ESIndividualBinaryData.java rename to src/eva2/optimization/individuals/ESIndividualBinaryData.java index 2f8f538d..4428ad8b 100644 --- a/src/eva2/server/go/individuals/ESIndividualBinaryData.java +++ b/src/eva2/optimization/individuals/ESIndividualBinaryData.java @@ -1,10 +1,10 @@ -package eva2.server.go.individuals; +package eva2.optimization.individuals; -import eva2.server.go.operators.crossover.CrossoverESDefault; -import eva2.server.go.operators.mutation.InterfaceMutation; -import eva2.server.go.operators.mutation.MutateESGlobal; -import eva2.server.go.problems.InterfaceHasInitRange; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.operators.crossover.CrossoverESDefault; +import eva2.optimization.operators.mutation.InterfaceMutation; +import eva2.optimization.operators.mutation.MutateESGlobal; +import eva2.optimization.problems.InterfaceHasInitRange; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import java.util.BitSet; diff --git a/src/eva2/server/go/individuals/ESIndividualDoubleData.java b/src/eva2/optimization/individuals/ESIndividualDoubleData.java similarity index 97% rename from src/eva2/server/go/individuals/ESIndividualDoubleData.java rename to src/eva2/optimization/individuals/ESIndividualDoubleData.java index 89766316..1ae59f5b 100644 --- a/src/eva2/server/go/individuals/ESIndividualDoubleData.java +++ b/src/eva2/optimization/individuals/ESIndividualDoubleData.java @@ -1,12 +1,12 @@ -package eva2.server.go.individuals; +package eva2.optimization.individuals; -import eva2.server.go.enums.MutateESCrossoverTypeEnum; -import eva2.server.go.operators.crossover.CrossoverESDefault; -import eva2.server.go.operators.mutation.InterfaceMutation; -import eva2.server.go.operators.mutation.MutateESGlobal; -import eva2.server.go.problems.InterfaceHasInitRange; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.enums.MutateESCrossoverTypeEnum; +import eva2.optimization.operators.crossover.CrossoverESDefault; +import eva2.optimization.operators.mutation.InterfaceMutation; +import eva2.optimization.operators.mutation.MutateESGlobal; +import eva2.optimization.problems.InterfaceHasInitRange; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.EVAERROR; import eva2.tools.math.Mathematics; import eva2.tools.math.RNG; diff --git a/src/eva2/server/go/individuals/ESIndividualIntegerData.java b/src/eva2/optimization/individuals/ESIndividualIntegerData.java similarity index 97% rename from src/eva2/server/go/individuals/ESIndividualIntegerData.java rename to src/eva2/optimization/individuals/ESIndividualIntegerData.java index 298ee302..545d66d6 100644 --- a/src/eva2/server/go/individuals/ESIndividualIntegerData.java +++ b/src/eva2/optimization/individuals/ESIndividualIntegerData.java @@ -1,10 +1,10 @@ -package eva2.server.go.individuals; +package eva2.optimization.individuals; -import eva2.server.go.operators.crossover.CrossoverESDefault; -import eva2.server.go.operators.mutation.InterfaceMutation; -import eva2.server.go.operators.mutation.MutateESGlobal; -import eva2.server.go.problems.InterfaceHasInitRange; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.operators.crossover.CrossoverESDefault; +import eva2.optimization.operators.mutation.InterfaceMutation; +import eva2.optimization.operators.mutation.MutateESGlobal; +import eva2.optimization.problems.InterfaceHasInitRange; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** This individual uses a real-valued genotype to code for integer values. diff --git a/src/eva2/server/go/individuals/ESIndividualPermutationData.java b/src/eva2/optimization/individuals/ESIndividualPermutationData.java similarity index 97% rename from src/eva2/server/go/individuals/ESIndividualPermutationData.java rename to src/eva2/optimization/individuals/ESIndividualPermutationData.java index 1816b95b..400da24e 100644 --- a/src/eva2/server/go/individuals/ESIndividualPermutationData.java +++ b/src/eva2/optimization/individuals/ESIndividualPermutationData.java @@ -1,10 +1,10 @@ -package eva2.server.go.individuals; +package eva2.optimization.individuals; -import eva2.server.go.operators.crossover.CrossoverESDefault; -import eva2.server.go.operators.mutation.InterfaceMutation; -import eva2.server.go.operators.mutation.MutateESGlobal; -import eva2.server.go.problems.InterfaceHasInitRange; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.operators.crossover.CrossoverESDefault; +import eva2.optimization.operators.mutation.InterfaceMutation; +import eva2.optimization.operators.mutation.MutateESGlobal; +import eva2.optimization.problems.InterfaceHasInitRange; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** diff --git a/src/eva2/server/go/individuals/GAESIndividualBinaryDoubleData.java b/src/eva2/optimization/individuals/GAESIndividualBinaryDoubleData.java similarity index 98% rename from src/eva2/server/go/individuals/GAESIndividualBinaryDoubleData.java rename to src/eva2/optimization/individuals/GAESIndividualBinaryDoubleData.java index f7149982..152c24fe 100644 --- a/src/eva2/server/go/individuals/GAESIndividualBinaryDoubleData.java +++ b/src/eva2/optimization/individuals/GAESIndividualBinaryDoubleData.java @@ -1,9 +1,9 @@ -package eva2.server.go.individuals; +package eva2.optimization.individuals; -import eva2.server.go.operators.mutation.InterfaceMutation; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.operators.mutation.InterfaceMutation; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import java.util.BitSet; diff --git a/src/eva2/server/go/individuals/GAIndividualBinaryData.java b/src/eva2/optimization/individuals/GAIndividualBinaryData.java similarity index 96% rename from src/eva2/server/go/individuals/GAIndividualBinaryData.java rename to src/eva2/optimization/individuals/GAIndividualBinaryData.java index 7c263015..47909b30 100644 --- a/src/eva2/server/go/individuals/GAIndividualBinaryData.java +++ b/src/eva2/optimization/individuals/GAIndividualBinaryData.java @@ -1,11 +1,11 @@ -package eva2.server.go.individuals; +package eva2.optimization.individuals; -import eva2.server.go.operators.crossover.CrossoverGAGINPoint; -import eva2.server.go.operators.crossover.InterfaceCrossover; -import eva2.server.go.operators.mutation.InterfaceMutation; -import eva2.server.go.operators.mutation.MutateGANBit; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.operators.crossover.CrossoverGAGINPoint; +import eva2.optimization.operators.crossover.InterfaceCrossover; +import eva2.optimization.operators.mutation.InterfaceMutation; +import eva2.optimization.operators.mutation.MutateGANBit; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import java.util.BitSet; diff --git a/src/eva2/server/go/individuals/GAIndividualDoubleData.java b/src/eva2/optimization/individuals/GAIndividualDoubleData.java similarity index 96% rename from src/eva2/server/go/individuals/GAIndividualDoubleData.java rename to src/eva2/optimization/individuals/GAIndividualDoubleData.java index 1f7e74df..7d9e7f90 100644 --- a/src/eva2/server/go/individuals/GAIndividualDoubleData.java +++ b/src/eva2/optimization/individuals/GAIndividualDoubleData.java @@ -1,13 +1,13 @@ -package eva2.server.go.individuals; +package eva2.optimization.individuals; -import eva2.server.go.individuals.codings.ga.GAStandardCodingDouble; -import eva2.server.go.individuals.codings.ga.InterfaceGADoubleCoding; -import eva2.server.go.operators.crossover.CrossoverGAGINPoint; -import eva2.server.go.operators.crossover.InterfaceCrossover; -import eva2.server.go.operators.mutation.InterfaceMutation; -import eva2.server.go.operators.mutation.MutateGAUniform; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.codings.ga.GAStandardCodingDouble; +import eva2.optimization.individuals.codings.ga.InterfaceGADoubleCoding; +import eva2.optimization.operators.crossover.CrossoverGAGINPoint; +import eva2.optimization.operators.crossover.InterfaceCrossover; +import eva2.optimization.operators.mutation.InterfaceMutation; +import eva2.optimization.operators.mutation.MutateGAUniform; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import java.util.BitSet; diff --git a/src/eva2/server/go/individuals/GAIndividualIntegerData.java b/src/eva2/optimization/individuals/GAIndividualIntegerData.java similarity index 97% rename from src/eva2/server/go/individuals/GAIndividualIntegerData.java rename to src/eva2/optimization/individuals/GAIndividualIntegerData.java index e1ad76db..2d8e738a 100644 --- a/src/eva2/server/go/individuals/GAIndividualIntegerData.java +++ b/src/eva2/optimization/individuals/GAIndividualIntegerData.java @@ -1,12 +1,12 @@ -package eva2.server.go.individuals; +package eva2.optimization.individuals; -import eva2.server.go.individuals.codings.ga.GAStandardCodingInteger; -import eva2.server.go.individuals.codings.ga.InterfaceGAIntegerCoding; -import eva2.server.go.operators.crossover.CrossoverGAGINPoint; -import eva2.server.go.operators.mutation.InterfaceMutation; -import eva2.server.go.operators.mutation.MutateGANBit; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.codings.ga.GAStandardCodingInteger; +import eva2.optimization.individuals.codings.ga.InterfaceGAIntegerCoding; +import eva2.optimization.operators.crossover.CrossoverGAGINPoint; +import eva2.optimization.operators.mutation.InterfaceMutation; +import eva2.optimization.operators.mutation.MutateGANBit; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import java.util.BitSet; diff --git a/src/eva2/server/go/individuals/GAPIndividualProgramData.java b/src/eva2/optimization/individuals/GAPIndividualProgramData.java similarity index 97% rename from src/eva2/server/go/individuals/GAPIndividualProgramData.java rename to src/eva2/optimization/individuals/GAPIndividualProgramData.java index 796c9172..9a8cb092 100644 --- a/src/eva2/server/go/individuals/GAPIndividualProgramData.java +++ b/src/eva2/optimization/individuals/GAPIndividualProgramData.java @@ -1,10 +1,10 @@ -package eva2.server.go.individuals; +package eva2.optimization.individuals; -import eva2.server.go.individuals.codings.gp.InterfaceProgram; -import eva2.server.go.operators.mutation.InterfaceMutation; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.codings.gp.InterfaceProgram; +import eva2.optimization.operators.mutation.InterfaceMutation; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** This individual combines a real-valued phenotype with a tree-based phenotype. diff --git a/src/eva2/server/go/individuals/GEIndividualProgramData.java b/src/eva2/optimization/individuals/GEIndividualProgramData.java similarity index 98% rename from src/eva2/server/go/individuals/GEIndividualProgramData.java rename to src/eva2/optimization/individuals/GEIndividualProgramData.java index 54a1b8eb..711b4222 100644 --- a/src/eva2/server/go/individuals/GEIndividualProgramData.java +++ b/src/eva2/optimization/individuals/GEIndividualProgramData.java @@ -1,13 +1,13 @@ -package eva2.server.go.individuals; +package eva2.optimization.individuals; -import eva2.server.go.individuals.codings.gp.AbstractGPNode; -import eva2.server.go.individuals.codings.gp.GPArea; -import eva2.server.go.individuals.codings.gp.InterfaceProgram; -import eva2.server.go.operators.crossover.CrossoverGADefault; -import eva2.server.go.operators.mutation.InterfaceMutation; -import eva2.server.go.operators.mutation.MutateDefault; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.codings.gp.AbstractGPNode; +import eva2.optimization.individuals.codings.gp.GPArea; +import eva2.optimization.individuals.codings.gp.InterfaceProgram; +import eva2.optimization.operators.crossover.CrossoverGADefault; +import eva2.optimization.operators.mutation.InterfaceMutation; +import eva2.optimization.operators.mutation.MutateDefault; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import java.util.ArrayList; import java.util.BitSet; diff --git a/src/eva2/server/go/individuals/GIIndividualIntegerData.java b/src/eva2/optimization/individuals/GIIndividualIntegerData.java similarity index 97% rename from src/eva2/server/go/individuals/GIIndividualIntegerData.java rename to src/eva2/optimization/individuals/GIIndividualIntegerData.java index 8cfb7d1d..5dbd8081 100644 --- a/src/eva2/server/go/individuals/GIIndividualIntegerData.java +++ b/src/eva2/optimization/individuals/GIIndividualIntegerData.java @@ -1,10 +1,10 @@ -package eva2.server.go.individuals; +package eva2.optimization.individuals; -import eva2.server.go.operators.crossover.CrossoverGIDefault; -import eva2.server.go.operators.mutation.InterfaceMutation; -import eva2.server.go.operators.mutation.MutateDefault; -import eva2.server.go.problems.InterfaceHasInitRange; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.operators.crossover.CrossoverGIDefault; +import eva2.optimization.operators.mutation.InterfaceMutation; +import eva2.optimization.operators.mutation.MutateDefault; +import eva2.optimization.problems.InterfaceHasInitRange; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** This individual uses a integer genotype to code for integer values. diff --git a/src/eva2/server/go/individuals/GIOBGAIndividualIntegerPermutationData.java b/src/eva2/optimization/individuals/GIOBGAIndividualIntegerPermutationData.java similarity index 98% rename from src/eva2/server/go/individuals/GIOBGAIndividualIntegerPermutationData.java rename to src/eva2/optimization/individuals/GIOBGAIndividualIntegerPermutationData.java index 2a835308..076eb279 100644 --- a/src/eva2/server/go/individuals/GIOBGAIndividualIntegerPermutationData.java +++ b/src/eva2/optimization/individuals/GIOBGAIndividualIntegerPermutationData.java @@ -1,8 +1,8 @@ -package eva2.server.go.individuals; +package eva2.optimization.individuals; -import eva2.server.go.operators.mutation.InterfaceMutation; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.operators.mutation.InterfaceMutation; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** This individual combines a binary and a real-valued phenotype. diff --git a/src/eva2/server/go/individuals/GPIndividualProgramData.java b/src/eva2/optimization/individuals/GPIndividualProgramData.java similarity index 97% rename from src/eva2/server/go/individuals/GPIndividualProgramData.java rename to src/eva2/optimization/individuals/GPIndividualProgramData.java index 45d5824e..f3aa1151 100644 --- a/src/eva2/server/go/individuals/GPIndividualProgramData.java +++ b/src/eva2/optimization/individuals/GPIndividualProgramData.java @@ -1,14 +1,14 @@ -package eva2.server.go.individuals; +package eva2.optimization.individuals; -import eva2.server.go.individuals.codings.gp.AbstractGPNode; -import eva2.server.go.individuals.codings.gp.GPArea; -import eva2.server.go.individuals.codings.gp.InterfaceProgram; -import eva2.server.go.operators.crossover.CrossoverGPDefault; -import eva2.server.go.operators.mutation.InterfaceMutation; -import eva2.server.go.operators.mutation.MutateDefault; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.codings.gp.AbstractGPNode; +import eva2.optimization.individuals.codings.gp.GPArea; +import eva2.optimization.individuals.codings.gp.InterfaceProgram; +import eva2.optimization.operators.crossover.CrossoverGPDefault; +import eva2.optimization.operators.mutation.InterfaceMutation; +import eva2.optimization.operators.mutation.MutateDefault; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.EVAERROR; import eva2.tools.math.RNG; diff --git a/src/eva2/server/go/individuals/IndividualDistanceComparator.java b/src/eva2/optimization/individuals/IndividualDistanceComparator.java similarity index 92% rename from src/eva2/server/go/individuals/IndividualDistanceComparator.java rename to src/eva2/optimization/individuals/IndividualDistanceComparator.java index 3cec24a5..24ad91a0 100644 --- a/src/eva2/server/go/individuals/IndividualDistanceComparator.java +++ b/src/eva2/optimization/individuals/IndividualDistanceComparator.java @@ -1,6 +1,6 @@ -package eva2.server.go.individuals; +package eva2.optimization.individuals; -import eva2.server.go.operators.distancemetric.InterfaceDistanceMetric; +import eva2.optimization.operators.distancemetric.InterfaceDistanceMetric; import java.io.Serializable; import java.util.Comparator; diff --git a/src/eva2/server/go/individuals/IndividualWeightedFitnessComparator.java b/src/eva2/optimization/individuals/IndividualWeightedFitnessComparator.java similarity index 99% rename from src/eva2/server/go/individuals/IndividualWeightedFitnessComparator.java rename to src/eva2/optimization/individuals/IndividualWeightedFitnessComparator.java index c191a9ef..b59b1928 100644 --- a/src/eva2/server/go/individuals/IndividualWeightedFitnessComparator.java +++ b/src/eva2/optimization/individuals/IndividualWeightedFitnessComparator.java @@ -1,4 +1,4 @@ -package eva2.server.go.individuals; +package eva2.optimization.individuals; import eva2.tools.EVAERROR; import java.io.Serializable; diff --git a/src/eva2/server/go/individuals/InterfaceDataTypeBinary.java b/src/eva2/optimization/individuals/InterfaceDataTypeBinary.java similarity index 97% rename from src/eva2/server/go/individuals/InterfaceDataTypeBinary.java rename to src/eva2/optimization/individuals/InterfaceDataTypeBinary.java index 69066e56..28287c27 100644 --- a/src/eva2/server/go/individuals/InterfaceDataTypeBinary.java +++ b/src/eva2/optimization/individuals/InterfaceDataTypeBinary.java @@ -1,4 +1,4 @@ -package eva2.server.go.individuals; +package eva2.optimization.individuals; import java.util.BitSet; diff --git a/src/eva2/server/go/individuals/InterfaceDataTypeDouble.java b/src/eva2/optimization/individuals/InterfaceDataTypeDouble.java similarity index 98% rename from src/eva2/server/go/individuals/InterfaceDataTypeDouble.java rename to src/eva2/optimization/individuals/InterfaceDataTypeDouble.java index a911d5a8..27c8a4f3 100644 --- a/src/eva2/server/go/individuals/InterfaceDataTypeDouble.java +++ b/src/eva2/optimization/individuals/InterfaceDataTypeDouble.java @@ -1,4 +1,4 @@ -package eva2.server.go.individuals; +package eva2.optimization.individuals; /** This interface gives access to a double phenotype and except * for problemspecific operators should only be used by the diff --git a/src/eva2/server/go/individuals/InterfaceDataTypeInteger.java b/src/eva2/optimization/individuals/InterfaceDataTypeInteger.java similarity index 97% rename from src/eva2/server/go/individuals/InterfaceDataTypeInteger.java rename to src/eva2/optimization/individuals/InterfaceDataTypeInteger.java index 02d19d18..fb79dc6b 100644 --- a/src/eva2/server/go/individuals/InterfaceDataTypeInteger.java +++ b/src/eva2/optimization/individuals/InterfaceDataTypeInteger.java @@ -1,4 +1,4 @@ -package eva2.server.go.individuals; +package eva2.optimization.individuals; /** This interface gives access to a integer phenotype and except * for problemspecific operators should only be used by the diff --git a/src/eva2/server/go/individuals/InterfaceDataTypePermutation.java b/src/eva2/optimization/individuals/InterfaceDataTypePermutation.java similarity index 97% rename from src/eva2/server/go/individuals/InterfaceDataTypePermutation.java rename to src/eva2/optimization/individuals/InterfaceDataTypePermutation.java index 6e6c48d8..03596d3a 100644 --- a/src/eva2/server/go/individuals/InterfaceDataTypePermutation.java +++ b/src/eva2/optimization/individuals/InterfaceDataTypePermutation.java @@ -1,4 +1,4 @@ -package eva2.server.go.individuals; +package eva2.optimization.individuals; /** This interface gives access to a permutation phenotype and except diff --git a/src/eva2/server/go/individuals/InterfaceDataTypeProgram.java b/src/eva2/optimization/individuals/InterfaceDataTypeProgram.java similarity index 94% rename from src/eva2/server/go/individuals/InterfaceDataTypeProgram.java rename to src/eva2/optimization/individuals/InterfaceDataTypeProgram.java index f8a69d1a..c804c092 100644 --- a/src/eva2/server/go/individuals/InterfaceDataTypeProgram.java +++ b/src/eva2/optimization/individuals/InterfaceDataTypeProgram.java @@ -1,6 +1,6 @@ -package eva2.server.go.individuals; +package eva2.optimization.individuals; -import eva2.server.go.individuals.codings.gp.InterfaceProgram; +import eva2.optimization.individuals.codings.gp.InterfaceProgram; /** This interface gives access to a program phenotype and except * for problemspecific operators should only be used by the diff --git a/src/eva2/server/go/individuals/InterfaceESIndividual.java b/src/eva2/optimization/individuals/InterfaceESIndividual.java similarity index 96% rename from src/eva2/server/go/individuals/InterfaceESIndividual.java rename to src/eva2/optimization/individuals/InterfaceESIndividual.java index 8ed51df3..5436e0f1 100644 --- a/src/eva2/server/go/individuals/InterfaceESIndividual.java +++ b/src/eva2/optimization/individuals/InterfaceESIndividual.java @@ -1,4 +1,4 @@ -package eva2.server.go.individuals; +package eva2.optimization.individuals; /** This interface gives access to a real-valued genotype and should * only be used by mutation and crossover operators. Onyl exception are diff --git a/src/eva2/server/go/individuals/InterfaceGAIndividual.java b/src/eva2/optimization/individuals/InterfaceGAIndividual.java similarity index 96% rename from src/eva2/server/go/individuals/InterfaceGAIndividual.java rename to src/eva2/optimization/individuals/InterfaceGAIndividual.java index d09b95cc..f26db072 100644 --- a/src/eva2/server/go/individuals/InterfaceGAIndividual.java +++ b/src/eva2/optimization/individuals/InterfaceGAIndividual.java @@ -1,4 +1,4 @@ -package eva2.server.go.individuals; +package eva2.optimization.individuals; import java.util.BitSet; diff --git a/src/eva2/server/go/individuals/InterfaceGIIndividual.java b/src/eva2/optimization/individuals/InterfaceGIIndividual.java similarity index 97% rename from src/eva2/server/go/individuals/InterfaceGIIndividual.java rename to src/eva2/optimization/individuals/InterfaceGIIndividual.java index 19e304b0..8fb4a855 100644 --- a/src/eva2/server/go/individuals/InterfaceGIIndividual.java +++ b/src/eva2/optimization/individuals/InterfaceGIIndividual.java @@ -1,4 +1,4 @@ -package eva2.server.go.individuals; +package eva2.optimization.individuals; /** This interface gives access to a integer genotype and should diff --git a/src/eva2/server/go/individuals/InterfaceGPIndividual.java b/src/eva2/optimization/individuals/InterfaceGPIndividual.java similarity index 92% rename from src/eva2/server/go/individuals/InterfaceGPIndividual.java rename to src/eva2/optimization/individuals/InterfaceGPIndividual.java index 1ed9f927..d093ddfd 100644 --- a/src/eva2/server/go/individuals/InterfaceGPIndividual.java +++ b/src/eva2/optimization/individuals/InterfaceGPIndividual.java @@ -1,6 +1,6 @@ -package eva2.server.go.individuals; +package eva2.optimization.individuals; -import eva2.server.go.individuals.codings.gp.AbstractGPNode; +import eva2.optimization.individuals.codings.gp.AbstractGPNode; /** This interface gives access to a tree-based genotype and should * only be used by mutation and crossover operators. diff --git a/src/eva2/server/go/individuals/InterfaceOBGAIndividual.java b/src/eva2/optimization/individuals/InterfaceOBGAIndividual.java similarity index 93% rename from src/eva2/server/go/individuals/InterfaceOBGAIndividual.java rename to src/eva2/optimization/individuals/InterfaceOBGAIndividual.java index c0f71db1..219038f8 100644 --- a/src/eva2/server/go/individuals/InterfaceOBGAIndividual.java +++ b/src/eva2/optimization/individuals/InterfaceOBGAIndividual.java @@ -1,4 +1,4 @@ -package eva2.server.go.individuals; +package eva2.optimization.individuals; /** This interface gives access to a permutation genotype and should * only be used by mutation and crossover operators. diff --git a/src/eva2/server/go/individuals/OBGAIndividualPermutationData.java b/src/eva2/optimization/individuals/OBGAIndividualPermutationData.java similarity index 97% rename from src/eva2/server/go/individuals/OBGAIndividualPermutationData.java rename to src/eva2/optimization/individuals/OBGAIndividualPermutationData.java index c99b7118..c393e1e2 100644 --- a/src/eva2/server/go/individuals/OBGAIndividualPermutationData.java +++ b/src/eva2/optimization/individuals/OBGAIndividualPermutationData.java @@ -1,10 +1,10 @@ -package eva2.server.go.individuals; +package eva2.optimization.individuals; -import eva2.server.go.operators.crossover.CrossoverOBGAPMX; -import eva2.server.go.operators.mutation.InterfaceMutation; -import eva2.server.go.operators.mutation.MutateOBGAFlip; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.operators.crossover.CrossoverOBGAPMX; +import eva2.optimization.operators.mutation.InterfaceMutation; +import eva2.optimization.operators.mutation.MutateOBGAFlip; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import java.util.ArrayList; diff --git a/src/eva2/server/go/individuals/codings/ga/GAGrayCodingDouble.java b/src/eva2/optimization/individuals/codings/ga/GAGrayCodingDouble.java similarity index 98% rename from src/eva2/server/go/individuals/codings/ga/GAGrayCodingDouble.java rename to src/eva2/optimization/individuals/codings/ga/GAGrayCodingDouble.java index 7310a944..f9286a44 100644 --- a/src/eva2/server/go/individuals/codings/ga/GAGrayCodingDouble.java +++ b/src/eva2/optimization/individuals/codings/ga/GAGrayCodingDouble.java @@ -1,4 +1,4 @@ -package eva2.server.go.individuals.codings.ga; +package eva2.optimization.individuals.codings.ga; import eva2.tools.math.RNG; diff --git a/src/eva2/server/go/individuals/codings/ga/GAGrayCodingInteger.java b/src/eva2/optimization/individuals/codings/ga/GAGrayCodingInteger.java similarity index 98% rename from src/eva2/server/go/individuals/codings/ga/GAGrayCodingInteger.java rename to src/eva2/optimization/individuals/codings/ga/GAGrayCodingInteger.java index 10d8df2f..be6f9541 100644 --- a/src/eva2/server/go/individuals/codings/ga/GAGrayCodingInteger.java +++ b/src/eva2/optimization/individuals/codings/ga/GAGrayCodingInteger.java @@ -1,4 +1,4 @@ -package eva2.server.go.individuals.codings.ga; +package eva2.optimization.individuals.codings.ga; import java.util.BitSet; diff --git a/src/eva2/server/go/individuals/codings/ga/GAStandardCodingDouble.java b/src/eva2/optimization/individuals/codings/ga/GAStandardCodingDouble.java similarity index 99% rename from src/eva2/server/go/individuals/codings/ga/GAStandardCodingDouble.java rename to src/eva2/optimization/individuals/codings/ga/GAStandardCodingDouble.java index ad964651..9a540bfc 100644 --- a/src/eva2/server/go/individuals/codings/ga/GAStandardCodingDouble.java +++ b/src/eva2/optimization/individuals/codings/ga/GAStandardCodingDouble.java @@ -1,4 +1,4 @@ -package eva2.server.go.individuals.codings.ga; +package eva2.optimization.individuals.codings.ga; import java.util.BitSet; diff --git a/src/eva2/server/go/individuals/codings/ga/GAStandardCodingInteger.java b/src/eva2/optimization/individuals/codings/ga/GAStandardCodingInteger.java similarity index 99% rename from src/eva2/server/go/individuals/codings/ga/GAStandardCodingInteger.java rename to src/eva2/optimization/individuals/codings/ga/GAStandardCodingInteger.java index a012d363..0cf7883a 100644 --- a/src/eva2/server/go/individuals/codings/ga/GAStandardCodingInteger.java +++ b/src/eva2/optimization/individuals/codings/ga/GAStandardCodingInteger.java @@ -1,4 +1,4 @@ -package eva2.server.go.individuals.codings.ga; +package eva2.optimization.individuals.codings.ga; import eva2.tools.math.RNG; diff --git a/src/eva2/server/go/individuals/codings/ga/InterfaceGADoubleCoding.java b/src/eva2/optimization/individuals/codings/ga/InterfaceGADoubleCoding.java similarity index 96% rename from src/eva2/server/go/individuals/codings/ga/InterfaceGADoubleCoding.java rename to src/eva2/optimization/individuals/codings/ga/InterfaceGADoubleCoding.java index cdaecc68..10c2e7ad 100644 --- a/src/eva2/server/go/individuals/codings/ga/InterfaceGADoubleCoding.java +++ b/src/eva2/optimization/individuals/codings/ga/InterfaceGADoubleCoding.java @@ -1,4 +1,4 @@ -package eva2.server.go.individuals.codings.ga; +package eva2.optimization.individuals.codings.ga; import java.util.BitSet; diff --git a/src/eva2/server/go/individuals/codings/ga/InterfaceGAIntegerCoding.java b/src/eva2/optimization/individuals/codings/ga/InterfaceGAIntegerCoding.java similarity index 97% rename from src/eva2/server/go/individuals/codings/ga/InterfaceGAIntegerCoding.java rename to src/eva2/optimization/individuals/codings/ga/InterfaceGAIntegerCoding.java index 3d0be3a7..c98fddce 100644 --- a/src/eva2/server/go/individuals/codings/ga/InterfaceGAIntegerCoding.java +++ b/src/eva2/optimization/individuals/codings/ga/InterfaceGAIntegerCoding.java @@ -1,4 +1,4 @@ -package eva2.server.go.individuals.codings.ga; +package eva2.optimization.individuals.codings.ga; import java.util.BitSet; diff --git a/src/eva2/server/go/individuals/codings/gp/AbstractGPNode.java b/src/eva2/optimization/individuals/codings/gp/AbstractGPNode.java similarity index 99% rename from src/eva2/server/go/individuals/codings/gp/AbstractGPNode.java rename to src/eva2/optimization/individuals/codings/gp/AbstractGPNode.java index 12e4f385..617d4754 100644 --- a/src/eva2/server/go/individuals/codings/gp/AbstractGPNode.java +++ b/src/eva2/optimization/individuals/codings/gp/AbstractGPNode.java @@ -1,10 +1,10 @@ -package eva2.server.go.individuals.codings.gp; +package eva2.optimization.individuals.codings.gp; import eva2.gui.BeanInspector; import eva2.gui.GenericObjectEditor; -import eva2.server.go.problems.GPFunctionProblem; -import eva2.server.go.problems.InterfaceProgramProblem; +import eva2.optimization.problems.GPFunctionProblem; +import eva2.optimization.problems.InterfaceProgramProblem; import eva2.tools.Pair; import eva2.tools.ReflectPackage; import eva2.tools.math.Mathematics; diff --git a/src/eva2/server/go/individuals/codings/gp/GPArea.java b/src/eva2/optimization/individuals/codings/gp/GPArea.java similarity index 99% rename from src/eva2/server/go/individuals/codings/gp/GPArea.java rename to src/eva2/optimization/individuals/codings/gp/GPArea.java index c9dcef39..1b1d3cbf 100644 --- a/src/eva2/server/go/individuals/codings/gp/GPArea.java +++ b/src/eva2/optimization/individuals/codings/gp/GPArea.java @@ -1,4 +1,4 @@ -package eva2.server.go.individuals.codings.gp; +package eva2.optimization.individuals.codings.gp; import eva2.tools.math.RNG; diff --git a/src/eva2/server/go/individuals/codings/gp/GPNodeAbs.java b/src/eva2/optimization/individuals/codings/gp/GPNodeAbs.java similarity index 92% rename from src/eva2/server/go/individuals/codings/gp/GPNodeAbs.java rename to src/eva2/optimization/individuals/codings/gp/GPNodeAbs.java index 03763f2f..425082d8 100644 --- a/src/eva2/server/go/individuals/codings/gp/GPNodeAbs.java +++ b/src/eva2/optimization/individuals/codings/gp/GPNodeAbs.java @@ -1,6 +1,6 @@ -package eva2.server.go.individuals.codings.gp; +package eva2.optimization.individuals.codings.gp; -import eva2.server.go.problems.InterfaceProgramProblem; +import eva2.optimization.problems.InterfaceProgramProblem; /** diff --git a/src/eva2/server/go/individuals/codings/gp/GPNodeAdd.java b/src/eva2/optimization/individuals/codings/gp/GPNodeAdd.java similarity index 93% rename from src/eva2/server/go/individuals/codings/gp/GPNodeAdd.java rename to src/eva2/optimization/individuals/codings/gp/GPNodeAdd.java index 0ff723a5..031d4c07 100644 --- a/src/eva2/server/go/individuals/codings/gp/GPNodeAdd.java +++ b/src/eva2/optimization/individuals/codings/gp/GPNodeAdd.java @@ -1,8 +1,8 @@ -package eva2.server.go.individuals.codings.gp; +package eva2.optimization.individuals.codings.gp; -import eva2.server.go.problems.InterfaceProgramProblem; +import eva2.optimization.problems.InterfaceProgramProblem; /** A simple add node with two arguments. * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/individuals/codings/gp/GPNodeConst.java b/src/eva2/optimization/individuals/codings/gp/GPNodeConst.java similarity index 92% rename from src/eva2/server/go/individuals/codings/gp/GPNodeConst.java rename to src/eva2/optimization/individuals/codings/gp/GPNodeConst.java index 579ae4bb..66ada5e7 100644 --- a/src/eva2/server/go/individuals/codings/gp/GPNodeConst.java +++ b/src/eva2/optimization/individuals/codings/gp/GPNodeConst.java @@ -1,6 +1,6 @@ -package eva2.server.go.individuals.codings.gp; +package eva2.optimization.individuals.codings.gp; -import eva2.server.go.problems.InterfaceProgramProblem; +import eva2.optimization.problems.InterfaceProgramProblem; /** * A simple constant node with the value 1. diff --git a/src/eva2/server/go/individuals/codings/gp/GPNodeCos.java b/src/eva2/optimization/individuals/codings/gp/GPNodeCos.java similarity index 92% rename from src/eva2/server/go/individuals/codings/gp/GPNodeCos.java rename to src/eva2/optimization/individuals/codings/gp/GPNodeCos.java index be104590..a0317226 100644 --- a/src/eva2/server/go/individuals/codings/gp/GPNodeCos.java +++ b/src/eva2/optimization/individuals/codings/gp/GPNodeCos.java @@ -1,6 +1,6 @@ -package eva2.server.go.individuals.codings.gp; +package eva2.optimization.individuals.codings.gp; -import eva2.server.go.problems.InterfaceProgramProblem; +import eva2.optimization.problems.InterfaceProgramProblem; /** A cos node with on argument. * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/individuals/codings/gp/GPNodeDiv.java b/src/eva2/optimization/individuals/codings/gp/GPNodeDiv.java similarity index 95% rename from src/eva2/server/go/individuals/codings/gp/GPNodeDiv.java rename to src/eva2/optimization/individuals/codings/gp/GPNodeDiv.java index c60eff97..81214e79 100644 --- a/src/eva2/server/go/individuals/codings/gp/GPNodeDiv.java +++ b/src/eva2/optimization/individuals/codings/gp/GPNodeDiv.java @@ -1,6 +1,6 @@ -package eva2.server.go.individuals.codings.gp; +package eva2.optimization.individuals.codings.gp; -import eva2.server.go.problems.InterfaceProgramProblem; +import eva2.optimization.problems.InterfaceProgramProblem; /** A division node with two arguments and secure division. If diff --git a/src/eva2/server/go/individuals/codings/gp/GPNodeExp.java b/src/eva2/optimization/individuals/codings/gp/GPNodeExp.java similarity index 94% rename from src/eva2/server/go/individuals/codings/gp/GPNodeExp.java rename to src/eva2/optimization/individuals/codings/gp/GPNodeExp.java index fed43b7b..4a07dd74 100644 --- a/src/eva2/server/go/individuals/codings/gp/GPNodeExp.java +++ b/src/eva2/optimization/individuals/codings/gp/GPNodeExp.java @@ -1,6 +1,6 @@ -package eva2.server.go.individuals.codings.gp; +package eva2.optimization.individuals.codings.gp; -import eva2.server.go.problems.InterfaceProgramProblem; +import eva2.optimization.problems.InterfaceProgramProblem; /** An exponent node with one argument. * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/individuals/codings/gp/GPNodeFlowExec2.java b/src/eva2/optimization/individuals/codings/gp/GPNodeFlowExec2.java similarity index 94% rename from src/eva2/server/go/individuals/codings/gp/GPNodeFlowExec2.java rename to src/eva2/optimization/individuals/codings/gp/GPNodeFlowExec2.java index 003dcc23..cb3799a9 100644 --- a/src/eva2/server/go/individuals/codings/gp/GPNodeFlowExec2.java +++ b/src/eva2/optimization/individuals/codings/gp/GPNodeFlowExec2.java @@ -1,6 +1,6 @@ -package eva2.server.go.individuals.codings.gp; +package eva2.optimization.individuals.codings.gp; -import eva2.server.go.problems.InterfaceProgramProblem; +import eva2.optimization.problems.InterfaceProgramProblem; /** This nodes executes both arguments. * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/individuals/codings/gp/GPNodeFlowExec3.java b/src/eva2/optimization/individuals/codings/gp/GPNodeFlowExec3.java similarity index 94% rename from src/eva2/server/go/individuals/codings/gp/GPNodeFlowExec3.java rename to src/eva2/optimization/individuals/codings/gp/GPNodeFlowExec3.java index 19415a45..958020f7 100644 --- a/src/eva2/server/go/individuals/codings/gp/GPNodeFlowExec3.java +++ b/src/eva2/optimization/individuals/codings/gp/GPNodeFlowExec3.java @@ -1,6 +1,6 @@ -package eva2.server.go.individuals.codings.gp; +package eva2.optimization.individuals.codings.gp; -import eva2.server.go.problems.InterfaceProgramProblem; +import eva2.optimization.problems.InterfaceProgramProblem; /** This node executes all three arguments. * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/individuals/codings/gp/GPNodeInput.java b/src/eva2/optimization/individuals/codings/gp/GPNodeInput.java similarity index 96% rename from src/eva2/server/go/individuals/codings/gp/GPNodeInput.java rename to src/eva2/optimization/individuals/codings/gp/GPNodeInput.java index 7272e223..4eb407ef 100644 --- a/src/eva2/server/go/individuals/codings/gp/GPNodeInput.java +++ b/src/eva2/optimization/individuals/codings/gp/GPNodeInput.java @@ -1,6 +1,6 @@ -package eva2.server.go.individuals.codings.gp; +package eva2.optimization.individuals.codings.gp; -import eva2.server.go.problems.InterfaceProgramProblem; +import eva2.optimization.problems.InterfaceProgramProblem; /** This node is able to read a sensor value from the environment (e.g. the * problem) the sensor to read is given by the identifier and has to be diff --git a/src/eva2/server/go/individuals/codings/gp/GPNodeMult.java b/src/eva2/optimization/individuals/codings/gp/GPNodeMult.java similarity index 94% rename from src/eva2/server/go/individuals/codings/gp/GPNodeMult.java rename to src/eva2/optimization/individuals/codings/gp/GPNodeMult.java index 552c9130..d4df4c42 100644 --- a/src/eva2/server/go/individuals/codings/gp/GPNodeMult.java +++ b/src/eva2/optimization/individuals/codings/gp/GPNodeMult.java @@ -1,6 +1,6 @@ -package eva2.server.go.individuals.codings.gp; +package eva2.optimization.individuals.codings.gp; -import eva2.server.go.problems.InterfaceProgramProblem; +import eva2.optimization.problems.InterfaceProgramProblem; /** A multiplicator node taking two arguments. diff --git a/src/eva2/server/go/individuals/codings/gp/GPNodeNeg.java b/src/eva2/optimization/individuals/codings/gp/GPNodeNeg.java similarity index 94% rename from src/eva2/server/go/individuals/codings/gp/GPNodeNeg.java rename to src/eva2/optimization/individuals/codings/gp/GPNodeNeg.java index 1fc80db3..c3baf8c0 100644 --- a/src/eva2/server/go/individuals/codings/gp/GPNodeNeg.java +++ b/src/eva2/optimization/individuals/codings/gp/GPNodeNeg.java @@ -1,6 +1,6 @@ -package eva2.server.go.individuals.codings.gp; +package eva2.optimization.individuals.codings.gp; -import eva2.server.go.problems.InterfaceProgramProblem; +import eva2.optimization.problems.InterfaceProgramProblem; /** A substraction node using two arguments. diff --git a/src/eva2/server/go/individuals/codings/gp/GPNodeOne.java b/src/eva2/optimization/individuals/codings/gp/GPNodeOne.java similarity index 89% rename from src/eva2/server/go/individuals/codings/gp/GPNodeOne.java rename to src/eva2/optimization/individuals/codings/gp/GPNodeOne.java index 917fd78f..aa18f141 100644 --- a/src/eva2/server/go/individuals/codings/gp/GPNodeOne.java +++ b/src/eva2/optimization/individuals/codings/gp/GPNodeOne.java @@ -1,4 +1,4 @@ -package eva2.server.go.individuals.codings.gp; +package eva2.optimization.individuals.codings.gp; /** diff --git a/src/eva2/server/go/individuals/codings/gp/GPNodeOutput.java b/src/eva2/optimization/individuals/codings/gp/GPNodeOutput.java similarity index 95% rename from src/eva2/server/go/individuals/codings/gp/GPNodeOutput.java rename to src/eva2/optimization/individuals/codings/gp/GPNodeOutput.java index 917aca27..d9d5a72a 100644 --- a/src/eva2/server/go/individuals/codings/gp/GPNodeOutput.java +++ b/src/eva2/optimization/individuals/codings/gp/GPNodeOutput.java @@ -1,6 +1,6 @@ -package eva2.server.go.individuals.codings.gp; +package eva2.optimization.individuals.codings.gp; -import eva2.server.go.problems.InterfaceProgramProblem; +import eva2.optimization.problems.InterfaceProgramProblem; /** The node allows the program to give an output or to perform an action * in the enviroment simulated in the problem. The type of action is given diff --git a/src/eva2/server/go/individuals/codings/gp/GPNodePi.java b/src/eva2/optimization/individuals/codings/gp/GPNodePi.java similarity index 92% rename from src/eva2/server/go/individuals/codings/gp/GPNodePi.java rename to src/eva2/optimization/individuals/codings/gp/GPNodePi.java index de77cf3d..b4fe7a17 100644 --- a/src/eva2/server/go/individuals/codings/gp/GPNodePi.java +++ b/src/eva2/optimization/individuals/codings/gp/GPNodePi.java @@ -1,4 +1,4 @@ -package eva2.server.go.individuals.codings.gp; +package eva2.optimization.individuals.codings.gp; /** diff --git a/src/eva2/server/go/individuals/codings/gp/GPNodePow2.java b/src/eva2/optimization/individuals/codings/gp/GPNodePow2.java similarity index 94% rename from src/eva2/server/go/individuals/codings/gp/GPNodePow2.java rename to src/eva2/optimization/individuals/codings/gp/GPNodePow2.java index e8b9cea1..e8ada1f7 100644 --- a/src/eva2/server/go/individuals/codings/gp/GPNodePow2.java +++ b/src/eva2/optimization/individuals/codings/gp/GPNodePow2.java @@ -1,6 +1,6 @@ -package eva2.server.go.individuals.codings.gp; +package eva2.optimization.individuals.codings.gp; -import eva2.server.go.problems.InterfaceProgramProblem; +import eva2.optimization.problems.InterfaceProgramProblem; /** This node puts the argument to the power of two. * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/individuals/codings/gp/GPNodePow3.java b/src/eva2/optimization/individuals/codings/gp/GPNodePow3.java similarity index 94% rename from src/eva2/server/go/individuals/codings/gp/GPNodePow3.java rename to src/eva2/optimization/individuals/codings/gp/GPNodePow3.java index 7d5d1869..b0c594a0 100644 --- a/src/eva2/server/go/individuals/codings/gp/GPNodePow3.java +++ b/src/eva2/optimization/individuals/codings/gp/GPNodePow3.java @@ -1,6 +1,6 @@ -package eva2.server.go.individuals.codings.gp; +package eva2.optimization.individuals.codings.gp; -import eva2.server.go.problems.InterfaceProgramProblem; +import eva2.optimization.problems.InterfaceProgramProblem; /** This argument puts the argument to the power of three. * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/individuals/codings/gp/GPNodeProd.java b/src/eva2/optimization/individuals/codings/gp/GPNodeProd.java similarity index 93% rename from src/eva2/server/go/individuals/codings/gp/GPNodeProd.java rename to src/eva2/optimization/individuals/codings/gp/GPNodeProd.java index 4bda8db2..b8056741 100644 --- a/src/eva2/server/go/individuals/codings/gp/GPNodeProd.java +++ b/src/eva2/optimization/individuals/codings/gp/GPNodeProd.java @@ -1,7 +1,7 @@ -package eva2.server.go.individuals.codings.gp; +package eva2.optimization.individuals.codings.gp; -import eva2.server.go.problems.InterfaceProgramProblem; +import eva2.optimization.problems.InterfaceProgramProblem; import eva2.tools.math.Mathematics; /** diff --git a/src/eva2/server/go/individuals/codings/gp/GPNodeSin.java b/src/eva2/optimization/individuals/codings/gp/GPNodeSin.java similarity index 94% rename from src/eva2/server/go/individuals/codings/gp/GPNodeSin.java rename to src/eva2/optimization/individuals/codings/gp/GPNodeSin.java index eac44c06..421561ee 100644 --- a/src/eva2/server/go/individuals/codings/gp/GPNodeSin.java +++ b/src/eva2/optimization/individuals/codings/gp/GPNodeSin.java @@ -1,6 +1,6 @@ -package eva2.server.go.individuals.codings.gp; +package eva2.optimization.individuals.codings.gp; -import eva2.server.go.problems.InterfaceProgramProblem; +import eva2.optimization.problems.InterfaceProgramProblem; /** A sinus node taking one argument. * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/individuals/codings/gp/GPNodeSqrt.java b/src/eva2/optimization/individuals/codings/gp/GPNodeSqrt.java similarity index 94% rename from src/eva2/server/go/individuals/codings/gp/GPNodeSqrt.java rename to src/eva2/optimization/individuals/codings/gp/GPNodeSqrt.java index 4554e34a..ff76b54b 100644 --- a/src/eva2/server/go/individuals/codings/gp/GPNodeSqrt.java +++ b/src/eva2/optimization/individuals/codings/gp/GPNodeSqrt.java @@ -1,6 +1,6 @@ -package eva2.server.go.individuals.codings.gp; +package eva2.optimization.individuals.codings.gp; -import eva2.server.go.problems.InterfaceProgramProblem; +import eva2.optimization.problems.InterfaceProgramProblem; /** A square root node taking one argument. Secure operation is guaranteed * by using the absolute value only. diff --git a/src/eva2/server/go/individuals/codings/gp/GPNodeSub.java b/src/eva2/optimization/individuals/codings/gp/GPNodeSub.java similarity index 94% rename from src/eva2/server/go/individuals/codings/gp/GPNodeSub.java rename to src/eva2/optimization/individuals/codings/gp/GPNodeSub.java index 283a52ce..d0d7a2ee 100644 --- a/src/eva2/server/go/individuals/codings/gp/GPNodeSub.java +++ b/src/eva2/optimization/individuals/codings/gp/GPNodeSub.java @@ -1,6 +1,6 @@ -package eva2.server.go.individuals.codings.gp; +package eva2.optimization.individuals.codings.gp; -import eva2.server.go.problems.InterfaceProgramProblem; +import eva2.optimization.problems.InterfaceProgramProblem; /** A substraction node using two arguments. diff --git a/src/eva2/server/go/individuals/codings/gp/GPNodeSum.java b/src/eva2/optimization/individuals/codings/gp/GPNodeSum.java similarity index 93% rename from src/eva2/server/go/individuals/codings/gp/GPNodeSum.java rename to src/eva2/optimization/individuals/codings/gp/GPNodeSum.java index 18b4802e..c8177bdd 100644 --- a/src/eva2/server/go/individuals/codings/gp/GPNodeSum.java +++ b/src/eva2/optimization/individuals/codings/gp/GPNodeSum.java @@ -1,7 +1,7 @@ -package eva2.server.go.individuals.codings.gp; +package eva2.optimization.individuals.codings.gp; -import eva2.server.go.problems.InterfaceProgramProblem; +import eva2.optimization.problems.InterfaceProgramProblem; import eva2.tools.math.Mathematics; /** diff --git a/src/eva2/server/go/individuals/codings/gp/InterfaceProgram.java b/src/eva2/optimization/individuals/codings/gp/InterfaceProgram.java similarity index 78% rename from src/eva2/server/go/individuals/codings/gp/InterfaceProgram.java rename to src/eva2/optimization/individuals/codings/gp/InterfaceProgram.java index 3e239b69..f828803d 100644 --- a/src/eva2/server/go/individuals/codings/gp/InterfaceProgram.java +++ b/src/eva2/optimization/individuals/codings/gp/InterfaceProgram.java @@ -1,4 +1,4 @@ -package eva2.server.go.individuals.codings.gp; +package eva2.optimization.individuals.codings.gp; /** * Created by IntelliJ IDEA. @@ -13,7 +13,7 @@ public interface InterfaceProgram { * using the getSensorValue and setActuatorValue methods. * @param environment */ - public Object evaluate(eva2.server.go.problems.InterfaceProgramProblem environment); + public Object evaluate(eva2.optimization.problems.InterfaceProgramProblem environment); /** This method returns a string representation of the current program. * @return string diff --git a/src/eva2/server/go/mocco/InterfaceProcessElement.java b/src/eva2/optimization/mocco/InterfaceProcessElement.java similarity index 93% rename from src/eva2/server/go/mocco/InterfaceProcessElement.java rename to src/eva2/optimization/mocco/InterfaceProcessElement.java index 524e4ab6..84db9ddd 100644 --- a/src/eva2/server/go/mocco/InterfaceProcessElement.java +++ b/src/eva2/optimization/mocco/InterfaceProcessElement.java @@ -1,4 +1,4 @@ -package eva2.server.go.mocco; +package eva2.optimization.mocco; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/mocco/MOCCOChooseMOStrategy.java b/src/eva2/optimization/mocco/MOCCOChooseMOStrategy.java similarity index 99% rename from src/eva2/server/go/mocco/MOCCOChooseMOStrategy.java rename to src/eva2/optimization/mocco/MOCCOChooseMOStrategy.java index 06ac165c..edaa2c44 100644 --- a/src/eva2/server/go/mocco/MOCCOChooseMOStrategy.java +++ b/src/eva2/optimization/mocco/MOCCOChooseMOStrategy.java @@ -1,7 +1,7 @@ -package eva2.server.go.mocco; +package eva2.optimization.mocco; -import eva2.server.go.MOCCOStandalone; +import eva2.optimization.go.MOCCOStandalone; import eva2.tools.BasicResourceLoader; import java.awt.*; import java.awt.event.ActionEvent; diff --git a/src/eva2/server/go/mocco/MOCCOChooseReferencePoint.java b/src/eva2/optimization/mocco/MOCCOChooseReferencePoint.java similarity index 94% rename from src/eva2/server/go/mocco/MOCCOChooseReferencePoint.java rename to src/eva2/optimization/mocco/MOCCOChooseReferencePoint.java index 46f76520..d2904dc3 100644 --- a/src/eva2/server/go/mocco/MOCCOChooseReferencePoint.java +++ b/src/eva2/optimization/mocco/MOCCOChooseReferencePoint.java @@ -1,10 +1,10 @@ -package eva2.server.go.mocco; +package eva2.optimization.mocco; -import eva2.server.go.MOCCOStandalone; -import eva2.server.go.mocco.paretofrontviewer.InterfaceRefPointListener; -import eva2.server.go.problems.InterfaceMultiObjectiveDeNovoProblem; -import eva2.server.go.problems.InterfaceOptimizationObjective; +import eva2.optimization.go.MOCCOStandalone; +import eva2.optimization.mocco.paretofrontviewer.InterfaceRefPointListener; +import eva2.optimization.problems.InterfaceMultiObjectiveDeNovoProblem; +import eva2.optimization.problems.InterfaceOptimizationObjective; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; diff --git a/src/eva2/server/go/mocco/MOCCOChooseReferenceSolution.java b/src/eva2/optimization/mocco/MOCCOChooseReferenceSolution.java similarity index 93% rename from src/eva2/server/go/mocco/MOCCOChooseReferenceSolution.java rename to src/eva2/optimization/mocco/MOCCOChooseReferenceSolution.java index 85f5ef09..72d38ff3 100644 --- a/src/eva2/server/go/mocco/MOCCOChooseReferenceSolution.java +++ b/src/eva2/optimization/mocco/MOCCOChooseReferenceSolution.java @@ -1,12 +1,12 @@ -package eva2.server.go.mocco; +package eva2.optimization.mocco; -import eva2.server.go.MOCCOStandalone; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.mocco.paretofrontviewer.InterfaceRefSolutionListener; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceMultiObjectiveDeNovoProblem; -import eva2.server.go.problems.InterfaceOptimizationObjective; +import eva2.optimization.go.MOCCOStandalone; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.mocco.paretofrontviewer.InterfaceRefSolutionListener; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceMultiObjectiveDeNovoProblem; +import eva2.optimization.problems.InterfaceOptimizationObjective; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; diff --git a/src/eva2/server/go/mocco/MOCCOInitialPopulationSize.java b/src/eva2/optimization/mocco/MOCCOInitialPopulationSize.java similarity index 97% rename from src/eva2/server/go/mocco/MOCCOInitialPopulationSize.java rename to src/eva2/optimization/mocco/MOCCOInitialPopulationSize.java index c578622c..c52ba985 100644 --- a/src/eva2/server/go/mocco/MOCCOInitialPopulationSize.java +++ b/src/eva2/optimization/mocco/MOCCOInitialPopulationSize.java @@ -1,6 +1,6 @@ -package eva2.server.go.mocco; +package eva2.optimization.mocco; -import eva2.server.go.MOCCOStandalone; +import eva2.optimization.go.MOCCOStandalone; import java.awt.BorderLayout; import java.awt.GridBagConstraints; import java.awt.GridBagLayout; diff --git a/src/eva2/server/go/mocco/MOCCOParameterizeGDF.java b/src/eva2/optimization/mocco/MOCCOParameterizeGDF.java similarity index 94% rename from src/eva2/server/go/mocco/MOCCOParameterizeGDF.java rename to src/eva2/optimization/mocco/MOCCOParameterizeGDF.java index 11bedd26..4cd75387 100644 --- a/src/eva2/server/go/mocco/MOCCOParameterizeGDF.java +++ b/src/eva2/optimization/mocco/MOCCOParameterizeGDF.java @@ -1,20 +1,20 @@ -package eva2.server.go.mocco; +package eva2.optimization.mocco; import eva2.gui.GenericObjectEditor; import eva2.gui.PropertyDoubleArray; import eva2.gui.PropertyEditorProvider; -import eva2.server.go.InterfaceTerminator; -import eva2.server.go.MOCCOStandalone; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.moso.MOSOWeightedFitness; -import eva2.server.go.problems.AbstractMultiObjectiveOptimizationProblem; -import eva2.server.go.problems.InterfaceMultiObjectiveDeNovoProblem; -import eva2.server.go.problems.InterfaceOptimizationObjective; -import eva2.server.go.strategies.GeneticAlgorithm; -import eva2.server.go.strategies.InterfaceOptimizer; -import eva2.server.go.tools.AbstractObjectEditor; -import eva2.server.go.tools.GeneralGOEProperty; +import eva2.optimization.go.InterfaceTerminator; +import eva2.optimization.go.MOCCOStandalone; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.operators.moso.MOSOWeightedFitness; +import eva2.optimization.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.optimization.problems.InterfaceMultiObjectiveDeNovoProblem; +import eva2.optimization.problems.InterfaceOptimizationObjective; +import eva2.optimization.strategies.GeneticAlgorithm; +import eva2.optimization.strategies.InterfaceOptimizer; +import eva2.optimization.tools.AbstractObjectEditor; +import eva2.optimization.tools.GeneralGOEProperty; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; diff --git a/src/eva2/server/go/mocco/MOCCOParameterizeMO.java b/src/eva2/optimization/mocco/MOCCOParameterizeMO.java similarity index 93% rename from src/eva2/server/go/mocco/MOCCOParameterizeMO.java rename to src/eva2/optimization/mocco/MOCCOParameterizeMO.java index c4340a1f..3af6739d 100644 --- a/src/eva2/server/go/mocco/MOCCOParameterizeMO.java +++ b/src/eva2/optimization/mocco/MOCCOParameterizeMO.java @@ -1,16 +1,16 @@ -package eva2.server.go.mocco; +package eva2.optimization.mocco; import eva2.gui.GenericObjectEditor; import eva2.gui.PropertyEditorProvider; -import eva2.server.go.InterfaceTerminator; -import eva2.server.go.MOCCOStandalone; -import eva2.server.go.populations.Population; -import eva2.server.go.strategies.GeneticAlgorithm; -import eva2.server.go.strategies.InterfaceOptimizer; -import eva2.server.go.strategies.MultiObjectiveEA; -import eva2.server.go.tools.AbstractObjectEditor; -import eva2.server.go.tools.GeneralGOEProperty; +import eva2.optimization.go.InterfaceTerminator; +import eva2.optimization.go.MOCCOStandalone; +import eva2.optimization.populations.Population; +import eva2.optimization.strategies.GeneticAlgorithm; +import eva2.optimization.strategies.InterfaceOptimizer; +import eva2.optimization.strategies.MultiObjectiveEA; +import eva2.optimization.tools.AbstractObjectEditor; +import eva2.optimization.tools.GeneralGOEProperty; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; diff --git a/src/eva2/server/go/mocco/MOCCOParameterizeRefPoint.java b/src/eva2/optimization/mocco/MOCCOParameterizeRefPoint.java similarity index 96% rename from src/eva2/server/go/mocco/MOCCOParameterizeRefPoint.java rename to src/eva2/optimization/mocco/MOCCOParameterizeRefPoint.java index a8afc761..2ef8a89b 100644 --- a/src/eva2/server/go/mocco/MOCCOParameterizeRefPoint.java +++ b/src/eva2/optimization/mocco/MOCCOParameterizeRefPoint.java @@ -1,16 +1,16 @@ -package eva2.server.go.mocco; +package eva2.optimization.mocco; import eva2.gui.GenericObjectEditor; import eva2.gui.PropertyEditorProvider; -import eva2.server.go.InterfaceTerminator; -import eva2.server.go.MOCCOStandalone; -import eva2.server.go.operators.migration.SOBestMigration; -import eva2.server.go.operators.moso.MOSOLpMetric; -import eva2.server.go.problems.AbstractMultiObjectiveOptimizationProblem; -import eva2.server.go.strategies.IslandModelEA; -import eva2.server.go.tools.AbstractObjectEditor; -import eva2.server.go.tools.GeneralGOEProperty; +import eva2.optimization.go.InterfaceTerminator; +import eva2.optimization.go.MOCCOStandalone; +import eva2.optimization.operators.migration.SOBestMigration; +import eva2.optimization.operators.moso.MOSOLpMetric; +import eva2.optimization.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.optimization.strategies.IslandModelEA; +import eva2.optimization.tools.AbstractObjectEditor; +import eva2.optimization.tools.GeneralGOEProperty; import eva2.tools.math.RNG; import java.awt.BorderLayout; import java.awt.GridBagConstraints; diff --git a/src/eva2/server/go/mocco/MOCCOParameterizeSO.java b/src/eva2/optimization/mocco/MOCCOParameterizeSO.java similarity index 93% rename from src/eva2/server/go/mocco/MOCCOParameterizeSO.java rename to src/eva2/optimization/mocco/MOCCOParameterizeSO.java index 7f3a35a0..51bf82dd 100644 --- a/src/eva2/server/go/mocco/MOCCOParameterizeSO.java +++ b/src/eva2/optimization/mocco/MOCCOParameterizeSO.java @@ -1,15 +1,15 @@ -package eva2.server.go.mocco; +package eva2.optimization.mocco; import eva2.gui.GenericObjectEditor; import eva2.gui.PropertyEditorProvider; -import eva2.server.go.InterfaceTerminator; -import eva2.server.go.MOCCOStandalone; -import eva2.server.go.strategies.GeneticAlgorithm; -import eva2.server.go.strategies.InterfaceOptimizer; -import eva2.server.go.strategies.MultiObjectiveEA; -import eva2.server.go.tools.AbstractObjectEditor; -import eva2.server.go.tools.GeneralGOEProperty; +import eva2.optimization.go.InterfaceTerminator; +import eva2.optimization.go.MOCCOStandalone; +import eva2.optimization.strategies.GeneticAlgorithm; +import eva2.optimization.strategies.InterfaceOptimizer; +import eva2.optimization.strategies.MultiObjectiveEA; +import eva2.optimization.tools.AbstractObjectEditor; +import eva2.optimization.tools.GeneralGOEProperty; import java.awt.BorderLayout; import java.awt.GridBagConstraints; import java.awt.GridBagLayout; diff --git a/src/eva2/server/go/mocco/MOCCOParameterizeSTEP.java b/src/eva2/optimization/mocco/MOCCOParameterizeSTEP.java similarity index 95% rename from src/eva2/server/go/mocco/MOCCOParameterizeSTEP.java rename to src/eva2/optimization/mocco/MOCCOParameterizeSTEP.java index bcf905c8..787dbdff 100644 --- a/src/eva2/server/go/mocco/MOCCOParameterizeSTEP.java +++ b/src/eva2/optimization/mocco/MOCCOParameterizeSTEP.java @@ -1,20 +1,20 @@ -package eva2.server.go.mocco; +package eva2.optimization.mocco; import eva2.gui.GenericObjectEditor; import eva2.gui.PropertyDoubleArray; import eva2.gui.PropertyEditorProvider; -import eva2.server.go.InterfaceTerminator; -import eva2.server.go.MOCCOStandalone; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.moso.MOSOWeightedFitness; -import eva2.server.go.problems.AbstractMultiObjectiveOptimizationProblem; -import eva2.server.go.problems.InterfaceMultiObjectiveDeNovoProblem; -import eva2.server.go.problems.InterfaceOptimizationObjective; -import eva2.server.go.strategies.GeneticAlgorithm; -import eva2.server.go.strategies.InterfaceOptimizer; -import eva2.server.go.tools.AbstractObjectEditor; -import eva2.server.go.tools.GeneralGOEProperty; +import eva2.optimization.go.InterfaceTerminator; +import eva2.optimization.go.MOCCOStandalone; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.operators.moso.MOSOWeightedFitness; +import eva2.optimization.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.optimization.problems.InterfaceMultiObjectiveDeNovoProblem; +import eva2.optimization.problems.InterfaceOptimizationObjective; +import eva2.optimization.strategies.GeneticAlgorithm; +import eva2.optimization.strategies.InterfaceOptimizer; +import eva2.optimization.tools.AbstractObjectEditor; +import eva2.optimization.tools.GeneralGOEProperty; import java.awt.BorderLayout; import java.awt.GridBagConstraints; import java.awt.GridBagLayout; diff --git a/src/eva2/server/go/mocco/MOCCOParameterizeTchebycheff.java b/src/eva2/optimization/mocco/MOCCOParameterizeTchebycheff.java similarity index 96% rename from src/eva2/server/go/mocco/MOCCOParameterizeTchebycheff.java rename to src/eva2/optimization/mocco/MOCCOParameterizeTchebycheff.java index ee9f4b72..c4b0d815 100644 --- a/src/eva2/server/go/mocco/MOCCOParameterizeTchebycheff.java +++ b/src/eva2/optimization/mocco/MOCCOParameterizeTchebycheff.java @@ -1,16 +1,16 @@ -package eva2.server.go.mocco; +package eva2.optimization.mocco; import eva2.gui.GenericObjectEditor; import eva2.gui.PropertyEditorProvider; -import eva2.server.go.InterfaceTerminator; -import eva2.server.go.MOCCOStandalone; -import eva2.server.go.operators.migration.SOBestMigration; -import eva2.server.go.operators.moso.MOSOWeightedLPTchebycheff; -import eva2.server.go.problems.AbstractMultiObjectiveOptimizationProblem; -import eva2.server.go.strategies.IslandModelEA; -import eva2.server.go.tools.AbstractObjectEditor; -import eva2.server.go.tools.GeneralGOEProperty; +import eva2.optimization.go.InterfaceTerminator; +import eva2.optimization.go.MOCCOStandalone; +import eva2.optimization.operators.migration.SOBestMigration; +import eva2.optimization.operators.moso.MOSOWeightedLPTchebycheff; +import eva2.optimization.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.optimization.strategies.IslandModelEA; +import eva2.optimization.tools.AbstractObjectEditor; +import eva2.optimization.tools.GeneralGOEProperty; import eva2.tools.math.RNG; import java.awt.BorderLayout; import java.awt.GridBagConstraints; diff --git a/src/eva2/server/go/mocco/MOCCOPhase.java b/src/eva2/optimization/mocco/MOCCOPhase.java similarity index 96% rename from src/eva2/server/go/mocco/MOCCOPhase.java rename to src/eva2/optimization/mocco/MOCCOPhase.java index 85e8ae8b..c3e6489f 100644 --- a/src/eva2/server/go/mocco/MOCCOPhase.java +++ b/src/eva2/optimization/mocco/MOCCOPhase.java @@ -1,6 +1,6 @@ -package eva2.server.go.mocco; +package eva2.optimization.mocco; -import eva2.server.go.MOCCOStandalone; +import eva2.optimization.go.MOCCOStandalone; import java.awt.BorderLayout; import java.awt.Font; import java.awt.event.ActionEvent; diff --git a/src/eva2/server/go/mocco/MOCCOProblemInitialization.java b/src/eva2/optimization/mocco/MOCCOProblemInitialization.java similarity index 96% rename from src/eva2/server/go/mocco/MOCCOProblemInitialization.java rename to src/eva2/optimization/mocco/MOCCOProblemInitialization.java index 550e4706..2ea5f955 100644 --- a/src/eva2/server/go/mocco/MOCCOProblemInitialization.java +++ b/src/eva2/optimization/mocco/MOCCOProblemInitialization.java @@ -1,8 +1,8 @@ -package eva2.server.go.mocco; +package eva2.optimization.mocco; import eva2.gui.JParaPanel; -import eva2.server.go.MOCCOStandalone; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.go.MOCCOStandalone; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.ReflectPackage; import java.awt.BorderLayout; import java.awt.GridBagConstraints; diff --git a/src/eva2/server/go/mocco/MOCCOProblemRedefinition.java b/src/eva2/optimization/mocco/MOCCOProblemRedefinition.java similarity index 96% rename from src/eva2/server/go/mocco/MOCCOProblemRedefinition.java rename to src/eva2/optimization/mocco/MOCCOProblemRedefinition.java index 3c6cd97b..375254ea 100644 --- a/src/eva2/server/go/mocco/MOCCOProblemRedefinition.java +++ b/src/eva2/optimization/mocco/MOCCOProblemRedefinition.java @@ -1,9 +1,9 @@ -package eva2.server.go.mocco; +package eva2.optimization.mocco; import eva2.gui.JParaPanel; -import eva2.server.go.MOCCOStandalone; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.go.MOCCOStandalone; +import eva2.optimization.problems.InterfaceOptimizationProblem; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; diff --git a/src/eva2/server/go/mocco/MOCCOState.java b/src/eva2/optimization/mocco/MOCCOState.java similarity index 93% rename from src/eva2/server/go/mocco/MOCCOState.java rename to src/eva2/optimization/mocco/MOCCOState.java index 48d7339d..c4ed8da8 100644 --- a/src/eva2/server/go/mocco/MOCCOState.java +++ b/src/eva2/optimization/mocco/MOCCOState.java @@ -1,16 +1,16 @@ -package eva2.server.go.mocco; +package eva2.optimization.mocco; -import eva2.server.go.InterfaceTerminator; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.archiving.ArchivingAllDominating; -import eva2.server.go.operators.terminators.EvaluationTerminator; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.AbstractMultiObjectiveOptimizationProblem; -import eva2.server.go.problems.InterfaceMultiObjectiveDeNovoProblem; -import eva2.server.go.problems.InterfaceOptimizationObjective; -import eva2.server.go.problems.InterfaceOptimizationProblem; -import eva2.server.go.strategies.InterfaceOptimizer; -import eva2.server.go.strategies.MultiObjectiveEA; +import eva2.optimization.go.InterfaceTerminator; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.operators.archiving.ArchivingAllDominating; +import eva2.optimization.operators.terminators.EvaluationTerminator; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.optimization.problems.InterfaceMultiObjectiveDeNovoProblem; +import eva2.optimization.problems.InterfaceOptimizationObjective; +import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.optimization.strategies.InterfaceOptimizer; +import eva2.optimization.strategies.MultiObjectiveEA; import java.awt.Color; import java.util.ArrayList; diff --git a/src/eva2/server/go/mocco/paretofrontviewer/InterfaceParetoFrontView.java b/src/eva2/optimization/mocco/paretofrontviewer/InterfaceParetoFrontView.java similarity index 88% rename from src/eva2/server/go/mocco/paretofrontviewer/InterfaceParetoFrontView.java rename to src/eva2/optimization/mocco/paretofrontviewer/InterfaceParetoFrontView.java index 3aedf460..36ef7252 100644 --- a/src/eva2/server/go/mocco/paretofrontviewer/InterfaceParetoFrontView.java +++ b/src/eva2/optimization/mocco/paretofrontviewer/InterfaceParetoFrontView.java @@ -1,4 +1,4 @@ -package eva2.server.go.mocco.paretofrontviewer; +package eva2.optimization.mocco.paretofrontviewer; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/mocco/paretofrontviewer/InterfaceRefPointListener.java b/src/eva2/optimization/mocco/paretofrontviewer/InterfaceRefPointListener.java similarity index 88% rename from src/eva2/server/go/mocco/paretofrontviewer/InterfaceRefPointListener.java rename to src/eva2/optimization/mocco/paretofrontviewer/InterfaceRefPointListener.java index d9a6e453..f477164f 100644 --- a/src/eva2/server/go/mocco/paretofrontviewer/InterfaceRefPointListener.java +++ b/src/eva2/optimization/mocco/paretofrontviewer/InterfaceRefPointListener.java @@ -1,4 +1,4 @@ -package eva2.server.go.mocco.paretofrontviewer; +package eva2.optimization.mocco.paretofrontviewer; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/mocco/paretofrontviewer/InterfaceRefSolutionListener.java b/src/eva2/optimization/mocco/paretofrontviewer/InterfaceRefSolutionListener.java similarity index 79% rename from src/eva2/server/go/mocco/paretofrontviewer/InterfaceRefSolutionListener.java rename to src/eva2/optimization/mocco/paretofrontviewer/InterfaceRefSolutionListener.java index 120d77e4..9a13f84e 100644 --- a/src/eva2/server/go/mocco/paretofrontviewer/InterfaceRefSolutionListener.java +++ b/src/eva2/optimization/mocco/paretofrontviewer/InterfaceRefSolutionListener.java @@ -1,6 +1,6 @@ -package eva2.server.go.mocco.paretofrontviewer; +package eva2.optimization.mocco.paretofrontviewer; -import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.AbstractEAIndividual; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/mocco/paretofrontviewer/MOCCOViewer.java b/src/eva2/optimization/mocco/paretofrontviewer/MOCCOViewer.java similarity index 98% rename from src/eva2/server/go/mocco/paretofrontviewer/MOCCOViewer.java rename to src/eva2/optimization/mocco/paretofrontviewer/MOCCOViewer.java index c3d3d1e7..f1d98ab3 100644 --- a/src/eva2/server/go/mocco/paretofrontviewer/MOCCOViewer.java +++ b/src/eva2/optimization/mocco/paretofrontviewer/MOCCOViewer.java @@ -1,14 +1,14 @@ -package eva2.server.go.mocco.paretofrontviewer; +package eva2.optimization.mocco.paretofrontviewer; import eva2.gui.FunctionArea; import eva2.gui.GraphPointSet; import eva2.gui.InterfaceDPointWithContent; -import eva2.server.go.MOCCOStandalone; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceMultiObjectiveDeNovoProblem; -import eva2.server.go.problems.InterfaceOptimizationObjective; +import eva2.optimization.go.MOCCOStandalone; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceMultiObjectiveDeNovoProblem; +import eva2.optimization.problems.InterfaceOptimizationObjective; import eva2.tools.chart2d.Chart2DDPointContentSelectable; import eva2.tools.chart2d.DPoint; import eva2.tools.chart2d.DPointIcon; diff --git a/src/eva2/server/go/mocco/paretofrontviewer/ParetoFrontView2D.java b/src/eva2/optimization/mocco/paretofrontviewer/ParetoFrontView2D.java similarity index 98% rename from src/eva2/server/go/mocco/paretofrontviewer/ParetoFrontView2D.java rename to src/eva2/optimization/mocco/paretofrontviewer/ParetoFrontView2D.java index fad8ff80..384146f8 100644 --- a/src/eva2/server/go/mocco/paretofrontviewer/ParetoFrontView2D.java +++ b/src/eva2/optimization/mocco/paretofrontviewer/ParetoFrontView2D.java @@ -1,11 +1,11 @@ -package eva2.server.go.mocco.paretofrontviewer; +package eva2.optimization.mocco.paretofrontviewer; import eva2.gui.*; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceMultiObjectiveDeNovoProblem; -import eva2.server.go.problems.InterfaceOptimizationObjective; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceMultiObjectiveDeNovoProblem; +import eva2.optimization.problems.InterfaceOptimizationObjective; import eva2.tools.chart2d.Chart2DDPointContentSelectable; import eva2.tools.chart2d.Chart2DDPointIconCross; import eva2.tools.chart2d.Chart2DDPointIconPoint; diff --git a/src/eva2/server/go/mocco/paretofrontviewer/ParetoFrontViewParallelAxsis.java b/src/eva2/optimization/mocco/paretofrontviewer/ParetoFrontViewParallelAxsis.java similarity index 92% rename from src/eva2/server/go/mocco/paretofrontviewer/ParetoFrontViewParallelAxsis.java rename to src/eva2/optimization/mocco/paretofrontviewer/ParetoFrontViewParallelAxsis.java index 6f530278..5972c447 100644 --- a/src/eva2/server/go/mocco/paretofrontviewer/ParetoFrontViewParallelAxsis.java +++ b/src/eva2/optimization/mocco/paretofrontviewer/ParetoFrontViewParallelAxsis.java @@ -1,4 +1,4 @@ -package eva2.server.go.mocco.paretofrontviewer; +package eva2.optimization.mocco.paretofrontviewer; import javax.swing.*; diff --git a/src/eva2/server/go/mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java b/src/eva2/optimization/mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java similarity index 98% rename from src/eva2/server/go/mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java rename to src/eva2/optimization/mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java index 958fe1e0..1a87e8a9 100644 --- a/src/eva2/server/go/mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java +++ b/src/eva2/optimization/mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java @@ -1,11 +1,11 @@ -package eva2.server.go.mocco.paretofrontviewer; +package eva2.optimization.mocco.paretofrontviewer; import eva2.gui.*; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceMultiObjectiveDeNovoProblem; -import eva2.server.go.problems.InterfaceOptimizationObjective; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceMultiObjectiveDeNovoProblem; +import eva2.optimization.problems.InterfaceOptimizationObjective; import eva2.tools.chart2d.Chart2DDPointContentSelectable; import eva2.tools.chart2d.DPoint; import eva2.tools.chart2d.DPointIcon; diff --git a/src/eva2/server/modules/AbstractGOParameters.java b/src/eva2/optimization/modules/AbstractGOParameters.java similarity index 92% rename from src/eva2/server/modules/AbstractGOParameters.java rename to src/eva2/optimization/modules/AbstractGOParameters.java index 377958d7..7f3d5c45 100644 --- a/src/eva2/server/modules/AbstractGOParameters.java +++ b/src/eva2/optimization/modules/AbstractGOParameters.java @@ -1,15 +1,15 @@ -package eva2.server.modules; +package eva2.optimization.modules; import eva2.gui.BeanInspector; -import eva2.server.go.InterfaceGOParameters; -import eva2.server.go.InterfaceNotifyOnInformers; -import eva2.server.go.InterfacePopulationChangedEventListener; -import eva2.server.go.InterfaceTerminator; -import eva2.server.go.operators.postprocess.InterfacePostProcessParams; -import eva2.server.go.operators.postprocess.PostProcessParams; -import eva2.server.go.problems.InterfaceAdditionalPopulationInformer; -import eva2.server.go.problems.InterfaceOptimizationProblem; -import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.optimization.go.InterfaceGOParameters; +import eva2.optimization.go.InterfaceNotifyOnInformers; +import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.go.InterfaceTerminator; +import eva2.optimization.operators.postprocess.InterfacePostProcessParams; +import eva2.optimization.operators.postprocess.PostProcessParams; +import eva2.optimization.problems.InterfaceAdditionalPopulationInformer; +import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.optimization.strategies.InterfaceOptimizer; import eva2.tools.Serializer; import java.io.FileNotFoundException; import java.io.FileOutputStream; diff --git a/src/eva2/server/modules/AbstractModuleAdapter.java b/src/eva2/optimization/modules/AbstractModuleAdapter.java similarity index 97% rename from src/eva2/server/modules/AbstractModuleAdapter.java rename to src/eva2/optimization/modules/AbstractModuleAdapter.java index ef7df3cf..c4e279e2 100644 --- a/src/eva2/server/modules/AbstractModuleAdapter.java +++ b/src/eva2/optimization/modules/AbstractModuleAdapter.java @@ -1,4 +1,4 @@ -package eva2.server.modules; +package eva2.optimization.modules; /* * Title: EvA2 * Description: @@ -9,8 +9,8 @@ package eva2.server.modules; * $Date: 2007-12-04 14:22:52 +0100 (Tue, 04 Dec 2007) $ * $Author: mkron $ */ -import eva2.server.go.InterfaceGOParameters; -import eva2.server.go.InterfaceProcessor; +import eva2.optimization.go.InterfaceGOParameters; +import eva2.optimization.go.InterfaceProcessor; import eva2.optimization.OptimizationStateListener; import java.io.Serializable; import java.util.ArrayList; diff --git a/src/eva2/server/modules/DEModuleAdapter.java b/src/eva2/optimization/modules/DEModuleAdapter.java similarity index 94% rename from src/eva2/server/modules/DEModuleAdapter.java rename to src/eva2/optimization/modules/DEModuleAdapter.java index 33611d2e..9815ddc1 100644 --- a/src/eva2/server/modules/DEModuleAdapter.java +++ b/src/eva2/optimization/modules/DEModuleAdapter.java @@ -1,4 +1,4 @@ -package eva2.server.modules; +package eva2.optimization.modules; /** * This the DE module adapter necessary to access this implementation from the EvA top level. diff --git a/src/eva2/server/modules/DEParameters.java b/src/eva2/optimization/modules/DEParameters.java similarity index 91% rename from src/eva2/server/modules/DEParameters.java rename to src/eva2/optimization/modules/DEParameters.java index 440cc35b..3d0a326b 100644 --- a/src/eva2/server/modules/DEParameters.java +++ b/src/eva2/optimization/modules/DEParameters.java @@ -1,13 +1,13 @@ -package eva2.server.modules; +package eva2.optimization.modules; -import eva2.server.go.InterfaceGOParameters; -import eva2.server.go.enums.DETypeEnum; -import eva2.server.go.operators.terminators.EvaluationTerminator; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.F1Problem; -import eva2.server.go.strategies.DifferentialEvolution; -import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.optimization.go.InterfaceGOParameters; +import eva2.optimization.enums.DETypeEnum; +import eva2.optimization.operators.terminators.EvaluationTerminator; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.F1Problem; +import eva2.optimization.strategies.DifferentialEvolution; +import eva2.optimization.strategies.InterfaceOptimizer; import eva2.tools.Serializer; import java.io.FileInputStream; import java.io.FileNotFoundException; diff --git a/src/eva2/server/modules/EPModuleAdapter.java b/src/eva2/optimization/modules/EPModuleAdapter.java similarity index 94% rename from src/eva2/server/modules/EPModuleAdapter.java rename to src/eva2/optimization/modules/EPModuleAdapter.java index 7dc77884..522e9f9a 100644 --- a/src/eva2/server/modules/EPModuleAdapter.java +++ b/src/eva2/optimization/modules/EPModuleAdapter.java @@ -1,4 +1,4 @@ -package eva2.server.modules; +package eva2.optimization.modules; /** * This the EP module adapter necessary to access this implementation from the EvA top level. diff --git a/src/eva2/server/modules/EPParameters.java b/src/eva2/optimization/modules/EPParameters.java similarity index 88% rename from src/eva2/server/modules/EPParameters.java rename to src/eva2/optimization/modules/EPParameters.java index 982f6136..745e3b68 100644 --- a/src/eva2/server/modules/EPParameters.java +++ b/src/eva2/optimization/modules/EPParameters.java @@ -1,13 +1,13 @@ -package eva2.server.modules; +package eva2.optimization.modules; -import eva2.server.go.InterfaceGOParameters; -import eva2.server.go.operators.selection.InterfaceSelection; -import eva2.server.go.operators.terminators.EvaluationTerminator; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.F1Problem; -import eva2.server.go.strategies.EvolutionaryProgramming; -import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.optimization.go.InterfaceGOParameters; +import eva2.optimization.operators.selection.InterfaceSelection; +import eva2.optimization.operators.terminators.EvaluationTerminator; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.F1Problem; +import eva2.optimization.strategies.EvolutionaryProgramming; +import eva2.optimization.strategies.InterfaceOptimizer; import eva2.tools.Serializer; import java.io.FileInputStream; import java.io.FileNotFoundException; diff --git a/src/eva2/server/modules/GAModuleAdapter.java b/src/eva2/optimization/modules/GAModuleAdapter.java similarity index 94% rename from src/eva2/server/modules/GAModuleAdapter.java rename to src/eva2/optimization/modules/GAModuleAdapter.java index 1cb7c832..17bcc97c 100644 --- a/src/eva2/server/modules/GAModuleAdapter.java +++ b/src/eva2/optimization/modules/GAModuleAdapter.java @@ -1,4 +1,4 @@ -package eva2.server.modules; +package eva2.optimization.modules; /** diff --git a/src/eva2/server/modules/GAParameters.java b/src/eva2/optimization/modules/GAParameters.java similarity index 92% rename from src/eva2/server/modules/GAParameters.java rename to src/eva2/optimization/modules/GAParameters.java index 9bb157f4..f69c4d74 100644 --- a/src/eva2/server/modules/GAParameters.java +++ b/src/eva2/optimization/modules/GAParameters.java @@ -1,12 +1,12 @@ -package eva2.server.modules; +package eva2.optimization.modules; -import eva2.server.go.InterfaceGOParameters; -import eva2.server.go.operators.selection.InterfaceSelection; -import eva2.server.go.operators.terminators.EvaluationTerminator; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.B1Problem; -import eva2.server.go.strategies.GeneticAlgorithm; -import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.optimization.go.InterfaceGOParameters; +import eva2.optimization.operators.selection.InterfaceSelection; +import eva2.optimization.operators.terminators.EvaluationTerminator; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.B1Problem; +import eva2.optimization.strategies.GeneticAlgorithm; +import eva2.optimization.strategies.InterfaceOptimizer; import eva2.tools.Serializer; import java.io.FileInputStream; import java.io.FileNotFoundException; diff --git a/src/eva2/server/modules/GOModuleAdapter.java b/src/eva2/optimization/modules/GOModuleAdapter.java similarity index 94% rename from src/eva2/server/modules/GOModuleAdapter.java rename to src/eva2/optimization/modules/GOModuleAdapter.java index 09ce1c82..5fdca6ed 100644 --- a/src/eva2/server/modules/GOModuleAdapter.java +++ b/src/eva2/optimization/modules/GOModuleAdapter.java @@ -1,6 +1,6 @@ -package eva2.server.modules; +package eva2.optimization.modules; -import eva2.server.go.InterfaceGOParameters; +import eva2.optimization.go.InterfaceGOParameters; import java.io.Serializable; diff --git a/src/eva2/server/modules/GOParameters.java b/src/eva2/optimization/modules/GOParameters.java similarity index 84% rename from src/eva2/server/modules/GOParameters.java rename to src/eva2/optimization/modules/GOParameters.java index 987d13f4..4227e276 100644 --- a/src/eva2/server/modules/GOParameters.java +++ b/src/eva2/optimization/modules/GOParameters.java @@ -1,12 +1,12 @@ -package eva2.server.modules; +package eva2.optimization.modules; -import eva2.server.go.InterfaceGOParameters; -import eva2.server.go.InterfaceTerminator; -import eva2.server.go.operators.terminators.EvaluationTerminator; -import eva2.server.go.problems.F1Problem; -import eva2.server.go.problems.InterfaceOptimizationProblem; -import eva2.server.go.strategies.GeneticAlgorithm; -import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.optimization.go.InterfaceGOParameters; +import eva2.optimization.go.InterfaceTerminator; +import eva2.optimization.operators.terminators.EvaluationTerminator; +import eva2.optimization.problems.F1Problem; +import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.optimization.strategies.GeneticAlgorithm; +import eva2.optimization.strategies.InterfaceOptimizer; import eva2.tools.Serializer; import java.io.FileInputStream; import java.io.FileNotFoundException; diff --git a/src/eva2/server/modules/GenericModuleAdapter.java b/src/eva2/optimization/modules/GenericModuleAdapter.java similarity index 93% rename from src/eva2/server/modules/GenericModuleAdapter.java rename to src/eva2/optimization/modules/GenericModuleAdapter.java index 3937c3b2..70b25ea0 100644 --- a/src/eva2/server/modules/GenericModuleAdapter.java +++ b/src/eva2/optimization/modules/GenericModuleAdapter.java @@ -1,17 +1,17 @@ -package eva2.server.modules; +package eva2.optimization.modules; import eva2.gui.EvAModuleButtonPanelMaker; import eva2.gui.EvATabbedFrameMaker; import eva2.gui.GenericObjectEditor; import eva2.gui.JParaPanel; -import eva2.server.go.InterfaceGOParameters; -import eva2.server.stat.AbstractStatistics; -import eva2.server.stat.EvAJob; -import eva2.server.stat.EvAJobList; -import eva2.server.stat.InterfaceStatisticsParameter; -import eva2.server.stat.StatisticsStandalone; -import eva2.server.stat.StatisticsWithGUI; +import eva2.optimization.go.InterfaceGOParameters; +import eva2.optimization.stat.AbstractStatistics; +import eva2.optimization.stat.EvAJob; +import eva2.optimization.stat.EvAJobList; +import eva2.optimization.stat.InterfaceStatisticsParameter; +import eva2.optimization.stat.StatisticsStandalone; +import eva2.optimization.stat.StatisticsWithGUI; import java.io.Serializable; import java.lang.reflect.Proxy; diff --git a/src/eva2/server/modules/HCModuleAdapter.java b/src/eva2/optimization/modules/HCModuleAdapter.java similarity index 95% rename from src/eva2/server/modules/HCModuleAdapter.java rename to src/eva2/optimization/modules/HCModuleAdapter.java index 736c4605..fb12fe2c 100644 --- a/src/eva2/server/modules/HCModuleAdapter.java +++ b/src/eva2/optimization/modules/HCModuleAdapter.java @@ -1,4 +1,4 @@ -package eva2.server.modules; +package eva2.optimization.modules; /** * This the HC module adapter necessary to access this implementation from the EvA top level. diff --git a/src/eva2/server/modules/HCParameters.java b/src/eva2/optimization/modules/HCParameters.java similarity index 87% rename from src/eva2/server/modules/HCParameters.java rename to src/eva2/optimization/modules/HCParameters.java index 938a88c0..bf81d549 100644 --- a/src/eva2/server/modules/HCParameters.java +++ b/src/eva2/optimization/modules/HCParameters.java @@ -1,11 +1,11 @@ -package eva2.server.modules; +package eva2.optimization.modules; -import eva2.server.go.InterfaceGOParameters; -import eva2.server.go.operators.terminators.EvaluationTerminator; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.B1Problem; -import eva2.server.go.strategies.HillClimbing; -import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.optimization.go.InterfaceGOParameters; +import eva2.optimization.operators.terminators.EvaluationTerminator; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.B1Problem; +import eva2.optimization.strategies.HillClimbing; +import eva2.optimization.strategies.InterfaceOptimizer; import eva2.tools.Serializer; import java.io.FileInputStream; import java.io.FileNotFoundException; diff --git a/src/eva2/server/modules/MCModuleAdapter.java b/src/eva2/optimization/modules/MCModuleAdapter.java similarity index 95% rename from src/eva2/server/modules/MCModuleAdapter.java rename to src/eva2/optimization/modules/MCModuleAdapter.java index 2f7efe94..1e8b9831 100644 --- a/src/eva2/server/modules/MCModuleAdapter.java +++ b/src/eva2/optimization/modules/MCModuleAdapter.java @@ -1,4 +1,4 @@ -package eva2.server.modules; +package eva2.optimization.modules; /** * This the MC module adapter necessary to access this implementation from the EvA top level. diff --git a/src/eva2/server/modules/MCParameters.java b/src/eva2/optimization/modules/MCParameters.java similarity index 87% rename from src/eva2/server/modules/MCParameters.java rename to src/eva2/optimization/modules/MCParameters.java index 66264fdc..453e63a0 100644 --- a/src/eva2/server/modules/MCParameters.java +++ b/src/eva2/optimization/modules/MCParameters.java @@ -1,11 +1,11 @@ -package eva2.server.modules; +package eva2.optimization.modules; -import eva2.server.go.InterfaceGOParameters; -import eva2.server.go.operators.terminators.EvaluationTerminator; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.B1Problem; -import eva2.server.go.strategies.InterfaceOptimizer; -import eva2.server.go.strategies.MonteCarloSearch; +import eva2.optimization.go.InterfaceGOParameters; +import eva2.optimization.operators.terminators.EvaluationTerminator; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.B1Problem; +import eva2.optimization.strategies.InterfaceOptimizer; +import eva2.optimization.strategies.MonteCarloSearch; import eva2.tools.Serializer; import java.io.FileInputStream; import java.io.FileNotFoundException; diff --git a/src/eva2/server/modules/MOEAModuleAdapter.java b/src/eva2/optimization/modules/MOEAModuleAdapter.java similarity index 95% rename from src/eva2/server/modules/MOEAModuleAdapter.java rename to src/eva2/optimization/modules/MOEAModuleAdapter.java index ebc95cbc..7be4eb51 100644 --- a/src/eva2/server/modules/MOEAModuleAdapter.java +++ b/src/eva2/optimization/modules/MOEAModuleAdapter.java @@ -1,4 +1,4 @@ -package eva2.server.modules; +package eva2.optimization.modules; import java.io.Serializable; diff --git a/src/eva2/server/modules/MOEAParameters.java b/src/eva2/optimization/modules/MOEAParameters.java similarity index 90% rename from src/eva2/server/modules/MOEAParameters.java rename to src/eva2/optimization/modules/MOEAParameters.java index 5e9cb3d6..0ab0cace 100644 --- a/src/eva2/server/modules/MOEAParameters.java +++ b/src/eva2/optimization/modules/MOEAParameters.java @@ -1,13 +1,13 @@ -package eva2.server.modules; +package eva2.optimization.modules; -import eva2.server.go.InterfaceGOParameters; -import eva2.server.go.operators.archiving.InterfaceArchiving; -import eva2.server.go.operators.archiving.InterfaceInformationRetrieval; -import eva2.server.go.operators.terminators.EvaluationTerminator; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.TF1Problem; -import eva2.server.go.strategies.InterfaceOptimizer; -import eva2.server.go.strategies.MultiObjectiveEA; +import eva2.optimization.go.InterfaceGOParameters; +import eva2.optimization.operators.archiving.InterfaceArchiving; +import eva2.optimization.operators.archiving.InterfaceInformationRetrieval; +import eva2.optimization.operators.terminators.EvaluationTerminator; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.TF1Problem; +import eva2.optimization.strategies.InterfaceOptimizer; +import eva2.optimization.strategies.MultiObjectiveEA; import eva2.tools.Serializer; import java.io.FileInputStream; import java.io.FileNotFoundException; diff --git a/src/eva2/server/modules/ModuleAdapter.java b/src/eva2/optimization/modules/ModuleAdapter.java similarity index 95% rename from src/eva2/server/modules/ModuleAdapter.java rename to src/eva2/optimization/modules/ModuleAdapter.java index 4d9142a7..411482d2 100644 --- a/src/eva2/server/modules/ModuleAdapter.java +++ b/src/eva2/optimization/modules/ModuleAdapter.java @@ -1,4 +1,4 @@ -package eva2.server.modules; +package eva2.optimization.modules; /* * Title: EvA2 * Description: @@ -11,7 +11,7 @@ package eva2.server.modules; */ import eva2.gui.EvATabbedFrameMaker; import eva2.optimization.OptimizationStateListener; -import eva2.server.stat.EvAJob; +import eva2.optimization.stat.EvAJob; /** * */ diff --git a/src/eva2/server/modules/PBILModuleAdapter.java b/src/eva2/optimization/modules/PBILModuleAdapter.java similarity index 95% rename from src/eva2/server/modules/PBILModuleAdapter.java rename to src/eva2/optimization/modules/PBILModuleAdapter.java index dc4e7cb1..6ef34edb 100644 --- a/src/eva2/server/modules/PBILModuleAdapter.java +++ b/src/eva2/optimization/modules/PBILModuleAdapter.java @@ -1,4 +1,4 @@ -package eva2.server.modules; +package eva2.optimization.modules; /** diff --git a/src/eva2/server/modules/PBILParameters.java b/src/eva2/optimization/modules/PBILParameters.java similarity index 92% rename from src/eva2/server/modules/PBILParameters.java rename to src/eva2/optimization/modules/PBILParameters.java index a380c669..b5f7d5b7 100644 --- a/src/eva2/server/modules/PBILParameters.java +++ b/src/eva2/optimization/modules/PBILParameters.java @@ -1,12 +1,12 @@ -package eva2.server.modules; +package eva2.optimization.modules; -import eva2.server.go.InterfaceGOParameters; -import eva2.server.go.operators.selection.InterfaceSelection; -import eva2.server.go.operators.terminators.EvaluationTerminator; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.B1Problem; -import eva2.server.go.strategies.InterfaceOptimizer; -import eva2.server.go.strategies.PopulationBasedIncrementalLearning; +import eva2.optimization.go.InterfaceGOParameters; +import eva2.optimization.operators.selection.InterfaceSelection; +import eva2.optimization.operators.terminators.EvaluationTerminator; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.B1Problem; +import eva2.optimization.strategies.InterfaceOptimizer; +import eva2.optimization.strategies.PopulationBasedIncrementalLearning; import eva2.tools.Serializer; import java.io.FileInputStream; import java.io.FileNotFoundException; diff --git a/src/eva2/server/modules/PSOModuleAdapter.java b/src/eva2/optimization/modules/PSOModuleAdapter.java similarity index 95% rename from src/eva2/server/modules/PSOModuleAdapter.java rename to src/eva2/optimization/modules/PSOModuleAdapter.java index bdad7289..24de1fe4 100644 --- a/src/eva2/server/modules/PSOModuleAdapter.java +++ b/src/eva2/optimization/modules/PSOModuleAdapter.java @@ -1,4 +1,4 @@ -package eva2.server.modules; +package eva2.optimization.modules; /** diff --git a/src/eva2/server/modules/PSOParameters.java b/src/eva2/optimization/modules/PSOParameters.java similarity index 95% rename from src/eva2/server/modules/PSOParameters.java rename to src/eva2/optimization/modules/PSOParameters.java index 8ca06590..346b6be4 100644 --- a/src/eva2/server/modules/PSOParameters.java +++ b/src/eva2/optimization/modules/PSOParameters.java @@ -1,14 +1,14 @@ -package eva2.server.modules; +package eva2.optimization.modules; import eva2.gui.GenericObjectEditor; -import eva2.server.go.InterfaceGOParameters; -import eva2.server.go.enums.PSOTopologyEnum; -import eva2.server.go.operators.terminators.EvaluationTerminator; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.F1Problem; -import eva2.server.go.strategies.InterfaceOptimizer; -import eva2.server.go.strategies.ParticleSwarmOptimization; +import eva2.optimization.go.InterfaceGOParameters; +import eva2.optimization.enums.PSOTopologyEnum; +import eva2.optimization.operators.terminators.EvaluationTerminator; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.F1Problem; +import eva2.optimization.strategies.InterfaceOptimizer; +import eva2.optimization.strategies.ParticleSwarmOptimization; import eva2.tools.SelectedTag; import eva2.tools.Serializer; import java.io.FileInputStream; diff --git a/src/eva2/server/modules/Processor.java b/src/eva2/optimization/modules/Processor.java similarity index 94% rename from src/eva2/server/modules/Processor.java rename to src/eva2/optimization/modules/Processor.java index 607b36f6..1cef3672 100644 --- a/src/eva2/server/modules/Processor.java +++ b/src/eva2/optimization/modules/Processor.java @@ -1,22 +1,27 @@ -package eva2.server.modules; +package eva2.optimization.modules; +import eva2.optimization.go.InterfaceNotifyOnInformers; +import eva2.optimization.go.PopulationInterface; +import eva2.optimization.go.InterfaceProcessor; +import eva2.optimization.go.InterfaceTerminator; +import eva2.optimization.go.InterfaceGOParameters; +import eva2.optimization.go.InterfacePopulationChangedEventListener; import eva2.gui.BeanInspector; import eva2.optimization.OptimizationStateListener; -import eva2.server.go.*; -import eva2.server.go.operators.paramcontrol.ConstantParameters; -import eva2.server.go.operators.paramcontrol.InterfaceParameterControl; -import eva2.server.go.operators.postprocess.PostProcess; -import eva2.server.go.operators.postprocess.PostProcessParams; -import eva2.server.go.operators.postprocess.SolutionHistogram; -import eva2.server.go.operators.terminators.EvaluationTerminator; -import eva2.server.go.operators.terminators.GenerationTerminator; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.AbstractOptimizationProblem; -import eva2.server.go.problems.InterfaceAdditionalPopulationInformer; -import eva2.server.go.strategies.InterfaceOptimizer; -import eva2.server.stat.InterfaceStatistics; -import eva2.server.stat.InterfaceTextListener; -import eva2.server.stat.StatisticsWithGUI; +import eva2.optimization.operators.paramcontrol.ConstantParameters; +import eva2.optimization.operators.paramcontrol.InterfaceParameterControl; +import eva2.optimization.operators.postprocess.PostProcess; +import eva2.optimization.operators.postprocess.PostProcessParams; +import eva2.optimization.operators.postprocess.SolutionHistogram; +import eva2.optimization.operators.terminators.EvaluationTerminator; +import eva2.optimization.operators.terminators.GenerationTerminator; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.AbstractOptimizationProblem; +import eva2.optimization.problems.InterfaceAdditionalPopulationInformer; +import eva2.optimization.strategies.InterfaceOptimizer; +import eva2.optimization.stat.InterfaceStatistics; +import eva2.optimization.stat.InterfaceTextListener; +import eva2.optimization.stat.StatisticsWithGUI; import eva2.tools.EVAERROR; import eva2.tools.EVAHELP; import eva2.tools.StringTools; diff --git a/src/eva2/server/modules/SAModuleAdapter.java b/src/eva2/optimization/modules/SAModuleAdapter.java similarity index 95% rename from src/eva2/server/modules/SAModuleAdapter.java rename to src/eva2/optimization/modules/SAModuleAdapter.java index 5e29fc57..9eaeea68 100644 --- a/src/eva2/server/modules/SAModuleAdapter.java +++ b/src/eva2/optimization/modules/SAModuleAdapter.java @@ -1,4 +1,4 @@ -package eva2.server.modules; +package eva2.optimization.modules; /** * This the SA module adapter necessary to access this implementation from the diff --git a/src/eva2/server/modules/SAParameters.java b/src/eva2/optimization/modules/SAParameters.java similarity index 87% rename from src/eva2/server/modules/SAParameters.java rename to src/eva2/optimization/modules/SAParameters.java index 07be9df6..ce1fd5e0 100644 --- a/src/eva2/server/modules/SAParameters.java +++ b/src/eva2/optimization/modules/SAParameters.java @@ -1,14 +1,14 @@ -package eva2.server.modules; +package eva2.optimization.modules; -import eva2.server.go.InterfaceGOParameters; -import eva2.server.go.InterfacePopulationChangedEventListener; -import eva2.server.go.InterfaceTerminator; -import eva2.server.go.operators.terminators.EvaluationTerminator; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.B1Problem; -import eva2.server.go.problems.InterfaceOptimizationProblem; -import eva2.server.go.strategies.InterfaceOptimizer; -import eva2.server.go.strategies.SimulatedAnnealing; +import eva2.optimization.go.InterfaceGOParameters; +import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.go.InterfaceTerminator; +import eva2.optimization.operators.terminators.EvaluationTerminator; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.B1Problem; +import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.optimization.strategies.InterfaceOptimizer; +import eva2.optimization.strategies.SimulatedAnnealing; import eva2.tools.Serializer; import java.io.FileInputStream; import java.io.FileNotFoundException; diff --git a/src/eva2/server/modules/SSGAModuleAdapter.java b/src/eva2/optimization/modules/SSGAModuleAdapter.java similarity index 95% rename from src/eva2/server/modules/SSGAModuleAdapter.java rename to src/eva2/optimization/modules/SSGAModuleAdapter.java index 0fe1aca4..39378c2e 100644 --- a/src/eva2/server/modules/SSGAModuleAdapter.java +++ b/src/eva2/optimization/modules/SSGAModuleAdapter.java @@ -1,4 +1,4 @@ -package eva2.server.modules; +package eva2.optimization.modules; /** * This the SSGA module adapter necessary to access this implementation from the diff --git a/src/eva2/server/modules/SSGAParameters.java b/src/eva2/optimization/modules/SSGAParameters.java similarity index 90% rename from src/eva2/server/modules/SSGAParameters.java rename to src/eva2/optimization/modules/SSGAParameters.java index ba2b13a6..cd2167d6 100644 --- a/src/eva2/server/modules/SSGAParameters.java +++ b/src/eva2/optimization/modules/SSGAParameters.java @@ -1,13 +1,13 @@ -package eva2.server.modules; +package eva2.optimization.modules; -import eva2.server.go.InterfaceGOParameters; -import eva2.server.go.operators.selection.InterfaceSelection; -import eva2.server.go.operators.selection.replacement.InterfaceReplacement; -import eva2.server.go.operators.terminators.EvaluationTerminator; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.B1Problem; -import eva2.server.go.strategies.InterfaceOptimizer; -import eva2.server.go.strategies.SteadyStateGA; +import eva2.optimization.go.InterfaceGOParameters; +import eva2.optimization.operators.selection.InterfaceSelection; +import eva2.optimization.operators.selection.replacement.InterfaceReplacement; +import eva2.optimization.operators.terminators.EvaluationTerminator; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.B1Problem; +import eva2.optimization.strategies.InterfaceOptimizer; +import eva2.optimization.strategies.SteadyStateGA; import eva2.tools.Serializer; import java.io.FileInputStream; import java.io.FileNotFoundException; diff --git a/src/eva2/server/go/operators/archiving/AbstractArchiving.java b/src/eva2/optimization/operators/archiving/AbstractArchiving.java similarity index 97% rename from src/eva2/server/go/operators/archiving/AbstractArchiving.java rename to src/eva2/optimization/operators/archiving/AbstractArchiving.java index 3853a37d..a711d214 100644 --- a/src/eva2/server/go/operators/archiving/AbstractArchiving.java +++ b/src/eva2/optimization/operators/archiving/AbstractArchiving.java @@ -1,8 +1,8 @@ -package eva2.server.go.operators.archiving; +package eva2.optimization.operators.archiving; import eva2.gui.*; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; import eva2.tools.chart2d.Chart2DDPointIconCross; import eva2.tools.chart2d.DPoint; import eva2.tools.chart2d.DPointIcon; diff --git a/src/eva2/server/go/operators/archiving/ArchivingAllDominating.java b/src/eva2/optimization/operators/archiving/ArchivingAllDominating.java similarity index 94% rename from src/eva2/server/go/operators/archiving/ArchivingAllDominating.java rename to src/eva2/optimization/operators/archiving/ArchivingAllDominating.java index acf1a3f4..edc5d9d9 100644 --- a/src/eva2/server/go/operators/archiving/ArchivingAllDominating.java +++ b/src/eva2/optimization/operators/archiving/ArchivingAllDominating.java @@ -1,8 +1,8 @@ -package eva2.server.go.operators.archiving; +package eva2.optimization.operators.archiving; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.selection.SelectBestIndividuals; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.operators.selection.SelectBestIndividuals; +import eva2.optimization.populations.Population; /** This simple strategy simply archives all Pareto optimal solutions. This method is * very prone to OutOfMemory errors! diff --git a/src/eva2/server/go/operators/archiving/ArchivingMaxiMin.java b/src/eva2/optimization/operators/archiving/ArchivingMaxiMin.java similarity index 95% rename from src/eva2/server/go/operators/archiving/ArchivingMaxiMin.java rename to src/eva2/optimization/operators/archiving/ArchivingMaxiMin.java index 7e2803c8..6d863e23 100644 --- a/src/eva2/server/go/operators/archiving/ArchivingMaxiMin.java +++ b/src/eva2/optimization/operators/archiving/ArchivingMaxiMin.java @@ -1,10 +1,10 @@ -package eva2.server.go.operators.archiving; +package eva2.optimization.operators.archiving; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.moso.MOSOMaxiMin; -import eva2.server.go.operators.selection.InterfaceSelection; -import eva2.server.go.operators.selection.SelectBestIndividuals; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.operators.moso.MOSOMaxiMin; +import eva2.optimization.operators.selection.InterfaceSelection; +import eva2.optimization.operators.selection.SelectBestIndividuals; +import eva2.optimization.populations.Population; import eva2.tools.chart2d.Chart2DDPointIconCross; import eva2.tools.chart2d.DPointIcon; diff --git a/src/eva2/server/go/operators/archiving/ArchivingNSGA.java b/src/eva2/optimization/operators/archiving/ArchivingNSGA.java similarity index 94% rename from src/eva2/server/go/operators/archiving/ArchivingNSGA.java rename to src/eva2/optimization/operators/archiving/ArchivingNSGA.java index 86341108..d8b9dac9 100644 --- a/src/eva2/server/go/operators/archiving/ArchivingNSGA.java +++ b/src/eva2/optimization/operators/archiving/ArchivingNSGA.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.archiving; +package eva2.optimization.operators.archiving; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; /** The non dominated sorting GA archiving method, based on dominace sorting. * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/archiving/ArchivingNSGAII.java b/src/eva2/optimization/operators/archiving/ArchivingNSGAII.java similarity index 98% rename from src/eva2/server/go/operators/archiving/ArchivingNSGAII.java rename to src/eva2/optimization/operators/archiving/ArchivingNSGAII.java index 3602391b..35efc64b 100644 --- a/src/eva2/server/go/operators/archiving/ArchivingNSGAII.java +++ b/src/eva2/optimization/operators/archiving/ArchivingNSGAII.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.archiving; +package eva2.optimization.operators.archiving; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; import eva2.tools.chart2d.Chart2DDPointIconCross; import eva2.tools.chart2d.DPointIcon; import java.util.ArrayList; diff --git a/src/eva2/server/go/operators/archiving/ArchivingNSGAIISMeasure.java b/src/eva2/optimization/operators/archiving/ArchivingNSGAIISMeasure.java similarity index 90% rename from src/eva2/server/go/operators/archiving/ArchivingNSGAIISMeasure.java rename to src/eva2/optimization/operators/archiving/ArchivingNSGAIISMeasure.java index d37f282a..5304f5d7 100644 --- a/src/eva2/server/go/operators/archiving/ArchivingNSGAIISMeasure.java +++ b/src/eva2/optimization/operators/archiving/ArchivingNSGAIISMeasure.java @@ -1,8 +1,8 @@ -package eva2.server.go.operators.archiving; +package eva2.optimization.operators.archiving; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.AbstractEAIndividualComparator; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.AbstractEAIndividualComparator; +import eva2.optimization.populations.Population; import java.util.Arrays; public class ArchivingNSGAIISMeasure extends ArchivingNSGAII { diff --git a/src/eva2/server/go/operators/archiving/ArchivingPESAII.java b/src/eva2/optimization/operators/archiving/ArchivingPESAII.java similarity index 98% rename from src/eva2/server/go/operators/archiving/ArchivingPESAII.java rename to src/eva2/optimization/operators/archiving/ArchivingPESAII.java index 807e56ca..e5aef87c 100644 --- a/src/eva2/server/go/operators/archiving/ArchivingPESAII.java +++ b/src/eva2/optimization/operators/archiving/ArchivingPESAII.java @@ -1,8 +1,8 @@ -package eva2.server.go.operators.archiving; +package eva2.optimization.operators.archiving; import eva2.gui.GraphPointSet; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; import eva2.tools.chart2d.Chart2DDPointIconCircle; import eva2.tools.chart2d.Chart2DDPointIconText; import eva2.tools.chart2d.DLine; diff --git a/src/eva2/server/go/operators/archiving/ArchivingSPEAII.java b/src/eva2/optimization/operators/archiving/ArchivingSPEAII.java similarity index 98% rename from src/eva2/server/go/operators/archiving/ArchivingSPEAII.java rename to src/eva2/optimization/operators/archiving/ArchivingSPEAII.java index d98fdf6b..38978df1 100644 --- a/src/eva2/server/go/operators/archiving/ArchivingSPEAII.java +++ b/src/eva2/optimization/operators/archiving/ArchivingSPEAII.java @@ -1,11 +1,11 @@ -package eva2.server.go.operators.archiving; +package eva2.optimization.operators.archiving; import eva2.gui.GraphPointSet; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.distancemetric.InterfaceDistanceMetric; -import eva2.server.go.operators.distancemetric.ObjectiveSpaceMetric; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.operators.distancemetric.InterfaceDistanceMetric; +import eva2.optimization.operators.distancemetric.ObjectiveSpaceMetric; +import eva2.optimization.populations.Population; import eva2.tools.chart2d.Chart2DDPointIconCircle; import eva2.tools.chart2d.Chart2DDPointIconText; import eva2.tools.chart2d.DPoint; diff --git a/src/eva2/server/go/operators/archiving/InformationRetrievalInserting.java b/src/eva2/optimization/operators/archiving/InformationRetrievalInserting.java similarity index 95% rename from src/eva2/server/go/operators/archiving/InformationRetrievalInserting.java rename to src/eva2/optimization/operators/archiving/InformationRetrievalInserting.java index 8d86ccaa..e7265658 100644 --- a/src/eva2/server/go/operators/archiving/InformationRetrievalInserting.java +++ b/src/eva2/optimization/operators/archiving/InformationRetrievalInserting.java @@ -1,6 +1,6 @@ -package eva2.server.go.operators.archiving; +package eva2.optimization.operators.archiving; -import eva2.server.go.populations.Population; +import eva2.optimization.populations.Population; /** This information retrieval inserts the retrieved * solutions, by removing random individuals from the diff --git a/src/eva2/server/go/operators/archiving/InformationRetrievalNone.java b/src/eva2/optimization/operators/archiving/InformationRetrievalNone.java similarity index 93% rename from src/eva2/server/go/operators/archiving/InformationRetrievalNone.java rename to src/eva2/optimization/operators/archiving/InformationRetrievalNone.java index 97a74c3e..50f29975 100644 --- a/src/eva2/server/go/operators/archiving/InformationRetrievalNone.java +++ b/src/eva2/optimization/operators/archiving/InformationRetrievalNone.java @@ -1,6 +1,6 @@ -package eva2.server.go.operators.archiving; +package eva2.optimization.operators.archiving; -import eva2.server.go.populations.Population; +import eva2.optimization.populations.Population; /** This class allows no information retrieval and thus no elitism * for MOEAs. diff --git a/src/eva2/server/go/operators/archiving/InformationRetrievalReplacing.java b/src/eva2/optimization/operators/archiving/InformationRetrievalReplacing.java similarity index 94% rename from src/eva2/server/go/operators/archiving/InformationRetrievalReplacing.java rename to src/eva2/optimization/operators/archiving/InformationRetrievalReplacing.java index 92a7fc4f..69f2593f 100644 --- a/src/eva2/server/go/operators/archiving/InformationRetrievalReplacing.java +++ b/src/eva2/optimization/operators/archiving/InformationRetrievalReplacing.java @@ -1,6 +1,6 @@ -package eva2.server.go.operators.archiving; +package eva2.optimization.operators.archiving; -import eva2.server.go.populations.Population; +import eva2.optimization.populations.Population; import eva2.tools.math.RNG; /** This information retrieval method simply add the retrieved solutions diff --git a/src/eva2/server/go/operators/archiving/InterfaceArchiving.java b/src/eva2/optimization/operators/archiving/InterfaceArchiving.java similarity index 88% rename from src/eva2/server/go/operators/archiving/InterfaceArchiving.java rename to src/eva2/optimization/operators/archiving/InterfaceArchiving.java index cd046e71..47e1b53d 100644 --- a/src/eva2/server/go/operators/archiving/InterfaceArchiving.java +++ b/src/eva2/optimization/operators/archiving/InterfaceArchiving.java @@ -1,6 +1,6 @@ -package eva2.server.go.operators.archiving; +package eva2.optimization.operators.archiving; -import eva2.server.go.populations.Population; +import eva2.optimization.populations.Population; /** This Interface give the general methods required for a archiving method. * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/archiving/InterfaceInformationRetrieval.java b/src/eva2/optimization/operators/archiving/InterfaceInformationRetrieval.java similarity index 87% rename from src/eva2/server/go/operators/archiving/InterfaceInformationRetrieval.java rename to src/eva2/optimization/operators/archiving/InterfaceInformationRetrieval.java index cf56ddfb..f5d316c4 100644 --- a/src/eva2/server/go/operators/archiving/InterfaceInformationRetrieval.java +++ b/src/eva2/optimization/operators/archiving/InterfaceInformationRetrieval.java @@ -1,6 +1,6 @@ -package eva2.server.go.operators.archiving; +package eva2.optimization.operators.archiving; -import eva2.server.go.populations.Population; +import eva2.optimization.populations.Population; /** This interface gives the necessary methods for an information * retrieval algorithm. diff --git a/src/eva2/server/go/operators/archiving/InterfaceRemoveSurplusIndividuals.java b/src/eva2/optimization/operators/archiving/InterfaceRemoveSurplusIndividuals.java similarity index 87% rename from src/eva2/server/go/operators/archiving/InterfaceRemoveSurplusIndividuals.java rename to src/eva2/optimization/operators/archiving/InterfaceRemoveSurplusIndividuals.java index 50dab8f3..081c505a 100644 --- a/src/eva2/server/go/operators/archiving/InterfaceRemoveSurplusIndividuals.java +++ b/src/eva2/optimization/operators/archiving/InterfaceRemoveSurplusIndividuals.java @@ -1,6 +1,6 @@ -package eva2.server.go.operators.archiving; +package eva2.optimization.operators.archiving; -import eva2.server.go.populations.Population; +import eva2.optimization.populations.Population; /** This interface gives the method necessary for an aglorithm * which is use to reduce the size of an archive. diff --git a/src/eva2/server/go/operators/archiving/RemoveSurplusIndividualsDynamicHyperCube.java b/src/eva2/optimization/operators/archiving/RemoveSurplusIndividualsDynamicHyperCube.java similarity index 96% rename from src/eva2/server/go/operators/archiving/RemoveSurplusIndividualsDynamicHyperCube.java rename to src/eva2/optimization/operators/archiving/RemoveSurplusIndividualsDynamicHyperCube.java index d08fe4cb..58313da2 100644 --- a/src/eva2/server/go/operators/archiving/RemoveSurplusIndividualsDynamicHyperCube.java +++ b/src/eva2/optimization/operators/archiving/RemoveSurplusIndividualsDynamicHyperCube.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.archiving; +package eva2.optimization.operators.archiving; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; import eva2.tools.math.RNG; /** This class removes surplus individuals based on bounding diff --git a/src/eva2/server/go/operators/archiving/RemoveSurplusIndividualsSMetric.java b/src/eva2/optimization/operators/archiving/RemoveSurplusIndividualsSMetric.java similarity index 95% rename from src/eva2/server/go/operators/archiving/RemoveSurplusIndividualsSMetric.java rename to src/eva2/optimization/operators/archiving/RemoveSurplusIndividualsSMetric.java index 1d1575ea..609791a4 100644 --- a/src/eva2/server/go/operators/archiving/RemoveSurplusIndividualsSMetric.java +++ b/src/eva2/optimization/operators/archiving/RemoveSurplusIndividualsSMetric.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.archiving; +package eva2.optimization.operators.archiving; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; import eva2.tools.math.RNG; /** This class removes surplus individuals based on bounding diff --git a/src/eva2/server/go/operators/archiving/RemoveSurplusIndividualsStaticHyperCube.java b/src/eva2/optimization/operators/archiving/RemoveSurplusIndividualsStaticHyperCube.java similarity index 94% rename from src/eva2/server/go/operators/archiving/RemoveSurplusIndividualsStaticHyperCube.java rename to src/eva2/optimization/operators/archiving/RemoveSurplusIndividualsStaticHyperCube.java index 99d9caaf..92744f7a 100644 --- a/src/eva2/server/go/operators/archiving/RemoveSurplusIndividualsStaticHyperCube.java +++ b/src/eva2/optimization/operators/archiving/RemoveSurplusIndividualsStaticHyperCube.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.archiving; +package eva2.optimization.operators.archiving; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; import eva2.tools.math.RNG; /** This class removes surplus individuals based on bounding diff --git a/src/eva2/server/go/operators/classification/ClassificationSelfOrganizingMaps.java b/src/eva2/optimization/operators/classification/ClassificationSelfOrganizingMaps.java similarity index 99% rename from src/eva2/server/go/operators/classification/ClassificationSelfOrganizingMaps.java rename to src/eva2/optimization/operators/classification/ClassificationSelfOrganizingMaps.java index 203429de..47859346 100644 --- a/src/eva2/server/go/operators/classification/ClassificationSelfOrganizingMaps.java +++ b/src/eva2/optimization/operators/classification/ClassificationSelfOrganizingMaps.java @@ -1,4 +1,4 @@ -package eva2.server.go.operators.classification; +package eva2.optimization.operators.classification; import eva2.tools.chart2d.*; import eva2.tools.math.RNG; diff --git a/src/eva2/server/go/operators/classification/InterfaceClassification.java b/src/eva2/optimization/operators/classification/InterfaceClassification.java similarity index 95% rename from src/eva2/server/go/operators/classification/InterfaceClassification.java rename to src/eva2/optimization/operators/classification/InterfaceClassification.java index e0069b63..d8b531df 100644 --- a/src/eva2/server/go/operators/classification/InterfaceClassification.java +++ b/src/eva2/optimization/operators/classification/InterfaceClassification.java @@ -1,4 +1,4 @@ -package eva2.server.go.operators.classification; +package eva2.optimization.operators.classification; /** An interface for classification methods, currently under construction. * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/cluster/ClusterAll.java b/src/eva2/optimization/operators/cluster/ClusterAll.java similarity index 96% rename from src/eva2/server/go/operators/cluster/ClusterAll.java rename to src/eva2/optimization/operators/cluster/ClusterAll.java index c700c3b7..3df59d3d 100644 --- a/src/eva2/server/go/operators/cluster/ClusterAll.java +++ b/src/eva2/optimization/operators/cluster/ClusterAll.java @@ -1,6 +1,6 @@ -package eva2.server.go.operators.cluster; +package eva2.optimization.operators.cluster; -import eva2.server.go.populations.Population; +import eva2.optimization.populations.Population; import java.io.Serializable; import java.util.Arrays; diff --git a/src/eva2/server/go/operators/cluster/ClusteringDensityBased.java b/src/eva2/optimization/operators/cluster/ClusteringDensityBased.java similarity index 97% rename from src/eva2/server/go/operators/cluster/ClusteringDensityBased.java rename to src/eva2/optimization/operators/cluster/ClusteringDensityBased.java index 3b5af12b..d73594fd 100644 --- a/src/eva2/server/go/operators/cluster/ClusteringDensityBased.java +++ b/src/eva2/optimization/operators/cluster/ClusteringDensityBased.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.cluster; +package eva2.optimization.operators.cluster; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.distancemetric.InterfaceDistanceMetric; -import eva2.server.go.operators.distancemetric.PhenotypeMetric; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.operators.distancemetric.InterfaceDistanceMetric; +import eva2.optimization.operators.distancemetric.PhenotypeMetric; +import eva2.optimization.populations.Population; import eva2.tools.Pair; import java.util.ArrayList; diff --git a/src/eva2/server/go/operators/cluster/ClusteringDynPeakIdent.java b/src/eva2/optimization/operators/cluster/ClusteringDynPeakIdent.java similarity index 94% rename from src/eva2/server/go/operators/cluster/ClusteringDynPeakIdent.java rename to src/eva2/optimization/operators/cluster/ClusteringDynPeakIdent.java index 17e9fe92..a1c535b8 100644 --- a/src/eva2/server/go/operators/cluster/ClusteringDynPeakIdent.java +++ b/src/eva2/optimization/operators/cluster/ClusteringDynPeakIdent.java @@ -1,13 +1,13 @@ -package eva2.server.go.operators.cluster; +package eva2.optimization.operators.cluster; import eva2.gui.BeanInspector; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.AbstractEAIndividualComparator; -import eva2.server.go.individuals.IndividualDistanceComparator; -import eva2.server.go.operators.distancemetric.EuclideanMetric; -import eva2.server.go.operators.distancemetric.InterfaceDistanceMetric; -import eva2.server.go.operators.distancemetric.PhenotypeMetric; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.AbstractEAIndividualComparator; +import eva2.optimization.individuals.IndividualDistanceComparator; +import eva2.optimization.operators.distancemetric.EuclideanMetric; +import eva2.optimization.operators.distancemetric.InterfaceDistanceMetric; +import eva2.optimization.operators.distancemetric.PhenotypeMetric; +import eva2.optimization.populations.Population; import eva2.tools.Pair; import java.util.ArrayList; diff --git a/src/eva2/server/go/operators/cluster/ClusteringKMeans.java b/src/eva2/optimization/operators/cluster/ClusteringKMeans.java similarity index 97% rename from src/eva2/server/go/operators/cluster/ClusteringKMeans.java rename to src/eva2/optimization/operators/cluster/ClusteringKMeans.java index 789ae60d..f114e8ef 100644 --- a/src/eva2/server/go/operators/cluster/ClusteringKMeans.java +++ b/src/eva2/optimization/operators/cluster/ClusteringKMeans.java @@ -1,14 +1,14 @@ -package eva2.server.go.operators.cluster; +package eva2.optimization.operators.cluster; import eva2.gui.GraphPointSet; import eva2.gui.Plot; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.ESIndividualDoubleData; -import eva2.server.go.individuals.InterfaceDataTypeDouble; -import eva2.server.go.operators.distancemetric.EuclideanMetric; -import eva2.server.go.operators.distancemetric.InterfaceDistanceMetric; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.F1Problem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.ESIndividualDoubleData; +import eva2.optimization.individuals.InterfaceDataTypeDouble; +import eva2.optimization.operators.distancemetric.EuclideanMetric; +import eva2.optimization.operators.distancemetric.InterfaceDistanceMetric; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.F1Problem; import eva2.tools.chart2d.Chart2DDPointIconCircle; import eva2.tools.chart2d.Chart2DDPointIconText; import eva2.tools.chart2d.DPoint; diff --git a/src/eva2/server/go/operators/cluster/ClusteringNearestBetter.java b/src/eva2/optimization/operators/cluster/ClusteringNearestBetter.java similarity index 97% rename from src/eva2/server/go/operators/cluster/ClusteringNearestBetter.java rename to src/eva2/optimization/operators/cluster/ClusteringNearestBetter.java index 98573b87..794476a8 100644 --- a/src/eva2/server/go/operators/cluster/ClusteringNearestBetter.java +++ b/src/eva2/optimization/operators/cluster/ClusteringNearestBetter.java @@ -1,14 +1,14 @@ -package eva2.server.go.operators.cluster; +package eva2.optimization.operators.cluster; import eva2.gui.BeanInspector; import eva2.gui.GenericObjectEditor; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.AbstractEAIndividualComparator; -import eva2.server.go.operators.distancemetric.InterfaceDistanceMetric; -import eva2.server.go.operators.distancemetric.PhenotypeMetric; -import eva2.server.go.operators.paramcontrol.ParamAdaption; -import eva2.server.go.operators.paramcontrol.ParameterControlManager; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.AbstractEAIndividualComparator; +import eva2.optimization.operators.distancemetric.InterfaceDistanceMetric; +import eva2.optimization.operators.distancemetric.PhenotypeMetric; +import eva2.optimization.operators.paramcontrol.ParamAdaption; +import eva2.optimization.operators.paramcontrol.ParameterControlManager; +import eva2.optimization.populations.Population; import java.io.Serializable; import java.util.ArrayList; import java.util.LinkedList; diff --git a/src/eva2/server/go/operators/cluster/ClusteringXMeans.java b/src/eva2/optimization/operators/cluster/ClusteringXMeans.java similarity index 97% rename from src/eva2/server/go/operators/cluster/ClusteringXMeans.java rename to src/eva2/optimization/operators/cluster/ClusteringXMeans.java index 8254e5a4..691c5139 100644 --- a/src/eva2/server/go/operators/cluster/ClusteringXMeans.java +++ b/src/eva2/optimization/operators/cluster/ClusteringXMeans.java @@ -1,12 +1,12 @@ -package eva2.server.go.operators.cluster; +package eva2.optimization.operators.cluster; import eva2.gui.GraphPointSet; import eva2.gui.Plot; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.ESIndividualDoubleData; -import eva2.server.go.individuals.InterfaceDataTypeDouble; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.F1Problem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.ESIndividualDoubleData; +import eva2.optimization.individuals.InterfaceDataTypeDouble; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.F1Problem; import eva2.tools.chart2d.Chart2DDPointIconCircle; import eva2.tools.chart2d.Chart2DDPointIconText; import eva2.tools.chart2d.DPoint; diff --git a/src/eva2/server/go/operators/cluster/InterfaceClustering.java b/src/eva2/optimization/operators/cluster/InterfaceClustering.java similarity index 97% rename from src/eva2/server/go/operators/cluster/InterfaceClustering.java rename to src/eva2/optimization/operators/cluster/InterfaceClustering.java index b671d283..97679927 100644 --- a/src/eva2/server/go/operators/cluster/InterfaceClustering.java +++ b/src/eva2/optimization/operators/cluster/InterfaceClustering.java @@ -1,6 +1,6 @@ -package eva2.server.go.operators.cluster; +package eva2.optimization.operators.cluster; -import eva2.server.go.populations.Population; +import eva2.optimization.populations.Population; /** * This the interface to clustering algorithms, but since there diff --git a/src/eva2/server/go/operators/cluster/InterfaceClusteringDistanceParam.java b/src/eva2/optimization/operators/cluster/InterfaceClusteringDistanceParam.java similarity index 86% rename from src/eva2/server/go/operators/cluster/InterfaceClusteringDistanceParam.java rename to src/eva2/optimization/operators/cluster/InterfaceClusteringDistanceParam.java index 596a1d45..bc50c56e 100644 --- a/src/eva2/server/go/operators/cluster/InterfaceClusteringDistanceParam.java +++ b/src/eva2/optimization/operators/cluster/InterfaceClusteringDistanceParam.java @@ -1,4 +1,4 @@ -package eva2.server.go.operators.cluster; +package eva2.optimization.operators.cluster; /** * A clustering method which has a cluster parameter - the niche radius for example. diff --git a/src/eva2/server/go/operators/cluster/InterfaceClusteringMetricBased.java b/src/eva2/optimization/operators/cluster/InterfaceClusteringMetricBased.java similarity index 67% rename from src/eva2/server/go/operators/cluster/InterfaceClusteringMetricBased.java rename to src/eva2/optimization/operators/cluster/InterfaceClusteringMetricBased.java index 921c7010..77e6e652 100644 --- a/src/eva2/server/go/operators/cluster/InterfaceClusteringMetricBased.java +++ b/src/eva2/optimization/operators/cluster/InterfaceClusteringMetricBased.java @@ -1,6 +1,6 @@ -package eva2.server.go.operators.cluster; +package eva2.optimization.operators.cluster; -import eva2.server.go.operators.distancemetric.InterfaceDistanceMetric; +import eva2.optimization.operators.distancemetric.InterfaceDistanceMetric; /** * A clustering method which is associated with a metric. diff --git a/src/eva2/server/go/operators/constraint/AbstractConstraint.java b/src/eva2/optimization/operators/constraint/AbstractConstraint.java similarity index 93% rename from src/eva2/server/go/operators/constraint/AbstractConstraint.java rename to src/eva2/optimization/operators/constraint/AbstractConstraint.java index ccaa40f4..ba4a5732 100644 --- a/src/eva2/server/go/operators/constraint/AbstractConstraint.java +++ b/src/eva2/optimization/operators/constraint/AbstractConstraint.java @@ -1,9 +1,13 @@ -package eva2.server.go.operators.constraint; +package eva2.optimization.operators.constraint; +import eva2.optimization.operators.paramcontrol.InterfaceParameterControl; +import eva2.optimization.operators.paramcontrol.ParamAdaption; +import eva2.optimization.operators.paramcontrol.ParameterControlManager; +import eva2.optimization.operators.paramcontrol.GenericParamAdaption; +import eva2.optimization.operators.paramcontrol.NoParamAdaption; import eva2.gui.GenericObjectEditor; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.paramcontrol.*; -import eva2.server.go.problems.AbstractProblemDouble; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.problems.AbstractProblemDouble; import eva2.tools.EVAERROR; import java.io.Serializable; diff --git a/src/eva2/server/go/operators/constraint/ConstBelongsToDifferentClass.java b/src/eva2/optimization/operators/constraint/ConstBelongsToDifferentClass.java similarity index 94% rename from src/eva2/server/go/operators/constraint/ConstBelongsToDifferentClass.java rename to src/eva2/optimization/operators/constraint/ConstBelongsToDifferentClass.java index 637ffd73..a03be984 100644 --- a/src/eva2/server/go/operators/constraint/ConstBelongsToDifferentClass.java +++ b/src/eva2/optimization/operators/constraint/ConstBelongsToDifferentClass.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.constraint; +package eva2.optimization.operators.constraint; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceDataTypeDouble; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceDataTypeDouble; /** This area constraint for parallelization is based on * the class type an individual belongs to. diff --git a/src/eva2/server/go/operators/constraint/ConstObjectivesInEqualityBiggerThanLinear.java b/src/eva2/optimization/operators/constraint/ConstObjectivesInEqualityBiggerThanLinear.java similarity index 92% rename from src/eva2/server/go/operators/constraint/ConstObjectivesInEqualityBiggerThanLinear.java rename to src/eva2/optimization/operators/constraint/ConstObjectivesInEqualityBiggerThanLinear.java index 8bc9928e..7accbee3 100644 --- a/src/eva2/server/go/operators/constraint/ConstObjectivesInEqualityBiggerThanLinear.java +++ b/src/eva2/optimization/operators/constraint/ConstObjectivesInEqualityBiggerThanLinear.java @@ -1,6 +1,6 @@ -package eva2.server.go.operators.constraint; +package eva2.optimization.operators.constraint; -import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.AbstractEAIndividual; /** This area constraint for parallelization is based on * a line constraint diff --git a/src/eva2/server/go/operators/constraint/ConstObjectivesInEqualityBiggerThanSurface.java b/src/eva2/optimization/operators/constraint/ConstObjectivesInEqualityBiggerThanSurface.java similarity index 95% rename from src/eva2/server/go/operators/constraint/ConstObjectivesInEqualityBiggerThanSurface.java rename to src/eva2/optimization/operators/constraint/ConstObjectivesInEqualityBiggerThanSurface.java index 2c631bcc..48c378b5 100644 --- a/src/eva2/server/go/operators/constraint/ConstObjectivesInEqualityBiggerThanSurface.java +++ b/src/eva2/optimization/operators/constraint/ConstObjectivesInEqualityBiggerThanSurface.java @@ -1,6 +1,6 @@ -package eva2.server.go.operators.constraint; +package eva2.optimization.operators.constraint; -import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.AbstractEAIndividual; /** This area constraint for parallelization is based on * a surface constraint diff --git a/src/eva2/server/go/operators/constraint/ConstObjectivesInEqualityLesserThanLinear.java b/src/eva2/optimization/operators/constraint/ConstObjectivesInEqualityLesserThanLinear.java similarity index 92% rename from src/eva2/server/go/operators/constraint/ConstObjectivesInEqualityLesserThanLinear.java rename to src/eva2/optimization/operators/constraint/ConstObjectivesInEqualityLesserThanLinear.java index 38848cac..0e9e5e95 100644 --- a/src/eva2/server/go/operators/constraint/ConstObjectivesInEqualityLesserThanLinear.java +++ b/src/eva2/optimization/operators/constraint/ConstObjectivesInEqualityLesserThanLinear.java @@ -1,6 +1,6 @@ -package eva2.server.go.operators.constraint; +package eva2.optimization.operators.constraint; -import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.AbstractEAIndividual; /** This area constraint for parallelization is based on * a line constraint diff --git a/src/eva2/server/go/operators/constraint/ConstObjectivesInEqualitySmallerThanSurface.java b/src/eva2/optimization/operators/constraint/ConstObjectivesInEqualitySmallerThanSurface.java similarity index 95% rename from src/eva2/server/go/operators/constraint/ConstObjectivesInEqualitySmallerThanSurface.java rename to src/eva2/optimization/operators/constraint/ConstObjectivesInEqualitySmallerThanSurface.java index 749dd92d..74171b7b 100644 --- a/src/eva2/server/go/operators/constraint/ConstObjectivesInEqualitySmallerThanSurface.java +++ b/src/eva2/optimization/operators/constraint/ConstObjectivesInEqualitySmallerThanSurface.java @@ -1,6 +1,6 @@ -package eva2.server.go.operators.constraint; +package eva2.optimization.operators.constraint; -import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.AbstractEAIndividual; /** This area constraint for parallelization is based on * a surface constraint diff --git a/src/eva2/server/go/operators/constraint/ConstraintCollection.java b/src/eva2/optimization/operators/constraint/ConstraintCollection.java similarity index 97% rename from src/eva2/server/go/operators/constraint/ConstraintCollection.java rename to src/eva2/optimization/operators/constraint/ConstraintCollection.java index bc5089e6..1f3205ca 100644 --- a/src/eva2/server/go/operators/constraint/ConstraintCollection.java +++ b/src/eva2/optimization/operators/constraint/ConstraintCollection.java @@ -1,4 +1,4 @@ -package eva2.server.go.operators.constraint; +package eva2.optimization.operators.constraint; /** * To handle a set of constraints with a single parameter adaption mechanism. diff --git a/src/eva2/server/go/operators/constraint/ConstraintHandlingEnum.java b/src/eva2/optimization/operators/constraint/ConstraintHandlingEnum.java similarity index 66% rename from src/eva2/server/go/operators/constraint/ConstraintHandlingEnum.java rename to src/eva2/optimization/operators/constraint/ConstraintHandlingEnum.java index 4c17bffd..d4fb8de4 100644 --- a/src/eva2/server/go/operators/constraint/ConstraintHandlingEnum.java +++ b/src/eva2/optimization/operators/constraint/ConstraintHandlingEnum.java @@ -1,4 +1,4 @@ -package eva2.server.go.operators.constraint; +package eva2.optimization.operators.constraint; public enum ConstraintHandlingEnum { specificTag, penaltyAdditive, penaltyMultiplicative; diff --git a/src/eva2/server/go/operators/constraint/ConstraintRelationEnum.java b/src/eva2/optimization/operators/constraint/ConstraintRelationEnum.java similarity index 66% rename from src/eva2/server/go/operators/constraint/ConstraintRelationEnum.java rename to src/eva2/optimization/operators/constraint/ConstraintRelationEnum.java index 2f36067e..ee6ce6a6 100644 --- a/src/eva2/server/go/operators/constraint/ConstraintRelationEnum.java +++ b/src/eva2/optimization/operators/constraint/ConstraintRelationEnum.java @@ -1,4 +1,4 @@ -package eva2.server.go.operators.constraint; +package eva2.optimization.operators.constraint; public enum ConstraintRelationEnum { lessEqZero, eqZero, greaterEqZero;//, linearLessEqZero; diff --git a/src/eva2/server/go/operators/constraint/DummyConstraint.java b/src/eva2/optimization/operators/constraint/DummyConstraint.java similarity index 91% rename from src/eva2/server/go/operators/constraint/DummyConstraint.java rename to src/eva2/optimization/operators/constraint/DummyConstraint.java index 2b0f87c3..6a896c50 100644 --- a/src/eva2/server/go/operators/constraint/DummyConstraint.java +++ b/src/eva2/optimization/operators/constraint/DummyConstraint.java @@ -1,4 +1,4 @@ -package eva2.server.go.operators.constraint; +package eva2.optimization.operators.constraint; import eva2.gui.GenericObjectEditor; diff --git a/src/eva2/server/go/operators/constraint/GenericConstraint.java b/src/eva2/optimization/operators/constraint/GenericConstraint.java similarity index 95% rename from src/eva2/server/go/operators/constraint/GenericConstraint.java rename to src/eva2/optimization/operators/constraint/GenericConstraint.java index 41aa7bab..48882ee8 100644 --- a/src/eva2/server/go/operators/constraint/GenericConstraint.java +++ b/src/eva2/optimization/operators/constraint/GenericConstraint.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.constraint; +package eva2.optimization.operators.constraint; -import eva2.server.go.individuals.codings.gp.AbstractGPNode; -import eva2.server.go.problems.GPFunctionProblem; +import eva2.optimization.individuals.codings.gp.AbstractGPNode; +import eva2.optimization.problems.GPFunctionProblem; import eva2.tools.EVAERROR; import java.io.Serializable; diff --git a/src/eva2/server/go/operators/constraint/ImplicitConstraint.java b/src/eva2/optimization/operators/constraint/ImplicitConstraint.java similarity index 96% rename from src/eva2/server/go/operators/constraint/ImplicitConstraint.java rename to src/eva2/optimization/operators/constraint/ImplicitConstraint.java index 1d86d8cd..11fab42f 100644 --- a/src/eva2/server/go/operators/constraint/ImplicitConstraint.java +++ b/src/eva2/optimization/operators/constraint/ImplicitConstraint.java @@ -1,4 +1,4 @@ -package eva2.server.go.operators.constraint; +package eva2.optimization.operators.constraint; /** * A constraint that is already calculated by the fitness function as an diff --git a/src/eva2/server/go/operators/constraint/InterfaceConstraint.java b/src/eva2/optimization/operators/constraint/InterfaceConstraint.java similarity index 87% rename from src/eva2/server/go/operators/constraint/InterfaceConstraint.java rename to src/eva2/optimization/operators/constraint/InterfaceConstraint.java index 394d104e..a4dcbff1 100644 --- a/src/eva2/server/go/operators/constraint/InterfaceConstraint.java +++ b/src/eva2/optimization/operators/constraint/InterfaceConstraint.java @@ -1,6 +1,6 @@ -package eva2.server.go.operators.constraint; +package eva2.optimization.operators.constraint; -import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.AbstractEAIndividual; /** This is a interface for area constraint for parallel MOEAs * giving area constraints on the separated parts for the Pareto front. diff --git a/src/eva2/server/go/operators/constraint/InterfaceDoubleConstraint.java b/src/eva2/optimization/operators/constraint/InterfaceDoubleConstraint.java similarity index 94% rename from src/eva2/server/go/operators/constraint/InterfaceDoubleConstraint.java rename to src/eva2/optimization/operators/constraint/InterfaceDoubleConstraint.java index 2cb79fd9..e80985d0 100644 --- a/src/eva2/server/go/operators/constraint/InterfaceDoubleConstraint.java +++ b/src/eva2/optimization/operators/constraint/InterfaceDoubleConstraint.java @@ -1,4 +1,4 @@ -package eva2.server.go.operators.constraint; +package eva2.optimization.operators.constraint; /** * A constraint delivering a double valued degree of violation. diff --git a/src/eva2/server/go/operators/constraint/IntervalConstraint.java b/src/eva2/optimization/operators/constraint/IntervalConstraint.java similarity index 98% rename from src/eva2/server/go/operators/constraint/IntervalConstraint.java rename to src/eva2/optimization/operators/constraint/IntervalConstraint.java index 62a410a8..2618b022 100644 --- a/src/eva2/server/go/operators/constraint/IntervalConstraint.java +++ b/src/eva2/optimization/operators/constraint/IntervalConstraint.java @@ -1,4 +1,4 @@ -package eva2.server.go.operators.constraint; +package eva2.optimization.operators.constraint; import eva2.gui.GenericObjectEditor; import eva2.tools.EVAERROR; diff --git a/src/eva2/server/go/operators/crossover/AdaptiveCrossoverEAMixer.java b/src/eva2/optimization/operators/crossover/AdaptiveCrossoverEAMixer.java similarity index 89% rename from src/eva2/server/go/operators/crossover/AdaptiveCrossoverEAMixer.java rename to src/eva2/optimization/operators/crossover/AdaptiveCrossoverEAMixer.java index 8bd53445..f7a15281 100644 --- a/src/eva2/server/go/operators/crossover/AdaptiveCrossoverEAMixer.java +++ b/src/eva2/optimization/operators/crossover/AdaptiveCrossoverEAMixer.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.crossover; +package eva2.optimization.operators.crossover; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.mutation.InterfaceAdaptOperatorGenerational; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.operators.mutation.InterfaceAdaptOperatorGenerational; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; /** * A modified version of the CrossoverEAMixer that adapts the weights with which the crossover-methods are chosen diff --git a/src/eva2/server/go/operators/crossover/CM1.java b/src/eva2/optimization/operators/crossover/CM1.java similarity index 81% rename from src/eva2/server/go/operators/crossover/CM1.java rename to src/eva2/optimization/operators/crossover/CM1.java index ada298a6..a2cf617b 100644 --- a/src/eva2/server/go/operators/crossover/CM1.java +++ b/src/eva2/optimization/operators/crossover/CM1.java @@ -1,10 +1,10 @@ -package eva2.server.go.operators.crossover; +package eva2.optimization.operators.crossover; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceDataTypeBinary; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; -import eva2.server.go.strategies.BinaryScatterSearch; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceDataTypeBinary; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.optimization.strategies.BinaryScatterSearch; import eva2.tools.math.RNG; import java.util.BitSet; diff --git a/src/eva2/server/go/operators/crossover/CM2.java b/src/eva2/optimization/operators/crossover/CM2.java similarity index 83% rename from src/eva2/server/go/operators/crossover/CM2.java rename to src/eva2/optimization/operators/crossover/CM2.java index ec377342..33dd42d2 100644 --- a/src/eva2/server/go/operators/crossover/CM2.java +++ b/src/eva2/optimization/operators/crossover/CM2.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.crossover; +package eva2.optimization.operators.crossover; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceDataTypeBinary; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceDataTypeBinary; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import java.util.BitSet; diff --git a/src/eva2/server/go/operators/crossover/CM3.java b/src/eva2/optimization/operators/crossover/CM3.java similarity index 85% rename from src/eva2/server/go/operators/crossover/CM3.java rename to src/eva2/optimization/operators/crossover/CM3.java index 4a0477b9..9832d87a 100644 --- a/src/eva2/server/go/operators/crossover/CM3.java +++ b/src/eva2/optimization/operators/crossover/CM3.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.crossover; +package eva2.optimization.operators.crossover; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceDataTypeBinary; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceDataTypeBinary; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import java.util.BitSet; diff --git a/src/eva2/server/go/operators/crossover/CM4.java b/src/eva2/optimization/operators/crossover/CM4.java similarity index 85% rename from src/eva2/server/go/operators/crossover/CM4.java rename to src/eva2/optimization/operators/crossover/CM4.java index 3f54a657..8cdb5135 100644 --- a/src/eva2/server/go/operators/crossover/CM4.java +++ b/src/eva2/optimization/operators/crossover/CM4.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.crossover; +package eva2.optimization.operators.crossover; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceDataTypeBinary; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceDataTypeBinary; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import java.util.BitSet; diff --git a/src/eva2/server/go/operators/crossover/CM5.java b/src/eva2/optimization/operators/crossover/CM5.java similarity index 83% rename from src/eva2/server/go/operators/crossover/CM5.java rename to src/eva2/optimization/operators/crossover/CM5.java index f8bcb4b6..8e074b1b 100644 --- a/src/eva2/server/go/operators/crossover/CM5.java +++ b/src/eva2/optimization/operators/crossover/CM5.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.crossover; +package eva2.optimization.operators.crossover; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceDataTypeBinary; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceDataTypeBinary; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import java.util.BitSet; diff --git a/src/eva2/server/go/operators/crossover/CM6.java b/src/eva2/optimization/operators/crossover/CM6.java similarity index 82% rename from src/eva2/server/go/operators/crossover/CM6.java rename to src/eva2/optimization/operators/crossover/CM6.java index f786de63..86a1478b 100644 --- a/src/eva2/server/go/operators/crossover/CM6.java +++ b/src/eva2/optimization/operators/crossover/CM6.java @@ -1,10 +1,10 @@ -package eva2.server.go.operators.crossover; +package eva2.optimization.operators.crossover; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceDataTypeBinary; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; -import eva2.server.go.strategies.BinaryScatterSearch; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceDataTypeBinary; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.optimization.strategies.BinaryScatterSearch; import eva2.tools.math.RNG; import java.util.BitSet; diff --git a/src/eva2/server/go/operators/crossover/CM7.java b/src/eva2/optimization/operators/crossover/CM7.java similarity index 87% rename from src/eva2/server/go/operators/crossover/CM7.java rename to src/eva2/optimization/operators/crossover/CM7.java index 1e84b45f..4bfe0150 100644 --- a/src/eva2/server/go/operators/crossover/CM7.java +++ b/src/eva2/optimization/operators/crossover/CM7.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.crossover; +package eva2.optimization.operators.crossover; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceDataTypeBinary; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceDataTypeBinary; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import java.util.BitSet; /** diff --git a/src/eva2/server/go/operators/crossover/CrossoverEAMixer.java b/src/eva2/optimization/operators/crossover/CrossoverEAMixer.java similarity index 97% rename from src/eva2/server/go/operators/crossover/CrossoverEAMixer.java rename to src/eva2/optimization/operators/crossover/CrossoverEAMixer.java index f7789e8c..3f718275 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverEAMixer.java +++ b/src/eva2/optimization/operators/crossover/CrossoverEAMixer.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.crossover; +package eva2.optimization.operators.crossover; import eva2.gui.GenericObjectEditor; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import java.util.ArrayList; diff --git a/src/eva2/server/go/operators/crossover/CrossoverESArithmetical.java b/src/eva2/optimization/operators/crossover/CrossoverESArithmetical.java similarity index 95% rename from src/eva2/server/go/operators/crossover/CrossoverESArithmetical.java rename to src/eva2/optimization/operators/crossover/CrossoverESArithmetical.java index 6f3b7b56..c23beff0 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverESArithmetical.java +++ b/src/eva2/optimization/operators/crossover/CrossoverESArithmetical.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.crossover; +package eva2.optimization.operators.crossover; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceESIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceESIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** diff --git a/src/eva2/server/go/operators/crossover/CrossoverESBLXAlpha.java b/src/eva2/optimization/operators/crossover/CrossoverESBLXAlpha.java similarity index 95% rename from src/eva2/server/go/operators/crossover/CrossoverESBLXAlpha.java rename to src/eva2/optimization/operators/crossover/CrossoverESBLXAlpha.java index c263c9ac..f0a92106 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverESBLXAlpha.java +++ b/src/eva2/optimization/operators/crossover/CrossoverESBLXAlpha.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.crossover; +package eva2.optimization.operators.crossover; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceESIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceESIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** diff --git a/src/eva2/server/go/operators/crossover/CrossoverESDefault.java b/src/eva2/optimization/operators/crossover/CrossoverESDefault.java similarity index 95% rename from src/eva2/server/go/operators/crossover/CrossoverESDefault.java rename to src/eva2/optimization/operators/crossover/CrossoverESDefault.java index d56aad50..08b4304f 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverESDefault.java +++ b/src/eva2/optimization/operators/crossover/CrossoverESDefault.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.crossover; +package eva2.optimization.operators.crossover; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceESIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceESIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** diff --git a/src/eva2/server/go/operators/crossover/CrossoverESFlat.java b/src/eva2/optimization/operators/crossover/CrossoverESFlat.java similarity index 95% rename from src/eva2/server/go/operators/crossover/CrossoverESFlat.java rename to src/eva2/optimization/operators/crossover/CrossoverESFlat.java index e92e4e15..0785e0dc 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverESFlat.java +++ b/src/eva2/optimization/operators/crossover/CrossoverESFlat.java @@ -1,10 +1,10 @@ -package eva2.server.go.operators.crossover; +package eva2.optimization.operators.crossover; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceESIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceESIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** diff --git a/src/eva2/server/go/operators/crossover/CrossoverESIntermediate.java b/src/eva2/optimization/operators/crossover/CrossoverESIntermediate.java similarity index 94% rename from src/eva2/server/go/operators/crossover/CrossoverESIntermediate.java rename to src/eva2/optimization/operators/crossover/CrossoverESIntermediate.java index 21a93e71..cf1407ef 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverESIntermediate.java +++ b/src/eva2/optimization/operators/crossover/CrossoverESIntermediate.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.crossover; +package eva2.optimization.operators.crossover; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceESIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceESIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/crossover/CrossoverESNPointDiscrete.java b/src/eva2/optimization/operators/crossover/CrossoverESNPointDiscrete.java similarity index 95% rename from src/eva2/server/go/operators/crossover/CrossoverESNPointDiscrete.java rename to src/eva2/optimization/operators/crossover/CrossoverESNPointDiscrete.java index 44feadf0..d32a6f79 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverESNPointDiscrete.java +++ b/src/eva2/optimization/operators/crossover/CrossoverESNPointDiscrete.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.crossover; +package eva2.optimization.operators.crossover; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceESIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceESIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** diff --git a/src/eva2/server/go/operators/crossover/CrossoverESNPointDiscreteDislocation.java b/src/eva2/optimization/operators/crossover/CrossoverESNPointDiscreteDislocation.java similarity index 96% rename from src/eva2/server/go/operators/crossover/CrossoverESNPointDiscreteDislocation.java rename to src/eva2/optimization/operators/crossover/CrossoverESNPointDiscreteDislocation.java index 09433073..e9d1136f 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverESNPointDiscreteDislocation.java +++ b/src/eva2/optimization/operators/crossover/CrossoverESNPointDiscreteDislocation.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.crossover; +package eva2.optimization.operators.crossover; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceESIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceESIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** diff --git a/src/eva2/server/go/operators/crossover/CrossoverESPCX.java b/src/eva2/optimization/operators/crossover/CrossoverESPCX.java similarity index 97% rename from src/eva2/server/go/operators/crossover/CrossoverESPCX.java rename to src/eva2/optimization/operators/crossover/CrossoverESPCX.java index 074200bf..519e2802 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverESPCX.java +++ b/src/eva2/optimization/operators/crossover/CrossoverESPCX.java @@ -1,13 +1,13 @@ -package eva2.server.go.operators.crossover; +package eva2.optimization.operators.crossover; import eva2.gui.Plot; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.ESIndividualDoubleData; -import eva2.server.go.individuals.InterfaceESIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.F1Problem; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.ESIndividualDoubleData; +import eva2.optimization.individuals.InterfaceESIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.F1Problem; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.Mathematics; import eva2.tools.math.RNG; import java.util.ArrayList; diff --git a/src/eva2/server/go/operators/crossover/CrossoverESSBX.java b/src/eva2/optimization/operators/crossover/CrossoverESSBX.java similarity index 95% rename from src/eva2/server/go/operators/crossover/CrossoverESSBX.java rename to src/eva2/optimization/operators/crossover/CrossoverESSBX.java index 73320bbc..ece08cce 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverESSBX.java +++ b/src/eva2/optimization/operators/crossover/CrossoverESSBX.java @@ -1,12 +1,12 @@ -package eva2.server.go.operators.crossover; +package eva2.optimization.operators.crossover; import eva2.gui.Plot; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.ESIndividualDoubleData; -import eva2.server.go.individuals.InterfaceESIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.F1Problem; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.ESIndividualDoubleData; +import eva2.optimization.individuals.InterfaceESIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.F1Problem; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** diff --git a/src/eva2/server/go/operators/crossover/CrossoverESSPX.java b/src/eva2/optimization/operators/crossover/CrossoverESSPX.java similarity index 96% rename from src/eva2/server/go/operators/crossover/CrossoverESSPX.java rename to src/eva2/optimization/operators/crossover/CrossoverESSPX.java index 7fcc5dba..65fab4c1 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverESSPX.java +++ b/src/eva2/optimization/operators/crossover/CrossoverESSPX.java @@ -1,12 +1,12 @@ -package eva2.server.go.operators.crossover; +package eva2.optimization.operators.crossover; import eva2.gui.Plot; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.ESIndividualDoubleData; -import eva2.server.go.individuals.InterfaceESIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.F1Problem; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.ESIndividualDoubleData; +import eva2.optimization.individuals.InterfaceESIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.F1Problem; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.Mathematics; import eva2.tools.math.RNG; diff --git a/src/eva2/server/go/operators/crossover/CrossoverESUNDX.java b/src/eva2/optimization/operators/crossover/CrossoverESUNDX.java similarity index 97% rename from src/eva2/server/go/operators/crossover/CrossoverESUNDX.java rename to src/eva2/optimization/operators/crossover/CrossoverESUNDX.java index 4c6d8a9d..ad8b19f5 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverESUNDX.java +++ b/src/eva2/optimization/operators/crossover/CrossoverESUNDX.java @@ -1,13 +1,13 @@ -package eva2.server.go.operators.crossover; +package eva2.optimization.operators.crossover; import eva2.gui.Plot; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.ESIndividualDoubleData; -import eva2.server.go.individuals.InterfaceESIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.F1Problem; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.ESIndividualDoubleData; +import eva2.optimization.individuals.InterfaceESIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.F1Problem; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.Mathematics; import eva2.tools.math.RNG; import java.util.ArrayList; diff --git a/src/eva2/server/go/operators/crossover/CrossoverESUniformDiscrete.java b/src/eva2/optimization/operators/crossover/CrossoverESUniformDiscrete.java similarity index 94% rename from src/eva2/server/go/operators/crossover/CrossoverESUniformDiscrete.java rename to src/eva2/optimization/operators/crossover/CrossoverESUniformDiscrete.java index ace5cd7b..57334f68 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverESUniformDiscrete.java +++ b/src/eva2/optimization/operators/crossover/CrossoverESUniformDiscrete.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.crossover; +package eva2.optimization.operators.crossover; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceESIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceESIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** diff --git a/src/eva2/server/go/operators/crossover/CrossoverGABitSimulated.java b/src/eva2/optimization/operators/crossover/CrossoverGABitSimulated.java similarity index 95% rename from src/eva2/server/go/operators/crossover/CrossoverGABitSimulated.java rename to src/eva2/optimization/operators/crossover/CrossoverGABitSimulated.java index 5c9d1976..b4254bcb 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverGABitSimulated.java +++ b/src/eva2/optimization/operators/crossover/CrossoverGABitSimulated.java @@ -1,10 +1,10 @@ -package eva2.server.go.operators.crossover; +package eva2.optimization.operators.crossover; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceGAIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceGAIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import java.util.BitSet; diff --git a/src/eva2/server/go/operators/crossover/CrossoverGADefault.java b/src/eva2/optimization/operators/crossover/CrossoverGADefault.java similarity index 94% rename from src/eva2/server/go/operators/crossover/CrossoverGADefault.java rename to src/eva2/optimization/operators/crossover/CrossoverGADefault.java index 0ec14c8d..01952ef1 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverGADefault.java +++ b/src/eva2/optimization/operators/crossover/CrossoverGADefault.java @@ -1,10 +1,10 @@ -package eva2.server.go.operators.crossover; +package eva2.optimization.operators.crossover; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceGAIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceGAIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import java.util.BitSet; diff --git a/src/eva2/server/go/operators/crossover/CrossoverGAGINPoint.java b/src/eva2/optimization/operators/crossover/CrossoverGAGINPoint.java similarity index 97% rename from src/eva2/server/go/operators/crossover/CrossoverGAGINPoint.java rename to src/eva2/optimization/operators/crossover/CrossoverGAGINPoint.java index 8555b545..b5bdfdd9 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverGAGINPoint.java +++ b/src/eva2/optimization/operators/crossover/CrossoverGAGINPoint.java @@ -1,12 +1,12 @@ -package eva2.server.go.operators.crossover; +package eva2.optimization.operators.crossover; import eva2.gui.BeanInspector; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceGAIndividual; -import eva2.server.go.individuals.InterfaceGIIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceGAIndividual; +import eva2.optimization.individuals.InterfaceGIIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import java.util.BitSet; diff --git a/src/eva2/server/go/operators/crossover/CrossoverGAGINPointSegmentwise.java b/src/eva2/optimization/operators/crossover/CrossoverGAGINPointSegmentwise.java similarity index 94% rename from src/eva2/server/go/operators/crossover/CrossoverGAGINPointSegmentwise.java rename to src/eva2/optimization/operators/crossover/CrossoverGAGINPointSegmentwise.java index 57d9f142..f65ddb34 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverGAGINPointSegmentwise.java +++ b/src/eva2/optimization/operators/crossover/CrossoverGAGINPointSegmentwise.java @@ -1,4 +1,4 @@ -package eva2.server.go.operators.crossover; +package eva2.optimization.operators.crossover; import eva2.tools.math.RNG; diff --git a/src/eva2/server/go/operators/crossover/CrossoverGAUniform.java b/src/eva2/optimization/operators/crossover/CrossoverGAUniform.java similarity index 94% rename from src/eva2/server/go/operators/crossover/CrossoverGAUniform.java rename to src/eva2/optimization/operators/crossover/CrossoverGAUniform.java index 1809b76a..33346640 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverGAUniform.java +++ b/src/eva2/optimization/operators/crossover/CrossoverGAUniform.java @@ -1,10 +1,10 @@ -package eva2.server.go.operators.crossover; +package eva2.optimization.operators.crossover; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceGAIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceGAIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import java.util.BitSet; diff --git a/src/eva2/server/go/operators/crossover/CrossoverGIDefault.java b/src/eva2/optimization/operators/crossover/CrossoverGIDefault.java similarity index 95% rename from src/eva2/server/go/operators/crossover/CrossoverGIDefault.java rename to src/eva2/optimization/operators/crossover/CrossoverGIDefault.java index 823c8313..0703f0f6 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverGIDefault.java +++ b/src/eva2/optimization/operators/crossover/CrossoverGIDefault.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.crossover; +package eva2.optimization.operators.crossover; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceGIIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceGIIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** diff --git a/src/eva2/server/go/operators/crossover/CrossoverGINPoint.java b/src/eva2/optimization/operators/crossover/CrossoverGINPoint.java similarity index 95% rename from src/eva2/server/go/operators/crossover/CrossoverGINPoint.java rename to src/eva2/optimization/operators/crossover/CrossoverGINPoint.java index b41da251..777e60ed 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverGINPoint.java +++ b/src/eva2/optimization/operators/crossover/CrossoverGINPoint.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.crossover; +package eva2.optimization.operators.crossover; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceGIIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceGIIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** diff --git a/src/eva2/server/go/operators/crossover/CrossoverGINPointVL.java b/src/eva2/optimization/operators/crossover/CrossoverGINPointVL.java similarity index 96% rename from src/eva2/server/go/operators/crossover/CrossoverGINPointVL.java rename to src/eva2/optimization/operators/crossover/CrossoverGINPointVL.java index f051d3e7..c4dd4eed 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverGINPointVL.java +++ b/src/eva2/optimization/operators/crossover/CrossoverGINPointVL.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.crossover; +package eva2.optimization.operators.crossover; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceGIIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceGIIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import java.util.BitSet; diff --git a/src/eva2/server/go/operators/crossover/CrossoverGIUniform.java b/src/eva2/optimization/operators/crossover/CrossoverGIUniform.java similarity index 94% rename from src/eva2/server/go/operators/crossover/CrossoverGIUniform.java rename to src/eva2/optimization/operators/crossover/CrossoverGIUniform.java index 4019893c..d82b14fa 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverGIUniform.java +++ b/src/eva2/optimization/operators/crossover/CrossoverGIUniform.java @@ -1,11 +1,11 @@ -package eva2.server.go.operators.crossover; +package eva2.optimization.operators.crossover; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceGIIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceGIIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** diff --git a/src/eva2/server/go/operators/crossover/CrossoverGPDefault.java b/src/eva2/optimization/operators/crossover/CrossoverGPDefault.java similarity index 94% rename from src/eva2/server/go/operators/crossover/CrossoverGPDefault.java rename to src/eva2/optimization/operators/crossover/CrossoverGPDefault.java index 2172f310..df0a7b78 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverGPDefault.java +++ b/src/eva2/optimization/operators/crossover/CrossoverGPDefault.java @@ -1,13 +1,13 @@ -package eva2.server.go.operators.crossover; +package eva2.optimization.operators.crossover; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.GPIndividualProgramData; -import eva2.server.go.individuals.InterfaceGPIndividual; -import eva2.server.go.individuals.codings.gp.AbstractGPNode; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.GPIndividualProgramData; +import eva2.optimization.individuals.InterfaceGPIndividual; +import eva2.optimization.individuals.codings.gp.AbstractGPNode; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** diff --git a/src/eva2/server/go/operators/crossover/CrossoverOBGAPMX.java b/src/eva2/optimization/operators/crossover/CrossoverOBGAPMX.java similarity index 93% rename from src/eva2/server/go/operators/crossover/CrossoverOBGAPMX.java rename to src/eva2/optimization/operators/crossover/CrossoverOBGAPMX.java index 986b011c..60a63e81 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverOBGAPMX.java +++ b/src/eva2/optimization/operators/crossover/CrossoverOBGAPMX.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.crossover; +package eva2.optimization.operators.crossover; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceOBGAIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceOBGAIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** diff --git a/src/eva2/server/go/operators/crossover/CrossoverOBGAPMXUniform.java b/src/eva2/optimization/operators/crossover/CrossoverOBGAPMXUniform.java similarity index 93% rename from src/eva2/server/go/operators/crossover/CrossoverOBGAPMXUniform.java rename to src/eva2/optimization/operators/crossover/CrossoverOBGAPMXUniform.java index 07cc99a7..d87fedd0 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverOBGAPMXUniform.java +++ b/src/eva2/optimization/operators/crossover/CrossoverOBGAPMXUniform.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.crossover; +package eva2.optimization.operators.crossover; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceOBGAIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceOBGAIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** diff --git a/src/eva2/server/go/operators/crossover/InterfaceCrossover.java b/src/eva2/optimization/operators/crossover/InterfaceCrossover.java similarity index 87% rename from src/eva2/server/go/operators/crossover/InterfaceCrossover.java rename to src/eva2/optimization/operators/crossover/InterfaceCrossover.java index 9851816d..dd9a749c 100644 --- a/src/eva2/server/go/operators/crossover/InterfaceCrossover.java +++ b/src/eva2/optimization/operators/crossover/InterfaceCrossover.java @@ -1,8 +1,8 @@ -package eva2.server.go.operators.crossover; +package eva2.optimization.operators.crossover; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; /** diff --git a/src/eva2/server/go/operators/crossover/InterfaceEvaluatingCrossoverOperator.java b/src/eva2/optimization/operators/crossover/InterfaceEvaluatingCrossoverOperator.java similarity index 80% rename from src/eva2/server/go/operators/crossover/InterfaceEvaluatingCrossoverOperator.java rename to src/eva2/optimization/operators/crossover/InterfaceEvaluatingCrossoverOperator.java index ad1da21d..8a705c8a 100644 --- a/src/eva2/server/go/operators/crossover/InterfaceEvaluatingCrossoverOperator.java +++ b/src/eva2/optimization/operators/crossover/InterfaceEvaluatingCrossoverOperator.java @@ -1,4 +1,4 @@ -package eva2.server.go.operators.crossover; +package eva2.optimization.operators.crossover; public interface InterfaceEvaluatingCrossoverOperator extends InterfaceCrossover { diff --git a/src/eva2/server/go/operators/crossover/NoCrossover.java b/src/eva2/optimization/operators/crossover/NoCrossover.java similarity index 93% rename from src/eva2/server/go/operators/crossover/NoCrossover.java rename to src/eva2/optimization/operators/crossover/NoCrossover.java index a5e22fdc..7544db5a 100644 --- a/src/eva2/server/go/operators/crossover/NoCrossover.java +++ b/src/eva2/optimization/operators/crossover/NoCrossover.java @@ -1,8 +1,8 @@ -package eva2.server.go.operators.crossover; +package eva2.optimization.operators.crossover; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/crossover/PropertyCrossoverMixer.java b/src/eva2/optimization/operators/crossover/PropertyCrossoverMixer.java similarity index 99% rename from src/eva2/server/go/operators/crossover/PropertyCrossoverMixer.java rename to src/eva2/optimization/operators/crossover/PropertyCrossoverMixer.java index 0a565713..508b4762 100644 --- a/src/eva2/server/go/operators/crossover/PropertyCrossoverMixer.java +++ b/src/eva2/optimization/operators/crossover/PropertyCrossoverMixer.java @@ -1,4 +1,4 @@ -package eva2.server.go.operators.crossover; +package eva2.optimization.operators.crossover; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/crossover/PropertyCrossoverMixerEditor.java b/src/eva2/optimization/operators/crossover/PropertyCrossoverMixerEditor.java similarity index 98% rename from src/eva2/server/go/operators/crossover/PropertyCrossoverMixerEditor.java rename to src/eva2/optimization/operators/crossover/PropertyCrossoverMixerEditor.java index 8cd1c57c..a46a5233 100644 --- a/src/eva2/server/go/operators/crossover/PropertyCrossoverMixerEditor.java +++ b/src/eva2/optimization/operators/crossover/PropertyCrossoverMixerEditor.java @@ -1,11 +1,11 @@ -package eva2.server.go.operators.crossover; +package eva2.optimization.operators.crossover; import eva2.gui.GenericObjectEditor; import eva2.gui.PropertyEditorProvider; -import eva2.server.go.tools.AbstractObjectEditor; -import eva2.server.go.tools.GeneralGEOFaker; -import eva2.server.go.tools.GeneralGOEProperty; +import eva2.optimization.tools.AbstractObjectEditor; +import eva2.optimization.tools.GeneralGEOFaker; +import eva2.optimization.tools.GeneralGOEProperty; import eva2.tools.BasicResourceLoader; import java.awt.BorderLayout; import java.awt.Component; diff --git a/src/eva2/server/go/operators/crossover/TestESCrossover.java b/src/eva2/optimization/operators/crossover/TestESCrossover.java similarity index 96% rename from src/eva2/server/go/operators/crossover/TestESCrossover.java rename to src/eva2/optimization/operators/crossover/TestESCrossover.java index 282338c4..9ef4f9cc 100644 --- a/src/eva2/server/go/operators/crossover/TestESCrossover.java +++ b/src/eva2/optimization/operators/crossover/TestESCrossover.java @@ -1,14 +1,14 @@ -package eva2.server.go.operators.crossover; +package eva2.optimization.operators.crossover; import eva2.gui.JParaPanel; import eva2.gui.Plot; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.ESIndividualDoubleData; -import eva2.server.go.individuals.InterfaceDataTypeDouble; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.F1Problem; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.ESIndividualDoubleData; +import eva2.optimization.individuals.InterfaceDataTypeDouble; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.F1Problem; +import eva2.optimization.problems.InterfaceOptimizationProblem; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; diff --git a/src/eva2/server/go/operators/distancemetric/DoubleIntegralMetric.java b/src/eva2/optimization/operators/distancemetric/DoubleIntegralMetric.java similarity index 96% rename from src/eva2/server/go/operators/distancemetric/DoubleIntegralMetric.java rename to src/eva2/optimization/operators/distancemetric/DoubleIntegralMetric.java index ba80b5b6..aa749b78 100644 --- a/src/eva2/server/go/operators/distancemetric/DoubleIntegralMetric.java +++ b/src/eva2/optimization/operators/distancemetric/DoubleIntegralMetric.java @@ -1,6 +1,6 @@ -package eva2.server.go.operators.distancemetric; +package eva2.optimization.operators.distancemetric; -import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.AbstractEAIndividual; import eva2.tools.EVAERROR; import eva2.tools.math.Mathematics; import java.io.Serializable; diff --git a/src/eva2/server/go/operators/distancemetric/EuclideanMetric.java b/src/eva2/optimization/operators/distancemetric/EuclideanMetric.java similarity index 95% rename from src/eva2/server/go/operators/distancemetric/EuclideanMetric.java rename to src/eva2/optimization/operators/distancemetric/EuclideanMetric.java index 9f894ae9..ef3d290d 100644 --- a/src/eva2/server/go/operators/distancemetric/EuclideanMetric.java +++ b/src/eva2/optimization/operators/distancemetric/EuclideanMetric.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.distancemetric; +package eva2.optimization.operators.distancemetric; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceDataTypeDouble; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceDataTypeDouble; import java.io.Serializable; /** diff --git a/src/eva2/server/go/operators/distancemetric/GenotypeMetricBitSet.java b/src/eva2/optimization/operators/distancemetric/GenotypeMetricBitSet.java similarity index 93% rename from src/eva2/server/go/operators/distancemetric/GenotypeMetricBitSet.java rename to src/eva2/optimization/operators/distancemetric/GenotypeMetricBitSet.java index aab62a36..8fe4f20a 100644 --- a/src/eva2/server/go/operators/distancemetric/GenotypeMetricBitSet.java +++ b/src/eva2/optimization/operators/distancemetric/GenotypeMetricBitSet.java @@ -1,8 +1,8 @@ -package eva2.server.go.operators.distancemetric; +package eva2.optimization.operators.distancemetric; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceGAIndividual; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceGAIndividual; import java.util.BitSet; /** Distance based on a bit-set if any. diff --git a/src/eva2/server/go/operators/distancemetric/IndividualDataMetric.java b/src/eva2/optimization/operators/distancemetric/IndividualDataMetric.java similarity index 95% rename from src/eva2/server/go/operators/distancemetric/IndividualDataMetric.java rename to src/eva2/optimization/operators/distancemetric/IndividualDataMetric.java index b673cc26..7902e457 100644 --- a/src/eva2/server/go/operators/distancemetric/IndividualDataMetric.java +++ b/src/eva2/optimization/operators/distancemetric/IndividualDataMetric.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.distancemetric; +package eva2.optimization.operators.distancemetric; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.strategies.ParticleSwarmOptimization; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.strategies.ParticleSwarmOptimization; import eva2.tools.EVAERROR; import java.io.Serializable; diff --git a/src/eva2/server/go/operators/distancemetric/InterfaceDistanceMetric.java b/src/eva2/optimization/operators/distancemetric/InterfaceDistanceMetric.java similarity index 89% rename from src/eva2/server/go/operators/distancemetric/InterfaceDistanceMetric.java rename to src/eva2/optimization/operators/distancemetric/InterfaceDistanceMetric.java index 9ceb0810..53c26dd4 100644 --- a/src/eva2/server/go/operators/distancemetric/InterfaceDistanceMetric.java +++ b/src/eva2/optimization/operators/distancemetric/InterfaceDistanceMetric.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.distancemetric; +package eva2.optimization.operators.distancemetric; -import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.AbstractEAIndividual; /** This metric methods is experimental and should be moved to the * optimization problem to allow problem specific distance metrics diff --git a/src/eva2/server/go/operators/distancemetric/ObjectiveSpaceMetric.java b/src/eva2/optimization/operators/distancemetric/ObjectiveSpaceMetric.java similarity index 94% rename from src/eva2/server/go/operators/distancemetric/ObjectiveSpaceMetric.java rename to src/eva2/optimization/operators/distancemetric/ObjectiveSpaceMetric.java index 27191315..b17fdddb 100644 --- a/src/eva2/server/go/operators/distancemetric/ObjectiveSpaceMetric.java +++ b/src/eva2/optimization/operators/distancemetric/ObjectiveSpaceMetric.java @@ -1,6 +1,6 @@ -package eva2.server.go.operators.distancemetric; +package eva2.optimization.operators.distancemetric; -import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.AbstractEAIndividual; /** Objective space metric suited for multi-objective optimization. * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/distancemetric/PhenotypeMetric.java b/src/eva2/optimization/operators/distancemetric/PhenotypeMetric.java similarity index 95% rename from src/eva2/server/go/operators/distancemetric/PhenotypeMetric.java rename to src/eva2/optimization/operators/distancemetric/PhenotypeMetric.java index cd801392..9bda4e8b 100644 --- a/src/eva2/server/go/operators/distancemetric/PhenotypeMetric.java +++ b/src/eva2/optimization/operators/distancemetric/PhenotypeMetric.java @@ -1,14 +1,14 @@ -package eva2.server.go.operators.distancemetric; +package eva2.optimization.operators.distancemetric; import eva2.gui.BeanInspector; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceDataTypeBinary; -import eva2.server.go.individuals.InterfaceDataTypeDouble; -import eva2.server.go.individuals.InterfaceDataTypeInteger; -import eva2.server.go.individuals.InterfaceDataTypePermutation; -import eva2.server.go.individuals.InterfaceDataTypeProgram; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceDataTypeBinary; +import eva2.optimization.individuals.InterfaceDataTypeDouble; +import eva2.optimization.individuals.InterfaceDataTypeInteger; +import eva2.optimization.individuals.InterfaceDataTypePermutation; +import eva2.optimization.individuals.InterfaceDataTypeProgram; import java.util.BitSet; /** diff --git a/src/eva2/server/go/operators/distancemetric/SigmaSingleMetricGlobalMutation.java b/src/eva2/optimization/operators/distancemetric/SigmaSingleMetricGlobalMutation.java similarity index 93% rename from src/eva2/server/go/operators/distancemetric/SigmaSingleMetricGlobalMutation.java rename to src/eva2/optimization/operators/distancemetric/SigmaSingleMetricGlobalMutation.java index 19ae004e..3f526eda 100644 --- a/src/eva2/server/go/operators/distancemetric/SigmaSingleMetricGlobalMutation.java +++ b/src/eva2/optimization/operators/distancemetric/SigmaSingleMetricGlobalMutation.java @@ -1,8 +1,8 @@ -package eva2.server.go.operators.distancemetric; +package eva2.optimization.operators.distancemetric; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceDataTypeDouble; -import eva2.server.go.operators.mutation.MutateESGlobal; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceDataTypeDouble; +import eva2.optimization.operators.mutation.MutateESGlobal; /** This method includes the sigma as distance element. * This can be used to make the CBN-EA self-adaptive diff --git a/src/eva2/server/go/operators/fitnessmodifier/FitnessAdaptiveClustering.java b/src/eva2/optimization/operators/fitnessmodifier/FitnessAdaptiveClustering.java similarity index 92% rename from src/eva2/server/go/operators/fitnessmodifier/FitnessAdaptiveClustering.java rename to src/eva2/optimization/operators/fitnessmodifier/FitnessAdaptiveClustering.java index 47a04b1c..7838c6b4 100644 --- a/src/eva2/server/go/operators/fitnessmodifier/FitnessAdaptiveClustering.java +++ b/src/eva2/optimization/operators/fitnessmodifier/FitnessAdaptiveClustering.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.fitnessmodifier; +package eva2.optimization.operators.fitnessmodifier; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.cluster.ClusteringDensityBased; -import eva2.server.go.operators.cluster.InterfaceClustering; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.operators.cluster.ClusteringDensityBased; +import eva2.optimization.operators.cluster.InterfaceClustering; +import eva2.optimization.populations.Population; /** The fitness modifier are defunct and are to be moved to * the selection operators... diff --git a/src/eva2/server/go/operators/fitnessmodifier/FitnessModifierNone.java b/src/eva2/optimization/operators/fitnessmodifier/FitnessModifierNone.java similarity index 92% rename from src/eva2/server/go/operators/fitnessmodifier/FitnessModifierNone.java rename to src/eva2/optimization/operators/fitnessmodifier/FitnessModifierNone.java index 30609e38..8214be09 100644 --- a/src/eva2/server/go/operators/fitnessmodifier/FitnessModifierNone.java +++ b/src/eva2/optimization/operators/fitnessmodifier/FitnessModifierNone.java @@ -1,6 +1,6 @@ -package eva2.server.go.operators.fitnessmodifier; +package eva2.optimization.operators.fitnessmodifier; -import eva2.server.go.populations.Population; +import eva2.optimization.populations.Population; /** The fitness modifier are defunct and are to be moved to * the selection operators... diff --git a/src/eva2/server/go/operators/fitnessmodifier/FitnessSharing.java b/src/eva2/optimization/operators/fitnessmodifier/FitnessSharing.java similarity index 92% rename from src/eva2/server/go/operators/fitnessmodifier/FitnessSharing.java rename to src/eva2/optimization/operators/fitnessmodifier/FitnessSharing.java index 68c22c97..e2bbdb4d 100644 --- a/src/eva2/server/go/operators/fitnessmodifier/FitnessSharing.java +++ b/src/eva2/optimization/operators/fitnessmodifier/FitnessSharing.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.fitnessmodifier; +package eva2.optimization.operators.fitnessmodifier; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.distancemetric.InterfaceDistanceMetric; -import eva2.server.go.operators.distancemetric.PhenotypeMetric; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.operators.distancemetric.InterfaceDistanceMetric; +import eva2.optimization.operators.distancemetric.PhenotypeMetric; +import eva2.optimization.populations.Population; /** The fitness modifier are defunct and are to be moved to * the selection operators... diff --git a/src/eva2/server/go/operators/fitnessmodifier/InterfaceFitnessModifier.java b/src/eva2/optimization/operators/fitnessmodifier/InterfaceFitnessModifier.java similarity index 85% rename from src/eva2/server/go/operators/fitnessmodifier/InterfaceFitnessModifier.java rename to src/eva2/optimization/operators/fitnessmodifier/InterfaceFitnessModifier.java index c5b3c21b..1160c34a 100644 --- a/src/eva2/server/go/operators/fitnessmodifier/InterfaceFitnessModifier.java +++ b/src/eva2/optimization/operators/fitnessmodifier/InterfaceFitnessModifier.java @@ -1,6 +1,6 @@ -package eva2.server.go.operators.fitnessmodifier; +package eva2.optimization.operators.fitnessmodifier; -import eva2.server.go.populations.Population; +import eva2.optimization.populations.Population; /** The fitness modifier are defunct and are to be moved to * the selection operators... diff --git a/src/eva2/server/go/operators/initialization/DefaultInitialization.java b/src/eva2/optimization/operators/initialization/DefaultInitialization.java similarity index 80% rename from src/eva2/server/go/operators/initialization/DefaultInitialization.java rename to src/eva2/optimization/operators/initialization/DefaultInitialization.java index 200e1466..a37ade19 100644 --- a/src/eva2/server/go/operators/initialization/DefaultInitialization.java +++ b/src/eva2/optimization/operators/initialization/DefaultInitialization.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.initialization; +package eva2.optimization.operators.initialization; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.problems.InterfaceOptimizationProblem; /** * A dummy initialization method which only calls the default init method of the individual. diff --git a/src/eva2/server/go/operators/initialization/GAGIInitializeSegmentwise.java b/src/eva2/optimization/operators/initialization/GAGIInitializeSegmentwise.java similarity index 97% rename from src/eva2/server/go/operators/initialization/GAGIInitializeSegmentwise.java rename to src/eva2/optimization/operators/initialization/GAGIInitializeSegmentwise.java index 7853e1f8..5aa6714b 100644 --- a/src/eva2/server/go/operators/initialization/GAGIInitializeSegmentwise.java +++ b/src/eva2/optimization/operators/initialization/GAGIInitializeSegmentwise.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.initialization; +package eva2.optimization.operators.initialization; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceGAIndividual; -import eva2.server.go.individuals.InterfaceGIIndividual; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceGAIndividual; +import eva2.optimization.individuals.InterfaceGIIndividual; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.EVAERROR; import eva2.tools.math.RNG; import java.util.BitSet; diff --git a/src/eva2/server/go/operators/initialization/InterfaceInitialization.java b/src/eva2/optimization/operators/initialization/InterfaceInitialization.java similarity index 80% rename from src/eva2/server/go/operators/initialization/InterfaceInitialization.java rename to src/eva2/optimization/operators/initialization/InterfaceInitialization.java index 282d59c8..2b32904d 100644 --- a/src/eva2/server/go/operators/initialization/InterfaceInitialization.java +++ b/src/eva2/optimization/operators/initialization/InterfaceInitialization.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.initialization; +package eva2.optimization.operators.initialization; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.problems.InterfaceOptimizationProblem; /** * An abstraction over individual initialization methods in analogy diff --git a/src/eva2/server/go/operators/migration/InterfaceMigration.java b/src/eva2/optimization/operators/migration/InterfaceMigration.java similarity index 93% rename from src/eva2/server/go/operators/migration/InterfaceMigration.java rename to src/eva2/optimization/operators/migration/InterfaceMigration.java index ef595e1e..f2b0d51a 100644 --- a/src/eva2/server/go/operators/migration/InterfaceMigration.java +++ b/src/eva2/optimization/operators/migration/InterfaceMigration.java @@ -1,6 +1,6 @@ -package eva2.server.go.operators.migration; +package eva2.optimization.operators.migration; -import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.optimization.strategies.InterfaceOptimizer; /** The migration methods give the migration topology * (currently all migration methods are typically fully diff --git a/src/eva2/server/go/operators/migration/MOBestMigration.java b/src/eva2/optimization/operators/migration/MOBestMigration.java similarity index 93% rename from src/eva2/server/go/operators/migration/MOBestMigration.java rename to src/eva2/optimization/operators/migration/MOBestMigration.java index c090f3e5..45c36cf7 100644 --- a/src/eva2/server/go/operators/migration/MOBestMigration.java +++ b/src/eva2/optimization/operators/migration/MOBestMigration.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.migration; +package eva2.optimization.operators.migration; -import eva2.server.go.operators.selection.InterfaceSelection; -import eva2.server.go.operators.selection.SelectMOMaxiMin; -import eva2.server.go.populations.Population; -import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.optimization.operators.selection.InterfaceSelection; +import eva2.optimization.operators.selection.SelectMOMaxiMin; +import eva2.optimization.populations.Population; +import eva2.optimization.strategies.InterfaceOptimizer; /** Migration based on a Multi-criterial selection mechanism * migrating the n best individuals between all populations. diff --git a/src/eva2/server/go/operators/migration/MOClusteringSeparation.java b/src/eva2/optimization/operators/migration/MOClusteringSeparation.java similarity index 96% rename from src/eva2/server/go/operators/migration/MOClusteringSeparation.java rename to src/eva2/optimization/operators/migration/MOClusteringSeparation.java index 7f6d3766..615fae40 100644 --- a/src/eva2/server/go/operators/migration/MOClusteringSeparation.java +++ b/src/eva2/optimization/operators/migration/MOClusteringSeparation.java @@ -1,17 +1,17 @@ -package eva2.server.go.operators.migration; +package eva2.optimization.operators.migration; import eva2.gui.GraphPointSet; import eva2.gui.Plot; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.archiving.ArchivingNSGAII; -import eva2.server.go.operators.cluster.ClusteringKMeans; -import eva2.server.go.operators.constraint.ConstBelongsToDifferentClass; -import eva2.server.go.operators.selection.InterfaceSelection; -import eva2.server.go.operators.selection.SelectRandom; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.AbstractMultiObjectiveOptimizationProblem; -import eva2.server.go.problems.InterfaceOptimizationProblem; -import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.operators.archiving.ArchivingNSGAII; +import eva2.optimization.operators.cluster.ClusteringKMeans; +import eva2.optimization.operators.constraint.ConstBelongsToDifferentClass; +import eva2.optimization.operators.selection.InterfaceSelection; +import eva2.optimization.operators.selection.SelectRandom; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.optimization.strategies.InterfaceOptimizer; import eva2.tools.chart2d.Chart2DDPointIconCircle; import eva2.tools.chart2d.Chart2DDPointIconText; import eva2.tools.chart2d.DPoint; diff --git a/src/eva2/server/go/operators/migration/MOConeSeparation.java b/src/eva2/optimization/operators/migration/MOConeSeparation.java similarity index 97% rename from src/eva2/server/go/operators/migration/MOConeSeparation.java rename to src/eva2/optimization/operators/migration/MOConeSeparation.java index 817de1e3..33d53a9e 100644 --- a/src/eva2/server/go/operators/migration/MOConeSeparation.java +++ b/src/eva2/optimization/operators/migration/MOConeSeparation.java @@ -1,20 +1,20 @@ -package eva2.server.go.operators.migration; +package eva2.optimization.operators.migration; import eva2.gui.GraphPointSet; import eva2.gui.Plot; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.archiving.ArchivingAllDominating; -import eva2.server.go.operators.archiving.InterfaceArchiving; -import eva2.server.go.operators.constraint.ConstObjectivesInEqualityBiggerThanLinear; -import eva2.server.go.operators.constraint.ConstObjectivesInEqualityBiggerThanSurface; -import eva2.server.go.operators.constraint.ConstObjectivesInEqualityLesserThanLinear; -import eva2.server.go.operators.constraint.ConstObjectivesInEqualitySmallerThanSurface; -import eva2.server.go.operators.selection.InterfaceSelection; -import eva2.server.go.operators.selection.SelectRandom; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.AbstractMultiObjectiveOptimizationProblem; -import eva2.server.go.problems.InterfaceOptimizationProblem; -import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.operators.archiving.ArchivingAllDominating; +import eva2.optimization.operators.archiving.InterfaceArchiving; +import eva2.optimization.operators.constraint.ConstObjectivesInEqualityBiggerThanLinear; +import eva2.optimization.operators.constraint.ConstObjectivesInEqualityBiggerThanSurface; +import eva2.optimization.operators.constraint.ConstObjectivesInEqualityLesserThanLinear; +import eva2.optimization.operators.constraint.ConstObjectivesInEqualitySmallerThanSurface; +import eva2.optimization.operators.selection.InterfaceSelection; +import eva2.optimization.operators.selection.SelectRandom; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.optimization.strategies.InterfaceOptimizer; import eva2.tools.chart2d.Chart2DDPointIconCircle; import eva2.tools.chart2d.Chart2DDPointIconText; import eva2.tools.chart2d.DPoint; diff --git a/src/eva2/server/go/operators/migration/MOXMeansSeparation.java b/src/eva2/optimization/operators/migration/MOXMeansSeparation.java similarity index 96% rename from src/eva2/server/go/operators/migration/MOXMeansSeparation.java rename to src/eva2/optimization/operators/migration/MOXMeansSeparation.java index c71cf1a5..3b8407c0 100644 --- a/src/eva2/server/go/operators/migration/MOXMeansSeparation.java +++ b/src/eva2/optimization/operators/migration/MOXMeansSeparation.java @@ -1,18 +1,18 @@ -package eva2.server.go.operators.migration; +package eva2.optimization.operators.migration; import eva2.gui.GraphPointSet; import eva2.gui.Plot; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.archiving.ArchivingNSGAII; -import eva2.server.go.operators.cluster.ClusteringXMeans; -import eva2.server.go.operators.constraint.ConstBelongsToDifferentClass; -import eva2.server.go.operators.selection.InterfaceSelection; -import eva2.server.go.operators.selection.SelectRandom; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.AbstractMultiObjectiveOptimizationProblem; -import eva2.server.go.problems.InterfaceOptimizationProblem; -import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.operators.archiving.ArchivingNSGAII; +import eva2.optimization.operators.cluster.ClusteringXMeans; +import eva2.optimization.operators.constraint.ConstBelongsToDifferentClass; +import eva2.optimization.operators.selection.InterfaceSelection; +import eva2.optimization.operators.selection.SelectRandom; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.optimization.strategies.InterfaceOptimizer; import eva2.tools.chart2d.Chart2DDPointIconCircle; import eva2.tools.chart2d.Chart2DDPointIconText; import eva2.tools.chart2d.DPoint; diff --git a/src/eva2/server/go/operators/migration/SOBestMigration.java b/src/eva2/optimization/operators/migration/SOBestMigration.java similarity index 92% rename from src/eva2/server/go/operators/migration/SOBestMigration.java rename to src/eva2/optimization/operators/migration/SOBestMigration.java index e7f2608e..d647be06 100644 --- a/src/eva2/server/go/operators/migration/SOBestMigration.java +++ b/src/eva2/optimization/operators/migration/SOBestMigration.java @@ -1,10 +1,10 @@ -package eva2.server.go.operators.migration; +package eva2.optimization.operators.migration; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.selection.InterfaceSelection; -import eva2.server.go.operators.selection.SelectBestIndividuals; -import eva2.server.go.populations.Population; -import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.operators.selection.InterfaceSelection; +import eva2.optimization.operators.selection.SelectBestIndividuals; +import eva2.optimization.populations.Population; +import eva2.optimization.strategies.InterfaceOptimizer; /** Simple single-objective migration scheme. * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/migration/SOMONoMigration.java b/src/eva2/optimization/operators/migration/SOMONoMigration.java similarity index 94% rename from src/eva2/server/go/operators/migration/SOMONoMigration.java rename to src/eva2/optimization/operators/migration/SOMONoMigration.java index 2152804e..26180fd2 100644 --- a/src/eva2/server/go/operators/migration/SOMONoMigration.java +++ b/src/eva2/optimization/operators/migration/SOMONoMigration.java @@ -1,6 +1,6 @@ -package eva2.server.go.operators.migration; +package eva2.optimization.operators.migration; -import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.optimization.strategies.InterfaceOptimizer; /** Implements no migration as reference. * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/moso/InterfaceMOSOConverter.java b/src/eva2/optimization/operators/moso/InterfaceMOSOConverter.java similarity index 92% rename from src/eva2/server/go/operators/moso/InterfaceMOSOConverter.java rename to src/eva2/optimization/operators/moso/InterfaceMOSOConverter.java index 96a6070c..2038641d 100644 --- a/src/eva2/server/go/operators/moso/InterfaceMOSOConverter.java +++ b/src/eva2/optimization/operators/moso/InterfaceMOSOConverter.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.moso; +package eva2.optimization.operators.moso; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; /** The MOSO converter work on the fitness values only and convert a double[] into * a single double values, thus allowing weight aggregation, goal programming and diff --git a/src/eva2/server/go/operators/moso/MOSODynamicallyWeightedFitness.java b/src/eva2/optimization/operators/moso/MOSODynamicallyWeightedFitness.java similarity index 96% rename from src/eva2/server/go/operators/moso/MOSODynamicallyWeightedFitness.java rename to src/eva2/optimization/operators/moso/MOSODynamicallyWeightedFitness.java index f6a7bd38..3886dd20 100644 --- a/src/eva2/server/go/operators/moso/MOSODynamicallyWeightedFitness.java +++ b/src/eva2/optimization/operators/moso/MOSODynamicallyWeightedFitness.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.moso; +package eva2.optimization.operators.moso; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/moso/MOSOEpsilonConstraint.java b/src/eva2/optimization/operators/moso/MOSOEpsilonConstraint.java similarity index 96% rename from src/eva2/server/go/operators/moso/MOSOEpsilonConstraint.java rename to src/eva2/optimization/operators/moso/MOSOEpsilonConstraint.java index 899e8760..877d0c26 100644 --- a/src/eva2/server/go/operators/moso/MOSOEpsilonConstraint.java +++ b/src/eva2/optimization/operators/moso/MOSOEpsilonConstraint.java @@ -1,8 +1,8 @@ -package eva2.server.go.operators.moso; +package eva2.optimization.operators.moso; import eva2.gui.PropertyEpsilonConstraint; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/moso/MOSOEpsilonThreshold.java b/src/eva2/optimization/operators/moso/MOSOEpsilonThreshold.java similarity index 97% rename from src/eva2/server/go/operators/moso/MOSOEpsilonThreshold.java rename to src/eva2/optimization/operators/moso/MOSOEpsilonThreshold.java index 0e3363b8..d55e0b49 100644 --- a/src/eva2/server/go/operators/moso/MOSOEpsilonThreshold.java +++ b/src/eva2/optimization/operators/moso/MOSOEpsilonThreshold.java @@ -1,8 +1,8 @@ -package eva2.server.go.operators.moso; +package eva2.optimization.operators.moso; import eva2.gui.PropertyEpsilonThreshold; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/moso/MOSOGoalProgramming.java b/src/eva2/optimization/operators/moso/MOSOGoalProgramming.java similarity index 96% rename from src/eva2/server/go/operators/moso/MOSOGoalProgramming.java rename to src/eva2/optimization/operators/moso/MOSOGoalProgramming.java index 31575c30..d56193e1 100644 --- a/src/eva2/server/go/operators/moso/MOSOGoalProgramming.java +++ b/src/eva2/optimization/operators/moso/MOSOGoalProgramming.java @@ -1,8 +1,8 @@ -package eva2.server.go.operators.moso; +package eva2.optimization.operators.moso; import eva2.gui.PropertyDoubleArray; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/moso/MOSOLpMetric.java b/src/eva2/optimization/operators/moso/MOSOLpMetric.java similarity index 97% rename from src/eva2/server/go/operators/moso/MOSOLpMetric.java rename to src/eva2/optimization/operators/moso/MOSOLpMetric.java index 196ff0ca..bae903d8 100644 --- a/src/eva2/server/go/operators/moso/MOSOLpMetric.java +++ b/src/eva2/optimization/operators/moso/MOSOLpMetric.java @@ -1,8 +1,8 @@ -package eva2.server.go.operators.moso; +package eva2.optimization.operators.moso; import eva2.gui.PropertyDoubleArray; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/moso/MOSOMOGARankBased.java b/src/eva2/optimization/operators/moso/MOSOMOGARankBased.java similarity index 95% rename from src/eva2/server/go/operators/moso/MOSOMOGARankBased.java rename to src/eva2/optimization/operators/moso/MOSOMOGARankBased.java index aef57c1e..56bd2036 100644 --- a/src/eva2/server/go/operators/moso/MOSOMOGARankBased.java +++ b/src/eva2/optimization/operators/moso/MOSOMOGARankBased.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.moso; +package eva2.optimization.operators.moso; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/moso/MOSOMaxiMin.java b/src/eva2/optimization/operators/moso/MOSOMaxiMin.java similarity index 97% rename from src/eva2/server/go/operators/moso/MOSOMaxiMin.java rename to src/eva2/optimization/operators/moso/MOSOMaxiMin.java index 6faece2c..be9f6eff 100644 --- a/src/eva2/server/go/operators/moso/MOSOMaxiMin.java +++ b/src/eva2/optimization/operators/moso/MOSOMaxiMin.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.moso; +package eva2.optimization.operators.moso; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; import eva2.tools.math.RNG; /** diff --git a/src/eva2/server/go/operators/moso/MOSONoConvert.java b/src/eva2/optimization/operators/moso/MOSONoConvert.java similarity index 94% rename from src/eva2/server/go/operators/moso/MOSONoConvert.java rename to src/eva2/optimization/operators/moso/MOSONoConvert.java index 54d75c64..ece7ee38 100644 --- a/src/eva2/server/go/operators/moso/MOSONoConvert.java +++ b/src/eva2/optimization/operators/moso/MOSONoConvert.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.moso; +package eva2.optimization.operators.moso; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/moso/MOSORandomChoice.java b/src/eva2/optimization/operators/moso/MOSORandomChoice.java similarity index 95% rename from src/eva2/server/go/operators/moso/MOSORandomChoice.java rename to src/eva2/optimization/operators/moso/MOSORandomChoice.java index 7faab59f..7b562a2f 100644 --- a/src/eva2/server/go/operators/moso/MOSORandomChoice.java +++ b/src/eva2/optimization/operators/moso/MOSORandomChoice.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.moso; +package eva2.optimization.operators.moso; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; import eva2.tools.math.RNG; /** diff --git a/src/eva2/server/go/operators/moso/MOSORandomWeight.java b/src/eva2/optimization/operators/moso/MOSORandomWeight.java similarity index 95% rename from src/eva2/server/go/operators/moso/MOSORandomWeight.java rename to src/eva2/optimization/operators/moso/MOSORandomWeight.java index 547dbb41..17ec5867 100644 --- a/src/eva2/server/go/operators/moso/MOSORandomWeight.java +++ b/src/eva2/optimization/operators/moso/MOSORandomWeight.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.moso; +package eva2.optimization.operators.moso; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; import eva2.tools.math.RNG; /** diff --git a/src/eva2/server/go/operators/moso/MOSORankbased.java b/src/eva2/optimization/operators/moso/MOSORankbased.java similarity index 92% rename from src/eva2/server/go/operators/moso/MOSORankbased.java rename to src/eva2/optimization/operators/moso/MOSORankbased.java index 0c186f0b..d241a41e 100644 --- a/src/eva2/server/go/operators/moso/MOSORankbased.java +++ b/src/eva2/optimization/operators/moso/MOSORankbased.java @@ -1,8 +1,8 @@ -package eva2.server.go.operators.moso; +package eva2.optimization.operators.moso; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.archiving.ArchivingNSGAII; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.operators.archiving.ArchivingNSGAII; +import eva2.optimization.populations.Population; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/moso/MOSOUtilityFunction.java b/src/eva2/optimization/operators/moso/MOSOUtilityFunction.java similarity index 96% rename from src/eva2/server/go/operators/moso/MOSOUtilityFunction.java rename to src/eva2/optimization/operators/moso/MOSOUtilityFunction.java index 90646d72..548d4f49 100644 --- a/src/eva2/server/go/operators/moso/MOSOUtilityFunction.java +++ b/src/eva2/optimization/operators/moso/MOSOUtilityFunction.java @@ -1,8 +1,8 @@ -package eva2.server.go.operators.moso; +package eva2.optimization.operators.moso; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/moso/MOSOWeightedFitness.java b/src/eva2/optimization/operators/moso/MOSOWeightedFitness.java similarity index 96% rename from src/eva2/server/go/operators/moso/MOSOWeightedFitness.java rename to src/eva2/optimization/operators/moso/MOSOWeightedFitness.java index 6a758a39..b0f7c0fd 100644 --- a/src/eva2/server/go/operators/moso/MOSOWeightedFitness.java +++ b/src/eva2/optimization/operators/moso/MOSOWeightedFitness.java @@ -1,8 +1,8 @@ -package eva2.server.go.operators.moso; +package eva2.optimization.operators.moso; import eva2.gui.PropertyDoubleArray; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/moso/MOSOWeightedLPTchebycheff.java b/src/eva2/optimization/operators/moso/MOSOWeightedLPTchebycheff.java similarity index 97% rename from src/eva2/server/go/operators/moso/MOSOWeightedLPTchebycheff.java rename to src/eva2/optimization/operators/moso/MOSOWeightedLPTchebycheff.java index c36b7386..7ad62ed0 100644 --- a/src/eva2/server/go/operators/moso/MOSOWeightedLPTchebycheff.java +++ b/src/eva2/optimization/operators/moso/MOSOWeightedLPTchebycheff.java @@ -1,8 +1,8 @@ -package eva2.server.go.operators.moso; +package eva2.optimization.operators.moso; import eva2.gui.PropertyWeightedLPTchebycheff; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/mutation/CMAParamSet.java b/src/eva2/optimization/operators/mutation/CMAParamSet.java similarity index 96% rename from src/eva2/server/go/operators/mutation/CMAParamSet.java rename to src/eva2/optimization/operators/mutation/CMAParamSet.java index e752b43b..66892e78 100644 --- a/src/eva2/server/go/operators/mutation/CMAParamSet.java +++ b/src/eva2/optimization/operators/mutation/CMAParamSet.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.mutation; +package eva2.optimization.operators.mutation; -import eva2.server.go.InterfacePopulationChangedEventListener; -import eva2.server.go.individuals.InterfaceDataTypeDouble; -import eva2.server.go.populations.Population; -import eva2.server.go.strategies.EvolutionStrategies; +import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.individuals.InterfaceDataTypeDouble; +import eva2.optimization.populations.Population; +import eva2.optimization.strategies.EvolutionStrategies; import eva2.tools.EVAERROR; import eva2.tools.math.Jama.Matrix; import eva2.tools.math.Mathematics; diff --git a/src/eva2/server/go/operators/mutation/InterfaceAdaptOperatorGenerational.java b/src/eva2/optimization/operators/mutation/InterfaceAdaptOperatorGenerational.java similarity index 94% rename from src/eva2/server/go/operators/mutation/InterfaceAdaptOperatorGenerational.java rename to src/eva2/optimization/operators/mutation/InterfaceAdaptOperatorGenerational.java index b7a2ddd8..b792397b 100644 --- a/src/eva2/server/go/operators/mutation/InterfaceAdaptOperatorGenerational.java +++ b/src/eva2/optimization/operators/mutation/InterfaceAdaptOperatorGenerational.java @@ -1,6 +1,6 @@ -package eva2.server.go.operators.mutation; +package eva2.optimization.operators.mutation; -import eva2.server.go.populations.Population; +import eva2.optimization.populations.Population; /** * An interface for a mutation operator which is updated on a generational basis, such as diff --git a/src/eva2/server/go/operators/mutation/InterfaceMutation.java b/src/eva2/optimization/operators/mutation/InterfaceMutation.java similarity index 88% rename from src/eva2/server/go/operators/mutation/InterfaceMutation.java rename to src/eva2/optimization/operators/mutation/InterfaceMutation.java index 8ed0f06b..a8d267a9 100644 --- a/src/eva2/server/go/operators/mutation/InterfaceMutation.java +++ b/src/eva2/optimization/operators/mutation/InterfaceMutation.java @@ -1,8 +1,8 @@ -package eva2.server.go.operators.mutation; +package eva2.optimization.operators.mutation; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; /** diff --git a/src/eva2/server/go/operators/mutation/MutateDefault.java b/src/eva2/optimization/operators/mutation/MutateDefault.java similarity index 90% rename from src/eva2/server/go/operators/mutation/MutateDefault.java rename to src/eva2/optimization/operators/mutation/MutateDefault.java index 501faa5a..db49eaf4 100644 --- a/src/eva2/server/go/operators/mutation/MutateDefault.java +++ b/src/eva2/optimization/operators/mutation/MutateDefault.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.mutation; +package eva2.optimization.operators.mutation; -import eva2.server.go.IndividualInterface; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.go.IndividualInterface; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; /** diff --git a/src/eva2/server/go/operators/mutation/MutateEAMixer.java b/src/eva2/optimization/operators/mutation/MutateEAMixer.java similarity index 97% rename from src/eva2/server/go/operators/mutation/MutateEAMixer.java rename to src/eva2/optimization/operators/mutation/MutateEAMixer.java index b7ee8cf1..293c4dda 100644 --- a/src/eva2/server/go/operators/mutation/MutateEAMixer.java +++ b/src/eva2/optimization/operators/mutation/MutateEAMixer.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.mutation; +package eva2.optimization.operators.mutation; import eva2.gui.GenericObjectEditor; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import java.util.ArrayList; diff --git a/src/eva2/server/go/operators/mutation/MutateESCorrVector.java b/src/eva2/optimization/operators/mutation/MutateESCorrVector.java similarity index 97% rename from src/eva2/server/go/operators/mutation/MutateESCorrVector.java rename to src/eva2/optimization/operators/mutation/MutateESCorrVector.java index cd709a61..342c68bd 100644 --- a/src/eva2/server/go/operators/mutation/MutateESCorrVector.java +++ b/src/eva2/optimization/operators/mutation/MutateESCorrVector.java @@ -1,10 +1,10 @@ -package eva2.server.go.operators.mutation; +package eva2.optimization.operators.mutation; import eva2.gui.BeanInspector; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceESIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceESIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.Mathematics; import eva2.tools.math.RNG; import java.util.ArrayList; diff --git a/src/eva2/server/go/operators/mutation/MutateESCorrolated.java b/src/eva2/optimization/operators/mutation/MutateESCorrolated.java similarity index 97% rename from src/eva2/server/go/operators/mutation/MutateESCorrolated.java rename to src/eva2/optimization/operators/mutation/MutateESCorrolated.java index 0b82043c..4e43b516 100644 --- a/src/eva2/server/go/operators/mutation/MutateESCorrolated.java +++ b/src/eva2/optimization/operators/mutation/MutateESCorrolated.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.mutation; +package eva2.optimization.operators.mutation; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceESIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceESIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** diff --git a/src/eva2/server/go/operators/mutation/MutateESCovarianceMatrixAdaption.java b/src/eva2/optimization/operators/mutation/MutateESCovarianceMatrixAdaption.java similarity index 98% rename from src/eva2/server/go/operators/mutation/MutateESCovarianceMatrixAdaption.java rename to src/eva2/optimization/operators/mutation/MutateESCovarianceMatrixAdaption.java index 5de63393..243b599e 100644 --- a/src/eva2/server/go/operators/mutation/MutateESCovarianceMatrixAdaption.java +++ b/src/eva2/optimization/operators/mutation/MutateESCovarianceMatrixAdaption.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.mutation; +package eva2.optimization.operators.mutation; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceESIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceESIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.Jama.EigenvalueDecomposition; import eva2.tools.math.Jama.Matrix; import eva2.tools.math.Mathematics; diff --git a/src/eva2/server/go/operators/mutation/MutateESCovarianceMatrixAdaptionPlus.java b/src/eva2/optimization/operators/mutation/MutateESCovarianceMatrixAdaptionPlus.java similarity index 93% rename from src/eva2/server/go/operators/mutation/MutateESCovarianceMatrixAdaptionPlus.java rename to src/eva2/optimization/operators/mutation/MutateESCovarianceMatrixAdaptionPlus.java index e28b57ca..33776716 100644 --- a/src/eva2/server/go/operators/mutation/MutateESCovarianceMatrixAdaptionPlus.java +++ b/src/eva2/optimization/operators/mutation/MutateESCovarianceMatrixAdaptionPlus.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.mutation; +package eva2.optimization.operators.mutation; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceESIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceESIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.Jama.Matrix; public class MutateESCovarianceMatrixAdaptionPlus extends diff --git a/src/eva2/server/go/operators/mutation/MutateESFixedStepSize.java b/src/eva2/optimization/operators/mutation/MutateESFixedStepSize.java similarity index 94% rename from src/eva2/server/go/operators/mutation/MutateESFixedStepSize.java rename to src/eva2/optimization/operators/mutation/MutateESFixedStepSize.java index 4a32fdc3..ec9c46fe 100644 --- a/src/eva2/server/go/operators/mutation/MutateESFixedStepSize.java +++ b/src/eva2/optimization/operators/mutation/MutateESFixedStepSize.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.mutation; +package eva2.optimization.operators.mutation; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceESIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceESIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** diff --git a/src/eva2/server/go/operators/mutation/MutateESGlobal.java b/src/eva2/optimization/operators/mutation/MutateESGlobal.java similarity index 95% rename from src/eva2/server/go/operators/mutation/MutateESGlobal.java rename to src/eva2/optimization/operators/mutation/MutateESGlobal.java index 6c631051..4e359b4c 100644 --- a/src/eva2/server/go/operators/mutation/MutateESGlobal.java +++ b/src/eva2/optimization/operators/mutation/MutateESGlobal.java @@ -1,12 +1,12 @@ -package eva2.server.go.operators.mutation; +package eva2.optimization.operators.mutation; -import eva2.server.go.PopulationInterface; -import eva2.server.go.enums.MutateESCrossoverTypeEnum; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceESIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceAdditionalPopulationInformer; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.go.PopulationInterface; +import eva2.optimization.enums.MutateESCrossoverTypeEnum; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceESIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceAdditionalPopulationInformer; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import java.util.ArrayList; diff --git a/src/eva2/server/go/operators/mutation/MutateESLocal.java b/src/eva2/optimization/operators/mutation/MutateESLocal.java similarity index 96% rename from src/eva2/server/go/operators/mutation/MutateESLocal.java rename to src/eva2/optimization/operators/mutation/MutateESLocal.java index 0d270fab..aca5d4e8 100644 --- a/src/eva2/server/go/operators/mutation/MutateESLocal.java +++ b/src/eva2/optimization/operators/mutation/MutateESLocal.java @@ -1,12 +1,12 @@ -package eva2.server.go.operators.mutation; +package eva2.optimization.operators.mutation; -import eva2.server.go.PopulationInterface; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceESIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceAdditionalPopulationInformer; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.go.PopulationInterface; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceESIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceAdditionalPopulationInformer; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.SelectedTag; import eva2.tools.Tag; import eva2.tools.math.RNG; diff --git a/src/eva2/server/go/operators/mutation/MutateESMainVectorAdaption.java b/src/eva2/optimization/operators/mutation/MutateESMainVectorAdaption.java similarity index 97% rename from src/eva2/server/go/operators/mutation/MutateESMainVectorAdaption.java rename to src/eva2/optimization/operators/mutation/MutateESMainVectorAdaption.java index d313b9f1..6f3ac332 100644 --- a/src/eva2/server/go/operators/mutation/MutateESMainVectorAdaption.java +++ b/src/eva2/optimization/operators/mutation/MutateESMainVectorAdaption.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.mutation; +package eva2.optimization.operators.mutation; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceESIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceESIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.Mathematics; import eva2.tools.math.RNG; diff --git a/src/eva2/server/go/operators/mutation/MutateESMutativeStepSizeControl.java b/src/eva2/optimization/operators/mutation/MutateESMutativeStepSizeControl.java similarity index 96% rename from src/eva2/server/go/operators/mutation/MutateESMutativeStepSizeControl.java rename to src/eva2/optimization/operators/mutation/MutateESMutativeStepSizeControl.java index 3cc4e44f..8bd33bd5 100644 --- a/src/eva2/server/go/operators/mutation/MutateESMutativeStepSizeControl.java +++ b/src/eva2/optimization/operators/mutation/MutateESMutativeStepSizeControl.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.mutation; +package eva2.optimization.operators.mutation; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceESIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceESIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** diff --git a/src/eva2/server/go/operators/mutation/MutateESPathLengthAdaption.java b/src/eva2/optimization/operators/mutation/MutateESPathLengthAdaption.java similarity index 96% rename from src/eva2/server/go/operators/mutation/MutateESPathLengthAdaption.java rename to src/eva2/optimization/operators/mutation/MutateESPathLengthAdaption.java index a383aff3..a42ce5ce 100644 --- a/src/eva2/server/go/operators/mutation/MutateESPathLengthAdaption.java +++ b/src/eva2/optimization/operators/mutation/MutateESPathLengthAdaption.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.mutation; +package eva2.optimization.operators.mutation; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceESIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceESIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.Mathematics; import eva2.tools.math.RNG; diff --git a/src/eva2/server/go/operators/mutation/MutateESPolynomial.java b/src/eva2/optimization/operators/mutation/MutateESPolynomial.java similarity index 91% rename from src/eva2/server/go/operators/mutation/MutateESPolynomial.java rename to src/eva2/optimization/operators/mutation/MutateESPolynomial.java index 7baad221..23634408 100644 --- a/src/eva2/server/go/operators/mutation/MutateESPolynomial.java +++ b/src/eva2/optimization/operators/mutation/MutateESPolynomial.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.mutation; +package eva2.optimization.operators.mutation; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceESIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceESIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** diff --git a/src/eva2/server/go/operators/mutation/MutateESRankMuCMA.java b/src/eva2/optimization/operators/mutation/MutateESRankMuCMA.java similarity index 98% rename from src/eva2/server/go/operators/mutation/MutateESRankMuCMA.java rename to src/eva2/optimization/operators/mutation/MutateESRankMuCMA.java index 916655fc..dd9d60e5 100644 --- a/src/eva2/server/go/operators/mutation/MutateESRankMuCMA.java +++ b/src/eva2/optimization/operators/mutation/MutateESRankMuCMA.java @@ -1,15 +1,15 @@ -package eva2.server.go.operators.mutation; +package eva2.optimization.operators.mutation; import eva2.gui.BeanInspector; import eva2.gui.GenericObjectEditor; -import eva2.server.go.enums.ESMutationInitialSigma; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.AbstractEAIndividualComparator; -import eva2.server.go.individuals.InterfaceDataTypeDouble; -import eva2.server.go.operators.distancemetric.EuclideanMetric; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; -import eva2.server.go.strategies.EvolutionStrategies; +import eva2.optimization.enums.ESMutationInitialSigma; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.AbstractEAIndividualComparator; +import eva2.optimization.individuals.InterfaceDataTypeDouble; +import eva2.optimization.operators.distancemetric.EuclideanMetric; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.optimization.strategies.EvolutionStrategies; import eva2.tools.EVAERROR; import eva2.tools.Pair; import eva2.tools.math.Jama.EigenvalueDecomposition; diff --git a/src/eva2/server/go/operators/mutation/MutateESStandard.java b/src/eva2/optimization/operators/mutation/MutateESStandard.java similarity index 99% rename from src/eva2/server/go/operators/mutation/MutateESStandard.java rename to src/eva2/optimization/operators/mutation/MutateESStandard.java index 95e714e8..a1386506 100644 --- a/src/eva2/server/go/operators/mutation/MutateESStandard.java +++ b/src/eva2/optimization/operators/mutation/MutateESStandard.java @@ -1,3 +1,5 @@ +package eva2.optimization.operators.mutation; + //package eva2.server.go.operators.mutation; // //import eva2.server.go.individuals.AbstractEAIndividual; diff --git a/src/eva2/server/go/operators/mutation/MutateESSuccessRule.java b/src/eva2/optimization/operators/mutation/MutateESSuccessRule.java similarity index 97% rename from src/eva2/server/go/operators/mutation/MutateESSuccessRule.java rename to src/eva2/optimization/operators/mutation/MutateESSuccessRule.java index 4e8eb6af..dae18a4e 100644 --- a/src/eva2/server/go/operators/mutation/MutateESSuccessRule.java +++ b/src/eva2/optimization/operators/mutation/MutateESSuccessRule.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.mutation; +package eva2.optimization.operators.mutation; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; /** * Success rule implementation. diff --git a/src/eva2/server/go/operators/mutation/MutateGAAdaptive.java b/src/eva2/optimization/operators/mutation/MutateGAAdaptive.java similarity index 95% rename from src/eva2/server/go/operators/mutation/MutateGAAdaptive.java rename to src/eva2/optimization/operators/mutation/MutateGAAdaptive.java index 97c93719..1bd1b4c1 100644 --- a/src/eva2/server/go/operators/mutation/MutateGAAdaptive.java +++ b/src/eva2/optimization/operators/mutation/MutateGAAdaptive.java @@ -1,10 +1,10 @@ -package eva2.server.go.operators.mutation; +package eva2.optimization.operators.mutation; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceGAIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceGAIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import java.util.BitSet; diff --git a/src/eva2/server/go/operators/mutation/MutateGAGISwapBits.java b/src/eva2/optimization/operators/mutation/MutateGAGISwapBits.java similarity index 96% rename from src/eva2/server/go/operators/mutation/MutateGAGISwapBits.java rename to src/eva2/optimization/operators/mutation/MutateGAGISwapBits.java index 8634e4c0..404b1885 100644 --- a/src/eva2/server/go/operators/mutation/MutateGAGISwapBits.java +++ b/src/eva2/optimization/operators/mutation/MutateGAGISwapBits.java @@ -1,10 +1,10 @@ -package eva2.server.go.operators.mutation; +package eva2.optimization.operators.mutation; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceGAIndividual; -import eva2.server.go.individuals.InterfaceGIIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceGAIndividual; +import eva2.optimization.individuals.InterfaceGIIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import java.util.BitSet; diff --git a/src/eva2/server/go/operators/mutation/MutateGAGISwapBitsSegmentwise.java b/src/eva2/optimization/operators/mutation/MutateGAGISwapBitsSegmentwise.java similarity index 94% rename from src/eva2/server/go/operators/mutation/MutateGAGISwapBitsSegmentwise.java rename to src/eva2/optimization/operators/mutation/MutateGAGISwapBitsSegmentwise.java index eae1edfc..32e1767b 100644 --- a/src/eva2/server/go/operators/mutation/MutateGAGISwapBitsSegmentwise.java +++ b/src/eva2/optimization/operators/mutation/MutateGAGISwapBitsSegmentwise.java @@ -1,4 +1,4 @@ -package eva2.server.go.operators.mutation; +package eva2.optimization.operators.mutation; import eva2.tools.EVAERROR; import java.io.Serializable; diff --git a/src/eva2/server/go/operators/mutation/MutateGAInvertBits.java b/src/eva2/optimization/operators/mutation/MutateGAInvertBits.java similarity index 95% rename from src/eva2/server/go/operators/mutation/MutateGAInvertBits.java rename to src/eva2/optimization/operators/mutation/MutateGAInvertBits.java index 3acb4f76..67350780 100644 --- a/src/eva2/server/go/operators/mutation/MutateGAInvertBits.java +++ b/src/eva2/optimization/operators/mutation/MutateGAInvertBits.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.mutation; +package eva2.optimization.operators.mutation; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceGAIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceGAIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import java.util.BitSet; diff --git a/src/eva2/server/go/operators/mutation/MutateGANBit.java b/src/eva2/optimization/operators/mutation/MutateGANBit.java similarity index 93% rename from src/eva2/server/go/operators/mutation/MutateGANBit.java rename to src/eva2/optimization/operators/mutation/MutateGANBit.java index 1987c3bd..d027f226 100644 --- a/src/eva2/server/go/operators/mutation/MutateGANBit.java +++ b/src/eva2/optimization/operators/mutation/MutateGANBit.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.mutation; +package eva2.optimization.operators.mutation; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceGAIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceGAIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import java.util.BitSet; diff --git a/src/eva2/server/go/operators/mutation/MutateGAShiftSubstring.java b/src/eva2/optimization/operators/mutation/MutateGAShiftSubstring.java similarity index 95% rename from src/eva2/server/go/operators/mutation/MutateGAShiftSubstring.java rename to src/eva2/optimization/operators/mutation/MutateGAShiftSubstring.java index 17c348a4..b25296ee 100644 --- a/src/eva2/server/go/operators/mutation/MutateGAShiftSubstring.java +++ b/src/eva2/optimization/operators/mutation/MutateGAShiftSubstring.java @@ -1,10 +1,10 @@ -package eva2.server.go.operators.mutation; +package eva2.optimization.operators.mutation; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceGAIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceGAIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import java.util.BitSet; diff --git a/src/eva2/server/go/operators/mutation/MutateGASwapBitsSegmentwise.java b/src/eva2/optimization/operators/mutation/MutateGASwapBitsSegmentwise.java similarity index 96% rename from src/eva2/server/go/operators/mutation/MutateGASwapBitsSegmentwise.java rename to src/eva2/optimization/operators/mutation/MutateGASwapBitsSegmentwise.java index 27065a67..784d4a25 100644 --- a/src/eva2/server/go/operators/mutation/MutateGASwapBitsSegmentwise.java +++ b/src/eva2/optimization/operators/mutation/MutateGASwapBitsSegmentwise.java @@ -1,10 +1,10 @@ -package eva2.server.go.operators.mutation; +package eva2.optimization.operators.mutation; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceGAIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceGAIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.EVAERROR; import eva2.tools.math.RNG; import java.util.BitSet; diff --git a/src/eva2/server/go/operators/mutation/MutateGAUniform.java b/src/eva2/optimization/operators/mutation/MutateGAUniform.java similarity index 91% rename from src/eva2/server/go/operators/mutation/MutateGAUniform.java rename to src/eva2/optimization/operators/mutation/MutateGAUniform.java index 5648838b..681f0b95 100644 --- a/src/eva2/server/go/operators/mutation/MutateGAUniform.java +++ b/src/eva2/optimization/operators/mutation/MutateGAUniform.java @@ -1,10 +1,10 @@ -package eva2.server.go.operators.mutation; +package eva2.optimization.operators.mutation; import eva2.gui.GenericObjectEditor; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceGAIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceGAIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.EVAERROR; import eva2.tools.math.RNG; import java.io.Serializable; diff --git a/src/eva2/server/go/operators/mutation/MutateGIInsertDelete.java b/src/eva2/optimization/operators/mutation/MutateGIInsertDelete.java similarity index 95% rename from src/eva2/server/go/operators/mutation/MutateGIInsertDelete.java rename to src/eva2/optimization/operators/mutation/MutateGIInsertDelete.java index d935fd96..e94a9a66 100644 --- a/src/eva2/server/go/operators/mutation/MutateGIInsertDelete.java +++ b/src/eva2/optimization/operators/mutation/MutateGIInsertDelete.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.mutation; +package eva2.optimization.operators.mutation; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceGIIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceGIIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** diff --git a/src/eva2/server/go/operators/mutation/MutateGIInvert.java b/src/eva2/optimization/operators/mutation/MutateGIInvert.java similarity index 94% rename from src/eva2/server/go/operators/mutation/MutateGIInvert.java rename to src/eva2/optimization/operators/mutation/MutateGIInvert.java index eecf8cad..001134f6 100644 --- a/src/eva2/server/go/operators/mutation/MutateGIInvert.java +++ b/src/eva2/optimization/operators/mutation/MutateGIInvert.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.mutation; +package eva2.optimization.operators.mutation; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceGIIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceGIIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** diff --git a/src/eva2/server/go/operators/mutation/MutateGINominal.java b/src/eva2/optimization/operators/mutation/MutateGINominal.java similarity index 93% rename from src/eva2/server/go/operators/mutation/MutateGINominal.java rename to src/eva2/optimization/operators/mutation/MutateGINominal.java index ece11ca6..4dad197a 100644 --- a/src/eva2/server/go/operators/mutation/MutateGINominal.java +++ b/src/eva2/optimization/operators/mutation/MutateGINominal.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.mutation; +package eva2.optimization.operators.mutation; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceGIIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceGIIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** diff --git a/src/eva2/server/go/operators/mutation/MutateGIOrdinal.java b/src/eva2/optimization/operators/mutation/MutateGIOrdinal.java similarity index 94% rename from src/eva2/server/go/operators/mutation/MutateGIOrdinal.java rename to src/eva2/optimization/operators/mutation/MutateGIOrdinal.java index 0dba2d6c..524b7a70 100644 --- a/src/eva2/server/go/operators/mutation/MutateGIOrdinal.java +++ b/src/eva2/optimization/operators/mutation/MutateGIOrdinal.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.mutation; +package eva2.optimization.operators.mutation; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceGIIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceGIIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** diff --git a/src/eva2/server/go/operators/mutation/MutateGISubset.java b/src/eva2/optimization/operators/mutation/MutateGISubset.java similarity index 91% rename from src/eva2/server/go/operators/mutation/MutateGISubset.java rename to src/eva2/optimization/operators/mutation/MutateGISubset.java index 145dc7b1..4e6b94e8 100644 --- a/src/eva2/server/go/operators/mutation/MutateGISubset.java +++ b/src/eva2/optimization/operators/mutation/MutateGISubset.java @@ -1,10 +1,10 @@ -package eva2.server.go.operators.mutation; +package eva2.optimization.operators.mutation; import eva2.gui.BeanInspector; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceGIIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceGIIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.EVAERROR; import eva2.tools.math.RNG; import java.io.Serializable; diff --git a/src/eva2/server/go/operators/mutation/MutateGITranslocate.java b/src/eva2/optimization/operators/mutation/MutateGITranslocate.java similarity index 96% rename from src/eva2/server/go/operators/mutation/MutateGITranslocate.java rename to src/eva2/optimization/operators/mutation/MutateGITranslocate.java index 7fca7cc1..ff248c36 100644 --- a/src/eva2/server/go/operators/mutation/MutateGITranslocate.java +++ b/src/eva2/optimization/operators/mutation/MutateGITranslocate.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.mutation; +package eva2.optimization.operators.mutation; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceGIIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceGIIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; diff --git a/src/eva2/server/go/operators/mutation/MutateGPAdaptive.java b/src/eva2/optimization/operators/mutation/MutateGPAdaptive.java similarity index 94% rename from src/eva2/server/go/operators/mutation/MutateGPAdaptive.java rename to src/eva2/optimization/operators/mutation/MutateGPAdaptive.java index 87f46c96..20c0029b 100644 --- a/src/eva2/server/go/operators/mutation/MutateGPAdaptive.java +++ b/src/eva2/optimization/operators/mutation/MutateGPAdaptive.java @@ -1,11 +1,11 @@ -package eva2.server.go.operators.mutation; +package eva2.optimization.operators.mutation; -import eva2.server.go.IndividualInterface; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceGPIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.go.IndividualInterface; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceGPIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** diff --git a/src/eva2/server/go/operators/mutation/MutateGPSingleNode.java b/src/eva2/optimization/operators/mutation/MutateGPSingleNode.java similarity index 92% rename from src/eva2/server/go/operators/mutation/MutateGPSingleNode.java rename to src/eva2/optimization/operators/mutation/MutateGPSingleNode.java index 200d9140..9dcdbe6b 100644 --- a/src/eva2/server/go/operators/mutation/MutateGPSingleNode.java +++ b/src/eva2/optimization/operators/mutation/MutateGPSingleNode.java @@ -1,12 +1,12 @@ -package eva2.server.go.operators.mutation; +package eva2.optimization.operators.mutation; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceGPIndividual; -import eva2.server.go.individuals.codings.gp.AbstractGPNode; -import eva2.server.go.individuals.codings.gp.GPArea; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceGPIndividual; +import eva2.optimization.individuals.codings.gp.AbstractGPNode; +import eva2.optimization.individuals.codings.gp.GPArea; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import java.util.ArrayList; diff --git a/src/eva2/server/go/operators/mutation/MutateOBGAFlip.java b/src/eva2/optimization/operators/mutation/MutateOBGAFlip.java similarity index 91% rename from src/eva2/server/go/operators/mutation/MutateOBGAFlip.java rename to src/eva2/optimization/operators/mutation/MutateOBGAFlip.java index 55fe469f..66fa0fc7 100644 --- a/src/eva2/server/go/operators/mutation/MutateOBGAFlip.java +++ b/src/eva2/optimization/operators/mutation/MutateOBGAFlip.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.mutation; +package eva2.optimization.operators.mutation; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceOBGAIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceOBGAIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; diff --git a/src/eva2/server/go/operators/mutation/MutateOBGAInversion.java b/src/eva2/optimization/operators/mutation/MutateOBGAInversion.java similarity index 89% rename from src/eva2/server/go/operators/mutation/MutateOBGAInversion.java rename to src/eva2/optimization/operators/mutation/MutateOBGAInversion.java index 59ab023a..da5f7536 100644 --- a/src/eva2/server/go/operators/mutation/MutateOBGAInversion.java +++ b/src/eva2/optimization/operators/mutation/MutateOBGAInversion.java @@ -1,10 +1,10 @@ -package eva2.server.go.operators.mutation; +package eva2.optimization.operators.mutation; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceDataTypePermutation; -import eva2.server.go.individuals.InterfaceOBGAIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceDataTypePermutation; +import eva2.optimization.individuals.InterfaceOBGAIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; diff --git a/src/eva2/server/go/operators/mutation/NoMutation.java b/src/eva2/optimization/operators/mutation/NoMutation.java similarity index 91% rename from src/eva2/server/go/operators/mutation/NoMutation.java rename to src/eva2/optimization/operators/mutation/NoMutation.java index 8b3ecc7b..35383301 100644 --- a/src/eva2/server/go/operators/mutation/NoMutation.java +++ b/src/eva2/optimization/operators/mutation/NoMutation.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.mutation; +package eva2.optimization.operators.mutation; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/mutation/PropertyMutationMixer.java b/src/eva2/optimization/operators/mutation/PropertyMutationMixer.java similarity index 99% rename from src/eva2/server/go/operators/mutation/PropertyMutationMixer.java rename to src/eva2/optimization/operators/mutation/PropertyMutationMixer.java index 909f0e7b..32d93882 100644 --- a/src/eva2/server/go/operators/mutation/PropertyMutationMixer.java +++ b/src/eva2/optimization/operators/mutation/PropertyMutationMixer.java @@ -1,4 +1,4 @@ -package eva2.server.go.operators.mutation; +package eva2.optimization.operators.mutation; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/mutation/PropertyMutationMixerEditor.java b/src/eva2/optimization/operators/mutation/PropertyMutationMixerEditor.java similarity index 98% rename from src/eva2/server/go/operators/mutation/PropertyMutationMixerEditor.java rename to src/eva2/optimization/operators/mutation/PropertyMutationMixerEditor.java index d5a112ab..fcc7f1ae 100644 --- a/src/eva2/server/go/operators/mutation/PropertyMutationMixerEditor.java +++ b/src/eva2/optimization/operators/mutation/PropertyMutationMixerEditor.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.mutation; +package eva2.optimization.operators.mutation; import eva2.gui.*; -import eva2.server.go.tools.AbstractObjectEditor; -import eva2.server.go.tools.GeneralGEOFaker; -import eva2.server.go.tools.GeneralGOEProperty; +import eva2.optimization.tools.AbstractObjectEditor; +import eva2.optimization.tools.GeneralGEOFaker; +import eva2.optimization.tools.GeneralGOEProperty; import eva2.tools.BasicResourceLoader; import java.awt.*; import java.awt.event.ActionEvent; diff --git a/src/eva2/server/go/operators/nichepso/absorption/ConsiderPBestAbsorptionStrategy.java b/src/eva2/optimization/operators/nichepso/absorption/ConsiderPBestAbsorptionStrategy.java similarity index 87% rename from src/eva2/server/go/operators/nichepso/absorption/ConsiderPBestAbsorptionStrategy.java rename to src/eva2/optimization/operators/nichepso/absorption/ConsiderPBestAbsorptionStrategy.java index 6b4174b4..b119c317 100644 --- a/src/eva2/server/go/operators/nichepso/absorption/ConsiderPBestAbsorptionStrategy.java +++ b/src/eva2/optimization/operators/nichepso/absorption/ConsiderPBestAbsorptionStrategy.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.nichepso.absorption; +package eva2.optimization.operators.nichepso.absorption; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.strategies.ParticleSubSwarmOptimization; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.strategies.ParticleSubSwarmOptimization; /** * Particles are absorbed into a subswarm if they move into an area covered by that subswarm. diff --git a/src/eva2/server/go/operators/nichepso/absorption/EuclideanDiversityAbsorptionStrategy.java b/src/eva2/optimization/operators/nichepso/absorption/EuclideanDiversityAbsorptionStrategy.java similarity index 91% rename from src/eva2/server/go/operators/nichepso/absorption/EuclideanDiversityAbsorptionStrategy.java rename to src/eva2/optimization/operators/nichepso/absorption/EuclideanDiversityAbsorptionStrategy.java index 2ed39676..ebeec84a 100644 --- a/src/eva2/server/go/operators/nichepso/absorption/EuclideanDiversityAbsorptionStrategy.java +++ b/src/eva2/optimization/operators/nichepso/absorption/EuclideanDiversityAbsorptionStrategy.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.nichepso.absorption; +package eva2.optimization.operators.nichepso.absorption; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.strategies.ParticleSubSwarmOptimization; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.strategies.ParticleSubSwarmOptimization; /** * A threshold epsilon is proposed in [1] in order to prevent premature absorptions diff --git a/src/eva2/server/go/operators/nichepso/absorption/InterfaceAbsorptionStrategy.java b/src/eva2/optimization/operators/nichepso/absorption/InterfaceAbsorptionStrategy.java similarity index 82% rename from src/eva2/server/go/operators/nichepso/absorption/InterfaceAbsorptionStrategy.java rename to src/eva2/optimization/operators/nichepso/absorption/InterfaceAbsorptionStrategy.java index 97e54d74..a5d154fe 100644 --- a/src/eva2/server/go/operators/nichepso/absorption/InterfaceAbsorptionStrategy.java +++ b/src/eva2/optimization/operators/nichepso/absorption/InterfaceAbsorptionStrategy.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.nichepso.absorption; +package eva2.optimization.operators.nichepso.absorption; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.strategies.ParticleSubSwarmOptimization; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.strategies.ParticleSubSwarmOptimization; /** * interface for the absorption strategies used in NichePSO diff --git a/src/eva2/server/go/operators/nichepso/absorption/StandardAbsorptionStrategy.java b/src/eva2/optimization/operators/nichepso/absorption/StandardAbsorptionStrategy.java similarity index 92% rename from src/eva2/server/go/operators/nichepso/absorption/StandardAbsorptionStrategy.java rename to src/eva2/optimization/operators/nichepso/absorption/StandardAbsorptionStrategy.java index 80902ccd..aaa0bc30 100644 --- a/src/eva2/server/go/operators/nichepso/absorption/StandardAbsorptionStrategy.java +++ b/src/eva2/optimization/operators/nichepso/absorption/StandardAbsorptionStrategy.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.nichepso.absorption; +package eva2.optimization.operators.nichepso.absorption; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.strategies.ParticleSubSwarmOptimization; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.strategies.ParticleSubSwarmOptimization; /** * Particles are absorbed into a subswarm when they move into an area diff --git a/src/eva2/server/go/operators/nichepso/deactivation/DummyDeactivationStrategy.java b/src/eva2/optimization/operators/nichepso/deactivation/DummyDeactivationStrategy.java similarity index 77% rename from src/eva2/server/go/operators/nichepso/deactivation/DummyDeactivationStrategy.java rename to src/eva2/optimization/operators/nichepso/deactivation/DummyDeactivationStrategy.java index e437c167..2351928a 100644 --- a/src/eva2/server/go/operators/nichepso/deactivation/DummyDeactivationStrategy.java +++ b/src/eva2/optimization/operators/nichepso/deactivation/DummyDeactivationStrategy.java @@ -1,6 +1,6 @@ -package eva2.server.go.operators.nichepso.deactivation; +package eva2.optimization.operators.nichepso.deactivation; -import eva2.server.go.strategies.ParticleSubSwarmOptimization; +import eva2.optimization.strategies.ParticleSubSwarmOptimization; /** * dummy strategy does not deactivate anything diff --git a/src/eva2/server/go/operators/nichepso/deactivation/ImprovementDeactivationStrategy.java b/src/eva2/optimization/operators/nichepso/deactivation/ImprovementDeactivationStrategy.java similarity index 92% rename from src/eva2/server/go/operators/nichepso/deactivation/ImprovementDeactivationStrategy.java rename to src/eva2/optimization/operators/nichepso/deactivation/ImprovementDeactivationStrategy.java index 3466c4fc..eb412212 100644 --- a/src/eva2/server/go/operators/nichepso/deactivation/ImprovementDeactivationStrategy.java +++ b/src/eva2/optimization/operators/nichepso/deactivation/ImprovementDeactivationStrategy.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.nichepso.deactivation; +package eva2.optimization.operators.nichepso.deactivation; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.strategies.NichePSO; -import eva2.server.go.strategies.ParticleSubSwarmOptimization; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.strategies.NichePSO; +import eva2.optimization.strategies.ParticleSubSwarmOptimization; import eva2.tools.EVAERROR; import java.util.List; import java.util.Vector; diff --git a/src/eva2/server/go/operators/nichepso/deactivation/InterfaceDeactivationStrategy.java b/src/eva2/optimization/operators/nichepso/deactivation/InterfaceDeactivationStrategy.java similarity index 83% rename from src/eva2/server/go/operators/nichepso/deactivation/InterfaceDeactivationStrategy.java rename to src/eva2/optimization/operators/nichepso/deactivation/InterfaceDeactivationStrategy.java index 61194a49..0f71df38 100644 --- a/src/eva2/server/go/operators/nichepso/deactivation/InterfaceDeactivationStrategy.java +++ b/src/eva2/optimization/operators/nichepso/deactivation/InterfaceDeactivationStrategy.java @@ -1,6 +1,6 @@ -package eva2.server.go.operators.nichepso.deactivation; +package eva2.optimization.operators.nichepso.deactivation; -import eva2.server.go.strategies.ParticleSubSwarmOptimization; +import eva2.optimization.strategies.ParticleSubSwarmOptimization; /** * interface for the deactivation strategies used in NichePSO/ANPSO diff --git a/src/eva2/server/go/operators/nichepso/deactivation/StandardDeactivationStrategy.java b/src/eva2/optimization/operators/nichepso/deactivation/StandardDeactivationStrategy.java similarity index 92% rename from src/eva2/server/go/operators/nichepso/deactivation/StandardDeactivationStrategy.java rename to src/eva2/optimization/operators/nichepso/deactivation/StandardDeactivationStrategy.java index 41fe576d..9b63d8cf 100644 --- a/src/eva2/server/go/operators/nichepso/deactivation/StandardDeactivationStrategy.java +++ b/src/eva2/optimization/operators/nichepso/deactivation/StandardDeactivationStrategy.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.nichepso.deactivation; +package eva2.optimization.operators.nichepso.deactivation; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.strategies.NichePSO; -import eva2.server.go.strategies.ParticleSubSwarmOptimization; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.strategies.NichePSO; +import eva2.optimization.strategies.ParticleSubSwarmOptimization; import eva2.tools.EVAERROR; import java.util.Vector; diff --git a/src/eva2/server/go/operators/nichepso/merging/InterfaceMergingStrategy.java b/src/eva2/optimization/operators/nichepso/merging/InterfaceMergingStrategy.java similarity index 86% rename from src/eva2/server/go/operators/nichepso/merging/InterfaceMergingStrategy.java rename to src/eva2/optimization/operators/nichepso/merging/InterfaceMergingStrategy.java index 8d3da3b2..f8025e9e 100644 --- a/src/eva2/server/go/operators/nichepso/merging/InterfaceMergingStrategy.java +++ b/src/eva2/optimization/operators/nichepso/merging/InterfaceMergingStrategy.java @@ -1,6 +1,6 @@ -package eva2.server.go.operators.nichepso.merging; +package eva2.optimization.operators.nichepso.merging; -import eva2.server.go.strategies.ParticleSubSwarmOptimization; +import eva2.optimization.strategies.ParticleSubSwarmOptimization; import java.util.Vector; diff --git a/src/eva2/server/go/operators/nichepso/merging/ScatterMergingStrategy.java b/src/eva2/optimization/operators/nichepso/merging/ScatterMergingStrategy.java similarity index 93% rename from src/eva2/server/go/operators/nichepso/merging/ScatterMergingStrategy.java rename to src/eva2/optimization/operators/nichepso/merging/ScatterMergingStrategy.java index da243f70..f04c91e4 100644 --- a/src/eva2/server/go/operators/nichepso/merging/ScatterMergingStrategy.java +++ b/src/eva2/optimization/operators/nichepso/merging/ScatterMergingStrategy.java @@ -1,6 +1,6 @@ -package eva2.server.go.operators.nichepso.merging; +package eva2.optimization.operators.nichepso.merging; -import eva2.server.go.strategies.ParticleSubSwarmOptimization; +import eva2.optimization.strategies.ParticleSubSwarmOptimization; import java.util.Vector; diff --git a/src/eva2/server/go/operators/nichepso/merging/StandardMergingStrategy.java b/src/eva2/optimization/operators/nichepso/merging/StandardMergingStrategy.java similarity index 90% rename from src/eva2/server/go/operators/nichepso/merging/StandardMergingStrategy.java rename to src/eva2/optimization/operators/nichepso/merging/StandardMergingStrategy.java index 3bfb437e..bb755949 100644 --- a/src/eva2/server/go/operators/nichepso/merging/StandardMergingStrategy.java +++ b/src/eva2/optimization/operators/nichepso/merging/StandardMergingStrategy.java @@ -1,10 +1,10 @@ -package eva2.server.go.operators.nichepso.merging; +package eva2.optimization.operators.nichepso.merging; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceESIndividual; -import eva2.server.go.operators.distancemetric.EuclideanMetric; -import eva2.server.go.operators.distancemetric.PhenotypeMetric; -import eva2.server.go.strategies.ParticleSubSwarmOptimization; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceESIndividual; +import eva2.optimization.operators.distancemetric.EuclideanMetric; +import eva2.optimization.operators.distancemetric.PhenotypeMetric; +import eva2.optimization.strategies.ParticleSubSwarmOptimization; import java.util.Vector; /** diff --git a/src/eva2/server/go/operators/nichepso/subswarmcreation/DummySubswarmCreationStrategy.java b/src/eva2/optimization/operators/nichepso/subswarmcreation/DummySubswarmCreationStrategy.java similarity index 72% rename from src/eva2/server/go/operators/nichepso/subswarmcreation/DummySubswarmCreationStrategy.java rename to src/eva2/optimization/operators/nichepso/subswarmcreation/DummySubswarmCreationStrategy.java index 952df39e..02ac637a 100644 --- a/src/eva2/server/go/operators/nichepso/subswarmcreation/DummySubswarmCreationStrategy.java +++ b/src/eva2/optimization/operators/nichepso/subswarmcreation/DummySubswarmCreationStrategy.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.nichepso.subswarmcreation; +package eva2.optimization.operators.nichepso.subswarmcreation; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.strategies.ParticleSubSwarmOptimization; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.strategies.ParticleSubSwarmOptimization; public class DummySubswarmCreationStrategy implements InterfaceSubswarmCreationStrategy { diff --git a/src/eva2/server/go/operators/nichepso/subswarmcreation/GenerateNeighborSubswarmCreationStrategy.java b/src/eva2/optimization/operators/nichepso/subswarmcreation/GenerateNeighborSubswarmCreationStrategy.java similarity index 89% rename from src/eva2/server/go/operators/nichepso/subswarmcreation/GenerateNeighborSubswarmCreationStrategy.java rename to src/eva2/optimization/operators/nichepso/subswarmcreation/GenerateNeighborSubswarmCreationStrategy.java index d08b6160..c1d6339d 100644 --- a/src/eva2/server/go/operators/nichepso/subswarmcreation/GenerateNeighborSubswarmCreationStrategy.java +++ b/src/eva2/optimization/operators/nichepso/subswarmcreation/GenerateNeighborSubswarmCreationStrategy.java @@ -1,10 +1,10 @@ -package eva2.server.go.operators.nichepso.subswarmcreation; +package eva2.optimization.operators.nichepso.subswarmcreation; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.ESIndividualDoubleData; -import eva2.server.go.operators.mutation.MutateESFixedStepSize; -import eva2.server.go.populations.Population; -import eva2.server.go.strategies.ParticleSubSwarmOptimization; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.ESIndividualDoubleData; +import eva2.optimization.operators.mutation.MutateESFixedStepSize; +import eva2.optimization.populations.Population; +import eva2.optimization.strategies.ParticleSubSwarmOptimization; /** * The standard deviation in the fitness of each main swarm particle over the last 3 iterations is calculated. diff --git a/src/eva2/server/go/operators/nichepso/subswarmcreation/InterfaceSubswarmCreationStrategy.java b/src/eva2/optimization/operators/nichepso/subswarmcreation/InterfaceSubswarmCreationStrategy.java similarity index 82% rename from src/eva2/server/go/operators/nichepso/subswarmcreation/InterfaceSubswarmCreationStrategy.java rename to src/eva2/optimization/operators/nichepso/subswarmcreation/InterfaceSubswarmCreationStrategy.java index dadf3763..7d0b3d61 100644 --- a/src/eva2/server/go/operators/nichepso/subswarmcreation/InterfaceSubswarmCreationStrategy.java +++ b/src/eva2/optimization/operators/nichepso/subswarmcreation/InterfaceSubswarmCreationStrategy.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.nichepso.subswarmcreation; +package eva2.optimization.operators.nichepso.subswarmcreation; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.strategies.ParticleSubSwarmOptimization; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.strategies.ParticleSubSwarmOptimization; /** * interface for the subswarm creation strategies used in NichePSO diff --git a/src/eva2/server/go/operators/nichepso/subswarmcreation/StandardSubswarmCreationStrategy.java b/src/eva2/optimization/operators/nichepso/subswarmcreation/StandardSubswarmCreationStrategy.java similarity index 91% rename from src/eva2/server/go/operators/nichepso/subswarmcreation/StandardSubswarmCreationStrategy.java rename to src/eva2/optimization/operators/nichepso/subswarmcreation/StandardSubswarmCreationStrategy.java index b8f384d8..d6b6a548 100644 --- a/src/eva2/server/go/operators/nichepso/subswarmcreation/StandardSubswarmCreationStrategy.java +++ b/src/eva2/optimization/operators/nichepso/subswarmcreation/StandardSubswarmCreationStrategy.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.nichepso.subswarmcreation; +package eva2.optimization.operators.nichepso.subswarmcreation; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.strategies.NichePSO; -import eva2.server.go.strategies.ParticleSubSwarmOptimization; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.strategies.NichePSO; +import eva2.optimization.strategies.ParticleSubSwarmOptimization; /** * The standard deviation in the fitness of each main swarm particle over the last 3 iterations is calculated. diff --git a/src/eva2/server/go/operators/paramcontrol/AbstractAdaptiveParameters.java b/src/eva2/optimization/operators/paramcontrol/AbstractAdaptiveParameters.java similarity index 98% rename from src/eva2/server/go/operators/paramcontrol/AbstractAdaptiveParameters.java rename to src/eva2/optimization/operators/paramcontrol/AbstractAdaptiveParameters.java index a66fb88f..eb492650 100644 --- a/src/eva2/server/go/operators/paramcontrol/AbstractAdaptiveParameters.java +++ b/src/eva2/optimization/operators/paramcontrol/AbstractAdaptiveParameters.java @@ -1,3 +1,5 @@ +package eva2.optimization.operators.paramcontrol; + //package eva2.server.go.operators.paramcontrol; // //import java.io.Serializable; diff --git a/src/eva2/server/go/operators/paramcontrol/AbstractLinearParamAdaption.java b/src/eva2/optimization/operators/paramcontrol/AbstractLinearParamAdaption.java similarity index 94% rename from src/eva2/server/go/operators/paramcontrol/AbstractLinearParamAdaption.java rename to src/eva2/optimization/operators/paramcontrol/AbstractLinearParamAdaption.java index 78a7e235..2a3873cb 100644 --- a/src/eva2/server/go/operators/paramcontrol/AbstractLinearParamAdaption.java +++ b/src/eva2/optimization/operators/paramcontrol/AbstractLinearParamAdaption.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.paramcontrol; +package eva2.optimization.operators.paramcontrol; import eva2.gui.BeanInspector; -import eva2.server.go.populations.Population; +import eva2.optimization.populations.Population; import eva2.tools.math.Mathematics; import java.io.Serializable; diff --git a/src/eva2/server/go/operators/paramcontrol/AbstractParameterControl.java b/src/eva2/optimization/operators/paramcontrol/AbstractParameterControl.java similarity index 97% rename from src/eva2/server/go/operators/paramcontrol/AbstractParameterControl.java rename to src/eva2/optimization/operators/paramcontrol/AbstractParameterControl.java index 4ccfe483..bcb319f1 100644 --- a/src/eva2/server/go/operators/paramcontrol/AbstractParameterControl.java +++ b/src/eva2/optimization/operators/paramcontrol/AbstractParameterControl.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.paramcontrol; +package eva2.optimization.operators.paramcontrol; import eva2.gui.BeanInspector; -import eva2.server.go.populations.Population; +import eva2.optimization.populations.Population; /** * Convenience class. Besides the init() method, two more remain to be implemented: diff --git a/src/eva2/server/go/operators/paramcontrol/AdaptivityEnum.java b/src/eva2/optimization/operators/paramcontrol/AdaptivityEnum.java similarity index 79% rename from src/eva2/server/go/operators/paramcontrol/AdaptivityEnum.java rename to src/eva2/optimization/operators/paramcontrol/AdaptivityEnum.java index a66a8873..5fdbae1a 100644 --- a/src/eva2/server/go/operators/paramcontrol/AdaptivityEnum.java +++ b/src/eva2/optimization/operators/paramcontrol/AdaptivityEnum.java @@ -1,3 +1,5 @@ +package eva2.optimization.operators.paramcontrol; + //package eva2.server.go.operators.paramcontrol; // ///** diff --git a/src/eva2/server/go/operators/paramcontrol/CbpsoFitnessThresholdBasedAdaption.java b/src/eva2/optimization/operators/paramcontrol/CbpsoFitnessThresholdBasedAdaption.java similarity index 97% rename from src/eva2/server/go/operators/paramcontrol/CbpsoFitnessThresholdBasedAdaption.java rename to src/eva2/optimization/operators/paramcontrol/CbpsoFitnessThresholdBasedAdaption.java index 3aae69b9..bc8bfdf8 100644 --- a/src/eva2/server/go/operators/paramcontrol/CbpsoFitnessThresholdBasedAdaption.java +++ b/src/eva2/optimization/operators/paramcontrol/CbpsoFitnessThresholdBasedAdaption.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.paramcontrol; +package eva2.optimization.operators.paramcontrol; -import eva2.server.go.populations.Population; -import eva2.server.go.strategies.CBNPSO; +import eva2.optimization.populations.Population; +import eva2.optimization.strategies.CBNPSO; import java.io.Serializable; /** diff --git a/src/eva2/server/go/operators/paramcontrol/ConstantParameters.java b/src/eva2/optimization/operators/paramcontrol/ConstantParameters.java similarity index 88% rename from src/eva2/server/go/operators/paramcontrol/ConstantParameters.java rename to src/eva2/optimization/operators/paramcontrol/ConstantParameters.java index 34c9725d..0d798fa9 100644 --- a/src/eva2/server/go/operators/paramcontrol/ConstantParameters.java +++ b/src/eva2/optimization/operators/paramcontrol/ConstantParameters.java @@ -1,6 +1,6 @@ -package eva2.server.go.operators.paramcontrol; +package eva2.optimization.operators.paramcontrol; -import eva2.server.go.populations.Population; +import eva2.optimization.populations.Population; import java.io.Serializable; /** diff --git a/src/eva2/server/go/operators/paramcontrol/ConstraintBasedAdaption.java b/src/eva2/optimization/operators/paramcontrol/ConstraintBasedAdaption.java similarity index 96% rename from src/eva2/server/go/operators/paramcontrol/ConstraintBasedAdaption.java rename to src/eva2/optimization/operators/paramcontrol/ConstraintBasedAdaption.java index a065c852..12360176 100644 --- a/src/eva2/server/go/operators/paramcontrol/ConstraintBasedAdaption.java +++ b/src/eva2/optimization/operators/paramcontrol/ConstraintBasedAdaption.java @@ -1,8 +1,8 @@ -package eva2.server.go.operators.paramcontrol; +package eva2.optimization.operators.paramcontrol; -import eva2.server.go.individuals.InterfaceDataTypeDouble; -import eva2.server.go.operators.constraint.AbstractConstraint; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.InterfaceDataTypeDouble; +import eva2.optimization.operators.constraint.AbstractConstraint; +import eva2.optimization.populations.Population; import eva2.tools.math.Mathematics; import java.io.Serializable; import java.util.LinkedList; diff --git a/src/eva2/server/go/operators/paramcontrol/ExponentialDecayAdaption.java b/src/eva2/optimization/operators/paramcontrol/ExponentialDecayAdaption.java similarity index 96% rename from src/eva2/server/go/operators/paramcontrol/ExponentialDecayAdaption.java rename to src/eva2/optimization/operators/paramcontrol/ExponentialDecayAdaption.java index 871065d0..7f017b77 100644 --- a/src/eva2/server/go/operators/paramcontrol/ExponentialDecayAdaption.java +++ b/src/eva2/optimization/operators/paramcontrol/ExponentialDecayAdaption.java @@ -1,6 +1,6 @@ -package eva2.server.go.operators.paramcontrol; +package eva2.optimization.operators.paramcontrol; -import eva2.server.go.populations.Population; +import eva2.optimization.populations.Population; import java.io.Serializable; /** diff --git a/src/eva2/server/go/operators/paramcontrol/GenericParamAdaption.java b/src/eva2/optimization/operators/paramcontrol/GenericParamAdaption.java similarity index 86% rename from src/eva2/server/go/operators/paramcontrol/GenericParamAdaption.java rename to src/eva2/optimization/operators/paramcontrol/GenericParamAdaption.java index 88200814..1f795de4 100644 --- a/src/eva2/server/go/operators/paramcontrol/GenericParamAdaption.java +++ b/src/eva2/optimization/operators/paramcontrol/GenericParamAdaption.java @@ -1,4 +1,4 @@ -package eva2.server.go.operators.paramcontrol; +package eva2.optimization.operators.paramcontrol; /** * This should be implemented by adaptors which can be applied to generic target properties. diff --git a/src/eva2/server/go/operators/paramcontrol/InterfaceHasUpperDoubleBound.java b/src/eva2/optimization/operators/paramcontrol/InterfaceHasUpperDoubleBound.java similarity index 83% rename from src/eva2/server/go/operators/paramcontrol/InterfaceHasUpperDoubleBound.java rename to src/eva2/optimization/operators/paramcontrol/InterfaceHasUpperDoubleBound.java index cd9ffbac..767a8127 100644 --- a/src/eva2/server/go/operators/paramcontrol/InterfaceHasUpperDoubleBound.java +++ b/src/eva2/optimization/operators/paramcontrol/InterfaceHasUpperDoubleBound.java @@ -1,4 +1,4 @@ -package eva2.server.go.operators.paramcontrol; +package eva2.optimization.operators.paramcontrol; /** * Interface for an instance which has a real valued upper bound of some kind which diff --git a/src/eva2/server/go/operators/paramcontrol/InterfaceParamControllable.java b/src/eva2/optimization/operators/paramcontrol/InterfaceParamControllable.java similarity index 88% rename from src/eva2/server/go/operators/paramcontrol/InterfaceParamControllable.java rename to src/eva2/optimization/operators/paramcontrol/InterfaceParamControllable.java index 8472c3b8..1de2d5b4 100644 --- a/src/eva2/server/go/operators/paramcontrol/InterfaceParamControllable.java +++ b/src/eva2/optimization/operators/paramcontrol/InterfaceParamControllable.java @@ -1,4 +1,4 @@ -package eva2.server.go.operators.paramcontrol; +package eva2.optimization.operators.paramcontrol; /** * An object which may be "controlled" dynamically using a String for access. diff --git a/src/eva2/server/go/operators/paramcontrol/InterfaceParameterControl.java b/src/eva2/optimization/operators/paramcontrol/InterfaceParameterControl.java similarity index 94% rename from src/eva2/server/go/operators/paramcontrol/InterfaceParameterControl.java rename to src/eva2/optimization/operators/paramcontrol/InterfaceParameterControl.java index 351fc451..02652556 100644 --- a/src/eva2/server/go/operators/paramcontrol/InterfaceParameterControl.java +++ b/src/eva2/optimization/operators/paramcontrol/InterfaceParameterControl.java @@ -1,6 +1,6 @@ -package eva2.server.go.operators.paramcontrol; +package eva2.optimization.operators.paramcontrol; -import eva2.server.go.populations.Population; +import eva2.optimization.populations.Population; /** * Interface for dynamic changes to object parameters. diff --git a/src/eva2/server/go/operators/paramcontrol/LinearParamAdaption.java b/src/eva2/optimization/operators/paramcontrol/LinearParamAdaption.java similarity index 97% rename from src/eva2/server/go/operators/paramcontrol/LinearParamAdaption.java rename to src/eva2/optimization/operators/paramcontrol/LinearParamAdaption.java index bf36125f..c91558ad 100644 --- a/src/eva2/server/go/operators/paramcontrol/LinearParamAdaption.java +++ b/src/eva2/optimization/operators/paramcontrol/LinearParamAdaption.java @@ -1,4 +1,4 @@ -package eva2.server.go.operators.paramcontrol; +package eva2.optimization.operators.paramcontrol; import java.io.Serializable; diff --git a/src/eva2/server/go/operators/paramcontrol/NoParamAdaption.java b/src/eva2/optimization/operators/paramcontrol/NoParamAdaption.java similarity index 88% rename from src/eva2/server/go/operators/paramcontrol/NoParamAdaption.java rename to src/eva2/optimization/operators/paramcontrol/NoParamAdaption.java index 249b5f5c..940e2fbe 100644 --- a/src/eva2/server/go/operators/paramcontrol/NoParamAdaption.java +++ b/src/eva2/optimization/operators/paramcontrol/NoParamAdaption.java @@ -1,6 +1,6 @@ -package eva2.server.go.operators.paramcontrol; +package eva2.optimization.operators.paramcontrol; -import eva2.server.go.populations.Population; +import eva2.optimization.populations.Population; import java.io.Serializable; /** diff --git a/src/eva2/server/go/operators/paramcontrol/PSOActivityFeedbackControl.java b/src/eva2/optimization/operators/paramcontrol/PSOActivityFeedbackControl.java similarity index 97% rename from src/eva2/server/go/operators/paramcontrol/PSOActivityFeedbackControl.java rename to src/eva2/optimization/operators/paramcontrol/PSOActivityFeedbackControl.java index 5769e1f4..2572b77f 100644 --- a/src/eva2/server/go/operators/paramcontrol/PSOActivityFeedbackControl.java +++ b/src/eva2/optimization/operators/paramcontrol/PSOActivityFeedbackControl.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.paramcontrol; +package eva2.optimization.operators.paramcontrol; -import eva2.server.go.populations.Population; -import eva2.server.go.strategies.ParticleSwarmOptimization; +import eva2.optimization.populations.Population; +import eva2.optimization.strategies.ParticleSwarmOptimization; import eva2.tools.math.Mathematics; import java.io.Serializable; diff --git a/src/eva2/server/go/operators/paramcontrol/PSOInertnessAdaption.java b/src/eva2/optimization/operators/paramcontrol/PSOInertnessAdaption.java similarity index 94% rename from src/eva2/server/go/operators/paramcontrol/PSOInertnessAdaption.java rename to src/eva2/optimization/operators/paramcontrol/PSOInertnessAdaption.java index b99e45d6..0a513def 100644 --- a/src/eva2/server/go/operators/paramcontrol/PSOInertnessAdaption.java +++ b/src/eva2/optimization/operators/paramcontrol/PSOInertnessAdaption.java @@ -1,4 +1,4 @@ -package eva2.server.go.operators.paramcontrol; +package eva2.optimization.operators.paramcontrol; import eva2.gui.GenericObjectEditor; import java.io.Serializable; diff --git a/src/eva2/server/go/operators/paramcontrol/ParamAdaption.java b/src/eva2/optimization/operators/paramcontrol/ParamAdaption.java similarity index 85% rename from src/eva2/server/go/operators/paramcontrol/ParamAdaption.java rename to src/eva2/optimization/operators/paramcontrol/ParamAdaption.java index a91e7188..05895794 100644 --- a/src/eva2/server/go/operators/paramcontrol/ParamAdaption.java +++ b/src/eva2/optimization/operators/paramcontrol/ParamAdaption.java @@ -1,6 +1,6 @@ -package eva2.server.go.operators.paramcontrol; +package eva2.optimization.operators.paramcontrol; -import eva2.server.go.populations.Population; +import eva2.optimization.populations.Population; /** * Adapt exactly one parameter with a generic method. diff --git a/src/eva2/server/go/operators/paramcontrol/ParamChangeListener.java b/src/eva2/optimization/operators/paramcontrol/ParamChangeListener.java similarity index 75% rename from src/eva2/server/go/operators/paramcontrol/ParamChangeListener.java rename to src/eva2/optimization/operators/paramcontrol/ParamChangeListener.java index d47c209d..78b2420b 100644 --- a/src/eva2/server/go/operators/paramcontrol/ParamChangeListener.java +++ b/src/eva2/optimization/operators/paramcontrol/ParamChangeListener.java @@ -1,4 +1,4 @@ -package eva2.server.go.operators.paramcontrol; +package eva2.optimization.operators.paramcontrol; public interface ParamChangeListener { public void notifyChange(InterfaceParamControllable controllable, Object oldVal, Object newVal, String msg); diff --git a/src/eva2/server/go/operators/paramcontrol/ParameterControlManager.java b/src/eva2/optimization/operators/paramcontrol/ParameterControlManager.java similarity index 98% rename from src/eva2/server/go/operators/paramcontrol/ParameterControlManager.java rename to src/eva2/optimization/operators/paramcontrol/ParameterControlManager.java index 645ed692..ce820e68 100644 --- a/src/eva2/server/go/operators/paramcontrol/ParameterControlManager.java +++ b/src/eva2/optimization/operators/paramcontrol/ParameterControlManager.java @@ -1,8 +1,8 @@ -package eva2.server.go.operators.paramcontrol; +package eva2.optimization.operators.paramcontrol; import eva2.gui.BeanInspector; -import eva2.server.go.populations.Population; -import eva2.server.modules.Processor; +import eva2.optimization.populations.Population; +import eva2.optimization.modules.Processor; import eva2.tools.Pair; import java.io.Serializable; import java.util.ArrayList; diff --git a/src/eva2/server/go/operators/paramcontrol/SingleParamAdaption.java b/src/eva2/optimization/operators/paramcontrol/SingleParamAdaption.java similarity index 97% rename from src/eva2/server/go/operators/paramcontrol/SingleParamAdaption.java rename to src/eva2/optimization/operators/paramcontrol/SingleParamAdaption.java index ebc43b37..8385fbdc 100644 --- a/src/eva2/server/go/operators/paramcontrol/SingleParamAdaption.java +++ b/src/eva2/optimization/operators/paramcontrol/SingleParamAdaption.java @@ -1,3 +1,5 @@ +package eva2.optimization.operators.paramcontrol; + //package eva2.server.go.operators.paramcontrol; // //import java.io.Serializable; diff --git a/src/eva2/server/go/operators/paramcontrol/SinusoidalParamAdaption.java b/src/eva2/optimization/operators/paramcontrol/SinusoidalParamAdaption.java similarity index 98% rename from src/eva2/server/go/operators/paramcontrol/SinusoidalParamAdaption.java rename to src/eva2/optimization/operators/paramcontrol/SinusoidalParamAdaption.java index 0a3a2f90..db6d9eb0 100644 --- a/src/eva2/server/go/operators/paramcontrol/SinusoidalParamAdaption.java +++ b/src/eva2/optimization/operators/paramcontrol/SinusoidalParamAdaption.java @@ -1,6 +1,6 @@ -package eva2.server.go.operators.paramcontrol; +package eva2.optimization.operators.paramcontrol; -import eva2.server.go.populations.Population; +import eva2.optimization.populations.Population; import java.io.Serializable; /** diff --git a/src/eva2/server/go/operators/paramcontrol/SuccessBasedAdaption.java b/src/eva2/optimization/operators/paramcontrol/SuccessBasedAdaption.java similarity index 92% rename from src/eva2/server/go/operators/paramcontrol/SuccessBasedAdaption.java rename to src/eva2/optimization/operators/paramcontrol/SuccessBasedAdaption.java index aec80c24..b269ea85 100644 --- a/src/eva2/server/go/operators/paramcontrol/SuccessBasedAdaption.java +++ b/src/eva2/optimization/operators/paramcontrol/SuccessBasedAdaption.java @@ -1,8 +1,8 @@ -package eva2.server.go.operators.paramcontrol; +package eva2.optimization.operators.paramcontrol; -import eva2.server.go.populations.Population; -import eva2.server.go.populations.SolutionSet; -import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.optimization.populations.Population; +import eva2.optimization.populations.SolutionSet; +import eva2.optimization.strategies.InterfaceOptimizer; import java.io.Serializable; public class SuccessBasedAdaption implements ParamAdaption, InterfaceHasUpperDoubleBound, diff --git a/src/eva2/server/go/operators/paretofrontmetrics/InterfaceParetoFrontMetric.java b/src/eva2/optimization/operators/paretofrontmetrics/InterfaceParetoFrontMetric.java similarity index 75% rename from src/eva2/server/go/operators/paretofrontmetrics/InterfaceParetoFrontMetric.java rename to src/eva2/optimization/operators/paretofrontmetrics/InterfaceParetoFrontMetric.java index a48e566d..1e89124a 100644 --- a/src/eva2/server/go/operators/paretofrontmetrics/InterfaceParetoFrontMetric.java +++ b/src/eva2/optimization/operators/paretofrontmetrics/InterfaceParetoFrontMetric.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.paretofrontmetrics; +package eva2.optimization.operators.paretofrontmetrics; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.AbstractMultiObjectiveOptimizationProblem; /** Interface for general Pareto front methods. * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/paretofrontmetrics/MetricD1ApproxParetoFront.java b/src/eva2/optimization/operators/paretofrontmetrics/MetricD1ApproxParetoFront.java similarity index 91% rename from src/eva2/server/go/operators/paretofrontmetrics/MetricD1ApproxParetoFront.java rename to src/eva2/optimization/operators/paretofrontmetrics/MetricD1ApproxParetoFront.java index ef53565a..fef635ad 100644 --- a/src/eva2/server/go/operators/paretofrontmetrics/MetricD1ApproxParetoFront.java +++ b/src/eva2/optimization/operators/paretofrontmetrics/MetricD1ApproxParetoFront.java @@ -1,12 +1,12 @@ -package eva2.server.go.operators.paretofrontmetrics; +package eva2.optimization.operators.paretofrontmetrics; import eva2.gui.PropertyFilePath; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.archiving.ArchivingAllDominating; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.AbstractMultiObjectiveOptimizationProblem; -import eva2.server.go.tools.FileTools; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.operators.archiving.ArchivingAllDominating; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.optimization.tools.FileTools; import java.util.ArrayList; /** The D1* Pareto front metric requires a refrence Pareto front @@ -18,7 +18,7 @@ import java.util.ArrayList; * Time: 13:57:28 * To change this template use File | Settings | File Templates. */ -public class MetricD1ApproxParetoFront implements eva2.server.go.operators.paretofrontmetrics.InterfaceParetoFrontMetric, java.io.Serializable { +public class MetricD1ApproxParetoFront implements eva2.optimization.operators.paretofrontmetrics.InterfaceParetoFrontMetric, java.io.Serializable { private PropertyFilePath m_InputFilePath = PropertyFilePath.getFilePathFromResource("MOPReference/T1_250.txt"); private String[] m_Titles; private double[][] m_Reference; diff --git a/src/eva2/server/go/operators/paretofrontmetrics/MetricD1TrueParetoFront.java b/src/eva2/optimization/operators/paretofrontmetrics/MetricD1TrueParetoFront.java similarity index 91% rename from src/eva2/server/go/operators/paretofrontmetrics/MetricD1TrueParetoFront.java rename to src/eva2/optimization/operators/paretofrontmetrics/MetricD1TrueParetoFront.java index 0244dc44..793d517b 100644 --- a/src/eva2/server/go/operators/paretofrontmetrics/MetricD1TrueParetoFront.java +++ b/src/eva2/optimization/operators/paretofrontmetrics/MetricD1TrueParetoFront.java @@ -1,12 +1,12 @@ -package eva2.server.go.operators.paretofrontmetrics; +package eva2.optimization.operators.paretofrontmetrics; import eva2.gui.PropertyFilePath; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.archiving.ArchivingAllDominating; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.AbstractMultiObjectiveOptimizationProblem; -import eva2.server.go.tools.FileTools; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.operators.archiving.ArchivingAllDominating; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.optimization.tools.FileTools; import java.util.ArrayList; /** The D1 Pareto front metric requires a refrence Pareto front @@ -18,7 +18,7 @@ import java.util.ArrayList; * Time: 13:57:13 * To change this template use File | Settings | File Templates. */ -public class MetricD1TrueParetoFront implements eva2.server.go.operators.paretofrontmetrics.InterfaceParetoFrontMetric, java.io.Serializable { +public class MetricD1TrueParetoFront implements eva2.optimization.operators.paretofrontmetrics.InterfaceParetoFrontMetric, java.io.Serializable { // private String base = System.getProperty("user.dir"); // private String FS = System.getProperty("file.separator"); diff --git a/src/eva2/server/go/operators/paretofrontmetrics/MetricErrorRatio.java b/src/eva2/optimization/operators/paretofrontmetrics/MetricErrorRatio.java similarity index 92% rename from src/eva2/server/go/operators/paretofrontmetrics/MetricErrorRatio.java rename to src/eva2/optimization/operators/paretofrontmetrics/MetricErrorRatio.java index be763b3a..71a98918 100644 --- a/src/eva2/server/go/operators/paretofrontmetrics/MetricErrorRatio.java +++ b/src/eva2/optimization/operators/paretofrontmetrics/MetricErrorRatio.java @@ -1,12 +1,12 @@ -package eva2.server.go.operators.paretofrontmetrics; +package eva2.optimization.operators.paretofrontmetrics; import eva2.gui.PropertyFilePath; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.archiving.ArchivingAllDominating; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.AbstractMultiObjectiveOptimizationProblem; -import eva2.server.go.tools.FileTools; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.operators.archiving.ArchivingAllDominating; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.optimization.tools.FileTools; import java.util.ArrayList; @@ -19,7 +19,7 @@ import java.util.ArrayList; * Time: 17:22:23 * To change this template use File | Settings | File Templates. */ -public class MetricErrorRatio implements eva2.server.go.operators.paretofrontmetrics.InterfaceParetoFrontMetric, java.io.Serializable { +public class MetricErrorRatio implements eva2.optimization.operators.paretofrontmetrics.InterfaceParetoFrontMetric, java.io.Serializable { private PropertyFilePath m_InputFilePath = PropertyFilePath.getFilePathFromResource("MOPReference/T1_250.txt"); private double m_Epsilon = 0.0001; private String[] m_Titles; diff --git a/src/eva2/server/go/operators/paretofrontmetrics/MetricMaximumParetoFrontError.java b/src/eva2/optimization/operators/paretofrontmetrics/MetricMaximumParetoFrontError.java similarity index 91% rename from src/eva2/server/go/operators/paretofrontmetrics/MetricMaximumParetoFrontError.java rename to src/eva2/optimization/operators/paretofrontmetrics/MetricMaximumParetoFrontError.java index 7060bec5..a2747f7e 100644 --- a/src/eva2/server/go/operators/paretofrontmetrics/MetricMaximumParetoFrontError.java +++ b/src/eva2/optimization/operators/paretofrontmetrics/MetricMaximumParetoFrontError.java @@ -1,12 +1,12 @@ -package eva2.server.go.operators.paretofrontmetrics; +package eva2.optimization.operators.paretofrontmetrics; import eva2.gui.PropertyFilePath; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.archiving.ArchivingAllDominating; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.AbstractMultiObjectiveOptimizationProblem; -import eva2.server.go.tools.FileTools; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.operators.archiving.ArchivingAllDominating; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.optimization.tools.FileTools; import java.util.ArrayList; /** Maximum Pareto Front Error gives the maximum distance of all minimum distances of each @@ -17,7 +17,7 @@ import java.util.ArrayList; * Time: 13:25:44 * To change this template use File | Settings | File Templates. */ -public class MetricMaximumParetoFrontError implements eva2.server.go.operators.paretofrontmetrics.InterfaceParetoFrontMetric, java.io.Serializable { +public class MetricMaximumParetoFrontError implements eva2.optimization.operators.paretofrontmetrics.InterfaceParetoFrontMetric, java.io.Serializable { private PropertyFilePath m_InputFilePath = PropertyFilePath.getFilePathFromResource("MOPReference/T1_250.txt"); private String[] m_Titles; private double[][] m_Reference; diff --git a/src/eva2/server/go/operators/paretofrontmetrics/MetricOverallNonDominatedVectors.java b/src/eva2/optimization/operators/paretofrontmetrics/MetricOverallNonDominatedVectors.java similarity index 87% rename from src/eva2/server/go/operators/paretofrontmetrics/MetricOverallNonDominatedVectors.java rename to src/eva2/optimization/operators/paretofrontmetrics/MetricOverallNonDominatedVectors.java index e4c4a91b..90af4906 100644 --- a/src/eva2/server/go/operators/paretofrontmetrics/MetricOverallNonDominatedVectors.java +++ b/src/eva2/optimization/operators/paretofrontmetrics/MetricOverallNonDominatedVectors.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.paretofrontmetrics; +package eva2.optimization.operators.paretofrontmetrics; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.archiving.ArchivingAllDominating; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.operators.archiving.ArchivingAllDominating; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.AbstractMultiObjectiveOptimizationProblem; /** Overall Non-Dom. Vector Generation calculates simply the number of * non-dominated solutions in the current soltuion set. diff --git a/src/eva2/server/go/operators/paretofrontmetrics/MetricS.java b/src/eva2/optimization/operators/paretofrontmetrics/MetricS.java similarity index 96% rename from src/eva2/server/go/operators/paretofrontmetrics/MetricS.java rename to src/eva2/optimization/operators/paretofrontmetrics/MetricS.java index b00a563c..3dcaeb44 100644 --- a/src/eva2/server/go/operators/paretofrontmetrics/MetricS.java +++ b/src/eva2/optimization/operators/paretofrontmetrics/MetricS.java @@ -1,11 +1,11 @@ -package eva2.server.go.operators.paretofrontmetrics; +package eva2.optimization.operators.paretofrontmetrics; import eva2.gui.BeanInspector; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.ESIndividualDoubleData; -import eva2.server.go.operators.archiving.ArchivingAllDominating; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.ESIndividualDoubleData; +import eva2.optimization.operators.archiving.ArchivingAllDominating; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.AbstractMultiObjectiveOptimizationProblem; /** S-Metric calculates the hyper-volume covered between the current solutions and a reference point. * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/paretofrontmetrics/MetricSWithReference.java b/src/eva2/optimization/operators/paretofrontmetrics/MetricSWithReference.java similarity index 96% rename from src/eva2/server/go/operators/paretofrontmetrics/MetricSWithReference.java rename to src/eva2/optimization/operators/paretofrontmetrics/MetricSWithReference.java index e52167af..463beb86 100644 --- a/src/eva2/server/go/operators/paretofrontmetrics/MetricSWithReference.java +++ b/src/eva2/optimization/operators/paretofrontmetrics/MetricSWithReference.java @@ -1,13 +1,13 @@ -package eva2.server.go.operators.paretofrontmetrics; +package eva2.optimization.operators.paretofrontmetrics; import eva2.gui.PropertyFilePath; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.ESIndividualDoubleData; -import eva2.server.go.operators.archiving.ArchivingAllDominating; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.AbstractMultiObjectiveOptimizationProblem; -import eva2.server.go.tools.FileTools; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.ESIndividualDoubleData; +import eva2.optimization.operators.archiving.ArchivingAllDominating; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.optimization.tools.FileTools; import java.util.ArrayList; /** S-Metric calculates the hyper-volume covered between the current solutions and a reference point. diff --git a/src/eva2/server/go/operators/postprocess/InterfacePostProcessParams.java b/src/eva2/optimization/operators/postprocess/InterfacePostProcessParams.java similarity index 91% rename from src/eva2/server/go/operators/postprocess/InterfacePostProcessParams.java rename to src/eva2/optimization/operators/postprocess/InterfacePostProcessParams.java index fa466302..20a434b4 100644 --- a/src/eva2/server/go/operators/postprocess/InterfacePostProcessParams.java +++ b/src/eva2/optimization/operators/postprocess/InterfacePostProcessParams.java @@ -1,6 +1,6 @@ -package eva2.server.go.operators.postprocess; +package eva2.optimization.operators.postprocess; -import eva2.server.go.enums.PostProcessMethod; +import eva2.optimization.enums.PostProcessMethod; /** * Parameters for an optional post processing of found solutions. Mainly contains diff --git a/src/eva2/server/go/operators/postprocess/PostProcess.java b/src/eva2/optimization/operators/postprocess/PostProcess.java similarity index 96% rename from src/eva2/server/go/operators/postprocess/PostProcess.java rename to src/eva2/optimization/operators/postprocess/PostProcess.java index 264d1609..974c7754 100644 --- a/src/eva2/server/go/operators/postprocess/PostProcess.java +++ b/src/eva2/optimization/operators/postprocess/PostProcess.java @@ -1,39 +1,45 @@ -package eva2.server.go.operators.postprocess; +package eva2.optimization.operators.postprocess; +import eva2.optimization.problems.InterfaceInterestingHistogram; +import eva2.optimization.problems.InterfaceMultimodalProblemKnown; +import eva2.optimization.problems.InterfaceSolutionViewer; +import eva2.optimization.problems.AbstractOptimizationProblem; +import eva2.optimization.problems.Interface2DBorderProblem; +import eva2.optimization.problems.InterfaceHasSolutionViewer; +import eva2.optimization.problems.FM0Problem; import eva2.OptimizerFactory; import eva2.OptimizerRunnable; import eva2.gui.BeanInspector; import eva2.gui.Plot; import eva2.gui.TopoPlot; -import eva2.server.go.IndividualInterface; -import eva2.server.go.InterfaceTerminator; -import eva2.server.go.enums.ESMutationInitialSigma; -import eva2.server.go.enums.PostProcessMethod; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.ESIndividualDoubleData; -import eva2.server.go.individuals.InterfaceDataTypeDouble; -import eva2.server.go.individuals.InterfaceESIndividual; -import eva2.server.go.operators.cluster.ClusteringDensityBased; -import eva2.server.go.operators.cluster.InterfaceClustering; -import eva2.server.go.operators.crossover.CrossoverESDefault; -import eva2.server.go.operators.distancemetric.EuclideanMetric; -import eva2.server.go.operators.distancemetric.InterfaceDistanceMetric; -import eva2.server.go.operators.distancemetric.PhenotypeMetric; -import eva2.server.go.operators.mutation.InterfaceMutation; -import eva2.server.go.operators.mutation.MutateESFixedStepSize; -import eva2.server.go.operators.mutation.MutateESMutativeStepSizeControl; -import eva2.server.go.operators.mutation.MutateESRankMuCMA; -import eva2.server.go.operators.selection.SelectBestIndividuals; -import eva2.server.go.operators.terminators.EvaluationTerminator; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.*; -import eva2.server.go.strategies.EvolutionStrategies; -import eva2.server.go.strategies.GradientDescentAlgorithm; -import eva2.server.go.strategies.HillClimbing; -import eva2.server.go.strategies.NelderMeadSimplex; -import eva2.server.modules.GOParameters; -import eva2.server.stat.InterfaceTextListener; -import eva2.server.stat.StatisticsParameter; +import eva2.optimization.go.IndividualInterface; +import eva2.optimization.go.InterfaceTerminator; +import eva2.optimization.enums.ESMutationInitialSigma; +import eva2.optimization.enums.PostProcessMethod; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.ESIndividualDoubleData; +import eva2.optimization.individuals.InterfaceDataTypeDouble; +import eva2.optimization.individuals.InterfaceESIndividual; +import eva2.optimization.operators.cluster.ClusteringDensityBased; +import eva2.optimization.operators.cluster.InterfaceClustering; +import eva2.optimization.operators.crossover.CrossoverESDefault; +import eva2.optimization.operators.distancemetric.EuclideanMetric; +import eva2.optimization.operators.distancemetric.InterfaceDistanceMetric; +import eva2.optimization.operators.distancemetric.PhenotypeMetric; +import eva2.optimization.operators.mutation.InterfaceMutation; +import eva2.optimization.operators.mutation.MutateESFixedStepSize; +import eva2.optimization.operators.mutation.MutateESMutativeStepSizeControl; +import eva2.optimization.operators.mutation.MutateESRankMuCMA; +import eva2.optimization.operators.selection.SelectBestIndividuals; +import eva2.optimization.operators.terminators.EvaluationTerminator; +import eva2.optimization.populations.Population; +import eva2.optimization.strategies.EvolutionStrategies; +import eva2.optimization.strategies.GradientDescentAlgorithm; +import eva2.optimization.strategies.HillClimbing; +import eva2.optimization.strategies.NelderMeadSimplex; +import eva2.optimization.modules.GOParameters; +import eva2.optimization.stat.InterfaceTextListener; +import eva2.optimization.stat.StatisticsParameter; import eva2.tools.Pair; import eva2.tools.math.Mathematics; import java.util.ArrayList; diff --git a/src/eva2/server/go/operators/postprocess/PostProcessParams.java b/src/eva2/optimization/operators/postprocess/PostProcessParams.java similarity index 98% rename from src/eva2/server/go/operators/postprocess/PostProcessParams.java rename to src/eva2/optimization/operators/postprocess/PostProcessParams.java index 6bb7e466..18abfe34 100644 --- a/src/eva2/server/go/operators/postprocess/PostProcessParams.java +++ b/src/eva2/optimization/operators/postprocess/PostProcessParams.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.postprocess; +package eva2.optimization.operators.postprocess; import eva2.gui.GenericObjectEditor; -import eva2.server.go.enums.PostProcessMethod; +import eva2.optimization.enums.PostProcessMethod; import java.io.Serializable; diff --git a/src/eva2/server/go/operators/postprocess/SolutionHistogram.java b/src/eva2/optimization/operators/postprocess/SolutionHistogram.java similarity index 95% rename from src/eva2/server/go/operators/postprocess/SolutionHistogram.java rename to src/eva2/optimization/operators/postprocess/SolutionHistogram.java index 62a91b2b..79ca2703 100644 --- a/src/eva2/server/go/operators/postprocess/SolutionHistogram.java +++ b/src/eva2/optimization/operators/postprocess/SolutionHistogram.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.postprocess; +package eva2.optimization.operators.postprocess; import eva2.gui.BeanInspector; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.AbstractOptimizationProblem; -import eva2.server.go.problems.InterfaceInterestingHistogram; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.AbstractOptimizationProblem; +import eva2.optimization.problems.InterfaceInterestingHistogram; import eva2.tools.math.Mathematics; import java.util.Arrays; diff --git a/src/eva2/server/go/operators/selection/InterfaceSelection.java b/src/eva2/optimization/operators/selection/InterfaceSelection.java similarity index 93% rename from src/eva2/server/go/operators/selection/InterfaceSelection.java rename to src/eva2/optimization/operators/selection/InterfaceSelection.java index 671ba91c..4dbd3639 100644 --- a/src/eva2/server/go/operators/selection/InterfaceSelection.java +++ b/src/eva2/optimization/operators/selection/InterfaceSelection.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.selection; +package eva2.optimization.operators.selection; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; /** Selection methods have to implement on the one hand the diff --git a/src/eva2/server/go/operators/selection/MOMultipleSolutions.java b/src/eva2/optimization/operators/selection/MOMultipleSolutions.java similarity index 96% rename from src/eva2/server/go/operators/selection/MOMultipleSolutions.java rename to src/eva2/optimization/operators/selection/MOMultipleSolutions.java index 253bdae1..db9e539c 100644 --- a/src/eva2/server/go/operators/selection/MOMultipleSolutions.java +++ b/src/eva2/optimization/operators/selection/MOMultipleSolutions.java @@ -1,4 +1,4 @@ -package eva2.server.go.operators.selection; +package eva2.optimization.operators.selection; import java.util.ArrayList; diff --git a/src/eva2/server/go/operators/selection/MOSolution.java b/src/eva2/optimization/operators/selection/MOSolution.java similarity index 93% rename from src/eva2/server/go/operators/selection/MOSolution.java rename to src/eva2/optimization/operators/selection/MOSolution.java index 2d931d0e..ec4b3e6b 100644 --- a/src/eva2/server/go/operators/selection/MOSolution.java +++ b/src/eva2/optimization/operators/selection/MOSolution.java @@ -1,4 +1,4 @@ -package eva2.server.go.operators.selection; +package eva2.optimization.operators.selection; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/selection/SelectAll.java b/src/eva2/optimization/operators/selection/SelectAll.java similarity index 96% rename from src/eva2/server/go/operators/selection/SelectAll.java rename to src/eva2/optimization/operators/selection/SelectAll.java index 4814108f..c675eda5 100644 --- a/src/eva2/server/go/operators/selection/SelectAll.java +++ b/src/eva2/optimization/operators/selection/SelectAll.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.selection; +package eva2.optimization.operators.selection; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; /** Simple method to selecet all. * In case of multiple fitness values the selection diff --git a/src/eva2/server/go/operators/selection/SelectBestIndividuals.java b/src/eva2/optimization/operators/selection/SelectBestIndividuals.java similarity index 97% rename from src/eva2/server/go/operators/selection/SelectBestIndividuals.java rename to src/eva2/optimization/operators/selection/SelectBestIndividuals.java index 874f60b4..ea7c025f 100644 --- a/src/eva2/server/go/operators/selection/SelectBestIndividuals.java +++ b/src/eva2/optimization/operators/selection/SelectBestIndividuals.java @@ -1,8 +1,8 @@ -package eva2.server.go.operators.selection; +package eva2.optimization.operators.selection; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; import eva2.tools.math.RNG; import java.util.ArrayList; diff --git a/src/eva2/server/go/operators/selection/SelectBestSingle.java b/src/eva2/optimization/operators/selection/SelectBestSingle.java similarity index 97% rename from src/eva2/server/go/operators/selection/SelectBestSingle.java rename to src/eva2/optimization/operators/selection/SelectBestSingle.java index 72c0dd83..618e5897 100644 --- a/src/eva2/server/go/operators/selection/SelectBestSingle.java +++ b/src/eva2/optimization/operators/selection/SelectBestSingle.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.selection; +package eva2.optimization.operators.selection; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; import eva2.tools.math.RNG; diff --git a/src/eva2/server/go/operators/selection/SelectEPTournaments.java b/src/eva2/optimization/operators/selection/SelectEPTournaments.java similarity index 98% rename from src/eva2/server/go/operators/selection/SelectEPTournaments.java rename to src/eva2/optimization/operators/selection/SelectEPTournaments.java index 0a3ff284..bddb5936 100644 --- a/src/eva2/server/go/operators/selection/SelectEPTournaments.java +++ b/src/eva2/optimization/operators/selection/SelectEPTournaments.java @@ -1,8 +1,8 @@ -package eva2.server.go.operators.selection; +package eva2.optimization.operators.selection; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; import eva2.tools.math.RNG; import java.util.ArrayList; diff --git a/src/eva2/server/go/operators/selection/SelectHomologousMate.java b/src/eva2/optimization/operators/selection/SelectHomologousMate.java similarity index 93% rename from src/eva2/server/go/operators/selection/SelectHomologousMate.java rename to src/eva2/optimization/operators/selection/SelectHomologousMate.java index 373ce71d..98d3568c 100644 --- a/src/eva2/server/go/operators/selection/SelectHomologousMate.java +++ b/src/eva2/optimization/operators/selection/SelectHomologousMate.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.selection; +package eva2.optimization.operators.selection; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.distancemetric.InterfaceDistanceMetric; -import eva2.server.go.operators.distancemetric.ObjectiveSpaceMetric; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.operators.distancemetric.InterfaceDistanceMetric; +import eva2.optimization.operators.distancemetric.ObjectiveSpaceMetric; +import eva2.optimization.populations.Population; /** An experimental implementation for mating restriction. * Possibly defunct. diff --git a/src/eva2/server/go/operators/selection/SelectMOMAIIDominanceCounter.java b/src/eva2/optimization/operators/selection/SelectMOMAIIDominanceCounter.java similarity index 97% rename from src/eva2/server/go/operators/selection/SelectMOMAIIDominanceCounter.java rename to src/eva2/optimization/operators/selection/SelectMOMAIIDominanceCounter.java index 0d50ffa9..2558d248 100644 --- a/src/eva2/server/go/operators/selection/SelectMOMAIIDominanceCounter.java +++ b/src/eva2/optimization/operators/selection/SelectMOMAIIDominanceCounter.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.selection; +package eva2.optimization.operators.selection; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; /** Experimental selection mechanism for MOMA II where * a single individual is a whole set of Pareto optimal diff --git a/src/eva2/server/go/operators/selection/SelectMOMaxiMin.java b/src/eva2/optimization/operators/selection/SelectMOMaxiMin.java similarity index 95% rename from src/eva2/server/go/operators/selection/SelectMOMaxiMin.java rename to src/eva2/optimization/operators/selection/SelectMOMaxiMin.java index 2fe86d14..a647ffa6 100644 --- a/src/eva2/server/go/operators/selection/SelectMOMaxiMin.java +++ b/src/eva2/optimization/operators/selection/SelectMOMaxiMin.java @@ -1,8 +1,8 @@ -package eva2.server.go.operators.selection; +package eva2.optimization.operators.selection; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.moso.MOSOMaxiMin; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.operators.moso.MOSOMaxiMin; +import eva2.optimization.populations.Population; /** A multi-objective selection criterion based on the maximin * method. diff --git a/src/eva2/server/go/operators/selection/SelectMONSGAIICrowedTournament.java b/src/eva2/optimization/operators/selection/SelectMONSGAIICrowedTournament.java similarity index 97% rename from src/eva2/server/go/operators/selection/SelectMONSGAIICrowedTournament.java rename to src/eva2/optimization/operators/selection/SelectMONSGAIICrowedTournament.java index 1daf5844..60a9767c 100644 --- a/src/eva2/server/go/operators/selection/SelectMONSGAIICrowedTournament.java +++ b/src/eva2/optimization/operators/selection/SelectMONSGAIICrowedTournament.java @@ -1,8 +1,8 @@ -package eva2.server.go.operators.selection; +package eva2.optimization.operators.selection; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.archiving.ArchivingNSGAII; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.operators.archiving.ArchivingNSGAII; +import eva2.optimization.populations.Population; import eva2.tools.math.RNG; /** The infamous NSGA-II selection scheme for multi-objective diff --git a/src/eva2/server/go/operators/selection/SelectMONonDominated.java b/src/eva2/optimization/operators/selection/SelectMONonDominated.java similarity index 97% rename from src/eva2/server/go/operators/selection/SelectMONonDominated.java rename to src/eva2/optimization/operators/selection/SelectMONonDominated.java index faf63911..d06d2b54 100644 --- a/src/eva2/server/go/operators/selection/SelectMONonDominated.java +++ b/src/eva2/optimization/operators/selection/SelectMONonDominated.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.selection; +package eva2.optimization.operators.selection; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; import eva2.tools.math.RNG; /** This multi-objective selection method preferrs non-dominated diff --git a/src/eva2/server/go/operators/selection/SelectMOPESA.java b/src/eva2/optimization/operators/selection/SelectMOPESA.java similarity index 95% rename from src/eva2/server/go/operators/selection/SelectMOPESA.java rename to src/eva2/optimization/operators/selection/SelectMOPESA.java index 0f3da1a6..7593a339 100644 --- a/src/eva2/server/go/operators/selection/SelectMOPESA.java +++ b/src/eva2/optimization/operators/selection/SelectMOPESA.java @@ -1,8 +1,8 @@ -package eva2.server.go.operators.selection; +package eva2.optimization.operators.selection; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.archiving.ArchivingPESAII; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.operators.archiving.ArchivingPESAII; +import eva2.optimization.populations.Population; import eva2.tools.math.RNG; /** The multi-objective PESA selection method. diff --git a/src/eva2/server/go/operators/selection/SelectMOPESAII.java b/src/eva2/optimization/operators/selection/SelectMOPESAII.java similarity index 96% rename from src/eva2/server/go/operators/selection/SelectMOPESAII.java rename to src/eva2/optimization/operators/selection/SelectMOPESAII.java index 897d55d6..7fd432b3 100644 --- a/src/eva2/server/go/operators/selection/SelectMOPESAII.java +++ b/src/eva2/optimization/operators/selection/SelectMOPESAII.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.selection; +package eva2.optimization.operators.selection; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.archiving.ArchivingPESAII; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.operators.archiving.ArchivingPESAII; +import eva2.optimization.populations.Population; import eva2.tools.math.RNG; import java.util.ArrayList; import java.util.Enumeration; diff --git a/src/eva2/server/go/operators/selection/SelectMOSPEAII.java b/src/eva2/optimization/operators/selection/SelectMOSPEAII.java similarity index 96% rename from src/eva2/server/go/operators/selection/SelectMOSPEAII.java rename to src/eva2/optimization/operators/selection/SelectMOSPEAII.java index ad820dff..aaf59eb1 100644 --- a/src/eva2/server/go/operators/selection/SelectMOSPEAII.java +++ b/src/eva2/optimization/operators/selection/SelectMOSPEAII.java @@ -1,10 +1,10 @@ -package eva2.server.go.operators.selection; +package eva2.optimization.operators.selection; import eva2.gui.GraphPointSet; import eva2.gui.Plot; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.archiving.ArchivingSPEAII; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.operators.archiving.ArchivingSPEAII; +import eva2.optimization.populations.Population; import eva2.tools.chart2d.Chart2DDPointIconCircle; import eva2.tools.chart2d.Chart2DDPointIconText; import eva2.tools.chart2d.DPoint; diff --git a/src/eva2/server/go/operators/selection/SelectParticleWheel.java b/src/eva2/optimization/operators/selection/SelectParticleWheel.java similarity index 94% rename from src/eva2/server/go/operators/selection/SelectParticleWheel.java rename to src/eva2/optimization/operators/selection/SelectParticleWheel.java index 8976650f..632d0079 100644 --- a/src/eva2/server/go/operators/selection/SelectParticleWheel.java +++ b/src/eva2/optimization/operators/selection/SelectParticleWheel.java @@ -1,10 +1,10 @@ -package eva2.server.go.operators.selection; +package eva2.optimization.operators.selection; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.selection.probability.InterfaceSelectionProbability; -import eva2.server.go.operators.selection.probability.SelProbStandard; -import eva2.server.go.operators.selection.probability.SelProbStandardScaling; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.operators.selection.probability.InterfaceSelectionProbability; +import eva2.optimization.operators.selection.probability.SelProbStandard; +import eva2.optimization.operators.selection.probability.SelProbStandardScaling; +import eva2.optimization.populations.Population; import eva2.tools.math.RNG; diff --git a/src/eva2/server/go/operators/selection/SelectRandom.java b/src/eva2/optimization/operators/selection/SelectRandom.java similarity index 96% rename from src/eva2/server/go/operators/selection/SelectRandom.java rename to src/eva2/optimization/operators/selection/SelectRandom.java index e41e4acc..593b2225 100644 --- a/src/eva2/server/go/operators/selection/SelectRandom.java +++ b/src/eva2/optimization/operators/selection/SelectRandom.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.selection; +package eva2.optimization.operators.selection; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; import eva2.tools.math.RNG; diff --git a/src/eva2/server/go/operators/selection/SelectTournament.java b/src/eva2/optimization/operators/selection/SelectTournament.java similarity index 97% rename from src/eva2/server/go/operators/selection/SelectTournament.java rename to src/eva2/optimization/operators/selection/SelectTournament.java index d90e8dd8..d62e6007 100644 --- a/src/eva2/server/go/operators/selection/SelectTournament.java +++ b/src/eva2/optimization/operators/selection/SelectTournament.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.selection; +package eva2.optimization.operators.selection; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; import eva2.tools.math.RNG; /** Tournament selection within a given tournament group size, diff --git a/src/eva2/server/go/operators/selection/SelectXProbRouletteWheel.java b/src/eva2/optimization/operators/selection/SelectXProbRouletteWheel.java similarity index 96% rename from src/eva2/server/go/operators/selection/SelectXProbRouletteWheel.java rename to src/eva2/optimization/operators/selection/SelectXProbRouletteWheel.java index 84d7cb09..2e2f99d6 100644 --- a/src/eva2/server/go/operators/selection/SelectXProbRouletteWheel.java +++ b/src/eva2/optimization/operators/selection/SelectXProbRouletteWheel.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.selection; +package eva2.optimization.operators.selection; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.selection.probability.InterfaceSelectionProbability; -import eva2.server.go.operators.selection.probability.SelProbStandard; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.operators.selection.probability.InterfaceSelectionProbability; +import eva2.optimization.operators.selection.probability.SelProbStandard; +import eva2.optimization.populations.Population; import eva2.tools.math.RNG; diff --git a/src/eva2/server/go/operators/selection/probability/AbstractSelProb.java b/src/eva2/optimization/operators/selection/probability/AbstractSelProb.java similarity index 97% rename from src/eva2/server/go/operators/selection/probability/AbstractSelProb.java rename to src/eva2/optimization/operators/selection/probability/AbstractSelProb.java index 3fd25a25..b51a7f9f 100644 --- a/src/eva2/server/go/operators/selection/probability/AbstractSelProb.java +++ b/src/eva2/optimization/operators/selection/probability/AbstractSelProb.java @@ -1,8 +1,8 @@ -package eva2.server.go.operators.selection.probability; +package eva2.optimization.operators.selection.probability; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; import eva2.tools.EVAERROR; import java.util.ArrayList; diff --git a/src/eva2/server/go/operators/selection/probability/InterfaceSelectionProbability.java b/src/eva2/optimization/operators/selection/probability/InterfaceSelectionProbability.java similarity index 94% rename from src/eva2/server/go/operators/selection/probability/InterfaceSelectionProbability.java rename to src/eva2/optimization/operators/selection/probability/InterfaceSelectionProbability.java index 97f5d140..9fb80339 100644 --- a/src/eva2/server/go/operators/selection/probability/InterfaceSelectionProbability.java +++ b/src/eva2/optimization/operators/selection/probability/InterfaceSelectionProbability.java @@ -1,6 +1,6 @@ -package eva2.server.go.operators.selection.probability; +package eva2.optimization.operators.selection.probability; -import eva2.server.go.populations.Population; +import eva2.optimization.populations.Population; /** The interface for methods with calculate the selection * probability from the fitness values. While the fitness diff --git a/src/eva2/server/go/operators/selection/probability/SelProbBoltzman.java b/src/eva2/optimization/operators/selection/probability/SelProbBoltzman.java similarity index 98% rename from src/eva2/server/go/operators/selection/probability/SelProbBoltzman.java rename to src/eva2/optimization/operators/selection/probability/SelProbBoltzman.java index 6df5f153..dc1b833a 100644 --- a/src/eva2/server/go/operators/selection/probability/SelProbBoltzman.java +++ b/src/eva2/optimization/operators/selection/probability/SelProbBoltzman.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.selection.probability; +package eva2.optimization.operators.selection.probability; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; /** Boltzman selection, actually it is no a selection method * but a scaling method, but it is very good, because it is diff --git a/src/eva2/server/go/operators/selection/probability/SelProbFitnessSharing.java b/src/eva2/optimization/operators/selection/probability/SelProbFitnessSharing.java similarity index 93% rename from src/eva2/server/go/operators/selection/probability/SelProbFitnessSharing.java rename to src/eva2/optimization/operators/selection/probability/SelProbFitnessSharing.java index 44173aad..7e28ffd4 100644 --- a/src/eva2/server/go/operators/selection/probability/SelProbFitnessSharing.java +++ b/src/eva2/optimization/operators/selection/probability/SelProbFitnessSharing.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.selection.probability; +package eva2.optimization.operators.selection.probability; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.distancemetric.InterfaceDistanceMetric; -import eva2.server.go.operators.distancemetric.PhenotypeMetric; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.operators.distancemetric.InterfaceDistanceMetric; +import eva2.optimization.operators.distancemetric.PhenotypeMetric; +import eva2.optimization.populations.Population; /** Here we have the infamous fitness sharing method. * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/selection/probability/SelProbInvertByMax.java b/src/eva2/optimization/operators/selection/probability/SelProbInvertByMax.java similarity index 95% rename from src/eva2/server/go/operators/selection/probability/SelProbInvertByMax.java rename to src/eva2/optimization/operators/selection/probability/SelProbInvertByMax.java index 3f9afc6f..0a23af65 100644 --- a/src/eva2/server/go/operators/selection/probability/SelProbInvertByMax.java +++ b/src/eva2/optimization/operators/selection/probability/SelProbInvertByMax.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.selection.probability; +package eva2.optimization.operators.selection.probability; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; /** * Scale the fitness of a maximization problem by inverting it by the maximum fitness, diff --git a/src/eva2/server/go/operators/selection/probability/SelProbLinearRanking.java b/src/eva2/optimization/operators/selection/probability/SelProbLinearRanking.java similarity index 98% rename from src/eva2/server/go/operators/selection/probability/SelProbLinearRanking.java rename to src/eva2/optimization/operators/selection/probability/SelProbLinearRanking.java index bc3aa848..ffeec5e6 100644 --- a/src/eva2/server/go/operators/selection/probability/SelProbLinearRanking.java +++ b/src/eva2/optimization/operators/selection/probability/SelProbLinearRanking.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.selection.probability; +package eva2.optimization.operators.selection.probability; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; /** A linear ranking method with offsets. * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/selection/probability/SelProbNonLinearRanking.java b/src/eva2/optimization/operators/selection/probability/SelProbNonLinearRanking.java similarity index 98% rename from src/eva2/server/go/operators/selection/probability/SelProbNonLinearRanking.java rename to src/eva2/optimization/operators/selection/probability/SelProbNonLinearRanking.java index 8f9a4522..b76f1202 100644 --- a/src/eva2/server/go/operators/selection/probability/SelProbNonLinearRanking.java +++ b/src/eva2/optimization/operators/selection/probability/SelProbNonLinearRanking.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.selection.probability; +package eva2.optimization.operators.selection.probability; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; /** A non-linear ranking, which is difficult to tune to * the given optimization problem i guess. diff --git a/src/eva2/server/go/operators/selection/probability/SelProbRanking.java b/src/eva2/optimization/operators/selection/probability/SelProbRanking.java similarity index 96% rename from src/eva2/server/go/operators/selection/probability/SelProbRanking.java rename to src/eva2/optimization/operators/selection/probability/SelProbRanking.java index 006dfb86..ac81f42d 100644 --- a/src/eva2/server/go/operators/selection/probability/SelProbRanking.java +++ b/src/eva2/optimization/operators/selection/probability/SelProbRanking.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.selection.probability; +package eva2.optimization.operators.selection.probability; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; /** Ranking for calculating the selection probability. * This truly scaling invariant. diff --git a/src/eva2/server/go/operators/selection/probability/SelProbStandard.java b/src/eva2/optimization/operators/selection/probability/SelProbStandard.java similarity index 96% rename from src/eva2/server/go/operators/selection/probability/SelProbStandard.java rename to src/eva2/optimization/operators/selection/probability/SelProbStandard.java index 7ecc53db..2bf47584 100644 --- a/src/eva2/server/go/operators/selection/probability/SelProbStandard.java +++ b/src/eva2/optimization/operators/selection/probability/SelProbStandard.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.selection.probability; +package eva2.optimization.operators.selection.probability; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; /** A simple sum to calculate the selection probability. * diff --git a/src/eva2/server/go/operators/selection/probability/SelProbStandardScaling.java b/src/eva2/optimization/operators/selection/probability/SelProbStandardScaling.java similarity index 97% rename from src/eva2/server/go/operators/selection/probability/SelProbStandardScaling.java rename to src/eva2/optimization/operators/selection/probability/SelProbStandardScaling.java index ebc5a352..46da5331 100644 --- a/src/eva2/server/go/operators/selection/probability/SelProbStandardScaling.java +++ b/src/eva2/optimization/operators/selection/probability/SelProbStandardScaling.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.selection.probability; +package eva2.optimization.operators.selection.probability; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; /** A simple sum with a scaling factor. * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/selection/replacement/InterfaceReplacement.java b/src/eva2/optimization/operators/selection/replacement/InterfaceReplacement.java similarity index 80% rename from src/eva2/server/go/operators/selection/replacement/InterfaceReplacement.java rename to src/eva2/optimization/operators/selection/replacement/InterfaceReplacement.java index 613761de..1c74587a 100644 --- a/src/eva2/server/go/operators/selection/replacement/InterfaceReplacement.java +++ b/src/eva2/optimization/operators/selection/replacement/InterfaceReplacement.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.selection.replacement; +package eva2.optimization.operators.selection.replacement; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; /** Replacement schemes for the steady-state GA. * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/selection/replacement/ReplaceDeterministicCrowding.java b/src/eva2/optimization/operators/selection/replacement/ReplaceDeterministicCrowding.java similarity index 89% rename from src/eva2/server/go/operators/selection/replacement/ReplaceDeterministicCrowding.java rename to src/eva2/optimization/operators/selection/replacement/ReplaceDeterministicCrowding.java index 4717bfa3..5f412051 100644 --- a/src/eva2/server/go/operators/selection/replacement/ReplaceDeterministicCrowding.java +++ b/src/eva2/optimization/operators/selection/replacement/ReplaceDeterministicCrowding.java @@ -1,8 +1,8 @@ -package eva2.server.go.operators.selection.replacement; +package eva2.optimization.operators.selection.replacement; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.distancemetric.PhenotypeMetric; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.operators.distancemetric.PhenotypeMetric; +import eva2.optimization.populations.Population; /** The deterministic crowiding method replaces the most similar parent if better * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/selection/replacement/ReplacePreselection.java b/src/eva2/optimization/operators/selection/replacement/ReplacePreselection.java similarity index 90% rename from src/eva2/server/go/operators/selection/replacement/ReplacePreselection.java rename to src/eva2/optimization/operators/selection/replacement/ReplacePreselection.java index e1c7f42a..636f9c4e 100644 --- a/src/eva2/server/go/operators/selection/replacement/ReplacePreselection.java +++ b/src/eva2/optimization/operators/selection/replacement/ReplacePreselection.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.selection.replacement; +package eva2.optimization.operators.selection.replacement; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; /** The preselection replacement scheme replaces the worst parent in case * the offspring is better. diff --git a/src/eva2/server/go/operators/selection/replacement/ReplaceRandom.java b/src/eva2/optimization/operators/selection/replacement/ReplaceRandom.java similarity index 89% rename from src/eva2/server/go/operators/selection/replacement/ReplaceRandom.java rename to src/eva2/optimization/operators/selection/replacement/ReplaceRandom.java index 0a2aeb9a..6688ec42 100644 --- a/src/eva2/server/go/operators/selection/replacement/ReplaceRandom.java +++ b/src/eva2/optimization/operators/selection/replacement/ReplaceRandom.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.selection.replacement; +package eva2.optimization.operators.selection.replacement; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; import eva2.tools.math.RNG; /** Random replacement. diff --git a/src/eva2/server/go/operators/selection/replacement/ReplaceWorst.java b/src/eva2/optimization/operators/selection/replacement/ReplaceWorst.java similarity index 90% rename from src/eva2/server/go/operators/selection/replacement/ReplaceWorst.java rename to src/eva2/optimization/operators/selection/replacement/ReplaceWorst.java index f21bde90..f753bbfc 100644 --- a/src/eva2/server/go/operators/selection/replacement/ReplaceWorst.java +++ b/src/eva2/optimization/operators/selection/replacement/ReplaceWorst.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.selection.replacement; +package eva2.optimization.operators.selection.replacement; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; /** This method replaces the worst indvidual in the population. * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/selection/replacement/ReplaceWorstParent.java b/src/eva2/optimization/operators/selection/replacement/ReplaceWorstParent.java similarity index 91% rename from src/eva2/server/go/operators/selection/replacement/ReplaceWorstParent.java rename to src/eva2/optimization/operators/selection/replacement/ReplaceWorstParent.java index 916190cb..b54c22dc 100644 --- a/src/eva2/server/go/operators/selection/replacement/ReplaceWorstParent.java +++ b/src/eva2/optimization/operators/selection/replacement/ReplaceWorstParent.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.selection.replacement; +package eva2.optimization.operators.selection.replacement; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; /** This method replaces the worst parent. Doesn't work, * most likely it has the effect of a negative elitism. diff --git a/src/eva2/server/go/operators/selection/replacement/ReplacementCrowding.java b/src/eva2/optimization/operators/selection/replacement/ReplacementCrowding.java similarity index 90% rename from src/eva2/server/go/operators/selection/replacement/ReplacementCrowding.java rename to src/eva2/optimization/operators/selection/replacement/ReplacementCrowding.java index 23f2e342..aea6d5cd 100644 --- a/src/eva2/server/go/operators/selection/replacement/ReplacementCrowding.java +++ b/src/eva2/optimization/operators/selection/replacement/ReplacementCrowding.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.selection.replacement; +package eva2.optimization.operators.selection.replacement; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.distancemetric.PhenotypeMetric; -import eva2.server.go.operators.selection.SelectRandom; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.operators.distancemetric.PhenotypeMetric; +import eva2.optimization.operators.selection.SelectRandom; +import eva2.optimization.populations.Population; /** This crowding method replaces the most similar individual from a random group if better. * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/selection/replacement/ReplacementNondominatedSortingDistanceCrowding.java b/src/eva2/optimization/operators/selection/replacement/ReplacementNondominatedSortingDistanceCrowding.java similarity index 88% rename from src/eva2/server/go/operators/selection/replacement/ReplacementNondominatedSortingDistanceCrowding.java rename to src/eva2/optimization/operators/selection/replacement/ReplacementNondominatedSortingDistanceCrowding.java index 80f671ba..c49c6555 100644 --- a/src/eva2/server/go/operators/selection/replacement/ReplacementNondominatedSortingDistanceCrowding.java +++ b/src/eva2/optimization/operators/selection/replacement/ReplacementNondominatedSortingDistanceCrowding.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.selection.replacement; +package eva2.optimization.operators.selection.replacement; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.archiving.ArchivingNSGAII; -import eva2.server.go.operators.selection.SelectRandom; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.operators.archiving.ArchivingNSGAII; +import eva2.optimization.operators.selection.SelectRandom; +import eva2.optimization.populations.Population; import java.util.Collections; import java.util.Comparator; diff --git a/src/eva2/server/go/operators/terminators/CombinedTerminator.java b/src/eva2/optimization/operators/terminators/CombinedTerminator.java similarity index 94% rename from src/eva2/server/go/operators/terminators/CombinedTerminator.java rename to src/eva2/optimization/operators/terminators/CombinedTerminator.java index 9d6244f1..aaab226a 100644 --- a/src/eva2/server/go/operators/terminators/CombinedTerminator.java +++ b/src/eva2/optimization/operators/terminators/CombinedTerminator.java @@ -1,9 +1,9 @@ -package eva2.server.go.operators.terminators; +package eva2.optimization.operators.terminators; -import eva2.server.go.InterfaceTerminator; -import eva2.server.go.PopulationInterface; -import eva2.server.go.populations.InterfaceSolutionSet; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.go.InterfaceTerminator; +import eva2.optimization.go.PopulationInterface; +import eva2.optimization.populations.InterfaceSolutionSet; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.SelectedTag; import java.io.Serializable; diff --git a/src/eva2/server/go/operators/terminators/DiversityTerminator.java b/src/eva2/optimization/operators/terminators/DiversityTerminator.java similarity index 87% rename from src/eva2/server/go/operators/terminators/DiversityTerminator.java rename to src/eva2/optimization/operators/terminators/DiversityTerminator.java index 716edfa9..c6bb8ccc 100644 --- a/src/eva2/server/go/operators/terminators/DiversityTerminator.java +++ b/src/eva2/optimization/operators/terminators/DiversityTerminator.java @@ -1,10 +1,10 @@ -package eva2.server.go.operators.terminators; +package eva2.optimization.operators.terminators; -import eva2.server.go.InterfaceTerminator; -import eva2.server.go.PopulationInterface; -import eva2.server.go.operators.distancemetric.InterfaceDistanceMetric; -import eva2.server.go.operators.distancemetric.PhenotypeMetric; -import eva2.server.go.populations.Population; +import eva2.optimization.go.InterfaceTerminator; +import eva2.optimization.go.PopulationInterface; +import eva2.optimization.operators.distancemetric.InterfaceDistanceMetric; +import eva2.optimization.operators.distancemetric.PhenotypeMetric; +import eva2.optimization.populations.Population; import java.io.Serializable; /** diff --git a/src/eva2/server/go/operators/terminators/EvaluationTerminator.java b/src/eva2/optimization/operators/terminators/EvaluationTerminator.java similarity index 90% rename from src/eva2/server/go/operators/terminators/EvaluationTerminator.java rename to src/eva2/optimization/operators/terminators/EvaluationTerminator.java index 160094ed..f2605cd4 100644 --- a/src/eva2/server/go/operators/terminators/EvaluationTerminator.java +++ b/src/eva2/optimization/operators/terminators/EvaluationTerminator.java @@ -1,4 +1,4 @@ -package eva2.server.go.operators.terminators; +package eva2.optimization.operators.terminators; /* * Title: EvA2 * Description: @@ -12,10 +12,10 @@ package eva2.server.go.operators.terminators; /*==========================================================================* * IMPORTS *==========================================================================*/ -import eva2.server.go.InterfaceTerminator; -import eva2.server.go.PopulationInterface; -import eva2.server.go.populations.InterfaceSolutionSet; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.go.InterfaceTerminator; +import eva2.optimization.go.PopulationInterface; +import eva2.optimization.populations.InterfaceSolutionSet; +import eva2.optimization.problems.InterfaceOptimizationProblem; import java.io.Serializable; /*==========================================================================* diff --git a/src/eva2/server/go/operators/terminators/FitnessConvergenceTerminator.java b/src/eva2/optimization/operators/terminators/FitnessConvergenceTerminator.java similarity index 90% rename from src/eva2/server/go/operators/terminators/FitnessConvergenceTerminator.java rename to src/eva2/optimization/operators/terminators/FitnessConvergenceTerminator.java index 82cbcdc4..f9b5ae15 100644 --- a/src/eva2/server/go/operators/terminators/FitnessConvergenceTerminator.java +++ b/src/eva2/optimization/operators/terminators/FitnessConvergenceTerminator.java @@ -1,7 +1,7 @@ -package eva2.server.go.operators.terminators; +package eva2.optimization.operators.terminators; -import eva2.server.go.InterfaceTerminator; -import eva2.server.go.PopulationInterface; +import eva2.optimization.go.InterfaceTerminator; +import eva2.optimization.go.PopulationInterface; import eva2.tools.math.Mathematics; import java.io.Serializable; diff --git a/src/eva2/server/go/operators/terminators/FitnessValueTerminator.java b/src/eva2/optimization/operators/terminators/FitnessValueTerminator.java similarity index 89% rename from src/eva2/server/go/operators/terminators/FitnessValueTerminator.java rename to src/eva2/optimization/operators/terminators/FitnessValueTerminator.java index c4a2c9f9..7bd81a3b 100644 --- a/src/eva2/server/go/operators/terminators/FitnessValueTerminator.java +++ b/src/eva2/optimization/operators/terminators/FitnessValueTerminator.java @@ -1,4 +1,4 @@ -package eva2.server.go.operators.terminators; +package eva2.optimization.operators.terminators; /* * Title: EvA2 * Description: @@ -13,10 +13,10 @@ package eva2.server.go.operators.terminators; * IMPORTS *==========================================================================*/ import eva2.gui.BeanInspector; -import eva2.server.go.InterfaceTerminator; -import eva2.server.go.PopulationInterface; -import eva2.server.go.populations.InterfaceSolutionSet; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.go.InterfaceTerminator; +import eva2.optimization.go.PopulationInterface; +import eva2.optimization.populations.InterfaceSolutionSet; +import eva2.optimization.problems.InterfaceOptimizationProblem; import java.io.Serializable; /*==========================================================================* diff --git a/src/eva2/server/go/operators/terminators/GenerationTerminator.java b/src/eva2/optimization/operators/terminators/GenerationTerminator.java similarity index 87% rename from src/eva2/server/go/operators/terminators/GenerationTerminator.java rename to src/eva2/optimization/operators/terminators/GenerationTerminator.java index d04e1758..055aa21a 100644 --- a/src/eva2/server/go/operators/terminators/GenerationTerminator.java +++ b/src/eva2/optimization/operators/terminators/GenerationTerminator.java @@ -1,4 +1,4 @@ -package eva2.server.go.operators.terminators; +package eva2.optimization.operators.terminators; /* * Title: EvA2 * Description: @@ -9,10 +9,10 @@ package eva2.server.go.operators.terminators; * $Date: 2007-12-05 11:29:32 +0100 (Wed, 05 Dec 2007) $ * $Author: mkron $ */ -import eva2.server.go.InterfaceTerminator; -import eva2.server.go.PopulationInterface; -import eva2.server.go.populations.InterfaceSolutionSet; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.go.InterfaceTerminator; +import eva2.optimization.go.PopulationInterface; +import eva2.optimization.populations.InterfaceSolutionSet; +import eva2.optimization.problems.InterfaceOptimizationProblem; import java.io.Serializable; /** diff --git a/src/eva2/server/go/operators/terminators/HistoryConvergenceTerminator.java b/src/eva2/optimization/operators/terminators/HistoryConvergenceTerminator.java similarity index 91% rename from src/eva2/server/go/operators/terminators/HistoryConvergenceTerminator.java rename to src/eva2/optimization/operators/terminators/HistoryConvergenceTerminator.java index f98c7e05..a5939433 100644 --- a/src/eva2/server/go/operators/terminators/HistoryConvergenceTerminator.java +++ b/src/eva2/optimization/operators/terminators/HistoryConvergenceTerminator.java @@ -1,13 +1,13 @@ -package eva2.server.go.operators.terminators; +package eva2.optimization.operators.terminators; -import eva2.server.go.InterfaceTerminator; -import eva2.server.go.PopulationInterface; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.AbstractEAIndividualComparator; -import eva2.server.go.operators.distancemetric.ObjectiveSpaceMetric; -import eva2.server.go.populations.InterfaceSolutionSet; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.go.InterfaceTerminator; +import eva2.optimization.go.PopulationInterface; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.AbstractEAIndividualComparator; +import eva2.optimization.operators.distancemetric.ObjectiveSpaceMetric; +import eva2.optimization.populations.InterfaceSolutionSet; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; import java.io.Serializable; import java.util.List; diff --git a/src/eva2/server/go/operators/terminators/KnownOptimaFoundTerminator.java b/src/eva2/optimization/operators/terminators/KnownOptimaFoundTerminator.java similarity index 86% rename from src/eva2/server/go/operators/terminators/KnownOptimaFoundTerminator.java rename to src/eva2/optimization/operators/terminators/KnownOptimaFoundTerminator.java index a61630e1..0c411e2d 100644 --- a/src/eva2/server/go/operators/terminators/KnownOptimaFoundTerminator.java +++ b/src/eva2/optimization/operators/terminators/KnownOptimaFoundTerminator.java @@ -1,11 +1,11 @@ -package eva2.server.go.operators.terminators; +package eva2.optimization.operators.terminators; -import eva2.server.go.InterfaceTerminator; -import eva2.server.go.PopulationInterface; -import eva2.server.go.populations.InterfaceSolutionSet; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceMultimodalProblemKnown; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.go.InterfaceTerminator; +import eva2.optimization.go.PopulationInterface; +import eva2.optimization.populations.InterfaceSolutionSet; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceMultimodalProblemKnown; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.EVAERROR; import java.io.Serializable; diff --git a/src/eva2/server/go/operators/terminators/ParetoMetricTerminator.java b/src/eva2/optimization/operators/terminators/ParetoMetricTerminator.java similarity index 89% rename from src/eva2/server/go/operators/terminators/ParetoMetricTerminator.java rename to src/eva2/optimization/operators/terminators/ParetoMetricTerminator.java index 341f89fa..f8cb2580 100644 --- a/src/eva2/server/go/operators/terminators/ParetoMetricTerminator.java +++ b/src/eva2/optimization/operators/terminators/ParetoMetricTerminator.java @@ -1,12 +1,12 @@ -package eva2.server.go.operators.terminators; +package eva2.optimization.operators.terminators; import eva2.gui.BeanInspector; -import eva2.server.go.PopulationInterface; -import eva2.server.go.operators.paretofrontmetrics.InterfaceParetoFrontMetric; -import eva2.server.go.operators.paretofrontmetrics.MetricS; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.AbstractMultiObjectiveOptimizationProblem; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.go.PopulationInterface; +import eva2.optimization.operators.paretofrontmetrics.InterfaceParetoFrontMetric; +import eva2.optimization.operators.paretofrontmetrics.MetricS; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.EVAERROR; import java.io.Serializable; diff --git a/src/eva2/server/go/operators/terminators/PhenotypeConvergenceTerminator.java b/src/eva2/optimization/operators/terminators/PhenotypeConvergenceTerminator.java similarity index 84% rename from src/eva2/server/go/operators/terminators/PhenotypeConvergenceTerminator.java rename to src/eva2/optimization/operators/terminators/PhenotypeConvergenceTerminator.java index 69a4d0ce..9d248af8 100644 --- a/src/eva2/server/go/operators/terminators/PhenotypeConvergenceTerminator.java +++ b/src/eva2/optimization/operators/terminators/PhenotypeConvergenceTerminator.java @@ -1,10 +1,10 @@ -package eva2.server.go.operators.terminators; +package eva2.optimization.operators.terminators; -import eva2.server.go.InterfaceTerminator; -import eva2.server.go.PopulationInterface; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.distancemetric.PhenotypeMetric; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.go.InterfaceTerminator; +import eva2.optimization.go.PopulationInterface; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.operators.distancemetric.PhenotypeMetric; +import eva2.optimization.problems.InterfaceOptimizationProblem; public class PhenotypeConvergenceTerminator extends PopulationMeasureTerminator implements InterfaceTerminator { AbstractEAIndividual oldIndy = null; diff --git a/src/eva2/server/go/operators/terminators/PopulationArchiveTerminator.java b/src/eva2/optimization/operators/terminators/PopulationArchiveTerminator.java similarity index 87% rename from src/eva2/server/go/operators/terminators/PopulationArchiveTerminator.java rename to src/eva2/optimization/operators/terminators/PopulationArchiveTerminator.java index fc5c721a..00957d99 100644 --- a/src/eva2/server/go/operators/terminators/PopulationArchiveTerminator.java +++ b/src/eva2/optimization/operators/terminators/PopulationArchiveTerminator.java @@ -1,8 +1,8 @@ -package eva2.server.go.operators.terminators; +package eva2.optimization.operators.terminators; -import eva2.server.go.PopulationInterface; -import eva2.server.go.individuals.IndividualWeightedFitnessComparator; -import eva2.server.go.populations.Population; +import eva2.optimization.go.PopulationInterface; +import eva2.optimization.individuals.IndividualWeightedFitnessComparator; +import eva2.optimization.populations.Population; /** * Terminate if a score based on the archive of the population converges. diff --git a/src/eva2/server/go/operators/terminators/PopulationMeasureTerminator.java b/src/eva2/optimization/operators/terminators/PopulationMeasureTerminator.java similarity index 97% rename from src/eva2/server/go/operators/terminators/PopulationMeasureTerminator.java rename to src/eva2/optimization/operators/terminators/PopulationMeasureTerminator.java index c138ba78..5be413dd 100644 --- a/src/eva2/server/go/operators/terminators/PopulationMeasureTerminator.java +++ b/src/eva2/optimization/operators/terminators/PopulationMeasureTerminator.java @@ -1,10 +1,10 @@ -package eva2.server.go.operators.terminators; +package eva2.optimization.operators.terminators; import eva2.gui.BeanInspector; -import eva2.server.go.InterfaceTerminator; -import eva2.server.go.PopulationInterface; -import eva2.server.go.populations.InterfaceSolutionSet; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.go.InterfaceTerminator; +import eva2.optimization.go.PopulationInterface; +import eva2.optimization.populations.InterfaceSolutionSet; +import eva2.optimization.problems.InterfaceOptimizationProblem; import java.io.Serializable; /** diff --git a/src/eva2/server/go/populations/InterfaceSolutionSet.java b/src/eva2/optimization/populations/InterfaceSolutionSet.java similarity index 92% rename from src/eva2/server/go/populations/InterfaceSolutionSet.java rename to src/eva2/optimization/populations/InterfaceSolutionSet.java index 52991586..2aa7f0f4 100644 --- a/src/eva2/server/go/populations/InterfaceSolutionSet.java +++ b/src/eva2/optimization/populations/InterfaceSolutionSet.java @@ -1,4 +1,4 @@ -package eva2.server.go.populations; +package eva2.optimization.populations; /** * This is just a wrapper type to distinct between a Population (current solution set diff --git a/src/eva2/server/go/populations/PBILPopulation.java b/src/eva2/optimization/populations/PBILPopulation.java similarity index 97% rename from src/eva2/server/go/populations/PBILPopulation.java rename to src/eva2/optimization/populations/PBILPopulation.java index 60329331..6289c15a 100644 --- a/src/eva2/server/go/populations/PBILPopulation.java +++ b/src/eva2/optimization/populations/PBILPopulation.java @@ -1,7 +1,7 @@ -package eva2.server.go.populations; +package eva2.optimization.populations; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceGAIndividual; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceGAIndividual; import eva2.tools.math.RNG; import java.util.BitSet; diff --git a/src/eva2/server/go/populations/Population.java b/src/eva2/optimization/populations/Population.java similarity index 99% rename from src/eva2/server/go/populations/Population.java rename to src/eva2/optimization/populations/Population.java index 1f094444..06adb05f 100644 --- a/src/eva2/server/go/populations/Population.java +++ b/src/eva2/optimization/populations/Population.java @@ -1,15 +1,19 @@ -package eva2.server.go.populations; +package eva2.optimization.populations; +import eva2.optimization.individuals.InterfaceDataTypeDouble; +import eva2.optimization.individuals.AbstractEAIndividualComparator; +import eva2.optimization.individuals.InterfaceESIndividual; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceGAIndividual; import eva2.gui.GenericObjectEditor; -import eva2.server.go.IndividualInterface; -import eva2.server.go.InterfacePopulationChangedEventListener; -import eva2.server.go.PopulationInterface; -import eva2.server.go.individuals.*; -import eva2.server.go.operators.distancemetric.EuclideanMetric; -import eva2.server.go.operators.distancemetric.InterfaceDistanceMetric; -import eva2.server.go.operators.distancemetric.PhenotypeMetric; -import eva2.server.go.operators.postprocess.PostProcess; -import eva2.server.go.operators.selection.probability.AbstractSelProb; +import eva2.optimization.go.IndividualInterface; +import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.go.PopulationInterface; +import eva2.optimization.operators.distancemetric.EuclideanMetric; +import eva2.optimization.operators.distancemetric.InterfaceDistanceMetric; +import eva2.optimization.operators.distancemetric.PhenotypeMetric; +import eva2.optimization.operators.postprocess.PostProcess; +import eva2.optimization.operators.selection.probability.AbstractSelProb; import eva2.tools.EVAERROR; import eva2.tools.Pair; import eva2.tools.Serializer; diff --git a/src/eva2/server/go/populations/PopulationInitMethod.java b/src/eva2/optimization/populations/PopulationInitMethod.java similarity index 76% rename from src/eva2/server/go/populations/PopulationInitMethod.java rename to src/eva2/optimization/populations/PopulationInitMethod.java index dbdb8740..966ac24b 100644 --- a/src/eva2/server/go/populations/PopulationInitMethod.java +++ b/src/eva2/optimization/populations/PopulationInitMethod.java @@ -1,4 +1,4 @@ -package eva2.server.go.populations; +package eva2.optimization.populations; public enum PopulationInitMethod { individualDefault, randomLatinHypercube, aroundSeed, binCardinality, aroundRandomSeed; diff --git a/src/eva2/server/go/populations/SolutionSet.java b/src/eva2/optimization/populations/SolutionSet.java similarity index 95% rename from src/eva2/server/go/populations/SolutionSet.java rename to src/eva2/optimization/populations/SolutionSet.java index 0e627a8e..53bbe9d1 100644 --- a/src/eva2/server/go/populations/SolutionSet.java +++ b/src/eva2/optimization/populations/SolutionSet.java @@ -1,4 +1,4 @@ -package eva2.server.go.populations; +package eva2.optimization.populations; public class SolutionSet implements InterfaceSolutionSet { Population pop = null; diff --git a/src/eva2/server/go/problems/AbstractDynTransProblem.java b/src/eva2/optimization/problems/AbstractDynTransProblem.java similarity index 92% rename from src/eva2/server/go/problems/AbstractDynTransProblem.java rename to src/eva2/optimization/problems/AbstractDynTransProblem.java index c1bc9a2d..23a2c4ad 100644 --- a/src/eva2/server/go/problems/AbstractDynTransProblem.java +++ b/src/eva2/optimization/problems/AbstractDynTransProblem.java @@ -1,9 +1,9 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceDataTypeDouble; -import eva2.server.go.populations.Population; -import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceDataTypeDouble; +import eva2.optimization.populations.Population; +import eva2.optimization.strategies.InterfaceOptimizer; import java.util.Random; diff --git a/src/eva2/server/go/problems/AbstractDynamicOptimizationProblem.java b/src/eva2/optimization/problems/AbstractDynamicOptimizationProblem.java similarity index 98% rename from src/eva2/server/go/problems/AbstractDynamicOptimizationProblem.java rename to src/eva2/optimization/problems/AbstractDynamicOptimizationProblem.java index 91044e4d..c4a29b80 100644 --- a/src/eva2/server/go/problems/AbstractDynamicOptimizationProblem.java +++ b/src/eva2/optimization/problems/AbstractDynamicOptimizationProblem.java @@ -1,8 +1,8 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; import eva2.gui.Plot; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; /** diff --git a/src/eva2/server/go/problems/AbstractMultiModalProblemKnown.java b/src/eva2/optimization/problems/AbstractMultiModalProblemKnown.java similarity index 97% rename from src/eva2/server/go/problems/AbstractMultiModalProblemKnown.java rename to src/eva2/optimization/problems/AbstractMultiModalProblemKnown.java index 0fc03c16..d0e9fdb5 100644 --- a/src/eva2/server/go/problems/AbstractMultiModalProblemKnown.java +++ b/src/eva2/optimization/problems/AbstractMultiModalProblemKnown.java @@ -1,13 +1,13 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; -import eva2.server.go.PopulationInterface; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.ESIndividualDoubleData; -import eva2.server.go.individuals.InterfaceDataTypeDouble; -import eva2.server.go.operators.distancemetric.InterfaceDistanceMetric; -import eva2.server.go.operators.distancemetric.PhenotypeMetric; -import eva2.server.go.operators.postprocess.PostProcess; -import eva2.server.go.populations.Population; +import eva2.optimization.go.PopulationInterface; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.ESIndividualDoubleData; +import eva2.optimization.individuals.InterfaceDataTypeDouble; +import eva2.optimization.operators.distancemetric.InterfaceDistanceMetric; +import eva2.optimization.operators.distancemetric.PhenotypeMetric; +import eva2.optimization.operators.postprocess.PostProcess; +import eva2.optimization.populations.Population; import eva2.tools.EVAERROR; import eva2.tools.ToolBox; import eva2.tools.math.Mathematics; diff --git a/src/eva2/server/go/problems/AbstractMultiObjectiveOptimizationProblem.java b/src/eva2/optimization/problems/AbstractMultiObjectiveOptimizationProblem.java similarity index 97% rename from src/eva2/server/go/problems/AbstractMultiObjectiveOptimizationProblem.java rename to src/eva2/optimization/problems/AbstractMultiObjectiveOptimizationProblem.java index 4f585b2d..a4f84da6 100644 --- a/src/eva2/server/go/problems/AbstractMultiObjectiveOptimizationProblem.java +++ b/src/eva2/optimization/problems/AbstractMultiObjectiveOptimizationProblem.java @@ -1,18 +1,18 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; import eva2.gui.GraphPointSet; import eva2.gui.Plot; -import eva2.server.go.PopulationInterface; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.ESIndividualDoubleData; -import eva2.server.go.operators.archiving.ArchivingAllDominating; -import eva2.server.go.operators.archiving.ArchivingNSGA; -import eva2.server.go.operators.moso.InterfaceMOSOConverter; -import eva2.server.go.operators.moso.MOSONoConvert; -import eva2.server.go.operators.paretofrontmetrics.InterfaceParetoFrontMetric; -import eva2.server.go.operators.paretofrontmetrics.MetricS; -import eva2.server.go.populations.Population; -import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.optimization.go.PopulationInterface; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.ESIndividualDoubleData; +import eva2.optimization.operators.archiving.ArchivingAllDominating; +import eva2.optimization.operators.archiving.ArchivingNSGA; +import eva2.optimization.operators.moso.InterfaceMOSOConverter; +import eva2.optimization.operators.moso.MOSONoConvert; +import eva2.optimization.operators.paretofrontmetrics.InterfaceParetoFrontMetric; +import eva2.optimization.operators.paretofrontmetrics.MetricS; +import eva2.optimization.populations.Population; +import eva2.optimization.strategies.InterfaceOptimizer; import eva2.tools.ToolBox; import eva2.tools.chart2d.Chart2DDPointIconCircle; import eva2.tools.chart2d.Chart2DDPointIconText; diff --git a/src/eva2/server/go/problems/AbstractOptimizationProblem.java b/src/eva2/optimization/problems/AbstractOptimizationProblem.java similarity index 94% rename from src/eva2/server/go/problems/AbstractOptimizationProblem.java rename to src/eva2/optimization/problems/AbstractOptimizationProblem.java index 67f783ea..5f16aa93 100644 --- a/src/eva2/server/go/problems/AbstractOptimizationProblem.java +++ b/src/eva2/optimization/problems/AbstractOptimizationProblem.java @@ -1,28 +1,28 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; -import eva2.server.go.InterfaceTerminator; -import eva2.server.go.PopulationInterface; -import eva2.server.go.enums.PostProcessMethod; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceDataTypeDouble; -import eva2.server.go.operators.cluster.ClusteringDensityBased; -import eva2.server.go.operators.cluster.InterfaceClustering; -import eva2.server.go.operators.distancemetric.IndividualDataMetric; -import eva2.server.go.operators.distancemetric.InterfaceDistanceMetric; -import eva2.server.go.operators.distancemetric.PhenotypeMetric; -import eva2.server.go.operators.moso.MOSONoConvert; -import eva2.server.go.operators.mutation.InterfaceMutation; -import eva2.server.go.operators.mutation.MutateESFixedStepSize; -import eva2.server.go.operators.postprocess.PostProcess; -import eva2.server.go.operators.postprocess.SolutionHistogram; -import eva2.server.go.operators.terminators.CombinedTerminator; -import eva2.server.go.operators.terminators.EvaluationTerminator; -import eva2.server.go.operators.terminators.PhenotypeConvergenceTerminator; -import eva2.server.go.operators.terminators.PopulationMeasureTerminator.ChangeTypeEnum; -import eva2.server.go.operators.terminators.PopulationMeasureTerminator.DirectionTypeEnum; -import eva2.server.go.operators.terminators.PopulationMeasureTerminator.StagnationTypeEnum; -import eva2.server.go.populations.Population; -import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.optimization.go.InterfaceTerminator; +import eva2.optimization.go.PopulationInterface; +import eva2.optimization.enums.PostProcessMethod; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceDataTypeDouble; +import eva2.optimization.operators.cluster.ClusteringDensityBased; +import eva2.optimization.operators.cluster.InterfaceClustering; +import eva2.optimization.operators.distancemetric.IndividualDataMetric; +import eva2.optimization.operators.distancemetric.InterfaceDistanceMetric; +import eva2.optimization.operators.distancemetric.PhenotypeMetric; +import eva2.optimization.operators.moso.MOSONoConvert; +import eva2.optimization.operators.mutation.InterfaceMutation; +import eva2.optimization.operators.mutation.MutateESFixedStepSize; +import eva2.optimization.operators.postprocess.PostProcess; +import eva2.optimization.operators.postprocess.SolutionHistogram; +import eva2.optimization.operators.terminators.CombinedTerminator; +import eva2.optimization.operators.terminators.EvaluationTerminator; +import eva2.optimization.operators.terminators.PhenotypeConvergenceTerminator; +import eva2.optimization.operators.terminators.PopulationMeasureTerminator.ChangeTypeEnum; +import eva2.optimization.operators.terminators.PopulationMeasureTerminator.DirectionTypeEnum; +import eva2.optimization.operators.terminators.PopulationMeasureTerminator.StagnationTypeEnum; +import eva2.optimization.populations.Population; +import eva2.optimization.strategies.InterfaceOptimizer; import eva2.tools.ToolBox; import java.awt.BorderLayout; import java.io.Serializable; diff --git a/src/eva2/server/go/problems/AbstractParallelOptimizationProblem.java b/src/eva2/optimization/problems/AbstractParallelOptimizationProblem.java similarity index 98% rename from src/eva2/server/go/problems/AbstractParallelOptimizationProblem.java rename to src/eva2/optimization/problems/AbstractParallelOptimizationProblem.java index b65ce9ca..9e3cfcd1 100644 --- a/src/eva2/server/go/problems/AbstractParallelOptimizationProblem.java +++ b/src/eva2/optimization/problems/AbstractParallelOptimizationProblem.java @@ -1,4 +1,4 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; /** * This class is under construction. diff --git a/src/eva2/server/go/problems/AbstractProblemBinary.java b/src/eva2/optimization/problems/AbstractProblemBinary.java similarity index 89% rename from src/eva2/server/go/problems/AbstractProblemBinary.java rename to src/eva2/optimization/problems/AbstractProblemBinary.java index fcc84b1c..c7e7f246 100644 --- a/src/eva2/server/go/problems/AbstractProblemBinary.java +++ b/src/eva2/optimization/problems/AbstractProblemBinary.java @@ -1,11 +1,11 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.GAIndividualBinaryData; -import eva2.server.go.individuals.InterfaceDataTypeBinary; -import eva2.server.go.individuals.InterfaceGAIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.GAIndividualBinaryData; +import eva2.optimization.individuals.InterfaceDataTypeBinary; +import eva2.optimization.individuals.InterfaceGAIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.strategies.InterfaceOptimizer; import java.util.BitSet; /** diff --git a/src/eva2/server/go/problems/AbstractProblemDouble.java b/src/eva2/optimization/problems/AbstractProblemDouble.java similarity index 95% rename from src/eva2/server/go/problems/AbstractProblemDouble.java rename to src/eva2/optimization/problems/AbstractProblemDouble.java index 90bb989d..cfccb00c 100644 --- a/src/eva2/server/go/problems/AbstractProblemDouble.java +++ b/src/eva2/optimization/problems/AbstractProblemDouble.java @@ -1,21 +1,21 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; import eva2.gui.GenericObjectEditor; import eva2.gui.TopoPlot; -import eva2.server.go.PopulationInterface; -import eva2.server.go.enums.PostProcessMethod; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.ESIndividualDoubleData; -import eva2.server.go.individuals.InterfaceDataTypeDouble; -import eva2.server.go.operators.constraint.AbstractConstraint; -import eva2.server.go.operators.constraint.GenericConstraint; -import eva2.server.go.operators.postprocess.PostProcess; -import eva2.server.go.operators.terminators.FitnessConvergenceTerminator; -import eva2.server.go.operators.terminators.PopulationMeasureTerminator.ChangeTypeEnum; -import eva2.server.go.operators.terminators.PopulationMeasureTerminator.DirectionTypeEnum; -import eva2.server.go.operators.terminators.PopulationMeasureTerminator.StagnationTypeEnum; -import eva2.server.go.populations.Population; -import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.optimization.go.PopulationInterface; +import eva2.optimization.enums.PostProcessMethod; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.ESIndividualDoubleData; +import eva2.optimization.individuals.InterfaceDataTypeDouble; +import eva2.optimization.operators.constraint.AbstractConstraint; +import eva2.optimization.operators.constraint.GenericConstraint; +import eva2.optimization.operators.postprocess.PostProcess; +import eva2.optimization.operators.terminators.FitnessConvergenceTerminator; +import eva2.optimization.operators.terminators.PopulationMeasureTerminator.ChangeTypeEnum; +import eva2.optimization.operators.terminators.PopulationMeasureTerminator.DirectionTypeEnum; +import eva2.optimization.operators.terminators.PopulationMeasureTerminator.StagnationTypeEnum; +import eva2.optimization.populations.Population; +import eva2.optimization.strategies.InterfaceOptimizer; import eva2.tools.Pair; import eva2.tools.ToolBox; import eva2.tools.diagram.ColorBarCalculator; diff --git a/src/eva2/server/go/problems/AbstractProblemDoubleOffset.java b/src/eva2/optimization/problems/AbstractProblemDoubleOffset.java similarity index 98% rename from src/eva2/server/go/problems/AbstractProblemDoubleOffset.java rename to src/eva2/optimization/problems/AbstractProblemDoubleOffset.java index e45cad44..87b01e3b 100644 --- a/src/eva2/server/go/problems/AbstractProblemDoubleOffset.java +++ b/src/eva2/optimization/problems/AbstractProblemDoubleOffset.java @@ -1,4 +1,4 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/problems/AbstractProblemInteger.java b/src/eva2/optimization/problems/AbstractProblemInteger.java similarity index 92% rename from src/eva2/server/go/problems/AbstractProblemInteger.java rename to src/eva2/optimization/problems/AbstractProblemInteger.java index aa9cbbb4..2ef4e12f 100644 --- a/src/eva2/server/go/problems/AbstractProblemInteger.java +++ b/src/eva2/optimization/problems/AbstractProblemInteger.java @@ -1,10 +1,10 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.GIIndividualIntegerData; -import eva2.server.go.individuals.InterfaceDataTypeInteger; -import eva2.server.go.populations.Population; -import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.GIIndividualIntegerData; +import eva2.optimization.individuals.InterfaceDataTypeInteger; +import eva2.optimization.populations.Population; +import eva2.optimization.strategies.InterfaceOptimizer; /** * An abstract problem with integer data type. diff --git a/src/eva2/server/go/problems/AbstractSynchronousOptimizationProblem.java b/src/eva2/optimization/problems/AbstractSynchronousOptimizationProblem.java similarity index 97% rename from src/eva2/server/go/problems/AbstractSynchronousOptimizationProblem.java rename to src/eva2/optimization/problems/AbstractSynchronousOptimizationProblem.java index 00b02258..f0495a4b 100644 --- a/src/eva2/server/go/problems/AbstractSynchronousOptimizationProblem.java +++ b/src/eva2/optimization/problems/AbstractSynchronousOptimizationProblem.java @@ -1,9 +1,9 @@ /** * */ -package eva2.server.go.problems; +package eva2.optimization.problems; -import eva2.server.go.populations.Population; +import eva2.optimization.populations.Population; /** * A synchronous problem changes in equal intervals. As the EA takes notice of the diff --git a/src/eva2/server/go/problems/B1Problem.java b/src/eva2/optimization/problems/B1Problem.java similarity index 91% rename from src/eva2/server/go/problems/B1Problem.java rename to src/eva2/optimization/problems/B1Problem.java index deb614dc..51b7f97a 100644 --- a/src/eva2/server/go/problems/B1Problem.java +++ b/src/eva2/optimization/problems/B1Problem.java @@ -1,12 +1,12 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceDataTypeBinary; -import eva2.server.go.operators.mutation.MutateEAMixer; -import eva2.server.go.operators.mutation.MutateGAGISwapBits; -import eva2.server.go.operators.mutation.MutateGAUniform; -import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceDataTypeBinary; +import eva2.optimization.operators.mutation.MutateEAMixer; +import eva2.optimization.operators.mutation.MutateGAGISwapBits; +import eva2.optimization.operators.mutation.MutateGAUniform; +import eva2.optimization.strategies.InterfaceOptimizer; import java.util.BitSet; /** diff --git a/src/eva2/server/go/problems/BKnapsackProblem.java b/src/eva2/optimization/problems/BKnapsackProblem.java similarity index 98% rename from src/eva2/server/go/problems/BKnapsackProblem.java rename to src/eva2/optimization/problems/BKnapsackProblem.java index a638c551..22d92c25 100644 --- a/src/eva2/server/go/problems/BKnapsackProblem.java +++ b/src/eva2/optimization/problems/BKnapsackProblem.java @@ -1,10 +1,10 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceDataTypeBinary; -import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceDataTypeBinary; +import eva2.optimization.strategies.InterfaceOptimizer; import eva2.tools.math.RNG; import java.util.BitSet; diff --git a/src/eva2/server/go/problems/ConstrHimmelblauProblem.java b/src/eva2/optimization/problems/ConstrHimmelblauProblem.java similarity index 91% rename from src/eva2/server/go/problems/ConstrHimmelblauProblem.java rename to src/eva2/optimization/problems/ConstrHimmelblauProblem.java index 3b0b2706..36409e9a 100644 --- a/src/eva2/server/go/problems/ConstrHimmelblauProblem.java +++ b/src/eva2/optimization/problems/ConstrHimmelblauProblem.java @@ -1,8 +1,8 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; -import eva2.server.go.operators.constraint.AbstractConstraint; -import eva2.server.go.operators.constraint.ConstraintCollection; -import eva2.server.go.operators.constraint.IntervalConstraint; +import eva2.optimization.operators.constraint.AbstractConstraint; +import eva2.optimization.operators.constraint.ConstraintCollection; +import eva2.optimization.operators.constraint.IntervalConstraint; import java.io.Serializable; import java.util.Vector; diff --git a/src/eva2/server/go/problems/ConstrPressureVessel.java b/src/eva2/optimization/problems/ConstrPressureVessel.java similarity index 90% rename from src/eva2/server/go/problems/ConstrPressureVessel.java rename to src/eva2/optimization/problems/ConstrPressureVessel.java index 2e45ee78..f7fc0321 100644 --- a/src/eva2/server/go/problems/ConstrPressureVessel.java +++ b/src/eva2/optimization/problems/ConstrPressureVessel.java @@ -1,12 +1,12 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; import eva2.gui.GenericObjectEditor; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.constraint.AbstractConstraint; -import eva2.server.go.operators.constraint.ConstraintCollection; -import eva2.server.go.operators.constraint.ConstraintHandlingEnum; -import eva2.server.go.operators.constraint.ConstraintRelationEnum; -import eva2.server.go.operators.constraint.GenericConstraint; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.operators.constraint.AbstractConstraint; +import eva2.optimization.operators.constraint.ConstraintCollection; +import eva2.optimization.operators.constraint.ConstraintHandlingEnum; +import eva2.optimization.operators.constraint.ConstraintRelationEnum; +import eva2.optimization.operators.constraint.GenericConstraint; import java.util.Vector; public class ConstrPressureVessel extends AbstractProblemDouble { diff --git a/src/eva2/server/go/problems/DynJumpProblem.java b/src/eva2/optimization/problems/DynJumpProblem.java similarity index 94% rename from src/eva2/server/go/problems/DynJumpProblem.java rename to src/eva2/optimization/problems/DynJumpProblem.java index d17820b0..b0d58095 100644 --- a/src/eva2/server/go/problems/DynJumpProblem.java +++ b/src/eva2/optimization/problems/DynJumpProblem.java @@ -1,7 +1,7 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.strategies.InterfaceOptimizer; import java.io.FileWriter; import java.io.IOException; import java.io.Writer; diff --git a/src/eva2/server/go/problems/ERPStarter.java b/src/eva2/optimization/problems/ERPStarter.java similarity index 91% rename from src/eva2/server/go/problems/ERPStarter.java rename to src/eva2/optimization/problems/ERPStarter.java index 10d877a1..a6da95b4 100644 --- a/src/eva2/server/go/problems/ERPStarter.java +++ b/src/eva2/optimization/problems/ERPStarter.java @@ -1,22 +1,22 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; import eva2.OptimizerFactory; import eva2.OptimizerRunnable; import eva2.client.EvAClient; import eva2.gui.BeanInspector; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.crossover.CrossoverESDefault; -import eva2.server.go.operators.moso.MOSONoConvert; -import eva2.server.go.operators.moso.MOSOWeightedFitness; -import eva2.server.go.operators.mutation.MutateESRankMuCMA; -import eva2.server.go.operators.selection.SelectBestIndividuals; -import eva2.server.go.operators.terminators.EvaluationTerminator; -import eva2.server.go.populations.InterfaceSolutionSet; -import eva2.server.go.populations.Population; -import eva2.server.go.strategies.GeneticAlgorithm; -import eva2.server.go.strategies.InterfaceOptimizer; -import eva2.server.modules.GOParameters; -import eva2.server.stat.StatisticsStandalone; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.operators.crossover.CrossoverESDefault; +import eva2.optimization.operators.moso.MOSONoConvert; +import eva2.optimization.operators.moso.MOSOWeightedFitness; +import eva2.optimization.operators.mutation.MutateESRankMuCMA; +import eva2.optimization.operators.selection.SelectBestIndividuals; +import eva2.optimization.operators.terminators.EvaluationTerminator; +import eva2.optimization.populations.InterfaceSolutionSet; +import eva2.optimization.populations.Population; +import eva2.optimization.strategies.GeneticAlgorithm; +import eva2.optimization.strategies.InterfaceOptimizer; +import eva2.optimization.modules.GOParameters; +import eva2.optimization.stat.StatisticsStandalone; import eva2.tools.BasicResourceLoader; import eva2.tools.StringTools; import eva2.tools.ToolBox; diff --git a/src/eva2/server/go/problems/ExternalRuntimeProblem.java b/src/eva2/optimization/problems/ExternalRuntimeProblem.java similarity index 94% rename from src/eva2/server/go/problems/ExternalRuntimeProblem.java rename to src/eva2/optimization/problems/ExternalRuntimeProblem.java index 58074e0d..99b91756 100644 --- a/src/eva2/server/go/problems/ExternalRuntimeProblem.java +++ b/src/eva2/optimization/problems/ExternalRuntimeProblem.java @@ -1,14 +1,14 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; import eva2.gui.BeanInspector; import eva2.gui.PropertyDoubleArray; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.ESIndividualDoubleData; -import eva2.server.go.individuals.InterfaceDataTypeDouble; -import eva2.server.go.operators.moso.InterfaceMOSOConverter; -import eva2.server.go.operators.moso.MOSONoConvert; -import eva2.server.go.populations.Population; -import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.ESIndividualDoubleData; +import eva2.optimization.individuals.InterfaceDataTypeDouble; +import eva2.optimization.operators.moso.InterfaceMOSOConverter; +import eva2.optimization.operators.moso.MOSONoConvert; +import eva2.optimization.populations.Population; +import eva2.optimization.strategies.InterfaceOptimizer; import eva2.tools.math.Mathematics; import java.io.BufferedInputStream; import java.io.BufferedReader; diff --git a/src/eva2/server/go/problems/F10Problem.java b/src/eva2/optimization/problems/F10Problem.java similarity index 97% rename from src/eva2/server/go/problems/F10Problem.java rename to src/eva2/optimization/problems/F10Problem.java index e106fa1a..473bca58 100644 --- a/src/eva2/server/go/problems/F10Problem.java +++ b/src/eva2/optimization/problems/F10Problem.java @@ -1,6 +1,6 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; -import eva2.server.go.individuals.ESIndividualDoubleData; +import eva2.optimization.individuals.ESIndividualDoubleData; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/problems/F11Problem.java b/src/eva2/optimization/problems/F11Problem.java similarity index 96% rename from src/eva2/server/go/problems/F11Problem.java rename to src/eva2/optimization/problems/F11Problem.java index fe8ec759..155e4501 100644 --- a/src/eva2/server/go/problems/F11Problem.java +++ b/src/eva2/optimization/problems/F11Problem.java @@ -1,6 +1,6 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; -import eva2.server.go.individuals.ESIndividualDoubleData; +import eva2.optimization.individuals.ESIndividualDoubleData; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/problems/F12Problem.java b/src/eva2/optimization/problems/F12Problem.java similarity index 98% rename from src/eva2/server/go/problems/F12Problem.java rename to src/eva2/optimization/problems/F12Problem.java index fa125b8f..b8b0af78 100644 --- a/src/eva2/server/go/problems/F12Problem.java +++ b/src/eva2/optimization/problems/F12Problem.java @@ -1,4 +1,4 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; import java.io.Serializable; diff --git a/src/eva2/server/go/problems/F13Problem.java b/src/eva2/optimization/problems/F13Problem.java similarity index 95% rename from src/eva2/server/go/problems/F13Problem.java rename to src/eva2/optimization/problems/F13Problem.java index fdd62d08..e9d285af 100644 --- a/src/eva2/server/go/problems/F13Problem.java +++ b/src/eva2/optimization/problems/F13Problem.java @@ -1,8 +1,8 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; import eva2.gui.GenericObjectEditor; -import eva2.server.go.individuals.ESIndividualDoubleData; -import eva2.server.go.operators.postprocess.SolutionHistogram; +import eva2.optimization.individuals.ESIndividualDoubleData; +import eva2.optimization.operators.postprocess.SolutionHistogram; /** * Schwefels sine root function (1981) with a minimum at 420.9687^n of value 0. diff --git a/src/eva2/server/go/problems/F14Problem.java b/src/eva2/optimization/problems/F14Problem.java similarity index 96% rename from src/eva2/server/go/problems/F14Problem.java rename to src/eva2/optimization/problems/F14Problem.java index a5672bf0..f51f2ee5 100644 --- a/src/eva2/server/go/problems/F14Problem.java +++ b/src/eva2/optimization/problems/F14Problem.java @@ -1,6 +1,6 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; -import eva2.server.go.individuals.ESIndividualDoubleData; +import eva2.optimization.individuals.ESIndividualDoubleData; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/problems/F15Problem.java b/src/eva2/optimization/problems/F15Problem.java similarity index 94% rename from src/eva2/server/go/problems/F15Problem.java rename to src/eva2/optimization/problems/F15Problem.java index c34d03ee..4649ed22 100644 --- a/src/eva2/server/go/problems/F15Problem.java +++ b/src/eva2/optimization/problems/F15Problem.java @@ -1,6 +1,6 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; -import eva2.server.go.operators.postprocess.SolutionHistogram; +import eva2.optimization.operators.postprocess.SolutionHistogram; import java.io.Serializable; /** diff --git a/src/eva2/server/go/problems/F16Problem.java b/src/eva2/optimization/problems/F16Problem.java similarity index 94% rename from src/eva2/server/go/problems/F16Problem.java rename to src/eva2/optimization/problems/F16Problem.java index c0d00b88..33fe0fd1 100644 --- a/src/eva2/server/go/problems/F16Problem.java +++ b/src/eva2/optimization/problems/F16Problem.java @@ -1,6 +1,6 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; -import eva2.server.go.operators.postprocess.SolutionHistogram; +import eva2.optimization.operators.postprocess.SolutionHistogram; /** * The Vincent function: Multiple optima with increasing density near the lower bounds, diff --git a/src/eva2/server/go/problems/F17Problem.java b/src/eva2/optimization/problems/F17Problem.java similarity index 94% rename from src/eva2/server/go/problems/F17Problem.java rename to src/eva2/optimization/problems/F17Problem.java index 0017ae7e..6da0178e 100644 --- a/src/eva2/server/go/problems/F17Problem.java +++ b/src/eva2/optimization/problems/F17Problem.java @@ -1,6 +1,6 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; -import eva2.server.go.operators.postprocess.SolutionHistogram; +import eva2.optimization.operators.postprocess.SolutionHistogram; /** * Bohachevsky function, numerous optima on an oval hyperparabola with similar attractor sizes * but decreasing fitness towards the bounds. Described e.g. in Shir&Bäck, PPSN 2006, diff --git a/src/eva2/server/go/problems/F18Problem.java b/src/eva2/optimization/problems/F18Problem.java similarity index 97% rename from src/eva2/server/go/problems/F18Problem.java rename to src/eva2/optimization/problems/F18Problem.java index 32ca5920..8657d3e5 100644 --- a/src/eva2/server/go/problems/F18Problem.java +++ b/src/eva2/optimization/problems/F18Problem.java @@ -1,4 +1,4 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; public class F18Problem extends AbstractProblemDouble implements InterfaceMultimodalProblem { diff --git a/src/eva2/server/go/problems/F19Problem.java b/src/eva2/optimization/problems/F19Problem.java similarity index 97% rename from src/eva2/server/go/problems/F19Problem.java rename to src/eva2/optimization/problems/F19Problem.java index 10f079bb..db94f535 100644 --- a/src/eva2/server/go/problems/F19Problem.java +++ b/src/eva2/optimization/problems/F19Problem.java @@ -1,6 +1,6 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; -import eva2.server.go.operators.postprocess.SolutionHistogram; +import eva2.optimization.operators.postprocess.SolutionHistogram; import eva2.tools.math.RNG; import java.util.Arrays; import java.util.Random; diff --git a/src/eva2/server/go/problems/F1Problem.java b/src/eva2/optimization/problems/F1Problem.java similarity index 97% rename from src/eva2/server/go/problems/F1Problem.java rename to src/eva2/optimization/problems/F1Problem.java index ef5e1d6e..6c043422 100644 --- a/src/eva2/server/go/problems/F1Problem.java +++ b/src/eva2/optimization/problems/F1Problem.java @@ -1,6 +1,6 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; -import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.optimization.strategies.InterfaceOptimizer; import eva2.tools.math.Mathematics; /** diff --git a/src/eva2/server/go/problems/F20Problem.java b/src/eva2/optimization/problems/F20Problem.java similarity index 97% rename from src/eva2/server/go/problems/F20Problem.java rename to src/eva2/optimization/problems/F20Problem.java index 77c928b6..28b5a6eb 100644 --- a/src/eva2/server/go/problems/F20Problem.java +++ b/src/eva2/optimization/problems/F20Problem.java @@ -1,6 +1,6 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; -import eva2.server.go.operators.postprocess.SolutionHistogram; +import eva2.optimization.operators.postprocess.SolutionHistogram; import java.io.Serializable; /** diff --git a/src/eva2/server/go/problems/F21Problem.java b/src/eva2/optimization/problems/F21Problem.java similarity index 96% rename from src/eva2/server/go/problems/F21Problem.java rename to src/eva2/optimization/problems/F21Problem.java index 81085ea4..92493513 100644 --- a/src/eva2/server/go/problems/F21Problem.java +++ b/src/eva2/optimization/problems/F21Problem.java @@ -1,6 +1,6 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; -import eva2.server.go.operators.postprocess.SolutionHistogram; +import eva2.optimization.operators.postprocess.SolutionHistogram; import java.util.Random; /** diff --git a/src/eva2/server/go/problems/F2Problem.java b/src/eva2/optimization/problems/F2Problem.java similarity index 94% rename from src/eva2/server/go/problems/F2Problem.java rename to src/eva2/optimization/problems/F2Problem.java index 068598d9..5c1ac74e 100644 --- a/src/eva2/server/go/problems/F2Problem.java +++ b/src/eva2/optimization/problems/F2Problem.java @@ -1,8 +1,8 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; -import eva2.server.go.individuals.ESIndividualDoubleData; -import eva2.server.go.populations.Population; -import eva2.server.go.strategies.GradientDescentAlgorithm; +import eva2.optimization.individuals.ESIndividualDoubleData; +import eva2.optimization.populations.Population; +import eva2.optimization.strategies.GradientDescentAlgorithm; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/problems/F3Problem.java b/src/eva2/optimization/problems/F3Problem.java similarity index 95% rename from src/eva2/server/go/problems/F3Problem.java rename to src/eva2/optimization/problems/F3Problem.java index e70a1897..858bd52a 100644 --- a/src/eva2/server/go/problems/F3Problem.java +++ b/src/eva2/optimization/problems/F3Problem.java @@ -1,6 +1,6 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; -import eva2.server.go.individuals.ESIndividualDoubleData; +import eva2.optimization.individuals.ESIndividualDoubleData; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/problems/F4Problem.java b/src/eva2/optimization/problems/F4Problem.java similarity index 98% rename from src/eva2/server/go/problems/F4Problem.java rename to src/eva2/optimization/problems/F4Problem.java index 69c31c3e..dbfe5fba 100644 --- a/src/eva2/server/go/problems/F4Problem.java +++ b/src/eva2/optimization/problems/F4Problem.java @@ -1,4 +1,4 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; import java.io.Serializable; diff --git a/src/eva2/server/go/problems/F5Problem.java b/src/eva2/optimization/problems/F5Problem.java similarity index 98% rename from src/eva2/server/go/problems/F5Problem.java rename to src/eva2/optimization/problems/F5Problem.java index a7ef7927..f0b5719d 100644 --- a/src/eva2/server/go/problems/F5Problem.java +++ b/src/eva2/optimization/problems/F5Problem.java @@ -1,4 +1,4 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; import java.io.Serializable; diff --git a/src/eva2/server/go/problems/F6Problem.java b/src/eva2/optimization/problems/F6Problem.java similarity index 94% rename from src/eva2/server/go/problems/F6Problem.java rename to src/eva2/optimization/problems/F6Problem.java index 5ab3ca12..301ac5e7 100644 --- a/src/eva2/server/go/problems/F6Problem.java +++ b/src/eva2/optimization/problems/F6Problem.java @@ -1,9 +1,9 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; -import eva2.server.go.individuals.ESIndividualDoubleData; -import eva2.server.go.operators.postprocess.SolutionHistogram; -import eva2.server.go.populations.Population; -import eva2.server.go.strategies.GradientDescentAlgorithm; +import eva2.optimization.individuals.ESIndividualDoubleData; +import eva2.optimization.operators.postprocess.SolutionHistogram; +import eva2.optimization.populations.Population; +import eva2.optimization.strategies.GradientDescentAlgorithm; import java.io.Serializable; /** diff --git a/src/eva2/server/go/problems/F7Problem.java b/src/eva2/optimization/problems/F7Problem.java similarity index 96% rename from src/eva2/server/go/problems/F7Problem.java rename to src/eva2/optimization/problems/F7Problem.java index 554f22ed..27403afb 100644 --- a/src/eva2/server/go/problems/F7Problem.java +++ b/src/eva2/optimization/problems/F7Problem.java @@ -1,8 +1,8 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.ESIndividualDoubleData; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.ESIndividualDoubleData; +import eva2.optimization.populations.Population; import eva2.tools.SelectedTag; import eva2.tools.Tag; import java.io.Serializable; diff --git a/src/eva2/server/go/problems/F8Problem.java b/src/eva2/optimization/problems/F8Problem.java similarity index 97% rename from src/eva2/server/go/problems/F8Problem.java rename to src/eva2/optimization/problems/F8Problem.java index 96c1175b..3bf32658 100644 --- a/src/eva2/server/go/problems/F8Problem.java +++ b/src/eva2/optimization/problems/F8Problem.java @@ -1,10 +1,10 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; -import eva2.server.go.PopulationInterface; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.distancemetric.EuclideanMetric; -import eva2.server.go.operators.postprocess.SolutionHistogram; -import eva2.server.go.populations.Population; +import eva2.optimization.go.PopulationInterface; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.operators.distancemetric.EuclideanMetric; +import eva2.optimization.operators.postprocess.SolutionHistogram; +import eva2.optimization.populations.Population; import eva2.tools.ToolBox; import eva2.tools.math.Mathematics; import java.util.Arrays; diff --git a/src/eva2/server/go/problems/F9Problem.java b/src/eva2/optimization/problems/F9Problem.java similarity index 95% rename from src/eva2/server/go/problems/F9Problem.java rename to src/eva2/optimization/problems/F9Problem.java index bfada2f4..b90f6c11 100644 --- a/src/eva2/server/go/problems/F9Problem.java +++ b/src/eva2/optimization/problems/F9Problem.java @@ -1,6 +1,6 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; -import eva2.server.go.individuals.ESIndividualDoubleData; +import eva2.optimization.individuals.ESIndividualDoubleData; public class F9Problem extends AbstractProblemDoubleOffset implements java.io.Serializable { diff --git a/src/eva2/server/go/problems/FLensProblem.java b/src/eva2/optimization/problems/FLensProblem.java similarity index 98% rename from src/eva2/server/go/problems/FLensProblem.java rename to src/eva2/optimization/problems/FLensProblem.java index ab655b75..33175f88 100644 --- a/src/eva2/server/go/problems/FLensProblem.java +++ b/src/eva2/optimization/problems/FLensProblem.java @@ -1,13 +1,13 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; -import eva2.server.go.GOStandaloneVersion; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.ESIndividualDoubleData; -import eva2.server.go.individuals.InterfaceDataTypeDouble; -import eva2.server.go.populations.Population; -import eva2.server.go.strategies.InterfaceOptimizer; -import eva2.server.modules.GOParameters; +import eva2.optimization.go.GOStandaloneVersion; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.ESIndividualDoubleData; +import eva2.optimization.individuals.InterfaceDataTypeDouble; +import eva2.optimization.populations.Population; +import eva2.optimization.strategies.InterfaceOptimizer; +import eva2.optimization.modules.GOParameters; import eva2.tools.math.RNG; import java.awt.BasicStroke; import java.awt.BorderLayout; diff --git a/src/eva2/server/go/problems/FM0Problem.java b/src/eva2/optimization/problems/FM0Problem.java similarity index 96% rename from src/eva2/server/go/problems/FM0Problem.java rename to src/eva2/optimization/problems/FM0Problem.java index c404cf93..b67e2464 100644 --- a/src/eva2/server/go/problems/FM0Problem.java +++ b/src/eva2/optimization/problems/FM0Problem.java @@ -1,6 +1,6 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; -import eva2.server.go.individuals.ESIndividualDoubleData; +import eva2.optimization.individuals.ESIndividualDoubleData; import java.io.Serializable; /** diff --git a/src/eva2/server/go/problems/GPFunctionProblem.java b/src/eva2/optimization/problems/GPFunctionProblem.java similarity index 93% rename from src/eva2/server/go/problems/GPFunctionProblem.java rename to src/eva2/optimization/problems/GPFunctionProblem.java index 4d0f3fb7..235a1214 100644 --- a/src/eva2/server/go/problems/GPFunctionProblem.java +++ b/src/eva2/optimization/problems/GPFunctionProblem.java @@ -1,9 +1,9 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; -import eva2.server.go.individuals.ESIndividualDoubleData; -import eva2.server.go.individuals.codings.gp.GPArea; -import eva2.server.go.individuals.codings.gp.InterfaceProgram; -import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.optimization.individuals.ESIndividualDoubleData; +import eva2.optimization.individuals.codings.gp.GPArea; +import eva2.optimization.individuals.codings.gp.InterfaceProgram; +import eva2.optimization.strategies.InterfaceOptimizer; import eva2.tools.EVAERROR; /** diff --git a/src/eva2/server/go/problems/I1Problem.java b/src/eva2/optimization/problems/I1Problem.java similarity index 95% rename from src/eva2/server/go/problems/I1Problem.java rename to src/eva2/optimization/problems/I1Problem.java index 0cde4fb8..48c4f6a7 100644 --- a/src/eva2/server/go/problems/I1Problem.java +++ b/src/eva2/optimization/problems/I1Problem.java @@ -1,8 +1,8 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; -import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.optimization.strategies.InterfaceOptimizer; /** * The integer hyper-sphere problem. diff --git a/src/eva2/server/go/problems/Interface2DBorderProblem.java b/src/eva2/optimization/problems/Interface2DBorderProblem.java similarity index 96% rename from src/eva2/server/go/problems/Interface2DBorderProblem.java rename to src/eva2/optimization/problems/Interface2DBorderProblem.java index 5b033f06..3e8c7a48 100644 --- a/src/eva2/server/go/problems/Interface2DBorderProblem.java +++ b/src/eva2/optimization/problems/Interface2DBorderProblem.java @@ -1,4 +1,4 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; /** * An interface refactored from InterfaceMultiModalProblem, having only methods used for diff --git a/src/eva2/server/go/problems/InterfaceAdditionalPopulationInformer.java b/src/eva2/optimization/problems/InterfaceAdditionalPopulationInformer.java similarity index 91% rename from src/eva2/server/go/problems/InterfaceAdditionalPopulationInformer.java rename to src/eva2/optimization/problems/InterfaceAdditionalPopulationInformer.java index 5304a32c..e78f05b2 100644 --- a/src/eva2/server/go/problems/InterfaceAdditionalPopulationInformer.java +++ b/src/eva2/optimization/problems/InterfaceAdditionalPopulationInformer.java @@ -1,6 +1,6 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; -import eva2.server.go.PopulationInterface; +import eva2.optimization.go.PopulationInterface; /** * An interface for an instance providing specialized statistical data on an optimization run. diff --git a/src/eva2/server/go/problems/InterfaceFirstOrderDerivableProblem.java b/src/eva2/optimization/problems/InterfaceFirstOrderDerivableProblem.java similarity index 94% rename from src/eva2/server/go/problems/InterfaceFirstOrderDerivableProblem.java rename to src/eva2/optimization/problems/InterfaceFirstOrderDerivableProblem.java index c50fb7db..a050532e 100644 --- a/src/eva2/server/go/problems/InterfaceFirstOrderDerivableProblem.java +++ b/src/eva2/optimization/problems/InterfaceFirstOrderDerivableProblem.java @@ -1,4 +1,4 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; /** * An interface for first-order derivable problems which can be used for gradient descent. diff --git a/src/eva2/server/go/problems/InterfaceHasInitRange.java b/src/eva2/optimization/problems/InterfaceHasInitRange.java similarity index 95% rename from src/eva2/server/go/problems/InterfaceHasInitRange.java rename to src/eva2/optimization/problems/InterfaceHasInitRange.java index 4e507f16..28f79c55 100644 --- a/src/eva2/server/go/problems/InterfaceHasInitRange.java +++ b/src/eva2/optimization/problems/InterfaceHasInitRange.java @@ -1,4 +1,4 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; /** * An interface for optimization problems having an extra initial range diff --git a/src/eva2/server/go/problems/InterfaceHasSolutionViewer.java b/src/eva2/optimization/problems/InterfaceHasSolutionViewer.java similarity index 84% rename from src/eva2/server/go/problems/InterfaceHasSolutionViewer.java rename to src/eva2/optimization/problems/InterfaceHasSolutionViewer.java index b8b7ac9a..49e2bd36 100644 --- a/src/eva2/server/go/problems/InterfaceHasSolutionViewer.java +++ b/src/eva2/optimization/problems/InterfaceHasSolutionViewer.java @@ -1,4 +1,4 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; /** * An interface for problems which have a specific viewer. diff --git a/src/eva2/server/go/problems/InterfaceInterestingHistogram.java b/src/eva2/optimization/problems/InterfaceInterestingHistogram.java similarity index 77% rename from src/eva2/server/go/problems/InterfaceInterestingHistogram.java rename to src/eva2/optimization/problems/InterfaceInterestingHistogram.java index c39b8c18..b1e0fdcb 100644 --- a/src/eva2/server/go/problems/InterfaceInterestingHistogram.java +++ b/src/eva2/optimization/problems/InterfaceInterestingHistogram.java @@ -1,6 +1,6 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; -import eva2.server.go.operators.postprocess.SolutionHistogram; +import eva2.optimization.operators.postprocess.SolutionHistogram; /** * Target functions may provide an idea which fitness values are diff --git a/src/eva2/server/go/problems/InterfaceLocalSearchable.java b/src/eva2/optimization/problems/InterfaceLocalSearchable.java similarity index 87% rename from src/eva2/server/go/problems/InterfaceLocalSearchable.java rename to src/eva2/optimization/problems/InterfaceLocalSearchable.java index 19317a82..a6f2066e 100644 --- a/src/eva2/server/go/problems/InterfaceLocalSearchable.java +++ b/src/eva2/optimization/problems/InterfaceLocalSearchable.java @@ -1,6 +1,6 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; -import eva2.server.go.populations.Population; +import eva2.optimization.populations.Population; /** *

Title: EvA2

diff --git a/src/eva2/server/go/problems/InterfaceMultiObjectiveDeNovoProblem.java b/src/eva2/optimization/problems/InterfaceMultiObjectiveDeNovoProblem.java similarity index 86% rename from src/eva2/server/go/problems/InterfaceMultiObjectiveDeNovoProblem.java rename to src/eva2/optimization/problems/InterfaceMultiObjectiveDeNovoProblem.java index 5b1f450f..40bdc9b5 100644 --- a/src/eva2/server/go/problems/InterfaceMultiObjectiveDeNovoProblem.java +++ b/src/eva2/optimization/problems/InterfaceMultiObjectiveDeNovoProblem.java @@ -1,7 +1,7 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; -import eva2.server.go.mocco.paretofrontviewer.InterfaceParetoFrontView; -import eva2.server.go.mocco.paretofrontviewer.MOCCOViewer; +import eva2.optimization.mocco.paretofrontviewer.InterfaceParetoFrontView; +import eva2.optimization.mocco.paretofrontviewer.MOCCOViewer; /** This is a general interface to access a multi-objective optimization * problem which enables de novo programming and thus MOCCO diff --git a/src/eva2/server/go/problems/InterfaceMultimodalProblem.java b/src/eva2/optimization/problems/InterfaceMultimodalProblem.java similarity index 82% rename from src/eva2/server/go/problems/InterfaceMultimodalProblem.java rename to src/eva2/optimization/problems/InterfaceMultimodalProblem.java index e286ae8f..c5280a95 100644 --- a/src/eva2/server/go/problems/InterfaceMultimodalProblem.java +++ b/src/eva2/optimization/problems/InterfaceMultimodalProblem.java @@ -1,4 +1,4 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; /** * An interface to tag possibly multimodal problems, but without diff --git a/src/eva2/server/go/problems/InterfaceMultimodalProblemKnown.java b/src/eva2/optimization/problems/InterfaceMultimodalProblemKnown.java similarity index 94% rename from src/eva2/server/go/problems/InterfaceMultimodalProblemKnown.java rename to src/eva2/optimization/problems/InterfaceMultimodalProblemKnown.java index 5e63ccba..db015e22 100644 --- a/src/eva2/server/go/problems/InterfaceMultimodalProblemKnown.java +++ b/src/eva2/optimization/problems/InterfaceMultimodalProblemKnown.java @@ -1,6 +1,6 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; -import eva2.server.go.populations.Population; +import eva2.optimization.populations.Population; /** * A multimodal problem which has knowledge of its optima. diff --git a/src/eva2/server/go/problems/InterfaceOptimizationObjective.java b/src/eva2/optimization/problems/InterfaceOptimizationObjective.java similarity index 97% rename from src/eva2/server/go/problems/InterfaceOptimizationObjective.java rename to src/eva2/optimization/problems/InterfaceOptimizationObjective.java index f3a48fab..b0fffe6f 100644 --- a/src/eva2/server/go/problems/InterfaceOptimizationObjective.java +++ b/src/eva2/optimization/problems/InterfaceOptimizationObjective.java @@ -1,4 +1,4 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/problems/InterfaceOptimizationProblem.java b/src/eva2/optimization/problems/InterfaceOptimizationProblem.java similarity index 93% rename from src/eva2/server/go/problems/InterfaceOptimizationProblem.java rename to src/eva2/optimization/problems/InterfaceOptimizationProblem.java index 17404939..6be44dfb 100644 --- a/src/eva2/server/go/problems/InterfaceOptimizationProblem.java +++ b/src/eva2/optimization/problems/InterfaceOptimizationProblem.java @@ -1,8 +1,8 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.strategies.InterfaceOptimizer; import javax.swing.*; /** diff --git a/src/eva2/server/go/problems/InterfaceOptimizationTarget.java b/src/eva2/optimization/problems/InterfaceOptimizationTarget.java similarity index 91% rename from src/eva2/server/go/problems/InterfaceOptimizationTarget.java rename to src/eva2/optimization/problems/InterfaceOptimizationTarget.java index 88e224e1..b704e090 100644 --- a/src/eva2/server/go/problems/InterfaceOptimizationTarget.java +++ b/src/eva2/optimization/problems/InterfaceOptimizationTarget.java @@ -1,4 +1,4 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/problems/InterfaceProblemDouble.java b/src/eva2/optimization/problems/InterfaceProblemDouble.java similarity index 94% rename from src/eva2/server/go/problems/InterfaceProblemDouble.java rename to src/eva2/optimization/problems/InterfaceProblemDouble.java index 8e631004..b7044823 100644 --- a/src/eva2/server/go/problems/InterfaceProblemDouble.java +++ b/src/eva2/optimization/problems/InterfaceProblemDouble.java @@ -1,6 +1,6 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; -import eva2.server.go.individuals.InterfaceDataTypeDouble; +import eva2.optimization.individuals.InterfaceDataTypeDouble; /** * A minimal interface for double valued problems. diff --git a/src/eva2/server/go/problems/InterfaceProgramProblem.java b/src/eva2/optimization/problems/InterfaceProgramProblem.java similarity index 90% rename from src/eva2/server/go/problems/InterfaceProgramProblem.java rename to src/eva2/optimization/problems/InterfaceProgramProblem.java index 07856cc9..9d130024 100644 --- a/src/eva2/server/go/problems/InterfaceProgramProblem.java +++ b/src/eva2/optimization/problems/InterfaceProgramProblem.java @@ -1,6 +1,6 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; -import eva2.server.go.individuals.codings.gp.GPArea; +import eva2.optimization.individuals.codings.gp.GPArea; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/problems/InterfaceSolutionViewer.java b/src/eva2/optimization/problems/InterfaceSolutionViewer.java similarity index 87% rename from src/eva2/server/go/problems/InterfaceSolutionViewer.java rename to src/eva2/optimization/problems/InterfaceSolutionViewer.java index a31c213c..ff96cd62 100644 --- a/src/eva2/server/go/problems/InterfaceSolutionViewer.java +++ b/src/eva2/optimization/problems/InterfaceSolutionViewer.java @@ -1,6 +1,6 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; -import eva2.server.go.populations.Population; +import eva2.optimization.populations.Population; /** * A standard interface for solution viewers which display a single (best) solution diff --git a/src/eva2/server/go/problems/MatlabEvalMediator.java b/src/eva2/optimization/problems/MatlabEvalMediator.java similarity index 99% rename from src/eva2/server/go/problems/MatlabEvalMediator.java rename to src/eva2/optimization/problems/MatlabEvalMediator.java index 8c119550..47a2cb9f 100644 --- a/src/eva2/server/go/problems/MatlabEvalMediator.java +++ b/src/eva2/optimization/problems/MatlabEvalMediator.java @@ -1,4 +1,4 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; import eva2.gui.BeanInspector; import java.util.BitSet; diff --git a/src/eva2/server/go/problems/MatlabProblem.java b/src/eva2/optimization/problems/MatlabProblem.java similarity index 94% rename from src/eva2/server/go/problems/MatlabProblem.java rename to src/eva2/optimization/problems/MatlabProblem.java index 7f19e776..05b5a384 100644 --- a/src/eva2/server/go/problems/MatlabProblem.java +++ b/src/eva2/optimization/problems/MatlabProblem.java @@ -1,20 +1,26 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; +import eva2.optimization.individuals.InterfaceDataTypeInteger; +import eva2.optimization.individuals.InterfaceDataTypeBinary; +import eva2.optimization.individuals.ESIndividualDoubleData; +import eva2.optimization.individuals.InterfaceDataTypeDouble; +import eva2.optimization.individuals.GIIndividualIntegerData; +import eva2.optimization.individuals.GAIndividualBinaryData; +import eva2.optimization.individuals.AbstractEAIndividual; import eva2.OptimizerFactory; import eva2.OptimizerRunnable; import eva2.gui.BeanInspector; -import eva2.server.go.individuals.*; -import eva2.server.go.operators.postprocess.InterfacePostProcessParams; -import eva2.server.go.operators.postprocess.PostProcess; -import eva2.server.go.operators.postprocess.PostProcessParams; -import eva2.server.go.operators.terminators.FitnessConvergenceTerminator; -import eva2.server.go.operators.terminators.PhenotypeConvergenceTerminator; -import eva2.server.go.operators.terminators.PopulationMeasureTerminator.ChangeTypeEnum; -import eva2.server.go.operators.terminators.PopulationMeasureTerminator.DirectionTypeEnum; -import eva2.server.go.operators.terminators.PopulationMeasureTerminator.StagnationTypeEnum; -import eva2.server.go.populations.Population; -import eva2.server.go.strategies.InterfaceOptimizer; -import eva2.server.stat.InterfaceTextListener; +import eva2.optimization.operators.postprocess.InterfacePostProcessParams; +import eva2.optimization.operators.postprocess.PostProcess; +import eva2.optimization.operators.postprocess.PostProcessParams; +import eva2.optimization.operators.terminators.FitnessConvergenceTerminator; +import eva2.optimization.operators.terminators.PhenotypeConvergenceTerminator; +import eva2.optimization.operators.terminators.PopulationMeasureTerminator.ChangeTypeEnum; +import eva2.optimization.operators.terminators.PopulationMeasureTerminator.DirectionTypeEnum; +import eva2.optimization.operators.terminators.PopulationMeasureTerminator.StagnationTypeEnum; +import eva2.optimization.populations.Population; +import eva2.optimization.strategies.InterfaceOptimizer; +import eva2.optimization.stat.InterfaceTextListener; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.PrintStream; diff --git a/src/eva2/server/go/problems/MatlabProblemDataTypeEnum.java b/src/eva2/optimization/problems/MatlabProblemDataTypeEnum.java similarity index 66% rename from src/eva2/server/go/problems/MatlabProblemDataTypeEnum.java rename to src/eva2/optimization/problems/MatlabProblemDataTypeEnum.java index 01d543cb..2e90aaee 100644 --- a/src/eva2/server/go/problems/MatlabProblemDataTypeEnum.java +++ b/src/eva2/optimization/problems/MatlabProblemDataTypeEnum.java @@ -1,4 +1,4 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; public enum MatlabProblemDataTypeEnum { typeDouble, typeBinary, typeInteger; diff --git a/src/eva2/server/go/problems/PSymbolicRegression.java b/src/eva2/optimization/problems/PSymbolicRegression.java similarity index 93% rename from src/eva2/server/go/problems/PSymbolicRegression.java rename to src/eva2/optimization/problems/PSymbolicRegression.java index e36ad46f..7e230ecf 100644 --- a/src/eva2/server/go/problems/PSymbolicRegression.java +++ b/src/eva2/optimization/problems/PSymbolicRegression.java @@ -1,33 +1,33 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; import eva2.gui.Plot; -import eva2.server.go.PopulationInterface; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.GAPIndividualProgramData; -import eva2.server.go.individuals.GPIndividualProgramData; -import eva2.server.go.individuals.InterfaceDataTypeDouble; -import eva2.server.go.individuals.InterfaceDataTypeProgram; -import eva2.server.go.individuals.codings.gp.AbstractGPNode; -import eva2.server.go.individuals.codings.gp.GPArea; -import eva2.server.go.individuals.codings.gp.GPNodeAbs; -import eva2.server.go.individuals.codings.gp.GPNodeAdd; -import eva2.server.go.individuals.codings.gp.GPNodeCos; -import eva2.server.go.individuals.codings.gp.GPNodeDiv; -import eva2.server.go.individuals.codings.gp.GPNodeExp; -import eva2.server.go.individuals.codings.gp.GPNodeInput; -import eva2.server.go.individuals.codings.gp.GPNodeMult; -import eva2.server.go.individuals.codings.gp.GPNodeOne; -import eva2.server.go.individuals.codings.gp.GPNodePi; -import eva2.server.go.individuals.codings.gp.GPNodePow2; -import eva2.server.go.individuals.codings.gp.GPNodePow3; -import eva2.server.go.individuals.codings.gp.GPNodeSin; -import eva2.server.go.individuals.codings.gp.GPNodeSqrt; -import eva2.server.go.individuals.codings.gp.GPNodeSub; -import eva2.server.go.individuals.codings.gp.InterfaceProgram; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.regression.InterfaceRegressionFunction; -import eva2.server.go.problems.regression.RFKoza_GPI_7_3; -import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.optimization.go.PopulationInterface; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.GAPIndividualProgramData; +import eva2.optimization.individuals.GPIndividualProgramData; +import eva2.optimization.individuals.InterfaceDataTypeDouble; +import eva2.optimization.individuals.InterfaceDataTypeProgram; +import eva2.optimization.individuals.codings.gp.AbstractGPNode; +import eva2.optimization.individuals.codings.gp.GPArea; +import eva2.optimization.individuals.codings.gp.GPNodeAbs; +import eva2.optimization.individuals.codings.gp.GPNodeAdd; +import eva2.optimization.individuals.codings.gp.GPNodeCos; +import eva2.optimization.individuals.codings.gp.GPNodeDiv; +import eva2.optimization.individuals.codings.gp.GPNodeExp; +import eva2.optimization.individuals.codings.gp.GPNodeInput; +import eva2.optimization.individuals.codings.gp.GPNodeMult; +import eva2.optimization.individuals.codings.gp.GPNodeOne; +import eva2.optimization.individuals.codings.gp.GPNodePi; +import eva2.optimization.individuals.codings.gp.GPNodePow2; +import eva2.optimization.individuals.codings.gp.GPNodePow3; +import eva2.optimization.individuals.codings.gp.GPNodeSin; +import eva2.optimization.individuals.codings.gp.GPNodeSqrt; +import eva2.optimization.individuals.codings.gp.GPNodeSub; +import eva2.optimization.individuals.codings.gp.InterfaceProgram; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.regression.InterfaceRegressionFunction; +import eva2.optimization.problems.regression.RFKoza_GPI_7_3; +import eva2.optimization.strategies.InterfaceOptimizer; import eva2.tools.EVAERROR; import eva2.tools.ToolBox; import eva2.tools.math.RNG; diff --git a/src/eva2/server/go/problems/SimpleProblemWrapper.java b/src/eva2/optimization/problems/SimpleProblemWrapper.java similarity index 95% rename from src/eva2/server/go/problems/SimpleProblemWrapper.java rename to src/eva2/optimization/problems/SimpleProblemWrapper.java index f77cd1e0..f83c0d18 100644 --- a/src/eva2/server/go/problems/SimpleProblemWrapper.java +++ b/src/eva2/optimization/problems/SimpleProblemWrapper.java @@ -1,15 +1,15 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; import eva2.gui.BeanInspector; import eva2.gui.GenericObjectEditor; import eva2.gui.Plot; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.ESIndividualDoubleData; -import eva2.server.go.individuals.GAIndividualBinaryData; -import eva2.server.go.individuals.InterfaceDataTypeBinary; -import eva2.server.go.individuals.InterfaceDataTypeDouble; -import eva2.server.go.populations.Population; -import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.ESIndividualDoubleData; +import eva2.optimization.individuals.GAIndividualBinaryData; +import eva2.optimization.individuals.InterfaceDataTypeBinary; +import eva2.optimization.individuals.InterfaceDataTypeDouble; +import eva2.optimization.populations.Population; +import eva2.optimization.strategies.InterfaceOptimizer; import eva2.tools.math.RNG; import java.util.BitSet; import simpleprobs.InterfaceSimpleProblem; diff --git a/src/eva2/server/go/problems/TF1Problem.java b/src/eva2/optimization/problems/TF1Problem.java similarity index 96% rename from src/eva2/server/go/problems/TF1Problem.java rename to src/eva2/optimization/problems/TF1Problem.java index 0c72c4e4..1e9e55ea 100644 --- a/src/eva2/server/go/problems/TF1Problem.java +++ b/src/eva2/optimization/problems/TF1Problem.java @@ -1,14 +1,14 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; import eva2.gui.Plot; import eva2.gui.PropertyFilePath; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceDataTypeDouble; -import eva2.server.go.operators.constraint.InterfaceConstraint; -import eva2.server.go.operators.moso.InterfaceMOSOConverter; -import eva2.server.go.operators.paretofrontmetrics.InterfaceParetoFrontMetric; -import eva2.server.go.populations.Population; -import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceDataTypeDouble; +import eva2.optimization.operators.constraint.InterfaceConstraint; +import eva2.optimization.operators.moso.InterfaceMOSOConverter; +import eva2.optimization.operators.paretofrontmetrics.InterfaceParetoFrontMetric; +import eva2.optimization.populations.Population; +import eva2.optimization.strategies.InterfaceOptimizer; import eva2.tools.math.RNG; import java.io.BufferedWriter; import java.io.FileWriter; diff --git a/src/eva2/server/go/problems/WaitForEvARunnable.java b/src/eva2/optimization/problems/WaitForEvARunnable.java similarity index 95% rename from src/eva2/server/go/problems/WaitForEvARunnable.java rename to src/eva2/optimization/problems/WaitForEvARunnable.java index da93accc..7ad57fb2 100644 --- a/src/eva2/server/go/problems/WaitForEvARunnable.java +++ b/src/eva2/optimization/problems/WaitForEvARunnable.java @@ -1,8 +1,8 @@ -package eva2.server.go.problems; +package eva2.optimization.problems; import eva2.OptimizerRunnable; import eva2.gui.BeanInspector; -import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.AbstractEAIndividual; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/src/eva2/server/go/problems/regression/InterfaceRegressionFunction.java b/src/eva2/optimization/problems/regression/InterfaceRegressionFunction.java similarity index 91% rename from src/eva2/server/go/problems/regression/InterfaceRegressionFunction.java rename to src/eva2/optimization/problems/regression/InterfaceRegressionFunction.java index 871394f8..2ffc9804 100644 --- a/src/eva2/server/go/problems/regression/InterfaceRegressionFunction.java +++ b/src/eva2/optimization/problems/regression/InterfaceRegressionFunction.java @@ -1,4 +1,4 @@ -package eva2.server.go.problems.regression; +package eva2.optimization.problems.regression; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/problems/regression/RFKoza_GPI_10_1.java b/src/eva2/optimization/problems/regression/RFKoza_GPI_10_1.java similarity index 96% rename from src/eva2/server/go/problems/regression/RFKoza_GPI_10_1.java rename to src/eva2/optimization/problems/regression/RFKoza_GPI_10_1.java index f95bd74c..59855fca 100644 --- a/src/eva2/server/go/problems/regression/RFKoza_GPI_10_1.java +++ b/src/eva2/optimization/problems/regression/RFKoza_GPI_10_1.java @@ -1,4 +1,4 @@ -package eva2.server.go.problems.regression; +package eva2.optimization.problems.regression; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/problems/regression/RFKoza_GPI_10_2.java b/src/eva2/optimization/problems/regression/RFKoza_GPI_10_2.java similarity index 96% rename from src/eva2/server/go/problems/regression/RFKoza_GPI_10_2.java rename to src/eva2/optimization/problems/regression/RFKoza_GPI_10_2.java index ef448e0f..777d73ba 100644 --- a/src/eva2/server/go/problems/regression/RFKoza_GPI_10_2.java +++ b/src/eva2/optimization/problems/regression/RFKoza_GPI_10_2.java @@ -1,4 +1,4 @@ -package eva2.server.go.problems.regression; +package eva2.optimization.problems.regression; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/problems/regression/RFKoza_GPI_7_3.java b/src/eva2/optimization/problems/regression/RFKoza_GPI_7_3.java similarity index 96% rename from src/eva2/server/go/problems/regression/RFKoza_GPI_7_3.java rename to src/eva2/optimization/problems/regression/RFKoza_GPI_7_3.java index 0dab1635..fc5d81cf 100644 --- a/src/eva2/server/go/problems/regression/RFKoza_GPI_7_3.java +++ b/src/eva2/optimization/problems/regression/RFKoza_GPI_7_3.java @@ -1,4 +1,4 @@ -package eva2.server.go.problems.regression; +package eva2.optimization.problems.regression; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/problems/regression/RFKoza_GPI_7_3_extended.java b/src/eva2/optimization/problems/regression/RFKoza_GPI_7_3_extended.java similarity index 96% rename from src/eva2/server/go/problems/regression/RFKoza_GPI_7_3_extended.java rename to src/eva2/optimization/problems/regression/RFKoza_GPI_7_3_extended.java index d86c5e69..3d821bc7 100644 --- a/src/eva2/server/go/problems/regression/RFKoza_GPI_7_3_extended.java +++ b/src/eva2/optimization/problems/regression/RFKoza_GPI_7_3_extended.java @@ -1,4 +1,4 @@ -package eva2.server.go.problems.regression; +package eva2.optimization.problems.regression; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/problems/regression/RFRaidl_F1.java b/src/eva2/optimization/problems/regression/RFRaidl_F1.java similarity index 96% rename from src/eva2/server/go/problems/regression/RFRaidl_F1.java rename to src/eva2/optimization/problems/regression/RFRaidl_F1.java index 207ea992..b73b087b 100644 --- a/src/eva2/server/go/problems/regression/RFRaidl_F1.java +++ b/src/eva2/optimization/problems/regression/RFRaidl_F1.java @@ -1,4 +1,4 @@ -package eva2.server.go.problems.regression; +package eva2.optimization.problems.regression; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/problems/regression/RFRaidl_F2.java b/src/eva2/optimization/problems/regression/RFRaidl_F2.java similarity index 96% rename from src/eva2/server/go/problems/regression/RFRaidl_F2.java rename to src/eva2/optimization/problems/regression/RFRaidl_F2.java index d2df82a0..b45f85f1 100644 --- a/src/eva2/server/go/problems/regression/RFRaidl_F2.java +++ b/src/eva2/optimization/problems/regression/RFRaidl_F2.java @@ -1,4 +1,4 @@ -package eva2.server.go.problems.regression; +package eva2.optimization.problems.regression; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/problems/regression/RFRaidl_F3.java b/src/eva2/optimization/problems/regression/RFRaidl_F3.java similarity index 96% rename from src/eva2/server/go/problems/regression/RFRaidl_F3.java rename to src/eva2/optimization/problems/regression/RFRaidl_F3.java index 985b7d3d..b5019a7a 100644 --- a/src/eva2/server/go/problems/regression/RFRaidl_F3.java +++ b/src/eva2/optimization/problems/regression/RFRaidl_F3.java @@ -1,4 +1,4 @@ -package eva2.server.go.problems.regression; +package eva2.optimization.problems.regression; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/stat/AbstractStatistics.java b/src/eva2/optimization/stat/AbstractStatistics.java similarity index 99% rename from src/eva2/server/stat/AbstractStatistics.java rename to src/eva2/optimization/stat/AbstractStatistics.java index ac7e77c8..0a92b212 100644 --- a/src/eva2/server/stat/AbstractStatistics.java +++ b/src/eva2/optimization/stat/AbstractStatistics.java @@ -1,13 +1,13 @@ -package eva2.server.stat; +package eva2.optimization.stat; import eva2.gui.BeanInspector; -import eva2.server.go.IndividualInterface; -import eva2.server.go.PopulationInterface; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.distancemetric.InterfaceDistanceMetric; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceAdditionalPopulationInformer; -import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.optimization.go.IndividualInterface; +import eva2.optimization.go.PopulationInterface; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.operators.distancemetric.InterfaceDistanceMetric; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceAdditionalPopulationInformer; +import eva2.optimization.strategies.InterfaceOptimizer; import eva2.tools.Pair; import eva2.tools.StringSelection; import eva2.tools.StringTools; diff --git a/src/eva2/server/stat/EvAJob.java b/src/eva2/optimization/stat/EvAJob.java similarity index 98% rename from src/eva2/server/stat/EvAJob.java rename to src/eva2/optimization/stat/EvAJob.java index d807f591..3740f45d 100644 --- a/src/eva2/server/stat/EvAJob.java +++ b/src/eva2/optimization/stat/EvAJob.java @@ -1,7 +1,7 @@ -package eva2.server.stat; +package eva2.optimization.stat; import eva2.gui.BeanInspector; -import eva2.server.go.InterfaceGOParameters; +import eva2.optimization.go.InterfaceGOParameters; import eva2.tools.StringSelection; import java.io.Serializable; import java.util.List; diff --git a/src/eva2/server/stat/EvAJobList.java b/src/eva2/optimization/stat/EvAJobList.java similarity index 96% rename from src/eva2/server/stat/EvAJobList.java rename to src/eva2/optimization/stat/EvAJobList.java index 0e5b21cb..0abad9b3 100644 --- a/src/eva2/server/stat/EvAJobList.java +++ b/src/eva2/optimization/stat/EvAJobList.java @@ -1,14 +1,14 @@ -package eva2.server.stat; +package eva2.optimization.stat; import eva2.gui.GenericArrayEditor; import eva2.gui.JParaPanel; import eva2.gui.PropertySelectableList; -import eva2.server.go.InterfaceGOParameters; -import eva2.server.go.tools.FileTools; -import eva2.server.modules.AbstractGOParameters; -import eva2.server.modules.AbstractModuleAdapter; -import eva2.server.modules.GenericModuleAdapter; -import eva2.server.modules.ModuleAdapter; +import eva2.optimization.go.InterfaceGOParameters; +import eva2.optimization.tools.FileTools; +import eva2.optimization.modules.AbstractGOParameters; +import eva2.optimization.modules.AbstractModuleAdapter; +import eva2.optimization.modules.GenericModuleAdapter; +import eva2.optimization.modules.ModuleAdapter; import eva2.tools.Serializer; import java.awt.Component; import java.awt.event.ActionEvent; diff --git a/src/eva2/server/stat/EvAStatisticalEvaluation.java b/src/eva2/optimization/stat/EvAStatisticalEvaluation.java similarity index 99% rename from src/eva2/server/stat/EvAStatisticalEvaluation.java rename to src/eva2/optimization/stat/EvAStatisticalEvaluation.java index fd3f9b1f..dae8de67 100644 --- a/src/eva2/server/stat/EvAStatisticalEvaluation.java +++ b/src/eva2/optimization/stat/EvAStatisticalEvaluation.java @@ -1,4 +1,4 @@ -package eva2.server.stat; +package eva2.optimization.stat; import eva2.gui.BeanInspector; import eva2.tools.ReflectPackage; diff --git a/src/eva2/server/stat/EvAStatisticalEvaluationParams.java b/src/eva2/optimization/stat/EvAStatisticalEvaluationParams.java similarity index 98% rename from src/eva2/server/stat/EvAStatisticalEvaluationParams.java rename to src/eva2/optimization/stat/EvAStatisticalEvaluationParams.java index 8593af73..e0c13464 100644 --- a/src/eva2/server/stat/EvAStatisticalEvaluationParams.java +++ b/src/eva2/optimization/stat/EvAStatisticalEvaluationParams.java @@ -1,4 +1,4 @@ -package eva2.server.stat; +package eva2.optimization.stat; import eva2.tools.StringSelection; import java.io.Serializable; diff --git a/src/eva2/server/stat/GenericStatistics.java b/src/eva2/optimization/stat/GenericStatistics.java similarity index 99% rename from src/eva2/server/stat/GenericStatistics.java rename to src/eva2/optimization/stat/GenericStatistics.java index c7d37fae..86fa79c9 100644 --- a/src/eva2/server/stat/GenericStatistics.java +++ b/src/eva2/optimization/stat/GenericStatistics.java @@ -1,4 +1,4 @@ -package eva2.server.stat; +package eva2.optimization.stat; /* * Title: EvA2 * Description: diff --git a/src/eva2/server/stat/GraphSelectionEnum.java b/src/eva2/optimization/stat/GraphSelectionEnum.java similarity index 98% rename from src/eva2/server/stat/GraphSelectionEnum.java rename to src/eva2/optimization/stat/GraphSelectionEnum.java index cde11637..f266a452 100644 --- a/src/eva2/server/stat/GraphSelectionEnum.java +++ b/src/eva2/optimization/stat/GraphSelectionEnum.java @@ -1,4 +1,4 @@ -package eva2.server.stat; +package eva2.optimization.stat; import eva2.tools.StringSelection; diff --git a/src/eva2/server/stat/InterfaceStatistics.java b/src/eva2/optimization/stat/InterfaceStatistics.java similarity index 87% rename from src/eva2/server/stat/InterfaceStatistics.java rename to src/eva2/optimization/stat/InterfaceStatistics.java index 7700f7e1..e259db4a 100644 --- a/src/eva2/server/stat/InterfaceStatistics.java +++ b/src/eva2/optimization/stat/InterfaceStatistics.java @@ -1,4 +1,4 @@ -package eva2.server.stat; +package eva2.optimization.stat; /* * Title: EvA2 * Description: @@ -12,11 +12,11 @@ package eva2.server.stat; /*==========================================================================* * IMPORTS *==========================================================================*/ -import eva2.server.go.IndividualInterface; -import eva2.server.go.PopulationInterface; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceAdditionalPopulationInformer; -import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.optimization.go.IndividualInterface; +import eva2.optimization.go.PopulationInterface; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceAdditionalPopulationInformer; +import eva2.optimization.strategies.InterfaceOptimizer; import java.util.List; /*==========================================================================* * INTERFACE DECLARATION diff --git a/src/eva2/server/stat/InterfaceStatisticsListener.java b/src/eva2/optimization/stat/InterfaceStatisticsListener.java similarity index 98% rename from src/eva2/server/stat/InterfaceStatisticsListener.java rename to src/eva2/optimization/stat/InterfaceStatisticsListener.java index 3ad78a76..ce90ec69 100644 --- a/src/eva2/server/stat/InterfaceStatisticsListener.java +++ b/src/eva2/optimization/stat/InterfaceStatisticsListener.java @@ -1,4 +1,4 @@ -package eva2.server.stat; +package eva2.optimization.stat; import java.util.List; diff --git a/src/eva2/server/stat/InterfaceStatisticsParameter.java b/src/eva2/optimization/stat/InterfaceStatisticsParameter.java similarity index 97% rename from src/eva2/server/stat/InterfaceStatisticsParameter.java rename to src/eva2/optimization/stat/InterfaceStatisticsParameter.java index d07b911c..da160dbe 100644 --- a/src/eva2/server/stat/InterfaceStatisticsParameter.java +++ b/src/eva2/optimization/stat/InterfaceStatisticsParameter.java @@ -1,4 +1,4 @@ -package eva2.server.stat; +package eva2.optimization.stat; import eva2.tools.SelectedTag; import eva2.tools.StringSelection; diff --git a/src/eva2/server/stat/InterfaceTextListener.java b/src/eva2/optimization/stat/InterfaceTextListener.java similarity index 86% rename from src/eva2/server/stat/InterfaceTextListener.java rename to src/eva2/optimization/stat/InterfaceTextListener.java index 2d38d068..e2e96b28 100644 --- a/src/eva2/server/stat/InterfaceTextListener.java +++ b/src/eva2/optimization/stat/InterfaceTextListener.java @@ -1,4 +1,4 @@ -package eva2.server.stat; +package eva2.optimization.stat; /** * A very simple interface class to receive raw String data. diff --git a/src/eva2/server/stat/MovingAverage.java b/src/eva2/optimization/stat/MovingAverage.java similarity index 98% rename from src/eva2/server/stat/MovingAverage.java rename to src/eva2/optimization/stat/MovingAverage.java index 3b3fbd61..b0f9549c 100644 --- a/src/eva2/server/stat/MovingAverage.java +++ b/src/eva2/optimization/stat/MovingAverage.java @@ -1,4 +1,4 @@ -package eva2.server.stat; +package eva2.optimization.stat; /* * Title: EvA2 * Description: diff --git a/src/eva2/server/stat/StatisticsDummy.java b/src/eva2/optimization/stat/StatisticsDummy.java similarity index 90% rename from src/eva2/server/stat/StatisticsDummy.java rename to src/eva2/optimization/stat/StatisticsDummy.java index cc394e33..2aedb02d 100644 --- a/src/eva2/server/stat/StatisticsDummy.java +++ b/src/eva2/optimization/stat/StatisticsDummy.java @@ -1,11 +1,11 @@ -package eva2.server.stat; +package eva2.optimization.stat; -import eva2.server.go.IndividualInterface; -import eva2.server.go.PopulationInterface; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceAdditionalPopulationInformer; -import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.optimization.go.IndividualInterface; +import eva2.optimization.go.PopulationInterface; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceAdditionalPopulationInformer; +import eva2.optimization.strategies.InterfaceOptimizer; import java.util.List; /** diff --git a/src/eva2/server/stat/StatisticsParameter.java b/src/eva2/optimization/stat/StatisticsParameter.java similarity index 98% rename from src/eva2/server/stat/StatisticsParameter.java rename to src/eva2/optimization/stat/StatisticsParameter.java index a87d136b..f1eef46d 100644 --- a/src/eva2/server/stat/StatisticsParameter.java +++ b/src/eva2/optimization/stat/StatisticsParameter.java @@ -1,9 +1,9 @@ -package eva2.server.stat; +package eva2.optimization.stat; import eva2.gui.BeanInspector; import eva2.gui.GenericObjectEditor; -import eva2.server.go.InterfaceNotifyOnInformers; -import eva2.server.go.problems.InterfaceAdditionalPopulationInformer; +import eva2.optimization.go.InterfaceNotifyOnInformers; +import eva2.optimization.problems.InterfaceAdditionalPopulationInformer; import eva2.tools.EVAERROR; import eva2.tools.SelectedTag; import eva2.tools.Serializer; diff --git a/src/eva2/server/stat/StatisticsStandalone.java b/src/eva2/optimization/stat/StatisticsStandalone.java similarity index 98% rename from src/eva2/server/stat/StatisticsStandalone.java rename to src/eva2/optimization/stat/StatisticsStandalone.java index e9ecc719..9df0101e 100644 --- a/src/eva2/server/stat/StatisticsStandalone.java +++ b/src/eva2/optimization/stat/StatisticsStandalone.java @@ -1,4 +1,4 @@ -package eva2.server.stat; +package eva2.optimization.stat; /* * Title: EvA2 @@ -13,8 +13,8 @@ package eva2.server.stat; /*==========================================================================* * IMPORTS *==========================================================================*/ -import eva2.server.go.PopulationInterface; -import eva2.server.go.problems.InterfaceAdditionalPopulationInformer; +import eva2.optimization.go.PopulationInterface; +import eva2.optimization.problems.InterfaceAdditionalPopulationInformer; import java.io.Serializable; import java.net.InetAddress; import java.util.ArrayList; diff --git a/src/eva2/server/stat/StatisticsWithGUI.java b/src/eva2/optimization/stat/StatisticsWithGUI.java similarity index 98% rename from src/eva2/server/stat/StatisticsWithGUI.java rename to src/eva2/optimization/stat/StatisticsWithGUI.java index 139ba1bd..938570d0 100644 --- a/src/eva2/server/stat/StatisticsWithGUI.java +++ b/src/eva2/optimization/stat/StatisticsWithGUI.java @@ -1,4 +1,4 @@ -package eva2.server.stat; +package eva2.optimization.stat; /* * Title: EvA2 @@ -17,8 +17,8 @@ import eva2.gui.JTextoutputFrame; import eva2.gui.JTextoutputFrameInterface; import eva2.gui.Plot; import eva2.gui.PlotInterface; -import eva2.server.go.PopulationInterface; -import eva2.server.go.problems.InterfaceAdditionalPopulationInformer; +import eva2.optimization.go.PopulationInterface; +import eva2.optimization.problems.InterfaceAdditionalPopulationInformer; import eva2.tools.EVAERROR; import eva2.tools.Pair; import java.io.Serializable; diff --git a/src/eva2/server/stat/StatsOnSingleDataSetEnum.java b/src/eva2/optimization/stat/StatsOnSingleDataSetEnum.java similarity index 87% rename from src/eva2/server/stat/StatsOnSingleDataSetEnum.java rename to src/eva2/optimization/stat/StatsOnSingleDataSetEnum.java index 244e4e2c..3fe849dc 100644 --- a/src/eva2/server/stat/StatsOnSingleDataSetEnum.java +++ b/src/eva2/optimization/stat/StatsOnSingleDataSetEnum.java @@ -1,4 +1,4 @@ -package eva2.server.stat; +package eva2.optimization.stat; public enum StatsOnSingleDataSetEnum { mean, median, variance, stdDev; diff --git a/src/eva2/server/stat/StatsOnTwoSampledDataEnum.java b/src/eva2/optimization/stat/StatsOnTwoSampledDataEnum.java similarity index 92% rename from src/eva2/server/stat/StatsOnTwoSampledDataEnum.java rename to src/eva2/optimization/stat/StatsOnTwoSampledDataEnum.java index 76f80fbf..63b36b8e 100644 --- a/src/eva2/server/stat/StatsOnTwoSampledDataEnum.java +++ b/src/eva2/optimization/stat/StatsOnTwoSampledDataEnum.java @@ -1,4 +1,4 @@ -package eva2.server.stat; +package eva2.optimization.stat; public enum StatsOnTwoSampledDataEnum { tTestEqLenEqVar, tTestUneqLenEqVar, tTestUneqLenUneqVar, mannWhitney; diff --git a/src/eva2/server/go/strategies/ANPSO.java b/src/eva2/optimization/strategies/ANPSO.java similarity index 95% rename from src/eva2/server/go/strategies/ANPSO.java rename to src/eva2/optimization/strategies/ANPSO.java index 16e74015..10a6a18b 100644 --- a/src/eva2/server/go/strategies/ANPSO.java +++ b/src/eva2/optimization/strategies/ANPSO.java @@ -1,21 +1,21 @@ -package eva2.server.go.strategies; +package eva2.optimization.strategies; import eva2.OptimizerFactory; import eva2.gui.GenericObjectEditor; -import eva2.server.go.InterfaceTerminator; -import eva2.server.go.PopulationInterface; -import eva2.server.go.enums.PSOTopologyEnum; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceDataTypeDouble; -import eva2.server.go.operators.nichepso.deactivation.StandardDeactivationStrategy; -import eva2.server.go.operators.paramcontrol.LinearParamAdaption; -import eva2.server.go.operators.paramcontrol.ParamAdaption; -import eva2.server.go.operators.terminators.EvaluationTerminator; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.AbstractOptimizationProblem; -import eva2.server.go.problems.Interface2DBorderProblem; -import eva2.server.go.problems.InterfaceAdditionalPopulationInformer; -import eva2.server.modules.GOParameters; +import eva2.optimization.go.InterfaceTerminator; +import eva2.optimization.go.PopulationInterface; +import eva2.optimization.enums.PSOTopologyEnum; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceDataTypeDouble; +import eva2.optimization.operators.nichepso.deactivation.StandardDeactivationStrategy; +import eva2.optimization.operators.paramcontrol.LinearParamAdaption; +import eva2.optimization.operators.paramcontrol.ParamAdaption; +import eva2.optimization.operators.terminators.EvaluationTerminator; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.AbstractOptimizationProblem; +import eva2.optimization.problems.Interface2DBorderProblem; +import eva2.optimization.problems.InterfaceAdditionalPopulationInformer; +import eva2.optimization.modules.GOParameters; import eva2.tools.ToolBox; import eva2.tools.chart2d.DPoint; import eva2.tools.chart2d.DPointSet; diff --git a/src/eva2/server/go/strategies/BOA.java b/src/eva2/optimization/strategies/BOA.java similarity index 94% rename from src/eva2/server/go/strategies/BOA.java rename to src/eva2/optimization/strategies/BOA.java index cf68faea..9bd1dde4 100644 --- a/src/eva2/server/go/strategies/BOA.java +++ b/src/eva2/optimization/strategies/BOA.java @@ -1,18 +1,18 @@ -package eva2.server.go.strategies; +package eva2.optimization.strategies; import eva2.gui.BeanInspector; -import eva2.server.go.InterfacePopulationChangedEventListener; -import eva2.server.go.enums.BOAScoringMethods; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.GAIndividualBinaryData; -import eva2.server.go.individuals.InterfaceDataTypeBinary; -import eva2.server.go.individuals.InterfaceGAIndividual; -import eva2.server.go.populations.InterfaceSolutionSet; -import eva2.server.go.populations.Population; -import eva2.server.go.populations.SolutionSet; -import eva2.server.go.problems.AbstractOptimizationProblem; -import eva2.server.go.problems.BKnapsackProblem; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.enums.BOAScoringMethods; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.GAIndividualBinaryData; +import eva2.optimization.individuals.InterfaceDataTypeBinary; +import eva2.optimization.individuals.InterfaceGAIndividual; +import eva2.optimization.populations.InterfaceSolutionSet; +import eva2.optimization.populations.Population; +import eva2.optimization.populations.SolutionSet; +import eva2.optimization.problems.AbstractOptimizationProblem; +import eva2.optimization.problems.BKnapsackProblem; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.Pair; import eva2.tools.math.BayNet; import eva2.tools.math.RNG; diff --git a/src/eva2/server/go/strategies/BinaryScatterSearch.java b/src/eva2/optimization/strategies/BinaryScatterSearch.java similarity index 94% rename from src/eva2/server/go/strategies/BinaryScatterSearch.java rename to src/eva2/optimization/strategies/BinaryScatterSearch.java index cb0d4fb2..dfe9b52b 100644 --- a/src/eva2/server/go/strategies/BinaryScatterSearch.java +++ b/src/eva2/optimization/strategies/BinaryScatterSearch.java @@ -1,25 +1,25 @@ -package eva2.server.go.strategies; +package eva2.optimization.strategies; import eva2.gui.BeanInspector; -import eva2.server.go.InterfacePopulationChangedEventListener; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceDataTypeBinary; -import eva2.server.go.individuals.InterfaceGAIndividual; -import eva2.server.go.operators.crossover.AdaptiveCrossoverEAMixer; -import eva2.server.go.operators.crossover.CM1; -import eva2.server.go.operators.crossover.CM2; -import eva2.server.go.operators.crossover.CM3; -import eva2.server.go.operators.crossover.CM4; -import eva2.server.go.operators.crossover.CM5; -import eva2.server.go.operators.crossover.CM6; -import eva2.server.go.operators.crossover.CM7; -import eva2.server.go.operators.distancemetric.GenotypeMetricBitSet; -import eva2.server.go.populations.InterfaceSolutionSet; -import eva2.server.go.populations.Population; -import eva2.server.go.populations.SolutionSet; -import eva2.server.go.problems.AbstractOptimizationProblem; -import eva2.server.go.problems.B1Problem; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceDataTypeBinary; +import eva2.optimization.individuals.InterfaceGAIndividual; +import eva2.optimization.operators.crossover.AdaptiveCrossoverEAMixer; +import eva2.optimization.operators.crossover.CM1; +import eva2.optimization.operators.crossover.CM2; +import eva2.optimization.operators.crossover.CM3; +import eva2.optimization.operators.crossover.CM4; +import eva2.optimization.operators.crossover.CM5; +import eva2.optimization.operators.crossover.CM6; +import eva2.optimization.operators.crossover.CM7; +import eva2.optimization.operators.distancemetric.GenotypeMetricBitSet; +import eva2.optimization.populations.InterfaceSolutionSet; +import eva2.optimization.populations.Population; +import eva2.optimization.populations.SolutionSet; +import eva2.optimization.problems.AbstractOptimizationProblem; +import eva2.optimization.problems.B1Problem; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.Pair; import eva2.tools.math.RNG; import java.util.ArrayList; diff --git a/src/eva2/server/go/strategies/CBNPSO.java b/src/eva2/optimization/strategies/CBNPSO.java similarity index 90% rename from src/eva2/server/go/strategies/CBNPSO.java rename to src/eva2/optimization/strategies/CBNPSO.java index 0f35e826..e5282835 100644 --- a/src/eva2/server/go/strategies/CBNPSO.java +++ b/src/eva2/optimization/strategies/CBNPSO.java @@ -1,19 +1,19 @@ -package eva2.server.go.strategies; +package eva2.optimization.strategies; -import eva2.server.go.PopulationInterface; -import eva2.server.go.enums.PSOTopologyEnum; -import eva2.server.go.operators.cluster.ClusteringDensityBased; -import eva2.server.go.operators.distancemetric.IndividualDataMetric; -import eva2.server.go.operators.paramcontrol.CbpsoFitnessThresholdBasedAdaption; -import eva2.server.go.operators.paramcontrol.LinearParamAdaption; -import eva2.server.go.operators.paramcontrol.ParamAdaption; -import eva2.server.go.operators.paramcontrol.SinusoidalParamAdaption; -import eva2.server.go.populations.Population; -import eva2.server.go.populations.SolutionSet; -import eva2.server.go.problems.AbstractProblemDouble; -import eva2.server.go.problems.InterfaceInterestingHistogram; -import eva2.server.go.problems.InterfaceOptimizationProblem; -import eva2.server.go.problems.InterfaceProblemDouble; +import eva2.optimization.go.PopulationInterface; +import eva2.optimization.enums.PSOTopologyEnum; +import eva2.optimization.operators.cluster.ClusteringDensityBased; +import eva2.optimization.operators.distancemetric.IndividualDataMetric; +import eva2.optimization.operators.paramcontrol.CbpsoFitnessThresholdBasedAdaption; +import eva2.optimization.operators.paramcontrol.LinearParamAdaption; +import eva2.optimization.operators.paramcontrol.ParamAdaption; +import eva2.optimization.operators.paramcontrol.SinusoidalParamAdaption; +import eva2.optimization.populations.Population; +import eva2.optimization.populations.SolutionSet; +import eva2.optimization.problems.AbstractProblemDouble; +import eva2.optimization.problems.InterfaceInterestingHistogram; +import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.optimization.problems.InterfaceProblemDouble; import eva2.tools.EVAERROR; import eva2.tools.ToolBox; import java.io.Serializable; diff --git a/src/eva2/server/go/strategies/CHCAdaptiveSearchAlgorithm.java b/src/eva2/optimization/strategies/CHCAdaptiveSearchAlgorithm.java similarity index 95% rename from src/eva2/server/go/strategies/CHCAdaptiveSearchAlgorithm.java rename to src/eva2/optimization/strategies/CHCAdaptiveSearchAlgorithm.java index 946db074..25cb71fb 100644 --- a/src/eva2/server/go/strategies/CHCAdaptiveSearchAlgorithm.java +++ b/src/eva2/optimization/strategies/CHCAdaptiveSearchAlgorithm.java @@ -1,16 +1,16 @@ -package eva2.server.go.strategies; +package eva2.optimization.strategies; -import eva2.server.go.InterfacePopulationChangedEventListener; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceGAIndividual; -import eva2.server.go.operators.selection.InterfaceSelection; -import eva2.server.go.operators.selection.SelectBestSingle; -import eva2.server.go.operators.selection.SelectRandom; -import eva2.server.go.populations.InterfaceSolutionSet; -import eva2.server.go.populations.Population; -import eva2.server.go.populations.SolutionSet; -import eva2.server.go.problems.B1Problem; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceGAIndividual; +import eva2.optimization.operators.selection.InterfaceSelection; +import eva2.optimization.operators.selection.SelectBestSingle; +import eva2.optimization.operators.selection.SelectRandom; +import eva2.optimization.populations.InterfaceSolutionSet; +import eva2.optimization.populations.Population; +import eva2.optimization.populations.SolutionSet; +import eva2.optimization.problems.B1Problem; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; import java.util.BitSet; diff --git a/src/eva2/server/go/strategies/ClusterBasedNichingEA.java b/src/eva2/optimization/strategies/ClusterBasedNichingEA.java similarity index 97% rename from src/eva2/server/go/strategies/ClusterBasedNichingEA.java rename to src/eva2/optimization/strategies/ClusterBasedNichingEA.java index d5bb2478..19df476a 100644 --- a/src/eva2/server/go/strategies/ClusterBasedNichingEA.java +++ b/src/eva2/optimization/strategies/ClusterBasedNichingEA.java @@ -1,33 +1,33 @@ -package eva2.server.go.strategies; +package eva2.optimization.strategies; import eva2.gui.BeanInspector; import eva2.gui.GenericObjectEditor; import eva2.gui.GraphPointSet; import eva2.gui.Plot; import eva2.gui.TopoPlot; -import eva2.server.go.InterfacePopulationChangedEventListener; -import eva2.server.go.InterfaceTerminator; -import eva2.server.go.PopulationInterface; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.AbstractEAIndividualComparator; -import eva2.server.go.individuals.InterfaceDataTypeDouble; -import eva2.server.go.operators.cluster.ClusteringDensityBased; -import eva2.server.go.operators.cluster.InterfaceClustering; -import eva2.server.go.operators.cluster.InterfaceClusteringDistanceParam; -import eva2.server.go.operators.cluster.InterfaceClusteringMetricBased; -import eva2.server.go.operators.distancemetric.ObjectiveSpaceMetric; -import eva2.server.go.operators.paramcontrol.InterfaceHasUpperDoubleBound; -import eva2.server.go.operators.paramcontrol.ParamAdaption; -import eva2.server.go.operators.paramcontrol.ParameterControlManager; -import eva2.server.go.operators.terminators.HistoryConvergenceTerminator; -import eva2.server.go.populations.Population; -import eva2.server.go.populations.SolutionSet; -import eva2.server.go.problems.B1Problem; -import eva2.server.go.problems.Interface2DBorderProblem; -import eva2.server.go.problems.InterfaceAdditionalPopulationInformer; -import eva2.server.go.problems.InterfaceOptimizationProblem; -import eva2.server.go.problems.InterfaceProblemDouble; -import eva2.server.go.problems.TF1Problem; +import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.go.InterfaceTerminator; +import eva2.optimization.go.PopulationInterface; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.AbstractEAIndividualComparator; +import eva2.optimization.individuals.InterfaceDataTypeDouble; +import eva2.optimization.operators.cluster.ClusteringDensityBased; +import eva2.optimization.operators.cluster.InterfaceClustering; +import eva2.optimization.operators.cluster.InterfaceClusteringDistanceParam; +import eva2.optimization.operators.cluster.InterfaceClusteringMetricBased; +import eva2.optimization.operators.distancemetric.ObjectiveSpaceMetric; +import eva2.optimization.operators.paramcontrol.InterfaceHasUpperDoubleBound; +import eva2.optimization.operators.paramcontrol.ParamAdaption; +import eva2.optimization.operators.paramcontrol.ParameterControlManager; +import eva2.optimization.operators.terminators.HistoryConvergenceTerminator; +import eva2.optimization.populations.Population; +import eva2.optimization.populations.SolutionSet; +import eva2.optimization.problems.B1Problem; +import eva2.optimization.problems.Interface2DBorderProblem; +import eva2.optimization.problems.InterfaceAdditionalPopulationInformer; +import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.optimization.problems.InterfaceProblemDouble; +import eva2.optimization.problems.TF1Problem; import eva2.tools.EVAERROR; import eva2.tools.chart2d.Chart2DDPointIconCircle; import eva2.tools.chart2d.Chart2DDPointIconText; diff --git a/src/eva2/server/go/strategies/ClusteringHillClimbing.java b/src/eva2/optimization/strategies/ClusteringHillClimbing.java similarity index 95% rename from src/eva2/server/go/strategies/ClusteringHillClimbing.java rename to src/eva2/optimization/strategies/ClusteringHillClimbing.java index 981e7f28..ebaa2cd8 100644 --- a/src/eva2/server/go/strategies/ClusteringHillClimbing.java +++ b/src/eva2/optimization/strategies/ClusteringHillClimbing.java @@ -1,18 +1,18 @@ -package eva2.server.go.strategies; +package eva2.optimization.strategies; import eva2.gui.GenericObjectEditor; -import eva2.server.go.InterfacePopulationChangedEventListener; -import eva2.server.go.PopulationInterface; -import eva2.server.go.enums.PostProcessMethod; -import eva2.server.go.operators.mutation.MutateESFixedStepSize; -import eva2.server.go.operators.postprocess.PostProcess; -import eva2.server.go.populations.InterfaceSolutionSet; -import eva2.server.go.populations.Population; -import eva2.server.go.populations.SolutionSet; -import eva2.server.go.problems.AbstractOptimizationProblem; -import eva2.server.go.problems.F1Problem; -import eva2.server.go.problems.InterfaceAdditionalPopulationInformer; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.go.PopulationInterface; +import eva2.optimization.enums.PostProcessMethod; +import eva2.optimization.operators.mutation.MutateESFixedStepSize; +import eva2.optimization.operators.postprocess.PostProcess; +import eva2.optimization.populations.InterfaceSolutionSet; +import eva2.optimization.populations.Population; +import eva2.optimization.populations.SolutionSet; +import eva2.optimization.problems.AbstractOptimizationProblem; +import eva2.optimization.problems.F1Problem; +import eva2.optimization.problems.InterfaceAdditionalPopulationInformer; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.Pair; import java.io.Serializable; diff --git a/src/eva2/server/go/strategies/DifferentialEvolution.java b/src/eva2/optimization/strategies/DifferentialEvolution.java similarity index 97% rename from src/eva2/server/go/strategies/DifferentialEvolution.java rename to src/eva2/optimization/strategies/DifferentialEvolution.java index ba78e154..effef920 100644 --- a/src/eva2/server/go/strategies/DifferentialEvolution.java +++ b/src/eva2/optimization/strategies/DifferentialEvolution.java @@ -1,20 +1,20 @@ -package eva2.server.go.strategies; +package eva2.optimization.strategies; import eva2.gui.BeanInspector; import eva2.gui.GenericObjectEditor; -import eva2.server.go.InterfacePopulationChangedEventListener; -import eva2.server.go.enums.DETypeEnum; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceDataTypeDouble; -import eva2.server.go.operators.selection.replacement.ReplacementCrowding; -import eva2.server.go.operators.selection.replacement.ReplacementNondominatedSortingDistanceCrowding; -import eva2.server.go.populations.InterfaceSolutionSet; -import eva2.server.go.populations.Population; -import eva2.server.go.populations.SolutionSet; -import eva2.server.go.problems.AbstractMultiObjectiveOptimizationProblem; -import eva2.server.go.problems.AbstractOptimizationProblem; -import eva2.server.go.problems.F1Problem; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.enums.DETypeEnum; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceDataTypeDouble; +import eva2.optimization.operators.selection.replacement.ReplacementCrowding; +import eva2.optimization.operators.selection.replacement.ReplacementNondominatedSortingDistanceCrowding; +import eva2.optimization.populations.InterfaceSolutionSet; +import eva2.optimization.populations.Population; +import eva2.optimization.populations.SolutionSet; +import eva2.optimization.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.optimization.problems.AbstractOptimizationProblem; +import eva2.optimization.problems.F1Problem; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.EVAERROR; import eva2.tools.math.Mathematics; import eva2.tools.math.RNG; diff --git a/src/eva2/server/go/strategies/DynamicParticleSwarmOptimization.java b/src/eva2/optimization/strategies/DynamicParticleSwarmOptimization.java similarity index 98% rename from src/eva2/server/go/strategies/DynamicParticleSwarmOptimization.java rename to src/eva2/optimization/strategies/DynamicParticleSwarmOptimization.java index 79a44202..273e7b51 100644 --- a/src/eva2/server/go/strategies/DynamicParticleSwarmOptimization.java +++ b/src/eva2/optimization/strategies/DynamicParticleSwarmOptimization.java @@ -1,12 +1,12 @@ -package eva2.server.go.strategies; +package eva2.optimization.strategies; import eva2.gui.GenericObjectEditor; import eva2.gui.Plot; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceDataTypeDouble; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.AbstractOptimizationProblem; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceDataTypeDouble; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.AbstractOptimizationProblem; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.SelectedTag; import eva2.tools.math.Mathematics; import eva2.tools.math.RNG; diff --git a/src/eva2/server/go/strategies/EsDpiNiching.java b/src/eva2/optimization/strategies/EsDpiNiching.java similarity index 97% rename from src/eva2/server/go/strategies/EsDpiNiching.java rename to src/eva2/optimization/strategies/EsDpiNiching.java index cdaff572..bf99b9b5 100644 --- a/src/eva2/server/go/strategies/EsDpiNiching.java +++ b/src/eva2/optimization/strategies/EsDpiNiching.java @@ -1,31 +1,31 @@ -package eva2.server.go.strategies; +package eva2.optimization.strategies; import eva2.gui.GenericObjectEditor; import eva2.gui.TopoPlot; -import eva2.server.go.InterfacePopulationChangedEventListener; -import eva2.server.go.PopulationInterface; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceDataTypeDouble; -import eva2.server.go.operators.cluster.ClusteringDynPeakIdent; -import eva2.server.go.operators.distancemetric.EuclideanMetric; -import eva2.server.go.operators.distancemetric.IndividualDataMetric; -import eva2.server.go.operators.distancemetric.InterfaceDistanceMetric; -import eva2.server.go.operators.distancemetric.PhenotypeMetric; -import eva2.server.go.operators.mutation.InterfaceAdaptOperatorGenerational; -import eva2.server.go.operators.paramcontrol.ParamAdaption; -import eva2.server.go.operators.paramcontrol.ParameterControlManager; -import eva2.server.go.operators.selection.InterfaceSelection; -import eva2.server.go.operators.selection.SelectBestIndividuals; -import eva2.server.go.operators.selection.SelectBestSingle; -import eva2.server.go.operators.selection.SelectRandom; -import eva2.server.go.operators.selection.SelectTournament; -import eva2.server.go.operators.terminators.HistoryConvergenceTerminator; -import eva2.server.go.populations.InterfaceSolutionSet; -import eva2.server.go.populations.Population; -import eva2.server.go.populations.SolutionSet; -import eva2.server.go.problems.Interface2DBorderProblem; -import eva2.server.go.problems.InterfaceAdditionalPopulationInformer; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.go.PopulationInterface; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceDataTypeDouble; +import eva2.optimization.operators.cluster.ClusteringDynPeakIdent; +import eva2.optimization.operators.distancemetric.EuclideanMetric; +import eva2.optimization.operators.distancemetric.IndividualDataMetric; +import eva2.optimization.operators.distancemetric.InterfaceDistanceMetric; +import eva2.optimization.operators.distancemetric.PhenotypeMetric; +import eva2.optimization.operators.mutation.InterfaceAdaptOperatorGenerational; +import eva2.optimization.operators.paramcontrol.ParamAdaption; +import eva2.optimization.operators.paramcontrol.ParameterControlManager; +import eva2.optimization.operators.selection.InterfaceSelection; +import eva2.optimization.operators.selection.SelectBestIndividuals; +import eva2.optimization.operators.selection.SelectBestSingle; +import eva2.optimization.operators.selection.SelectRandom; +import eva2.optimization.operators.selection.SelectTournament; +import eva2.optimization.operators.terminators.HistoryConvergenceTerminator; +import eva2.optimization.populations.InterfaceSolutionSet; +import eva2.optimization.populations.Population; +import eva2.optimization.populations.SolutionSet; +import eva2.optimization.problems.Interface2DBorderProblem; +import eva2.optimization.problems.InterfaceAdditionalPopulationInformer; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.Mathematics; import eva2.tools.math.RNG; import java.io.Serializable; diff --git a/src/eva2/server/go/strategies/EsDpiNichingCma.java b/src/eva2/optimization/strategies/EsDpiNichingCma.java similarity index 93% rename from src/eva2/server/go/strategies/EsDpiNichingCma.java rename to src/eva2/optimization/strategies/EsDpiNichingCma.java index aa8a09dc..aae293b2 100644 --- a/src/eva2/server/go/strategies/EsDpiNichingCma.java +++ b/src/eva2/optimization/strategies/EsDpiNichingCma.java @@ -1,6 +1,6 @@ -package eva2.server.go.strategies; +package eva2.optimization.strategies; -import eva2.server.go.operators.selection.SelectBestSingle; +import eva2.optimization.operators.selection.SelectBestSingle; public class EsDpiNichingCma extends EsDpiNiching { diff --git a/src/eva2/server/go/strategies/EvolutionStrategies.java b/src/eva2/optimization/strategies/EvolutionStrategies.java similarity index 96% rename from src/eva2/server/go/strategies/EvolutionStrategies.java rename to src/eva2/optimization/strategies/EvolutionStrategies.java index d2528daf..9d2352e6 100644 --- a/src/eva2/server/go/strategies/EvolutionStrategies.java +++ b/src/eva2/optimization/strategies/EvolutionStrategies.java @@ -1,16 +1,16 @@ -package eva2.server.go.strategies; +package eva2.optimization.strategies; -import eva2.server.go.InterfacePopulationChangedEventListener; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.mutation.InterfaceAdaptOperatorGenerational; -import eva2.server.go.operators.selection.InterfaceSelection; -import eva2.server.go.operators.selection.SelectBestIndividuals; -import eva2.server.go.operators.selection.SelectRandom; -import eva2.server.go.populations.InterfaceSolutionSet; -import eva2.server.go.populations.Population; -import eva2.server.go.populations.SolutionSet; -import eva2.server.go.problems.B1Problem; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.operators.mutation.InterfaceAdaptOperatorGenerational; +import eva2.optimization.operators.selection.InterfaceSelection; +import eva2.optimization.operators.selection.SelectBestIndividuals; +import eva2.optimization.operators.selection.SelectRandom; +import eva2.optimization.populations.InterfaceSolutionSet; +import eva2.optimization.populations.Population; +import eva2.optimization.populations.SolutionSet; +import eva2.optimization.problems.B1Problem; +import eva2.optimization.problems.InterfaceOptimizationProblem; /** * Evolution strategies by Rechenberg and Schwefel, but please remember that diff --git a/src/eva2/server/go/strategies/EvolutionStrategyIPOP.java b/src/eva2/optimization/strategies/EvolutionStrategyIPOP.java similarity index 94% rename from src/eva2/server/go/strategies/EvolutionStrategyIPOP.java rename to src/eva2/optimization/strategies/EvolutionStrategyIPOP.java index da1fd5ac..6792924a 100644 --- a/src/eva2/server/go/strategies/EvolutionStrategyIPOP.java +++ b/src/eva2/optimization/strategies/EvolutionStrategyIPOP.java @@ -1,18 +1,18 @@ -package eva2.server.go.strategies; +package eva2.optimization.strategies; import eva2.gui.GenericObjectEditor; -import eva2.server.go.InterfacePopulationChangedEventListener; -import eva2.server.go.InterfaceTerminator; -import eva2.server.go.PopulationInterface; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.mutation.MutateESRankMuCMA; -import eva2.server.go.operators.terminators.FitnessConvergenceTerminator; -import eva2.server.go.operators.terminators.PopulationMeasureTerminator.ChangeTypeEnum; -import eva2.server.go.operators.terminators.PopulationMeasureTerminator.DirectionTypeEnum; -import eva2.server.go.operators.terminators.PopulationMeasureTerminator.StagnationTypeEnum; -import eva2.server.go.populations.Population; -import eva2.server.go.populations.SolutionSet; -import eva2.server.go.problems.InterfaceAdditionalPopulationInformer; +import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.go.InterfaceTerminator; +import eva2.optimization.go.PopulationInterface; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.operators.mutation.MutateESRankMuCMA; +import eva2.optimization.operators.terminators.FitnessConvergenceTerminator; +import eva2.optimization.operators.terminators.PopulationMeasureTerminator.ChangeTypeEnum; +import eva2.optimization.operators.terminators.PopulationMeasureTerminator.DirectionTypeEnum; +import eva2.optimization.operators.terminators.PopulationMeasureTerminator.StagnationTypeEnum; +import eva2.optimization.populations.Population; +import eva2.optimization.populations.SolutionSet; +import eva2.optimization.problems.InterfaceAdditionalPopulationInformer; import java.util.Arrays; import java.util.LinkedList; diff --git a/src/eva2/server/go/strategies/EvolutionaryProgramming.java b/src/eva2/optimization/strategies/EvolutionaryProgramming.java similarity index 93% rename from src/eva2/server/go/strategies/EvolutionaryProgramming.java rename to src/eva2/optimization/strategies/EvolutionaryProgramming.java index 67989e8f..a5a385c2 100644 --- a/src/eva2/server/go/strategies/EvolutionaryProgramming.java +++ b/src/eva2/optimization/strategies/EvolutionaryProgramming.java @@ -1,14 +1,14 @@ -package eva2.server.go.strategies; +package eva2.optimization.strategies; -import eva2.server.go.InterfacePopulationChangedEventListener; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.selection.InterfaceSelection; -import eva2.server.go.operators.selection.SelectEPTournaments; -import eva2.server.go.populations.InterfaceSolutionSet; -import eva2.server.go.populations.Population; -import eva2.server.go.populations.SolutionSet; -import eva2.server.go.problems.F1Problem; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.operators.selection.InterfaceSelection; +import eva2.optimization.operators.selection.SelectEPTournaments; +import eva2.optimization.populations.InterfaceSolutionSet; +import eva2.optimization.populations.Population; +import eva2.optimization.populations.SolutionSet; +import eva2.optimization.problems.F1Problem; +import eva2.optimization.problems.InterfaceOptimizationProblem; /** * Evolutionary programming by Fogel. Works fine but is actually a quite greedy diff --git a/src/eva2/server/go/strategies/FloodAlgorithm.java b/src/eva2/optimization/strategies/FloodAlgorithm.java similarity index 95% rename from src/eva2/server/go/strategies/FloodAlgorithm.java rename to src/eva2/optimization/strategies/FloodAlgorithm.java index 637399db..dfe93428 100644 --- a/src/eva2/server/go/strategies/FloodAlgorithm.java +++ b/src/eva2/optimization/strategies/FloodAlgorithm.java @@ -1,13 +1,13 @@ -package eva2.server.go.strategies; +package eva2.optimization.strategies; -import eva2.server.go.InterfacePopulationChangedEventListener; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.GAIndividualBinaryData; -import eva2.server.go.populations.InterfaceSolutionSet; -import eva2.server.go.populations.Population; -import eva2.server.go.populations.SolutionSet; -import eva2.server.go.problems.B1Problem; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.GAIndividualBinaryData; +import eva2.optimization.populations.InterfaceSolutionSet; +import eva2.optimization.populations.Population; +import eva2.optimization.populations.SolutionSet; +import eva2.optimization.problems.B1Problem; +import eva2.optimization.problems.InterfaceOptimizationProblem; /** * The flood algorithm, and alternative to the threshold algorithms. No really diff --git a/src/eva2/server/go/strategies/GeneticAlgorithm.java b/src/eva2/optimization/strategies/GeneticAlgorithm.java similarity index 94% rename from src/eva2/server/go/strategies/GeneticAlgorithm.java rename to src/eva2/optimization/strategies/GeneticAlgorithm.java index 789e3e97..5e7bb4b2 100644 --- a/src/eva2/server/go/strategies/GeneticAlgorithm.java +++ b/src/eva2/optimization/strategies/GeneticAlgorithm.java @@ -1,16 +1,16 @@ -package eva2.server.go.strategies; +package eva2.optimization.strategies; -import eva2.server.go.InterfacePopulationChangedEventListener; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.mutation.InterfaceAdaptOperatorGenerational; -import eva2.server.go.operators.selection.InterfaceSelection; -import eva2.server.go.operators.selection.SelectRandom; -import eva2.server.go.operators.selection.SelectXProbRouletteWheel; -import eva2.server.go.populations.InterfaceSolutionSet; -import eva2.server.go.populations.Population; -import eva2.server.go.populations.SolutionSet; -import eva2.server.go.problems.F1Problem; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.operators.mutation.InterfaceAdaptOperatorGenerational; +import eva2.optimization.operators.selection.InterfaceSelection; +import eva2.optimization.operators.selection.SelectRandom; +import eva2.optimization.operators.selection.SelectXProbRouletteWheel; +import eva2.optimization.populations.InterfaceSolutionSet; +import eva2.optimization.populations.Population; +import eva2.optimization.populations.SolutionSet; +import eva2.optimization.problems.F1Problem; +import eva2.optimization.problems.InterfaceOptimizationProblem; /** * The traditional genetic algorithms as devised by Holland. To only special diff --git a/src/eva2/server/go/strategies/GradientDescentAlgorithm.java b/src/eva2/optimization/strategies/GradientDescentAlgorithm.java similarity index 97% rename from src/eva2/server/go/strategies/GradientDescentAlgorithm.java rename to src/eva2/optimization/strategies/GradientDescentAlgorithm.java index 841ab870..220be2c3 100644 --- a/src/eva2/server/go/strategies/GradientDescentAlgorithm.java +++ b/src/eva2/optimization/strategies/GradientDescentAlgorithm.java @@ -1,15 +1,15 @@ -package eva2.server.go.strategies; +package eva2.optimization.strategies; import eva2.gui.BeanInspector; -import eva2.server.go.InterfacePopulationChangedEventListener; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceDataTypeDouble; -import eva2.server.go.populations.InterfaceSolutionSet; -import eva2.server.go.populations.Population; -import eva2.server.go.populations.SolutionSet; -import eva2.server.go.problems.F1Problem; -import eva2.server.go.problems.InterfaceFirstOrderDerivableProblem; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceDataTypeDouble; +import eva2.optimization.populations.InterfaceSolutionSet; +import eva2.optimization.populations.Population; +import eva2.optimization.populations.SolutionSet; +import eva2.optimization.problems.F1Problem; +import eva2.optimization.problems.InterfaceFirstOrderDerivableProblem; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.EVAERROR; import eva2.tools.ReflectPackage; diff --git a/src/eva2/server/go/strategies/HillClimbing.java b/src/eva2/optimization/strategies/HillClimbing.java similarity index 95% rename from src/eva2/server/go/strategies/HillClimbing.java rename to src/eva2/optimization/strategies/HillClimbing.java index 4d9253be..7363991c 100644 --- a/src/eva2/server/go/strategies/HillClimbing.java +++ b/src/eva2/optimization/strategies/HillClimbing.java @@ -1,13 +1,13 @@ -package eva2.server.go.strategies; +package eva2.optimization.strategies; -import eva2.server.go.InterfacePopulationChangedEventListener; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.mutation.InterfaceMutation; -import eva2.server.go.populations.InterfaceSolutionSet; -import eva2.server.go.populations.Population; -import eva2.server.go.populations.SolutionSet; -import eva2.server.go.problems.B1Problem; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.operators.mutation.InterfaceMutation; +import eva2.optimization.populations.InterfaceSolutionSet; +import eva2.optimization.populations.Population; +import eva2.optimization.populations.SolutionSet; +import eva2.optimization.problems.B1Problem; +import eva2.optimization.problems.InterfaceOptimizationProblem; /** * This is a Multi-Start Hill-Climber, here the population size gives the number diff --git a/src/eva2/server/go/strategies/InterfaceOptimizer.java b/src/eva2/optimization/strategies/InterfaceOptimizer.java similarity index 92% rename from src/eva2/server/go/strategies/InterfaceOptimizer.java rename to src/eva2/optimization/strategies/InterfaceOptimizer.java index 6a33cba0..e7980466 100644 --- a/src/eva2/server/go/strategies/InterfaceOptimizer.java +++ b/src/eva2/optimization/strategies/InterfaceOptimizer.java @@ -1,9 +1,9 @@ -package eva2.server.go.strategies; +package eva2.optimization.strategies; -import eva2.server.go.InterfacePopulationChangedEventListener; -import eva2.server.go.populations.InterfaceSolutionSet; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.populations.InterfaceSolutionSet; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; /** The general interface for optimizers giving the main methods necessary diff --git a/src/eva2/server/go/strategies/InterfaceSpeciesAware.java b/src/eva2/optimization/strategies/InterfaceSpeciesAware.java similarity index 90% rename from src/eva2/server/go/strategies/InterfaceSpeciesAware.java rename to src/eva2/optimization/strategies/InterfaceSpeciesAware.java index 2b0553f5..f802bf75 100644 --- a/src/eva2/server/go/strategies/InterfaceSpeciesAware.java +++ b/src/eva2/optimization/strategies/InterfaceSpeciesAware.java @@ -1,6 +1,6 @@ -package eva2.server.go.strategies; +package eva2.optimization.strategies; -import eva2.server.go.populations.Population; +import eva2.optimization.populations.Population; /** * An interface for optimizers which are to be notified in case of species diff --git a/src/eva2/server/go/strategies/IslandModelEA.java b/src/eva2/optimization/strategies/IslandModelEA.java similarity index 96% rename from src/eva2/server/go/strategies/IslandModelEA.java rename to src/eva2/optimization/strategies/IslandModelEA.java index d1ebbf1f..425364d8 100644 --- a/src/eva2/server/go/strategies/IslandModelEA.java +++ b/src/eva2/optimization/strategies/IslandModelEA.java @@ -1,21 +1,21 @@ -package eva2.server.go.strategies; +package eva2.optimization.strategies; import eva2.gui.BeanInspector; import eva2.gui.Plot; -import eva2.server.go.InterfacePopulationChangedEventListener; -import eva2.server.go.individuals.ESIndividualDoubleData; -import eva2.server.go.operators.migration.InterfaceMigration; -import eva2.server.go.operators.migration.MOBestMigration; -import eva2.server.go.operators.migration.MOClusteringSeparation; -import eva2.server.go.operators.migration.MOConeSeparation; -import eva2.server.go.operators.migration.SOBestMigration; -import eva2.server.go.populations.InterfaceSolutionSet; -import eva2.server.go.populations.Population; -import eva2.server.go.populations.SolutionSet; -import eva2.server.go.problems.F1Problem; -import eva2.server.go.problems.F8Problem; -import eva2.server.go.problems.InterfaceOptimizationProblem; -import eva2.server.go.problems.TF1Problem; +import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.individuals.ESIndividualDoubleData; +import eva2.optimization.operators.migration.InterfaceMigration; +import eva2.optimization.operators.migration.MOBestMigration; +import eva2.optimization.operators.migration.MOClusteringSeparation; +import eva2.optimization.operators.migration.MOConeSeparation; +import eva2.optimization.operators.migration.SOBestMigration; +import eva2.optimization.populations.InterfaceSolutionSet; +import eva2.optimization.populations.Population; +import eva2.optimization.populations.SolutionSet; +import eva2.optimization.problems.F1Problem; +import eva2.optimization.problems.F8Problem; +import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.optimization.problems.TF1Problem; /** * The one and only island model for parallelization. Since parallelization diff --git a/src/eva2/server/go/strategies/LTGA.java b/src/eva2/optimization/strategies/LTGA.java similarity index 95% rename from src/eva2/server/go/strategies/LTGA.java rename to src/eva2/optimization/strategies/LTGA.java index 867acc29..8cc1c5de 100644 --- a/src/eva2/server/go/strategies/LTGA.java +++ b/src/eva2/optimization/strategies/LTGA.java @@ -1,16 +1,16 @@ -package eva2.server.go.strategies; +package eva2.optimization.strategies; import eva2.gui.BeanInspector; -import eva2.server.go.InterfacePopulationChangedEventListener; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceDataTypeBinary; -import eva2.server.go.individuals.InterfaceGAIndividual; -import eva2.server.go.populations.InterfaceSolutionSet; -import eva2.server.go.populations.Population; -import eva2.server.go.populations.SolutionSet; -import eva2.server.go.problems.AbstractOptimizationProblem; -import eva2.server.go.problems.BKnapsackProblem; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceDataTypeBinary; +import eva2.optimization.individuals.InterfaceGAIndividual; +import eva2.optimization.populations.InterfaceSolutionSet; +import eva2.optimization.populations.Population; +import eva2.optimization.populations.SolutionSet; +import eva2.optimization.problems.AbstractOptimizationProblem; +import eva2.optimization.problems.BKnapsackProblem; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.Pair; import eva2.tools.math.SpecialFunction; import java.util.BitSet; diff --git a/src/eva2/server/go/strategies/MLTGA.java b/src/eva2/optimization/strategies/MLTGA.java similarity index 95% rename from src/eva2/server/go/strategies/MLTGA.java rename to src/eva2/optimization/strategies/MLTGA.java index 397899d5..eb6662f9 100644 --- a/src/eva2/server/go/strategies/MLTGA.java +++ b/src/eva2/optimization/strategies/MLTGA.java @@ -1,16 +1,16 @@ -package eva2.server.go.strategies; +package eva2.optimization.strategies; import eva2.gui.BeanInspector; -import eva2.server.go.InterfacePopulationChangedEventListener; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceDataTypeBinary; -import eva2.server.go.individuals.InterfaceGAIndividual; -import eva2.server.go.populations.InterfaceSolutionSet; -import eva2.server.go.populations.Population; -import eva2.server.go.populations.SolutionSet; -import eva2.server.go.problems.AbstractOptimizationProblem; -import eva2.server.go.problems.BKnapsackProblem; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceDataTypeBinary; +import eva2.optimization.individuals.InterfaceGAIndividual; +import eva2.optimization.populations.InterfaceSolutionSet; +import eva2.optimization.populations.Population; +import eva2.optimization.populations.SolutionSet; +import eva2.optimization.problems.AbstractOptimizationProblem; +import eva2.optimization.problems.BKnapsackProblem; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.Pair; import eva2.tools.math.SpecialFunction; import java.util.BitSet; diff --git a/src/eva2/server/go/strategies/MemeticAlgorithm.java b/src/eva2/optimization/strategies/MemeticAlgorithm.java similarity index 95% rename from src/eva2/server/go/strategies/MemeticAlgorithm.java rename to src/eva2/optimization/strategies/MemeticAlgorithm.java index 4e191b83..1289a5aa 100644 --- a/src/eva2/server/go/strategies/MemeticAlgorithm.java +++ b/src/eva2/optimization/strategies/MemeticAlgorithm.java @@ -1,15 +1,15 @@ -package eva2.server.go.strategies; +package eva2.optimization.strategies; -import eva2.server.go.InterfacePopulationChangedEventListener; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.selection.InterfaceSelection; -import eva2.server.go.operators.selection.SelectBestIndividuals; -import eva2.server.go.populations.InterfaceSolutionSet; -import eva2.server.go.populations.Population; -import eva2.server.go.populations.SolutionSet; -import eva2.server.go.problems.F1Problem; -import eva2.server.go.problems.InterfaceLocalSearchable; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.operators.selection.InterfaceSelection; +import eva2.optimization.operators.selection.SelectBestIndividuals; +import eva2.optimization.populations.InterfaceSolutionSet; +import eva2.optimization.populations.Population; +import eva2.optimization.populations.SolutionSet; +import eva2.optimization.problems.F1Problem; +import eva2.optimization.problems.InterfaceLocalSearchable; +import eva2.optimization.problems.InterfaceOptimizationProblem; import java.util.Hashtable; /** diff --git a/src/eva2/server/go/strategies/MonteCarloSearch.java b/src/eva2/optimization/strategies/MonteCarloSearch.java similarity index 94% rename from src/eva2/server/go/strategies/MonteCarloSearch.java rename to src/eva2/optimization/strategies/MonteCarloSearch.java index ea775409..e8ad9f60 100644 --- a/src/eva2/server/go/strategies/MonteCarloSearch.java +++ b/src/eva2/optimization/strategies/MonteCarloSearch.java @@ -1,13 +1,13 @@ -package eva2.server.go.strategies; +package eva2.optimization.strategies; -import eva2.server.go.InterfacePopulationChangedEventListener; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.GAIndividualBinaryData; -import eva2.server.go.populations.InterfaceSolutionSet; -import eva2.server.go.populations.Population; -import eva2.server.go.populations.SolutionSet; -import eva2.server.go.problems.B1Problem; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.GAIndividualBinaryData; +import eva2.optimization.populations.InterfaceSolutionSet; +import eva2.optimization.populations.Population; +import eva2.optimization.populations.SolutionSet; +import eva2.optimization.problems.B1Problem; +import eva2.optimization.problems.InterfaceOptimizationProblem; /** * The simple random or Monte-Carlo search, simple but useful to evaluate the diff --git a/src/eva2/server/go/strategies/MultiObjectiveCMAES.java b/src/eva2/optimization/strategies/MultiObjectiveCMAES.java similarity index 91% rename from src/eva2/server/go/strategies/MultiObjectiveCMAES.java rename to src/eva2/optimization/strategies/MultiObjectiveCMAES.java index 86624d8e..70df84c9 100644 --- a/src/eva2/server/go/strategies/MultiObjectiveCMAES.java +++ b/src/eva2/optimization/strategies/MultiObjectiveCMAES.java @@ -1,16 +1,16 @@ -package eva2.server.go.strategies; +package eva2.optimization.strategies; import eva2.gui.GenericObjectEditor; -import eva2.server.go.InterfacePopulationChangedEventListener; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.archiving.ArchivingNSGAII; -import eva2.server.go.operators.archiving.ArchivingNSGAIISMeasure; -import eva2.server.go.operators.mutation.MutateESCovarianceMatrixAdaptionPlus; -import eva2.server.go.populations.InterfaceSolutionSet; -import eva2.server.go.populations.Population; -import eva2.server.go.populations.SolutionSet; -import eva2.server.go.problems.AbstractOptimizationProblem; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.operators.archiving.ArchivingNSGAII; +import eva2.optimization.operators.archiving.ArchivingNSGAIISMeasure; +import eva2.optimization.operators.mutation.MutateESCovarianceMatrixAdaptionPlus; +import eva2.optimization.populations.InterfaceSolutionSet; +import eva2.optimization.populations.Population; +import eva2.optimization.populations.SolutionSet; +import eva2.optimization.problems.AbstractOptimizationProblem; +import eva2.optimization.problems.InterfaceOptimizationProblem; import java.io.Serializable; import java.util.HashMap; diff --git a/src/eva2/server/go/strategies/MultiObjectiveEA.java b/src/eva2/optimization/strategies/MultiObjectiveEA.java similarity index 93% rename from src/eva2/server/go/strategies/MultiObjectiveEA.java rename to src/eva2/optimization/strategies/MultiObjectiveEA.java index 3f5a0ce4..9edd674e 100644 --- a/src/eva2/server/go/strategies/MultiObjectiveEA.java +++ b/src/eva2/optimization/strategies/MultiObjectiveEA.java @@ -1,19 +1,19 @@ -package eva2.server.go.strategies; +package eva2.optimization.strategies; -import eva2.server.go.InterfacePopulationChangedEventListener; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.AbstractEAIndividualComparator; -import eva2.server.go.operators.archiving.ArchivingNSGAII; -import eva2.server.go.operators.archiving.InformationRetrievalInserting; -import eva2.server.go.operators.archiving.InterfaceArchiving; -import eva2.server.go.operators.archiving.InterfaceInformationRetrieval; -import eva2.server.go.operators.selection.SelectMONonDominated; -import eva2.server.go.populations.InterfaceSolutionSet; -import eva2.server.go.populations.Population; -import eva2.server.go.populations.SolutionSet; -import eva2.server.go.problems.AbstractOptimizationProblem; -import eva2.server.go.problems.FM0Problem; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.AbstractEAIndividualComparator; +import eva2.optimization.operators.archiving.ArchivingNSGAII; +import eva2.optimization.operators.archiving.InformationRetrievalInserting; +import eva2.optimization.operators.archiving.InterfaceArchiving; +import eva2.optimization.operators.archiving.InterfaceInformationRetrieval; +import eva2.optimization.operators.selection.SelectMONonDominated; +import eva2.optimization.populations.InterfaceSolutionSet; +import eva2.optimization.populations.Population; +import eva2.optimization.populations.SolutionSet; +import eva2.optimization.problems.AbstractOptimizationProblem; +import eva2.optimization.problems.FM0Problem; +import eva2.optimization.problems.InterfaceOptimizationProblem; /** * A generic framework for multi-objecitve optimization, you need to specify an diff --git a/src/eva2/server/go/strategies/NelderMeadSimplex.java b/src/eva2/optimization/strategies/NelderMeadSimplex.java similarity index 97% rename from src/eva2/server/go/strategies/NelderMeadSimplex.java rename to src/eva2/optimization/strategies/NelderMeadSimplex.java index 219198c2..6a209e28 100644 --- a/src/eva2/server/go/strategies/NelderMeadSimplex.java +++ b/src/eva2/optimization/strategies/NelderMeadSimplex.java @@ -1,15 +1,15 @@ -package eva2.server.go.strategies; +package eva2.optimization.strategies; import eva2.gui.BeanInspector; -import eva2.server.go.InterfacePopulationChangedEventListener; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceDataTypeDouble; -import eva2.server.go.populations.InterfaceSolutionSet; -import eva2.server.go.populations.Population; -import eva2.server.go.populations.SolutionSet; -import eva2.server.go.problems.AbstractOptimizationProblem; -import eva2.server.go.problems.AbstractProblemDouble; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceDataTypeDouble; +import eva2.optimization.populations.InterfaceSolutionSet; +import eva2.optimization.populations.Population; +import eva2.optimization.populations.SolutionSet; +import eva2.optimization.problems.AbstractOptimizationProblem; +import eva2.optimization.problems.AbstractProblemDouble; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.Mathematics; import java.io.Serializable; import java.util.Vector; diff --git a/src/eva2/server/go/strategies/NicheGraph.java b/src/eva2/optimization/strategies/NicheGraph.java similarity index 95% rename from src/eva2/server/go/strategies/NicheGraph.java rename to src/eva2/optimization/strategies/NicheGraph.java index b787f4c4..288087ce 100644 --- a/src/eva2/server/go/strategies/NicheGraph.java +++ b/src/eva2/optimization/strategies/NicheGraph.java @@ -1,4 +1,4 @@ -package eva2.server.go.strategies; +package eva2.optimization.strategies; import java.util.ArrayList; import java.util.HashSet; diff --git a/src/eva2/server/go/strategies/NichePSO.java b/src/eva2/optimization/strategies/NichePSO.java similarity index 95% rename from src/eva2/server/go/strategies/NichePSO.java rename to src/eva2/optimization/strategies/NichePSO.java index 33ac74f4..71aa9943 100644 --- a/src/eva2/server/go/strategies/NichePSO.java +++ b/src/eva2/optimization/strategies/NichePSO.java @@ -1,38 +1,38 @@ -package eva2.server.go.strategies; +package eva2.optimization.strategies; import eva2.OptimizerFactory; import eva2.gui.GenericObjectEditor; import eva2.gui.TopoPlot; -import eva2.server.go.InterfacePopulationChangedEventListener; -import eva2.server.go.InterfaceTerminator; -import eva2.server.go.PopulationInterface; -import eva2.server.go.enums.PSOTopologyEnum; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceDataTypeDouble; -import eva2.server.go.operators.nichepso.absorption.EuclideanDiversityAbsorptionStrategy; -import eva2.server.go.operators.nichepso.absorption.InterfaceAbsorptionStrategy; -import eva2.server.go.operators.nichepso.absorption.StandardAbsorptionStrategy; -import eva2.server.go.operators.nichepso.deactivation.InterfaceDeactivationStrategy; -import eva2.server.go.operators.nichepso.deactivation.StandardDeactivationStrategy; -import eva2.server.go.operators.nichepso.merging.InterfaceMergingStrategy; -import eva2.server.go.operators.nichepso.merging.ScatterMergingStrategy; -import eva2.server.go.operators.nichepso.merging.StandardMergingStrategy; -import eva2.server.go.operators.nichepso.subswarmcreation.InterfaceSubswarmCreationStrategy; -import eva2.server.go.operators.nichepso.subswarmcreation.StandardSubswarmCreationStrategy; -import eva2.server.go.operators.paramcontrol.LinearParamAdaption; -import eva2.server.go.operators.paramcontrol.ParamAdaption; -import eva2.server.go.operators.paramcontrol.ParameterControlManager; -import eva2.server.go.operators.terminators.EvaluationTerminator; -import eva2.server.go.populations.Population; -import eva2.server.go.populations.SolutionSet; -import eva2.server.go.problems.AbstractOptimizationProblem; -import eva2.server.go.problems.FM0Problem; -import eva2.server.go.problems.Interface2DBorderProblem; -import eva2.server.go.problems.InterfaceAdditionalPopulationInformer; -import eva2.server.go.problems.InterfaceMultimodalProblem; -import eva2.server.go.problems.InterfaceMultimodalProblemKnown; -import eva2.server.go.problems.InterfaceOptimizationProblem; -import eva2.server.modules.GOParameters; +import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.go.InterfaceTerminator; +import eva2.optimization.go.PopulationInterface; +import eva2.optimization.enums.PSOTopologyEnum; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceDataTypeDouble; +import eva2.optimization.operators.nichepso.absorption.EuclideanDiversityAbsorptionStrategy; +import eva2.optimization.operators.nichepso.absorption.InterfaceAbsorptionStrategy; +import eva2.optimization.operators.nichepso.absorption.StandardAbsorptionStrategy; +import eva2.optimization.operators.nichepso.deactivation.InterfaceDeactivationStrategy; +import eva2.optimization.operators.nichepso.deactivation.StandardDeactivationStrategy; +import eva2.optimization.operators.nichepso.merging.InterfaceMergingStrategy; +import eva2.optimization.operators.nichepso.merging.ScatterMergingStrategy; +import eva2.optimization.operators.nichepso.merging.StandardMergingStrategy; +import eva2.optimization.operators.nichepso.subswarmcreation.InterfaceSubswarmCreationStrategy; +import eva2.optimization.operators.nichepso.subswarmcreation.StandardSubswarmCreationStrategy; +import eva2.optimization.operators.paramcontrol.LinearParamAdaption; +import eva2.optimization.operators.paramcontrol.ParamAdaption; +import eva2.optimization.operators.paramcontrol.ParameterControlManager; +import eva2.optimization.operators.terminators.EvaluationTerminator; +import eva2.optimization.populations.Population; +import eva2.optimization.populations.SolutionSet; +import eva2.optimization.problems.AbstractOptimizationProblem; +import eva2.optimization.problems.FM0Problem; +import eva2.optimization.problems.Interface2DBorderProblem; +import eva2.optimization.problems.InterfaceAdditionalPopulationInformer; +import eva2.optimization.problems.InterfaceMultimodalProblem; +import eva2.optimization.problems.InterfaceMultimodalProblemKnown; +import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.optimization.modules.GOParameters; import eva2.tools.SelectedTag; import eva2.tools.chart2d.Chart2DDPointIconCircle; import eva2.tools.chart2d.Chart2DDPointIconContent; diff --git a/src/eva2/server/go/strategies/ParticleFilterOptimization.java b/src/eva2/optimization/strategies/ParticleFilterOptimization.java similarity index 94% rename from src/eva2/server/go/strategies/ParticleFilterOptimization.java rename to src/eva2/optimization/strategies/ParticleFilterOptimization.java index 792a4b7b..ca574c7c 100644 --- a/src/eva2/server/go/strategies/ParticleFilterOptimization.java +++ b/src/eva2/optimization/strategies/ParticleFilterOptimization.java @@ -1,22 +1,22 @@ -package eva2.server.go.strategies; +package eva2.optimization.strategies; import eva2.gui.BeanInspector; import eva2.gui.GenericObjectEditor; import eva2.gui.Plot; -import eva2.server.go.InterfacePopulationChangedEventListener; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceDataTypeDouble; -import eva2.server.go.operators.distancemetric.EuclideanMetric; -import eva2.server.go.operators.mutation.MutateESCorrVector; -import eva2.server.go.operators.mutation.MutateESFixedStepSize; -import eva2.server.go.operators.selection.InterfaceSelection; -import eva2.server.go.operators.selection.SelectParticleWheel; -import eva2.server.go.populations.InterfaceSolutionSet; -import eva2.server.go.populations.Population; -import eva2.server.go.populations.SolutionSet; -import eva2.server.go.problems.AbstractOptimizationProblem; -import eva2.server.go.problems.F1Problem; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceDataTypeDouble; +import eva2.optimization.operators.distancemetric.EuclideanMetric; +import eva2.optimization.operators.mutation.MutateESCorrVector; +import eva2.optimization.operators.mutation.MutateESFixedStepSize; +import eva2.optimization.operators.selection.InterfaceSelection; +import eva2.optimization.operators.selection.SelectParticleWheel; +import eva2.optimization.populations.InterfaceSolutionSet; +import eva2.optimization.populations.Population; +import eva2.optimization.populations.SolutionSet; +import eva2.optimization.problems.AbstractOptimizationProblem; +import eva2.optimization.problems.F1Problem; +import eva2.optimization.problems.InterfaceOptimizationProblem; /** * This is a Particle Filter implemented by Frank Senke, only some documentation diff --git a/src/eva2/server/go/strategies/ParticleSubSwarmOptimization.java b/src/eva2/optimization/strategies/ParticleSubSwarmOptimization.java similarity index 95% rename from src/eva2/server/go/strategies/ParticleSubSwarmOptimization.java rename to src/eva2/optimization/strategies/ParticleSubSwarmOptimization.java index 1265dd60..d54ea8a3 100644 --- a/src/eva2/server/go/strategies/ParticleSubSwarmOptimization.java +++ b/src/eva2/optimization/strategies/ParticleSubSwarmOptimization.java @@ -1,13 +1,13 @@ -package eva2.server.go.strategies; +package eva2.optimization.strategies; -import eva2.server.go.IndividualInterface; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.ESIndividualDoubleData; -import eva2.server.go.individuals.InterfaceDataTypeDouble; -import eva2.server.go.operators.distancemetric.EuclideanMetric; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.AbstractOptimizationProblem; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.go.IndividualInterface; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.ESIndividualDoubleData; +import eva2.optimization.individuals.InterfaceDataTypeDouble; +import eva2.optimization.operators.distancemetric.EuclideanMetric; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.AbstractOptimizationProblem; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.Mathematics; import java.util.Vector; diff --git a/src/eva2/server/go/strategies/ParticleSwarmOptimization.java b/src/eva2/optimization/strategies/ParticleSwarmOptimization.java similarity index 98% rename from src/eva2/server/go/strategies/ParticleSwarmOptimization.java rename to src/eva2/optimization/strategies/ParticleSwarmOptimization.java index 9b8b8ecc..d32dfb76 100644 --- a/src/eva2/server/go/strategies/ParticleSwarmOptimization.java +++ b/src/eva2/optimization/strategies/ParticleSwarmOptimization.java @@ -1,21 +1,25 @@ -package eva2.server.go.strategies; +package eva2.optimization.strategies; +import eva2.optimization.problems.F1Problem; +import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.optimization.problems.InterfaceProblemDouble; +import eva2.optimization.problems.InterfaceAdditionalPopulationInformer; +import eva2.optimization.problems.Interface2DBorderProblem; import eva2.gui.BeanInspector; import eva2.gui.GenericObjectEditor; import eva2.gui.TopoPlot; -import eva2.server.go.InterfacePopulationChangedEventListener; -import eva2.server.go.PopulationInterface; -import eva2.server.go.enums.PSOTopologyEnum; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.AbstractEAIndividualComparator; -import eva2.server.go.individuals.InterfaceDataTypeDouble; -import eva2.server.go.operators.distancemetric.PhenotypeMetric; -import eva2.server.go.operators.paramcontrol.ParamAdaption; -import eva2.server.go.operators.paramcontrol.ParameterControlManager; -import eva2.server.go.populations.InterfaceSolutionSet; -import eva2.server.go.populations.Population; -import eva2.server.go.populations.SolutionSet; -import eva2.server.go.problems.*; +import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.go.PopulationInterface; +import eva2.optimization.enums.PSOTopologyEnum; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.AbstractEAIndividualComparator; +import eva2.optimization.individuals.InterfaceDataTypeDouble; +import eva2.optimization.operators.distancemetric.PhenotypeMetric; +import eva2.optimization.operators.paramcontrol.ParamAdaption; +import eva2.optimization.operators.paramcontrol.ParameterControlManager; +import eva2.optimization.populations.InterfaceSolutionSet; +import eva2.optimization.populations.Population; +import eva2.optimization.populations.SolutionSet; import eva2.tools.SelectedTag; import eva2.tools.chart2d.DPoint; import eva2.tools.chart2d.DPointSet; diff --git a/src/eva2/server/go/strategies/ParticleSwarmOptimizationGCPSO.java b/src/eva2/optimization/strategies/ParticleSwarmOptimizationGCPSO.java similarity index 96% rename from src/eva2/server/go/strategies/ParticleSwarmOptimizationGCPSO.java rename to src/eva2/optimization/strategies/ParticleSwarmOptimizationGCPSO.java index 234e38b2..5a125a0d 100644 --- a/src/eva2/server/go/strategies/ParticleSwarmOptimizationGCPSO.java +++ b/src/eva2/optimization/strategies/ParticleSwarmOptimizationGCPSO.java @@ -1,6 +1,6 @@ -package eva2.server.go.strategies; +package eva2.optimization.strategies; -import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.AbstractEAIndividual; import eva2.tools.math.RNG; /** diff --git a/src/eva2/server/go/strategies/PopulationBasedIncrementalLearning.java b/src/eva2/optimization/strategies/PopulationBasedIncrementalLearning.java similarity index 94% rename from src/eva2/server/go/strategies/PopulationBasedIncrementalLearning.java rename to src/eva2/optimization/strategies/PopulationBasedIncrementalLearning.java index e42cd9de..607903aa 100644 --- a/src/eva2/server/go/strategies/PopulationBasedIncrementalLearning.java +++ b/src/eva2/optimization/strategies/PopulationBasedIncrementalLearning.java @@ -1,17 +1,17 @@ -package eva2.server.go.strategies; +package eva2.optimization.strategies; -import eva2.server.go.InterfacePopulationChangedEventListener; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceGAIndividual; -import eva2.server.go.operators.selection.InterfaceSelection; -import eva2.server.go.operators.selection.SelectBestIndividuals; -import eva2.server.go.populations.InterfaceSolutionSet; -import eva2.server.go.populations.PBILPopulation; -import eva2.server.go.populations.Population; -import eva2.server.go.populations.SolutionSet; -import eva2.server.go.problems.AbstractOptimizationProblem; -import eva2.server.go.problems.B1Problem; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceGAIndividual; +import eva2.optimization.operators.selection.InterfaceSelection; +import eva2.optimization.operators.selection.SelectBestIndividuals; +import eva2.optimization.populations.InterfaceSolutionSet; +import eva2.optimization.populations.PBILPopulation; +import eva2.optimization.populations.Population; +import eva2.optimization.populations.SolutionSet; +import eva2.optimization.problems.AbstractOptimizationProblem; +import eva2.optimization.problems.B1Problem; +import eva2.optimization.problems.InterfaceOptimizationProblem; /** * Population based incremental learning in the PSM by Monmarche version with diff --git a/src/eva2/server/go/strategies/ScatterSearch.java b/src/eva2/optimization/strategies/ScatterSearch.java similarity index 97% rename from src/eva2/server/go/strategies/ScatterSearch.java rename to src/eva2/optimization/strategies/ScatterSearch.java index 6031a80c..ec9d67b4 100644 --- a/src/eva2/server/go/strategies/ScatterSearch.java +++ b/src/eva2/optimization/strategies/ScatterSearch.java @@ -1,23 +1,23 @@ -package eva2.server.go.strategies; +package eva2.optimization.strategies; import eva2.OptimizerFactory; import eva2.OptimizerRunnable; import eva2.gui.BeanInspector; import eva2.gui.GenericObjectEditor; -import eva2.server.go.InterfacePopulationChangedEventListener; -import eva2.server.go.InterfaceTerminator; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceDataTypeDouble; -import eva2.server.go.operators.distancemetric.PhenotypeMetric; -import eva2.server.go.operators.postprocess.PostProcess; -import eva2.server.go.operators.terminators.EvaluationTerminator; -import eva2.server.go.populations.InterfaceSolutionSet; -import eva2.server.go.populations.Population; -import eva2.server.go.populations.SolutionSet; -import eva2.server.go.problems.AbstractOptimizationProblem; -import eva2.server.go.problems.F1Problem; -import eva2.server.go.problems.InterfaceOptimizationProblem; -import eva2.server.modules.GOParameters; +import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.go.InterfaceTerminator; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceDataTypeDouble; +import eva2.optimization.operators.distancemetric.PhenotypeMetric; +import eva2.optimization.operators.postprocess.PostProcess; +import eva2.optimization.operators.terminators.EvaluationTerminator; +import eva2.optimization.populations.InterfaceSolutionSet; +import eva2.optimization.populations.Population; +import eva2.optimization.populations.SolutionSet; +import eva2.optimization.problems.AbstractOptimizationProblem; +import eva2.optimization.problems.F1Problem; +import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.optimization.modules.GOParameters; import eva2.tools.Pair; import eva2.tools.SelectedTag; import eva2.tools.math.Mathematics; diff --git a/src/eva2/server/go/strategies/SimulatedAnnealing.java b/src/eva2/optimization/strategies/SimulatedAnnealing.java similarity index 95% rename from src/eva2/server/go/strategies/SimulatedAnnealing.java rename to src/eva2/optimization/strategies/SimulatedAnnealing.java index aa86ea72..5c16f3e5 100644 --- a/src/eva2/server/go/strategies/SimulatedAnnealing.java +++ b/src/eva2/optimization/strategies/SimulatedAnnealing.java @@ -1,13 +1,13 @@ -package eva2.server.go.strategies; +package eva2.optimization.strategies; -import eva2.server.go.InterfacePopulationChangedEventListener; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.GAIndividualBinaryData; -import eva2.server.go.populations.InterfaceSolutionSet; -import eva2.server.go.populations.Population; -import eva2.server.go.populations.SolutionSet; -import eva2.server.go.problems.B1Problem; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.GAIndividualBinaryData; +import eva2.optimization.populations.InterfaceSolutionSet; +import eva2.optimization.populations.Population; +import eva2.optimization.populations.SolutionSet; +import eva2.optimization.problems.B1Problem; +import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.tools.math.RNG; /** diff --git a/src/eva2/server/go/strategies/SqPSO.java b/src/eva2/optimization/strategies/SqPSO.java similarity index 81% rename from src/eva2/server/go/strategies/SqPSO.java rename to src/eva2/optimization/strategies/SqPSO.java index dc9271c1..66ccbea9 100644 --- a/src/eva2/server/go/strategies/SqPSO.java +++ b/src/eva2/optimization/strategies/SqPSO.java @@ -1,9 +1,9 @@ -package eva2.server.go.strategies; +package eva2.optimization.strategies; -import eva2.server.go.enums.PSOTopologyEnum; -import eva2.server.go.operators.cluster.ClusteringDensityBased; -import eva2.server.go.operators.distancemetric.IndividualDataMetric; -import eva2.server.go.operators.paramcontrol.ParamAdaption; +import eva2.optimization.enums.PSOTopologyEnum; +import eva2.optimization.operators.cluster.ClusteringDensityBased; +import eva2.optimization.operators.distancemetric.IndividualDataMetric; +import eva2.optimization.operators.paramcontrol.ParamAdaption; /** * A thunk class preconfiguring CBN-EA to function as a sequential niching method. This diff --git a/src/eva2/server/go/strategies/StarANPSO.java b/src/eva2/optimization/strategies/StarANPSO.java similarity index 88% rename from src/eva2/server/go/strategies/StarANPSO.java rename to src/eva2/optimization/strategies/StarANPSO.java index 6d10a7fc..e86ccc74 100644 --- a/src/eva2/server/go/strategies/StarANPSO.java +++ b/src/eva2/optimization/strategies/StarANPSO.java @@ -1,7 +1,7 @@ -package eva2.server.go.strategies; +package eva2.optimization.strategies; -import eva2.server.go.operators.paramcontrol.LinearParamAdaption; -import eva2.server.go.operators.paramcontrol.ParamAdaption; +import eva2.optimization.operators.paramcontrol.LinearParamAdaption; +import eva2.optimization.operators.paramcontrol.ParamAdaption; public class StarANPSO extends ANPSO { private int defaultEvalCnt=10000; diff --git a/src/eva2/server/go/strategies/SteadyStateGA.java b/src/eva2/optimization/strategies/SteadyStateGA.java similarity index 92% rename from src/eva2/server/go/strategies/SteadyStateGA.java rename to src/eva2/optimization/strategies/SteadyStateGA.java index b3831734..1e8b7d21 100644 --- a/src/eva2/server/go/strategies/SteadyStateGA.java +++ b/src/eva2/optimization/strategies/SteadyStateGA.java @@ -1,17 +1,17 @@ -package eva2.server.go.strategies; +package eva2.optimization.strategies; -import eva2.server.go.InterfacePopulationChangedEventListener; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.GAIndividualBinaryData; -import eva2.server.go.operators.selection.InterfaceSelection; -import eva2.server.go.operators.selection.SelectTournament; -import eva2.server.go.operators.selection.replacement.InterfaceReplacement; -import eva2.server.go.operators.selection.replacement.ReplaceWorst; -import eva2.server.go.populations.InterfaceSolutionSet; -import eva2.server.go.populations.Population; -import eva2.server.go.populations.SolutionSet; -import eva2.server.go.problems.B1Problem; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.GAIndividualBinaryData; +import eva2.optimization.operators.selection.InterfaceSelection; +import eva2.optimization.operators.selection.SelectTournament; +import eva2.optimization.operators.selection.replacement.InterfaceReplacement; +import eva2.optimization.operators.selection.replacement.ReplaceWorst; +import eva2.optimization.populations.InterfaceSolutionSet; +import eva2.optimization.populations.Population; +import eva2.optimization.populations.SolutionSet; +import eva2.optimization.problems.B1Problem; +import eva2.optimization.problems.InterfaceOptimizationProblem; /** * A simple implementation of the steady-state GA with variable replacement diff --git a/src/eva2/server/go/strategies/ThresholdAlgorithm.java b/src/eva2/optimization/strategies/ThresholdAlgorithm.java similarity index 95% rename from src/eva2/server/go/strategies/ThresholdAlgorithm.java rename to src/eva2/optimization/strategies/ThresholdAlgorithm.java index 44cabbbb..38b8cf0a 100644 --- a/src/eva2/server/go/strategies/ThresholdAlgorithm.java +++ b/src/eva2/optimization/strategies/ThresholdAlgorithm.java @@ -1,13 +1,13 @@ -package eva2.server.go.strategies; +package eva2.optimization.strategies; -import eva2.server.go.InterfacePopulationChangedEventListener; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.GAIndividualBinaryData; -import eva2.server.go.populations.InterfaceSolutionSet; -import eva2.server.go.populations.Population; -import eva2.server.go.populations.SolutionSet; -import eva2.server.go.problems.B1Problem; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.GAIndividualBinaryData; +import eva2.optimization.populations.InterfaceSolutionSet; +import eva2.optimization.populations.Population; +import eva2.optimization.populations.SolutionSet; +import eva2.optimization.problems.B1Problem; +import eva2.optimization.problems.InterfaceOptimizationProblem; /** * Threshold accepting algorithm simliar strategy as the flood algorithm, diff --git a/src/eva2/server/go/strategies/Tribes.java b/src/eva2/optimization/strategies/Tribes.java similarity index 97% rename from src/eva2/server/go/strategies/Tribes.java rename to src/eva2/optimization/strategies/Tribes.java index 6b7dccc3..ad38b3fb 100644 --- a/src/eva2/server/go/strategies/Tribes.java +++ b/src/eva2/optimization/strategies/Tribes.java @@ -1,19 +1,19 @@ -package eva2.server.go.strategies; +package eva2.optimization.strategies; import eva2.gui.GenericObjectEditor; -import eva2.server.go.InterfacePopulationChangedEventListener; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceDataTypeDouble; -import eva2.server.go.populations.InterfaceSolutionSet; -import eva2.server.go.populations.Population; -import eva2.server.go.populations.SolutionSet; -import eva2.server.go.problems.AbstractOptimizationProblem; -import eva2.server.go.problems.InterfaceHasInitRange; -import eva2.server.go.problems.InterfaceOptimizationProblem; -import eva2.server.go.strategies.tribes.TribesExplorer; -import eva2.server.go.strategies.tribes.TribesParam; -import eva2.server.go.strategies.tribes.TribesPosition; -import eva2.server.go.strategies.tribes.TribesSwarm; +import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceDataTypeDouble; +import eva2.optimization.populations.InterfaceSolutionSet; +import eva2.optimization.populations.Population; +import eva2.optimization.populations.SolutionSet; +import eva2.optimization.problems.AbstractOptimizationProblem; +import eva2.optimization.problems.InterfaceHasInitRange; +import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.optimization.strategies.tribes.TribesExplorer; +import eva2.optimization.strategies.tribes.TribesParam; +import eva2.optimization.strategies.tribes.TribesPosition; +import eva2.optimization.strategies.tribes.TribesSwarm; import java.util.Iterator; import java.util.List; diff --git a/src/eva2/server/go/strategies/WingedMultiObjectiveEA.java b/src/eva2/optimization/strategies/WingedMultiObjectiveEA.java similarity index 95% rename from src/eva2/server/go/strategies/WingedMultiObjectiveEA.java rename to src/eva2/optimization/strategies/WingedMultiObjectiveEA.java index 9d2b8291..85a73687 100644 --- a/src/eva2/server/go/strategies/WingedMultiObjectiveEA.java +++ b/src/eva2/optimization/strategies/WingedMultiObjectiveEA.java @@ -1,15 +1,15 @@ -package eva2.server.go.strategies; +package eva2.optimization.strategies; import eva2.gui.PropertyDoubleArray; -import eva2.server.go.InterfacePopulationChangedEventListener; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.operators.moso.MOSOWeightedFitness; -import eva2.server.go.populations.InterfaceSolutionSet; -import eva2.server.go.populations.Population; -import eva2.server.go.populations.SolutionSet; -import eva2.server.go.problems.AbstractMultiObjectiveOptimizationProblem; -import eva2.server.go.problems.FM0Problem; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.go.InterfacePopulationChangedEventListener; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.operators.moso.MOSOWeightedFitness; +import eva2.optimization.populations.InterfaceSolutionSet; +import eva2.optimization.populations.Population; +import eva2.optimization.populations.SolutionSet; +import eva2.optimization.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.optimization.problems.FM0Problem; +import eva2.optimization.problems.InterfaceOptimizationProblem; /** * The winged MOEA was a nice idea, which didn't really work out. Here a diff --git a/src/eva2/server/go/strategies/tribes/Tribe.java b/src/eva2/optimization/strategies/tribes/Tribe.java similarity index 97% rename from src/eva2/server/go/strategies/tribes/Tribe.java rename to src/eva2/optimization/strategies/tribes/Tribe.java index cfe882d6..43af08bc 100644 --- a/src/eva2/server/go/strategies/tribes/Tribe.java +++ b/src/eva2/optimization/strategies/tribes/Tribe.java @@ -1,7 +1,7 @@ -package eva2.server.go.strategies.tribes; +package eva2.optimization.strategies.tribes; -import eva2.server.go.problems.InterfaceOptimizationProblem; -import eva2.server.go.strategies.Tribes; +import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.optimization.strategies.Tribes; import eva2.tools.math.RNG; diff --git a/src/eva2/server/go/strategies/tribes/TribesExplorer.java b/src/eva2/optimization/strategies/tribes/TribesExplorer.java similarity index 99% rename from src/eva2/server/go/strategies/tribes/TribesExplorer.java rename to src/eva2/optimization/strategies/tribes/TribesExplorer.java index 243fc446..ee134d96 100644 --- a/src/eva2/server/go/strategies/tribes/TribesExplorer.java +++ b/src/eva2/optimization/strategies/tribes/TribesExplorer.java @@ -1,10 +1,10 @@ -package eva2.server.go.strategies.tribes; +package eva2.optimization.strategies.tribes; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceDataTypeDouble; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; -import eva2.server.go.strategies.Tribes; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceDataTypeDouble; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.optimization.strategies.Tribes; import eva2.tools.math.RNG; public class TribesExplorer extends AbstractEAIndividual implements InterfaceDataTypeDouble { diff --git a/src/eva2/server/go/strategies/tribes/TribesMemory.java b/src/eva2/optimization/strategies/tribes/TribesMemory.java similarity index 98% rename from src/eva2/server/go/strategies/tribes/TribesMemory.java rename to src/eva2/optimization/strategies/tribes/TribesMemory.java index 02056c61..58bc036f 100644 --- a/src/eva2/server/go/strategies/tribes/TribesMemory.java +++ b/src/eva2/optimization/strategies/tribes/TribesMemory.java @@ -1,4 +1,4 @@ -package eva2.server.go.strategies.tribes; +package eva2.optimization.strategies.tribes; public class TribesMemory implements java.io.Serializable { /** diff --git a/src/eva2/server/go/strategies/tribes/TribesParam.java b/src/eva2/optimization/strategies/tribes/TribesParam.java similarity index 95% rename from src/eva2/server/go/strategies/tribes/TribesParam.java rename to src/eva2/optimization/strategies/tribes/TribesParam.java index ae37d38c..cc2d313b 100644 --- a/src/eva2/server/go/strategies/tribes/TribesParam.java +++ b/src/eva2/optimization/strategies/tribes/TribesParam.java @@ -1,4 +1,4 @@ -package eva2.server.go.strategies.tribes; +package eva2.optimization.strategies.tribes; /** * This class for now is used only for keeping the door open to the original diff --git a/src/eva2/server/go/strategies/tribes/TribesPosition.java b/src/eva2/optimization/strategies/tribes/TribesPosition.java similarity index 99% rename from src/eva2/server/go/strategies/tribes/TribesPosition.java rename to src/eva2/optimization/strategies/tribes/TribesPosition.java index 078aec5c..9421b3c7 100644 --- a/src/eva2/server/go/strategies/tribes/TribesPosition.java +++ b/src/eva2/optimization/strategies/tribes/TribesPosition.java @@ -1,6 +1,6 @@ -package eva2.server.go.strategies.tribes; +package eva2.optimization.strategies.tribes; -import eva2.server.go.strategies.Tribes; +import eva2.optimization.strategies.Tribes; import eva2.tools.math.RNG; import java.util.Arrays; diff --git a/src/eva2/server/go/strategies/tribes/TribesSwarm.java b/src/eva2/optimization/strategies/tribes/TribesSwarm.java similarity index 99% rename from src/eva2/server/go/strategies/tribes/TribesSwarm.java rename to src/eva2/optimization/strategies/tribes/TribesSwarm.java index 6d4c5c97..84bf4c5b 100644 --- a/src/eva2/server/go/strategies/tribes/TribesSwarm.java +++ b/src/eva2/optimization/strategies/tribes/TribesSwarm.java @@ -1,8 +1,8 @@ -package eva2.server.go.strategies.tribes; +package eva2.optimization.strategies.tribes; -import eva2.server.go.populations.Population; -import eva2.server.go.problems.InterfaceOptimizationProblem; -import eva2.server.go.strategies.Tribes; +import eva2.optimization.populations.Population; +import eva2.optimization.problems.InterfaceOptimizationProblem; +import eva2.optimization.strategies.Tribes; import eva2.tools.math.RNG; import java.util.ArrayList; import java.util.List; diff --git a/src/eva2/server/go/tools/AbstractObjectEditor.java b/src/eva2/optimization/tools/AbstractObjectEditor.java similarity index 99% rename from src/eva2/server/go/tools/AbstractObjectEditor.java rename to src/eva2/optimization/tools/AbstractObjectEditor.java index 645b9273..020d7814 100644 --- a/src/eva2/server/go/tools/AbstractObjectEditor.java +++ b/src/eva2/optimization/tools/AbstractObjectEditor.java @@ -1,4 +1,4 @@ -package eva2.server.go.tools; +package eva2.optimization.tools; import eva2.gui.*; diff --git a/src/eva2/server/go/tools/DeNovofilter.java b/src/eva2/optimization/tools/DeNovofilter.java similarity index 89% rename from src/eva2/server/go/tools/DeNovofilter.java rename to src/eva2/optimization/tools/DeNovofilter.java index 49af12d3..11f4a3fc 100644 --- a/src/eva2/server/go/tools/DeNovofilter.java +++ b/src/eva2/optimization/tools/DeNovofilter.java @@ -1,10 +1,10 @@ -package eva2.server.go.tools; +package eva2.optimization.tools; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.ESIndividualDoubleData; -import eva2.server.go.operators.archiving.ArchivingAllDominating; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.ESIndividualDoubleData; +import eva2.optimization.operators.archiving.ArchivingAllDominating; +import eva2.optimization.populations.Population; import java.io.BufferedReader; import java.io.FileReader; import java.util.ArrayList; diff --git a/src/eva2/server/go/tools/DoubleArrayComparator.java b/src/eva2/optimization/tools/DoubleArrayComparator.java similarity index 95% rename from src/eva2/server/go/tools/DoubleArrayComparator.java rename to src/eva2/optimization/tools/DoubleArrayComparator.java index 69352a74..e34debea 100644 --- a/src/eva2/server/go/tools/DoubleArrayComparator.java +++ b/src/eva2/optimization/tools/DoubleArrayComparator.java @@ -1,6 +1,6 @@ -package eva2.server.go.tools; +package eva2.optimization.tools; -import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.AbstractEAIndividual; import java.util.Comparator; /** diff --git a/src/eva2/server/go/tools/FileTools.java b/src/eva2/optimization/tools/FileTools.java similarity index 99% rename from src/eva2/server/go/tools/FileTools.java rename to src/eva2/optimization/tools/FileTools.java index a062a08d..4c417da3 100644 --- a/src/eva2/server/go/tools/FileTools.java +++ b/src/eva2/optimization/tools/FileTools.java @@ -1,4 +1,4 @@ -package eva2.server.go.tools; +package eva2.optimization.tools; import eva2.gui.BeanInspector; import eva2.tools.BasicResourceLoader; diff --git a/src/eva2/server/go/tools/GONamingBox.java b/src/eva2/optimization/tools/GONamingBox.java similarity index 98% rename from src/eva2/server/go/tools/GONamingBox.java rename to src/eva2/optimization/tools/GONamingBox.java index 9db76f54..4bb95077 100644 --- a/src/eva2/server/go/tools/GONamingBox.java +++ b/src/eva2/optimization/tools/GONamingBox.java @@ -1,4 +1,4 @@ -package eva2.server.go.tools; +package eva2.optimization.tools; import eva2.tools.math.RNG; diff --git a/src/eva2/server/go/tools/GeneralGEOFaker.java b/src/eva2/optimization/tools/GeneralGEOFaker.java similarity index 99% rename from src/eva2/server/go/tools/GeneralGEOFaker.java rename to src/eva2/optimization/tools/GeneralGEOFaker.java index d5fcc6c4..3a3ab387 100644 --- a/src/eva2/server/go/tools/GeneralGEOFaker.java +++ b/src/eva2/optimization/tools/GeneralGEOFaker.java @@ -1,4 +1,4 @@ -package eva2.server.go.tools; +package eva2.optimization.tools; import java.awt.*; import java.awt.event.ActionEvent; diff --git a/src/eva2/server/go/tools/GeneralGOEProperty.java b/src/eva2/optimization/tools/GeneralGOEProperty.java similarity index 95% rename from src/eva2/server/go/tools/GeneralGOEProperty.java rename to src/eva2/optimization/tools/GeneralGOEProperty.java index 96888bd4..716e3afa 100644 --- a/src/eva2/server/go/tools/GeneralGOEProperty.java +++ b/src/eva2/optimization/tools/GeneralGOEProperty.java @@ -1,4 +1,4 @@ -package eva2.server.go.tools; +package eva2.optimization.tools; import java.beans.PropertyEditor; import java.lang.reflect.Method; diff --git a/src/eva2/server/go/tools/GeneralGenericObjectEditorPanel.java b/src/eva2/optimization/tools/GeneralGenericObjectEditorPanel.java similarity index 99% rename from src/eva2/server/go/tools/GeneralGenericObjectEditorPanel.java rename to src/eva2/optimization/tools/GeneralGenericObjectEditorPanel.java index e345f380..35ff0aec 100644 --- a/src/eva2/server/go/tools/GeneralGenericObjectEditorPanel.java +++ b/src/eva2/optimization/tools/GeneralGenericObjectEditorPanel.java @@ -1,4 +1,4 @@ -package eva2.server.go.tools; +package eva2.optimization.tools; import eva2.gui.GenericObjectEditor; diff --git a/src/eva2/server/go/tools/ImpactOfDimensionOnMOEAs.java b/src/eva2/optimization/tools/ImpactOfDimensionOnMOEAs.java similarity index 93% rename from src/eva2/server/go/tools/ImpactOfDimensionOnMOEAs.java rename to src/eva2/optimization/tools/ImpactOfDimensionOnMOEAs.java index 22f3aa13..5fe55aec 100644 --- a/src/eva2/server/go/tools/ImpactOfDimensionOnMOEAs.java +++ b/src/eva2/optimization/tools/ImpactOfDimensionOnMOEAs.java @@ -1,13 +1,13 @@ -package eva2.server.go.tools; +package eva2.optimization.tools; import eva2.gui.GraphPointSet; import eva2.gui.Plot; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.ESIndividualDoubleData; -import eva2.server.go.individuals.InterfaceDataTypeDouble; -import eva2.server.go.operators.archiving.ArchivingAllDominating; -import eva2.server.go.populations.Population; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.ESIndividualDoubleData; +import eva2.optimization.individuals.InterfaceDataTypeDouble; +import eva2.optimization.operators.archiving.ArchivingAllDominating; +import eva2.optimization.populations.Population; import eva2.tools.chart2d.DPoint; import java.io.*; diff --git a/src/eva2/server/go/tools/ModuloTest.java b/src/eva2/optimization/tools/ModuloTest.java similarity index 94% rename from src/eva2/server/go/tools/ModuloTest.java rename to src/eva2/optimization/tools/ModuloTest.java index 87d2ea76..971140ff 100644 --- a/src/eva2/server/go/tools/ModuloTest.java +++ b/src/eva2/optimization/tools/ModuloTest.java @@ -1,4 +1,4 @@ -package eva2.server.go.tools; +package eva2.optimization.tools; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/tools/ParetoFrontLocalTester.java b/src/eva2/optimization/tools/ParetoFrontLocalTester.java similarity index 99% rename from src/eva2/server/go/tools/ParetoFrontLocalTester.java rename to src/eva2/optimization/tools/ParetoFrontLocalTester.java index 26bc4b0f..5da31594 100644 --- a/src/eva2/server/go/tools/ParetoFrontLocalTester.java +++ b/src/eva2/optimization/tools/ParetoFrontLocalTester.java @@ -1,4 +1,4 @@ -package eva2.server.go.tools; +package eva2.optimization.tools; import eva2.gui.GraphPointSet; diff --git a/src/eva2/server/go/tools/PortfolioFrontTester.java b/src/eva2/optimization/tools/PortfolioFrontTester.java similarity index 99% rename from src/eva2/server/go/tools/PortfolioFrontTester.java rename to src/eva2/optimization/tools/PortfolioFrontTester.java index f61616ab..9ad63617 100644 --- a/src/eva2/server/go/tools/PortfolioFrontTester.java +++ b/src/eva2/optimization/tools/PortfolioFrontTester.java @@ -1,4 +1,4 @@ -package eva2.server.go.tools; +package eva2.optimization.tools; import eva2.gui.GraphPointSet; diff --git a/src/eva2/server/go/tools/TestingDArea.java b/src/eva2/optimization/tools/TestingDArea.java similarity index 97% rename from src/eva2/server/go/tools/TestingDArea.java rename to src/eva2/optimization/tools/TestingDArea.java index cbafc9bb..0e5a8351 100644 --- a/src/eva2/server/go/tools/TestingDArea.java +++ b/src/eva2/optimization/tools/TestingDArea.java @@ -1,4 +1,4 @@ -package eva2.server.go.tools; +package eva2.optimization.tools; import eva2.tools.chart2d.*; diff --git a/src/eva2/tools/chart2d/Chart2DDPointContentSelectable.java b/src/eva2/tools/chart2d/Chart2DDPointContentSelectable.java index 9820fd29..cfc4ad19 100644 --- a/src/eva2/tools/chart2d/Chart2DDPointContentSelectable.java +++ b/src/eva2/tools/chart2d/Chart2DDPointContentSelectable.java @@ -3,9 +3,9 @@ package eva2.tools.chart2d; import eva2.gui.InterfaceDPointWithContent; import eva2.gui.InterfaceSelectablePointIcon; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.mocco.paretofrontviewer.InterfaceRefSolutionListener; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.mocco.paretofrontviewer.InterfaceRefSolutionListener; +import eva2.optimization.problems.InterfaceOptimizationProblem; import java.awt.*; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; diff --git a/src/eva2/tools/chart2d/Chart2DDPointIconContent.java b/src/eva2/tools/chart2d/Chart2DDPointIconContent.java index c279a3f1..b0dada6c 100644 --- a/src/eva2/tools/chart2d/Chart2DDPointIconContent.java +++ b/src/eva2/tools/chart2d/Chart2DDPointIconContent.java @@ -2,8 +2,8 @@ package eva2.tools.chart2d; import eva2.gui.InterfaceDPointWithContent; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.problems.InterfaceOptimizationProblem; import java.awt.*; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; diff --git a/src/eva2/tools/math/BayNet.java b/src/eva2/tools/math/BayNet.java index a5b5f767..e09d874d 100644 --- a/src/eva2/tools/math/BayNet.java +++ b/src/eva2/tools/math/BayNet.java @@ -1,11 +1,11 @@ package eva2.tools.math; import eva2.gui.BeanInspector; -import eva2.server.go.enums.BOAScoringMethods; -import eva2.server.go.individuals.AbstractEAIndividual; -import eva2.server.go.individuals.InterfaceDataTypeBinary; -import eva2.server.go.individuals.InterfaceGAIndividual; -import eva2.server.go.populations.Population; +import eva2.optimization.enums.BOAScoringMethods; +import eva2.optimization.individuals.AbstractEAIndividual; +import eva2.optimization.individuals.InterfaceDataTypeBinary; +import eva2.optimization.individuals.InterfaceGAIndividual; +import eva2.optimization.populations.Population; import eva2.tools.Pair; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/eva2/tools/math/Mathematics.java b/src/eva2/tools/math/Mathematics.java index 38ff9d1d..01665196 100644 --- a/src/eva2/tools/math/Mathematics.java +++ b/src/eva2/tools/math/Mathematics.java @@ -1,6 +1,6 @@ package eva2.tools.math; -import eva2.server.go.tools.DoubleArrayComparator; +import eva2.optimization.tools.DoubleArrayComparator; import eva2.tools.EVAERROR; import eva2.tools.math.Jama.Matrix; import eva2.tools.math.interpolation.BasicDataSet; diff --git a/src/eva2/tools/math/StatisticUtils.java b/src/eva2/tools/math/StatisticUtils.java index 63e1739c..4d765259 100644 --- a/src/eva2/tools/math/StatisticUtils.java +++ b/src/eva2/tools/math/StatisticUtils.java @@ -12,7 +12,7 @@ package eva2.tools.math; // Copyright (c) Dept. Computer Architecture, University of Tuebingen, Germany // /////////////////////////////////////////////////////////////////////////////// -import eva2.server.go.problems.AbstractProblemDouble; +import eva2.optimization.problems.AbstractProblemDouble; import eva2.tools.math.Jama.Matrix; import java.util.ArrayList; import java.util.Collections;