diff --git a/resources/JavaEvA.props b/resources/EvA2.props similarity index 83% rename from resources/JavaEvA.props rename to resources/EvA2.props index bbbcb291..9b954cbd 100644 --- a/resources/JavaEvA.props +++ b/resources/EvA2.props @@ -12,7 +12,7 @@ ServerList = localhost,134.2.172.14,ranode22 #################### Internals: Do not alter! # base class for modules. Do not alter! -ModulePackage = javaeva.server.modules +ModulePackage = eva2.server.modules # filter class for modules. Do not alter! -ModuleFilterClass = javaeva.server.modules.AbstractModuleAdapter +ModuleFilterClass = eva2.server.modules.AbstractModuleAdapter diff --git a/resources/images/JavaEvA2SplashScreen.png b/resources/images/JavaEvA2SplashScreen.png deleted file mode 100644 index 6e61ec7e..00000000 Binary files a/resources/images/JavaEvA2SplashScreen.png and /dev/null differ diff --git a/resources/images/JavaEvaSplashScreen.png b/resources/images/JavaEvaSplashScreen.png deleted file mode 100644 index 76ef87c8..00000000 Binary files a/resources/images/JavaEvaSplashScreen.png and /dev/null differ diff --git a/resources/images/JavaEvAIcon.gif b/resources/images/icon1.gif similarity index 100% rename from resources/images/JavaEvAIcon.gif rename to resources/images/icon1.gif diff --git a/resources/images/JavaEvAIcon_2.gif b/resources/images/icon2.gif similarity index 100% rename from resources/images/JavaEvAIcon_2.gif rename to resources/images/icon2.gif diff --git a/resources/images/JavaEvAIcon_3.gif b/resources/images/icon3.gif similarity index 100% rename from resources/images/JavaEvAIcon_3.gif rename to resources/images/icon3.gif diff --git a/resources/images/splashScreen2.png b/resources/images/splashScreen2.png new file mode 100644 index 00000000..772be1d5 Binary files /dev/null and b/resources/images/splashScreen2.png differ diff --git a/src/javaeva/OptimizerFactory.java b/src/eva2/OptimizerFactory.java similarity index 92% rename from src/javaeva/OptimizerFactory.java rename to src/eva2/OptimizerFactory.java index b6c2ee5d..466af6a9 100644 --- a/src/javaeva/OptimizerFactory.java +++ b/src/eva2/OptimizerFactory.java @@ -1,48 +1,49 @@ /* * Copyright (c) ZBiT, University of Tübingen, Germany */ -package javaeva; +package eva2; import java.util.BitSet; import java.util.Vector; -import javaeva.server.go.IndividualInterface; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.InterfaceTerminator; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceDataTypeBinary; -import javaeva.server.go.individuals.InterfaceDataTypeDouble; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.operators.cluster.ClusteringDensityBased; -import javaeva.server.go.operators.crossover.CrossoverESDefault; -import javaeva.server.go.operators.crossover.InterfaceCrossover; -import javaeva.server.go.operators.crossover.NoCrossover; -import javaeva.server.go.operators.mutation.InterfaceMutation; -import javaeva.server.go.operators.mutation.MutateESCovarianceMartixAdaption; -import javaeva.server.go.operators.mutation.MutateESFixedStepSize; -import javaeva.server.go.operators.mutation.MutateESGlobal; -import javaeva.server.go.operators.mutation.NoMutation; -import javaeva.server.go.operators.postprocess.InterfacePostProcessParams; -import javaeva.server.go.operators.postprocess.PostProcessParams; -import javaeva.server.go.operators.selection.InterfaceSelection; -import javaeva.server.go.operators.terminators.CombinedTerminator; -import javaeva.server.go.operators.terminators.EvaluationTerminator; -import javaeva.server.go.operators.terminators.FitnessConvergenceTerminator; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.AbstractOptimizationProblem; -import javaeva.server.go.strategies.ClusterBasedNichingEA; -import javaeva.server.go.strategies.ClusteringHillClimbing; -import javaeva.server.go.strategies.DifferentialEvolution; -import javaeva.server.go.strategies.EvolutionStrategies; -import javaeva.server.go.strategies.GeneticAlgorithm; -import javaeva.server.go.strategies.GradientDescentAlgorithm; -import javaeva.server.go.strategies.HillClimbing; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.server.go.strategies.MonteCarloSearch; -import javaeva.server.go.strategies.ParticleSwarmOptimization; -import javaeva.server.go.strategies.SimulatedAnnealing; -import javaeva.server.go.strategies.Tribes; -import javaeva.server.modules.GOParameters; +import eva2.server.go.IndividualInterface; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.InterfaceTerminator; +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.cluster.ClusteringDensityBased; +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.mutation.InterfaceMutation; +import eva2.server.go.operators.mutation.MutateESCovarianceMartixAdaption; +import eva2.server.go.operators.mutation.MutateESFixedStepSize; +import eva2.server.go.operators.mutation.MutateESGlobal; +import eva2.server.go.operators.mutation.NoMutation; +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.terminators.CombinedTerminator; +import eva2.server.go.operators.terminators.EvaluationTerminator; +import eva2.server.go.operators.terminators.FitnessConvergenceTerminator; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.AbstractOptimizationProblem; +import eva2.server.go.strategies.ClusterBasedNichingEA; +import eva2.server.go.strategies.ClusteringHillClimbing; +import eva2.server.go.strategies.DifferentialEvolution; +import eva2.server.go.strategies.EvolutionStrategies; +import eva2.server.go.strategies.GeneticAlgorithm; +import eva2.server.go.strategies.GradientDescentAlgorithm; +import eva2.server.go.strategies.HillClimbing; +import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.server.go.strategies.MonteCarloSearch; +import eva2.server.go.strategies.ParticleSwarmOptimization; +import eva2.server.go.strategies.SimulatedAnnealing; +import eva2.server.go.strategies.Tribes; +import eva2.server.modules.GOParameters; + /** *

diff --git a/src/javaeva/OptimizerRunnable.java b/src/eva2/OptimizerRunnable.java similarity index 84% rename from src/javaeva/OptimizerRunnable.java rename to src/eva2/OptimizerRunnable.java index aad3606b..55e5d809 100644 --- a/src/javaeva/OptimizerRunnable.java +++ b/src/eva2/OptimizerRunnable.java @@ -1,23 +1,24 @@ -package javaeva; +package eva2; import java.io.PrintWriter; import java.io.StringWriter; import java.util.BitSet; -import javaeva.server.go.IndividualInterface; -import javaeva.server.go.InterfaceGOParameters; -import javaeva.server.go.InterfaceTerminator; -import javaeva.server.go.individuals.InterfaceDataTypeBinary; -import javaeva.server.go.individuals.InterfaceDataTypeDouble; -import javaeva.server.go.individuals.InterfaceDataTypeInteger; -import javaeva.server.go.operators.postprocess.InterfacePostProcessParams; -import javaeva.server.go.operators.postprocess.PostProcessParams; -import javaeva.server.go.populations.Population; -import javaeva.server.modules.GOParameters; -import javaeva.server.modules.Processor; -import javaeva.server.stat.AbstractStatistics; -import javaeva.server.stat.InterfaceTextListener; -import javaeva.server.stat.StatisticsStandalone; +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.modules.GOParameters; +import eva2.server.modules.Processor; +import eva2.server.stat.AbstractStatistics; +import eva2.server.stat.InterfaceTextListener; +import eva2.server.stat.StatisticsStandalone; + /** * This Runnable class just encapsulates the Processor class with some simple ways to access a solution. diff --git a/src/javaeva/client/AppExitAction.java b/src/eva2/client/AppExitAction.java similarity index 94% rename from src/javaeva/client/AppExitAction.java rename to src/eva2/client/AppExitAction.java index cb142afc..68f16f75 100644 --- a/src/javaeva/client/AppExitAction.java +++ b/src/eva2/client/AppExitAction.java @@ -1,8 +1,10 @@ -package javaeva.client; +package eva2.client; -import javaeva.gui.ExtAction; import javax.swing.*; + +import eva2.gui.ExtAction; + import java.awt.event.WindowListener; import java.awt.event.ActionEvent; import java.awt.event.WindowEvent; diff --git a/src/javaeva/client/EvAClient.java b/src/eva2/client/EvAClient.java similarity index 91% rename from src/javaeva/client/EvAClient.java rename to src/eva2/client/EvAClient.java index 55890077..8465d96e 100644 --- a/src/javaeva/client/EvAClient.java +++ b/src/eva2/client/EvAClient.java @@ -1,7 +1,7 @@ -package javaeva.client; +package eva2.client; /* - * Title: JavaEvA + * Title: EvA2 * Description: * Copyright: Copyright (c) 2003 * Company: University of Tuebingen, Computer Architecture @@ -28,18 +28,6 @@ import java.net.URL; import java.util.Properties; import java.util.Set; -import javaeva.gui.ExtAction; -import javaeva.gui.JEFrame; -import javaeva.gui.JEFrameRegister; -import javaeva.gui.JExtMenu; -import javaeva.gui.JTabbedModuleFrame; -import javaeva.gui.LogPanel; -import javaeva.server.EvAServer; -import javaeva.server.modules.ModuleAdapter; -import javaeva.tools.EVAERROR; -import javaeva.tools.EVAHELP; -import javaeva.tools.ReflectPackage; -import javaeva.tools.Serializer; import javax.swing.ButtonGroup; import javax.swing.ImageIcon; @@ -59,6 +47,19 @@ import javax.swing.UnsupportedLookAndFeelException; import javax.swing.event.MenuEvent; import javax.swing.event.MenuListener; +import eva2.gui.ExtAction; +import eva2.gui.JEFrame; +import eva2.gui.JEFrameRegister; +import eva2.gui.JExtMenu; +import eva2.gui.JTabbedModuleFrame; +import eva2.gui.LogPanel; +import eva2.server.EvAServer; +import eva2.server.modules.ModuleAdapter; +import eva2.tools.EVAERROR; +import eva2.tools.EVAHELP; +import eva2.tools.ReflectPackage; +import eva2.tools.Serializer; + import wsi.ra.jproxy.RemoteStateListener; import wsi.ra.tool.BasicResourceLoader; @@ -73,15 +74,14 @@ import wsi.ra.tool.BasicResourceLoader; * */ public class EvAClient implements RemoteStateListener, Serializable { - public static final String EVA_PROPERTY_FILE = "resources/JavaEvA.props"; + public static final String EVA_PROPERTY_FILE = "resources/EvA2.props"; private static Properties EVA_PROPERTIES; - public static final String iconLocation = "resources/images/JavaEvAIcon_3.gif"; - private static final String splashLocation = "resources/images/JavaEvA2SplashScreen.png"; -// private static final String splashLocation = "resources/images/JavaEvA2SplashScreen.jpg"; + public static final String iconLocation = "resources/images/icon3.gif"; + private static final String splashLocation = "resources/images/splashScreen2.png"; final int splashScreenTime = 1500; public static boolean TRACE = false; - private static String m_ProductName = "JavaEvA 2"; + private static String m_ProductName = "EvA 2"; // private int PREFERRED_WIDTH = 680; // private int PREFERRED_HEIGHT = 550; public JEFrame m_Frame; @@ -155,8 +155,8 @@ public class EvAClient implements RemoteStateListener, Serializable { } /** - * Constructor of GUI of JavaEva. - * Works as client for the JavaEva server. + * Constructor of GUI of EvA2. + * Works as client for the EvA2 server. * */ public EvAClient(final String hostName) { @@ -202,9 +202,9 @@ public class EvAClient implements RemoteStateListener, Serializable { try { m_Frame.setIconImage(Toolkit.getDefaultToolkit().createImage(bytes)); } catch (java.lang.NullPointerException e) { - System.out.println("Could not find JavaEvA icon, please move rescoure folder to working directory!"); + System.out.println("Could not find EvA2 icon, please move rescoure folder to working directory!"); } - m_Frame.setTitle("JavaEvA workbench"); + m_Frame.setTitle("EvA2 workbench"); try { Thread.sleep(200); @@ -231,7 +231,7 @@ public class EvAClient implements RemoteStateListener, Serializable { m_Frame.addWindowListener(new WindowAdapter() { public void windowClosing(WindowEvent e) { - System.out.println("Closing JavaEvA Client. Bye!"); + System.out.println("Closing EvA2 Client. Bye!"); m_Frame.dispose(); Set keys = System.getenv().keySet(); if (keys.contains("MATLAB")) { @@ -256,27 +256,6 @@ public class EvAClient implements RemoteStateListener, Serializable { m_Frame.setVisible(true); } } -// -// /** -// * Create the JavaEvA splash screen. -// */ -// public void createSplashScreen() { -// BasicResourceLoader loader = BasicResourceLoader.instance(); -// byte[] bytes = loader.getBytesFromResourceLocation("resources/images/JavaEvA2SplashScreen.jpg"); -// try { -// ImageIcon ii = new ImageIcon(Toolkit.getDefaultToolkit().createImage(bytes)); -// JLabel splashLabel = new JLabel(ii); -// m_splashScreen = new JWindow(); -// m_splashScreen.getContentPane().add(splashLabel); -// m_splashScreen.pack(); -// Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); -// //splashScreen.setSize(screenSize); -// m_splashScreen.setLocation(screenSize.width / 2 - m_splashScreen.getSize().width / 2, screenSize.height / 2 - m_splashScreen.getSize().height / 2); -// } catch (java.lang.NullPointerException e) { -// System.err.println("Could not find JavaEvA splash screen, please move rescoure folder to working directory!"); -// } -// -// } /** * The one and only main of the client program. @@ -531,7 +510,7 @@ public class EvAClient implements RemoteStateListener, Serializable { if (selectedModule == null) { // show a dialog and ask for a module String[] ModuleNameList = m_ComAdapter.getModuleNameList(); if (ModuleNameList == null) { - JOptionPane.showMessageDialog(m_Frame.getContentPane(), "No modules available on " + m_ComAdapter.getHostName(), "JavaEvA Information", 1); + JOptionPane.showMessageDialog(m_Frame.getContentPane(), "No modules available on " + m_ComAdapter.getHostName(), "EvA2 Information", 1); } else { String LastModuleName = Serializer.loadString("lastmodule.ser"); if (LastModuleName == null) LastModuleName = ModuleNameList[0]; @@ -664,7 +643,7 @@ public class EvAClient implements RemoteStateListener, Serializable { } private void showPleaseWaitDialog() { - JOptionPane.showMessageDialog(m_Frame.getContentPane(), "Please wait one moment.", "JavaEvA Information", 1); + JOptionPane.showMessageDialog(m_Frame.getContentPane(), "Please wait one moment.", "EvA2 Information", 1); } private void showAboutDialog() { @@ -672,11 +651,11 @@ public class EvAClient implements RemoteStateListener, Serializable { (m_Frame, m_ProductName + "\n University of Tuebingen\n Computer Architecture\n H. Ulmer & F. Streichert & H. Planatscher & M. de Paly & M. Kronfeld\n Prof. Dr. Andreas Zell \n (c) 2008 \n Version " + - EvAServer.Version + " \n http://www.ra.cs.uni-tuebingen.de/software/JavaEvA", "JavaEvA Information", 1); + EvAServer.Version + " \n http://www.ra.cs.uni-tuebingen.de/software/EvA2", "EvA2 Information", 1); } private void showNoHostFoundDialog() { - JOptionPane.showMessageDialog(m_Frame.getContentPane(), "No host with running EVASERVER found. Please start one or \nadd the correct address to the properties list.", "JavaEvA Information", 1); + JOptionPane.showMessageDialog(m_Frame.getContentPane(), "No host with running EVASERVER found. Please start one or \nadd the correct address to the properties list.", "EvA2 Information", 1); } /** @@ -779,7 +758,7 @@ final class SplashScreen extends Frame { splashWindow.setLocation(screenSize.width / 2 - splashWindow.getSize().width / 2, screenSize.height / 2 - splashWindow.getSize().height / 2); splashWindow.setVisible(true); } catch (java.lang.NullPointerException e) { - System.err.println("Could not find JavaEvA splash screen, please move rescoure folder to working directory!"); + System.err.println("Could not find EvA2 splash screen, please move rescoure folder to working directory!"); } } diff --git a/src/javaeva/client/EvAComAdapter.java b/src/eva2/client/EvAComAdapter.java similarity index 94% rename from src/javaeva/client/EvAComAdapter.java rename to src/eva2/client/EvAComAdapter.java index e8087972..e60d837b 100644 --- a/src/javaeva/client/EvAComAdapter.java +++ b/src/eva2/client/EvAComAdapter.java @@ -1,7 +1,7 @@ -package javaeva.client; +package eva2.client; /* - * Title: JavaEvA + * Title: EvA2 * Description: * Copyright: Copyright (c) 2003 * Company: University of Tuebingen, Computer Architecture @@ -17,11 +17,12 @@ package javaeva.client; import java.rmi.RemoteException; import java.rmi.registry.Registry; import java.util.ArrayList; -import javaeva.gui.LogPanel; -import javaeva.server.EvAMainAdapter; -import javaeva.server.EvAMainAdapterImpl; -import javaeva.server.RMIServerEvA; -import javaeva.server.modules.ModuleAdapter; + +import eva2.gui.LogPanel; +import eva2.server.EvAMainAdapter; +import eva2.server.EvAMainAdapterImpl; +import eva2.server.RMIServerEvA; +import eva2.server.modules.ModuleAdapter; import wsi.ra.jproxy.ComAdapter; import wsi.ra.jproxy.MainAdapter; diff --git a/src/javaeva/client/RMIConnectionEvA.java b/src/eva2/client/RMIConnectionEvA.java similarity index 92% rename from src/javaeva/client/RMIConnectionEvA.java rename to src/eva2/client/RMIConnectionEvA.java index 5a547e5b..0b295a0a 100644 --- a/src/javaeva/client/RMIConnectionEvA.java +++ b/src/eva2/client/RMIConnectionEvA.java @@ -1,10 +1,11 @@ -package javaeva.client; +package eva2.client; import java.net.InetAddress; import java.net.UnknownHostException; -import javaeva.server.EvAMainAdapter; -import javaeva.server.modules.ModuleAdapter; +import eva2.server.EvAMainAdapter; +import eva2.server.modules.ModuleAdapter; + import wsi.ra.jproxy.MainAdapter; import wsi.ra.jproxy.MainAdapterClient; import wsi.ra.jproxy.RMIConnection; diff --git a/src/javaeva/gui/BeanInspector.java b/src/eva2/gui/BeanInspector.java similarity index 99% rename from src/javaeva/gui/BeanInspector.java rename to src/eva2/gui/BeanInspector.java index 825f1705..3d5cbdf9 100644 --- a/src/javaeva/gui/BeanInspector.java +++ b/src/eva2/gui/BeanInspector.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: @@ -21,9 +21,10 @@ import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; -import javaeva.server.go.populations.Population; -import javaeva.tools.SelectedTag; -import javaeva.tools.Tag; +import eva2.server.go.populations.Population; +import eva2.tools.SelectedTag; +import eva2.tools.Tag; + /* * ==========================================================================* diff --git a/src/javaeva/gui/BigStringEditor.java b/src/eva2/gui/BigStringEditor.java similarity index 99% rename from src/javaeva/gui/BigStringEditor.java rename to src/eva2/gui/BigStringEditor.java index 43fd7430..1d8bd700 100644 --- a/src/javaeva/gui/BigStringEditor.java +++ b/src/eva2/gui/BigStringEditor.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/gui/Chart2DDPointContentSelectable.java b/src/eva2/gui/Chart2DDPointContentSelectable.java similarity index 94% rename from src/javaeva/gui/Chart2DDPointContentSelectable.java rename to src/eva2/gui/Chart2DDPointContentSelectable.java index 55b0f412..9ec0838d 100644 --- a/src/javaeva/gui/Chart2DDPointContentSelectable.java +++ b/src/eva2/gui/Chart2DDPointContentSelectable.java @@ -1,12 +1,14 @@ -package javaeva.gui; +package eva2.gui; import wsi.ra.chart2d.DPointIcon; import wsi.ra.chart2d.DBorder; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.mocco.paretofrontviewer.InterfaceRefSolutionListener; -import javaeva.server.go.problems.InterfaceOptimizationProblem; import javax.swing.*; + +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.mocco.paretofrontviewer.InterfaceRefSolutionListener; +import eva2.server.go.problems.InterfaceOptimizationProblem; + import java.awt.*; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; diff --git a/src/javaeva/gui/Chart2DDPointIconCircle.java b/src/eva2/gui/Chart2DDPointIconCircle.java similarity index 98% rename from src/javaeva/gui/Chart2DDPointIconCircle.java rename to src/eva2/gui/Chart2DDPointIconCircle.java index 279dbc84..879ab561 100644 --- a/src/javaeva/gui/Chart2DDPointIconCircle.java +++ b/src/eva2/gui/Chart2DDPointIconCircle.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; import wsi.ra.chart2d.DPointIcon; import wsi.ra.chart2d.DBorder; diff --git a/src/javaeva/gui/Chart2DDPointIconContent.java b/src/eva2/gui/Chart2DDPointIconContent.java similarity index 94% rename from src/javaeva/gui/Chart2DDPointIconContent.java rename to src/eva2/gui/Chart2DDPointIconContent.java index a9ac9d97..cf813268 100644 --- a/src/javaeva/gui/Chart2DDPointIconContent.java +++ b/src/eva2/gui/Chart2DDPointIconContent.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; import wsi.ra.chart2d.DBorder; import wsi.ra.chart2d.DPointIcon; @@ -7,11 +7,12 @@ import java.awt.*; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.problems.InterfaceOptimizationProblem; import javax.swing.*; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.problems.InterfaceOptimizationProblem; + /** * Created by IntelliJ IDEA. * User: streiche diff --git a/src/javaeva/gui/Chart2DDPointIconCross.java b/src/eva2/gui/Chart2DDPointIconCross.java similarity index 97% rename from src/javaeva/gui/Chart2DDPointIconCross.java rename to src/eva2/gui/Chart2DDPointIconCross.java index 5ef211fd..97b85ef6 100644 --- a/src/javaeva/gui/Chart2DDPointIconCross.java +++ b/src/eva2/gui/Chart2DDPointIconCross.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; import wsi.ra.chart2d.DBorder; import wsi.ra.chart2d.DPointIcon; diff --git a/src/javaeva/gui/Chart2DDPointIconPoint.java b/src/eva2/gui/Chart2DDPointIconPoint.java similarity index 98% rename from src/javaeva/gui/Chart2DDPointIconPoint.java rename to src/eva2/gui/Chart2DDPointIconPoint.java index 6be2683c..eb461f10 100644 --- a/src/javaeva/gui/Chart2DDPointIconPoint.java +++ b/src/eva2/gui/Chart2DDPointIconPoint.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; import wsi.ra.chart2d.DPointIcon; import wsi.ra.chart2d.DBorder; diff --git a/src/javaeva/gui/Chart2DDPointIconText.java b/src/eva2/gui/Chart2DDPointIconText.java similarity index 98% rename from src/javaeva/gui/Chart2DDPointIconText.java rename to src/eva2/gui/Chart2DDPointIconText.java index 0777aa3e..b9a4123b 100644 --- a/src/javaeva/gui/Chart2DDPointIconText.java +++ b/src/eva2/gui/Chart2DDPointIconText.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; import wsi.ra.chart2d.DPointIcon; import wsi.ra.chart2d.DBorder; diff --git a/src/javaeva/gui/ComponentFilter.java b/src/eva2/gui/ComponentFilter.java similarity index 96% rename from src/javaeva/gui/ComponentFilter.java rename to src/eva2/gui/ComponentFilter.java index 545039c9..0e22ad2a 100644 --- a/src/javaeva/gui/ComponentFilter.java +++ b/src/eva2/gui/ComponentFilter.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/gui/DPointSetMultiIcon.java b/src/eva2/gui/DPointSetMultiIcon.java similarity index 99% rename from src/javaeva/gui/DPointSetMultiIcon.java rename to src/eva2/gui/DPointSetMultiIcon.java index d51bfe9f..89629e66 100644 --- a/src/javaeva/gui/DPointSetMultiIcon.java +++ b/src/eva2/gui/DPointSetMultiIcon.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; import wsi.ra.chart2d.*; diff --git a/src/javaeva/gui/DataViewer.java b/src/eva2/gui/DataViewer.java similarity index 99% rename from src/javaeva/gui/DataViewer.java rename to src/eva2/gui/DataViewer.java index 449ef7ac..de4de9d2 100644 --- a/src/javaeva/gui/DataViewer.java +++ b/src/eva2/gui/DataViewer.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/gui/DataViewerInterface.java b/src/eva2/gui/DataViewerInterface.java similarity index 96% rename from src/javaeva/gui/DataViewerInterface.java rename to src/eva2/gui/DataViewerInterface.java index 3a0823a3..12b705dd 100644 --- a/src/javaeva/gui/DataViewerInterface.java +++ b/src/eva2/gui/DataViewerInterface.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/gui/Exp.java b/src/eva2/gui/Exp.java similarity index 98% rename from src/javaeva/gui/Exp.java rename to src/eva2/gui/Exp.java index c04c5c2f..5badcfae 100644 --- a/src/javaeva/gui/Exp.java +++ b/src/eva2/gui/Exp.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/gui/ExtAction.java b/src/eva2/gui/ExtAction.java similarity index 98% rename from src/javaeva/gui/ExtAction.java rename to src/eva2/gui/ExtAction.java index 0a9a7e4f..7eb821e9 100644 --- a/src/javaeva/gui/ExtAction.java +++ b/src/eva2/gui/ExtAction.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/gui/ExtActionChangedListener.java b/src/eva2/gui/ExtActionChangedListener.java similarity index 97% rename from src/javaeva/gui/ExtActionChangedListener.java rename to src/eva2/gui/ExtActionChangedListener.java index d1a4fc37..236b0b46 100644 --- a/src/javaeva/gui/ExtActionChangedListener.java +++ b/src/eva2/gui/ExtActionChangedListener.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/gui/ExtDesktopManager.java b/src/eva2/gui/ExtDesktopManager.java similarity index 99% rename from src/javaeva/gui/ExtDesktopManager.java rename to src/eva2/gui/ExtDesktopManager.java index e3f38e5a..7a3619c4 100644 --- a/src/javaeva/gui/ExtDesktopManager.java +++ b/src/eva2/gui/ExtDesktopManager.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/gui/FunctionArea.java b/src/eva2/gui/FunctionArea.java similarity index 99% rename from src/javaeva/gui/FunctionArea.java rename to src/eva2/gui/FunctionArea.java index 1016205e..ffe1b696 100644 --- a/src/javaeva/gui/FunctionArea.java +++ b/src/eva2/gui/FunctionArea.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA @@ -29,13 +29,14 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.mocco.paretofrontviewer.InterfaceRefPointListener; import javax.swing.JFileChooser; import javax.swing.JMenuItem; import javax.swing.JPopupMenu; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.mocco.paretofrontviewer.InterfaceRefPointListener; + import wsi.ra.chart2d.DArea; import wsi.ra.chart2d.DBorder; import wsi.ra.chart2d.DPoint; diff --git a/src/javaeva/gui/GenericAreaEditor.java b/src/eva2/gui/GenericAreaEditor.java similarity index 96% rename from src/javaeva/gui/GenericAreaEditor.java rename to src/eva2/gui/GenericAreaEditor.java index 8d90ca00..f9ec3c91 100644 --- a/src/javaeva/gui/GenericAreaEditor.java +++ b/src/eva2/gui/GenericAreaEditor.java @@ -1,10 +1,12 @@ -package javaeva.gui; +package eva2.gui; -import javaeva.tools.EVAHELP; -import javaeva.server.go.individuals.codings.gp.AbstractGPNode; -import javaeva.server.go.individuals.codings.gp.GPArea; import javax.swing.*; + +import eva2.server.go.individuals.codings.gp.AbstractGPNode; +import eva2.server.go.individuals.codings.gp.GPArea; +import eva2.tools.EVAHELP; + import java.beans.PropertyEditorSupport; import java.beans.PropertyEditor; import java.beans.PropertyChangeListener; diff --git a/src/javaeva/gui/GenericArrayEditor.java b/src/eva2/gui/GenericArrayEditor.java similarity index 99% rename from src/javaeva/gui/GenericArrayEditor.java rename to src/eva2/gui/GenericArrayEditor.java index 5b79316e..d7dafbae 100644 --- a/src/javaeva/gui/GenericArrayEditor.java +++ b/src/eva2/gui/GenericArrayEditor.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: @@ -13,8 +13,6 @@ package javaeva.gui; * IMPORTS *==========================================================================*/ -import javaeva.tools.EVAHELP; -import javaeva.tools.SelectedTag; import java.awt.*; import java.awt.event.*; @@ -31,6 +29,10 @@ import javax.swing.JOptionPane; import javax.swing.DefaultListModel; import javax.swing.JScrollPane; import javax.swing.DefaultListCellRenderer; + +import eva2.tools.EVAHELP; +import eva2.tools.SelectedTag; + import java.beans.PropertyEditor; import java.beans.PropertyChangeSupport; import java.beans.PropertyChangeListener; diff --git a/src/javaeva/gui/GenericDoubleArrayEditor.java b/src/eva2/gui/GenericDoubleArrayEditor.java similarity index 99% rename from src/javaeva/gui/GenericDoubleArrayEditor.java rename to src/eva2/gui/GenericDoubleArrayEditor.java index 1af18b82..4c866147 100644 --- a/src/javaeva/gui/GenericDoubleArrayEditor.java +++ b/src/eva2/gui/GenericDoubleArrayEditor.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; import javax.swing.*; import java.beans.PropertyEditor; diff --git a/src/javaeva/gui/GenericEpsilonConstraintEditor.java b/src/eva2/gui/GenericEpsilonConstraintEditor.java similarity index 99% rename from src/javaeva/gui/GenericEpsilonConstraintEditor.java rename to src/eva2/gui/GenericEpsilonConstraintEditor.java index cbffd159..3b6e9375 100644 --- a/src/javaeva/gui/GenericEpsilonConstraintEditor.java +++ b/src/eva2/gui/GenericEpsilonConstraintEditor.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; import javax.swing.*; import java.beans.PropertyEditor; diff --git a/src/javaeva/gui/GenericEpsilonThresholdEditor.java b/src/eva2/gui/GenericEpsilonThresholdEditor.java similarity index 99% rename from src/javaeva/gui/GenericEpsilonThresholdEditor.java rename to src/eva2/gui/GenericEpsilonThresholdEditor.java index a2d1eb86..a3bced3a 100644 --- a/src/javaeva/gui/GenericEpsilonThresholdEditor.java +++ b/src/eva2/gui/GenericEpsilonThresholdEditor.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; import javax.swing.*; import java.beans.PropertyEditor; diff --git a/src/javaeva/gui/GenericFilePathEditor.java b/src/eva2/gui/GenericFilePathEditor.java similarity index 99% rename from src/javaeva/gui/GenericFilePathEditor.java rename to src/eva2/gui/GenericFilePathEditor.java index 5539a981..73c3cdc1 100644 --- a/src/javaeva/gui/GenericFilePathEditor.java +++ b/src/eva2/gui/GenericFilePathEditor.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; import javax.swing.*; import java.beans.PropertyEditor; diff --git a/src/javaeva/gui/GenericIntArrayEditor.java b/src/eva2/gui/GenericIntArrayEditor.java similarity index 99% rename from src/javaeva/gui/GenericIntArrayEditor.java rename to src/eva2/gui/GenericIntArrayEditor.java index ba35b9a6..bf556185 100644 --- a/src/javaeva/gui/GenericIntArrayEditor.java +++ b/src/eva2/gui/GenericIntArrayEditor.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; import javax.swing.*; import java.beans.PropertyEditor; diff --git a/src/javaeva/gui/GenericObjectEditor.java b/src/eva2/gui/GenericObjectEditor.java similarity index 99% rename from src/javaeva/gui/GenericObjectEditor.java rename to src/eva2/gui/GenericObjectEditor.java index dd71c5cb..d0dfeba2 100644 --- a/src/javaeva/gui/GenericObjectEditor.java +++ b/src/eva2/gui/GenericObjectEditor.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: @@ -45,9 +45,6 @@ import java.util.ArrayList; import java.util.StringTokenizer; import java.util.Vector; -import javaeva.client.EvAClient; -import javaeva.tools.EVAHELP; -import javaeva.tools.ReflectPackage; import javax.swing.BorderFactory; import javax.swing.DefaultComboBoxModel; @@ -57,6 +54,10 @@ import javax.swing.JFileChooser; import javax.swing.JOptionPane; import javax.swing.JPanel; +import eva2.client.EvAClient; +import eva2.tools.EVAHELP; +import eva2.tools.ReflectPackage; + import wsi.ra.jproxy.RMIProxyLocal; diff --git a/src/javaeva/gui/GenericOptimizationObjectivesEditor.java b/src/eva2/gui/GenericOptimizationObjectivesEditor.java similarity index 98% rename from src/javaeva/gui/GenericOptimizationObjectivesEditor.java rename to src/eva2/gui/GenericOptimizationObjectivesEditor.java index c67f1d4e..09493598 100644 --- a/src/javaeva/gui/GenericOptimizationObjectivesEditor.java +++ b/src/eva2/gui/GenericOptimizationObjectivesEditor.java @@ -1,10 +1,12 @@ -package javaeva.gui; +package eva2.gui; -import javaeva.server.go.problems.InterfaceOptimizationObjective; -import javaeva.server.go.problems.InterfaceOptimizationTarget; -import javaeva.server.go.tools.GeneralGOEProperty; import javax.swing.*; + +import eva2.server.go.problems.InterfaceOptimizationObjective; +import eva2.server.go.problems.InterfaceOptimizationTarget; +import eva2.server.go.tools.GeneralGOEProperty; + import java.beans.*; import java.awt.*; import java.awt.event.*; diff --git a/src/javaeva/gui/GenericOptimizationObjectivesWithParamEditor.java b/src/eva2/gui/GenericOptimizationObjectivesWithParamEditor.java similarity index 99% rename from src/javaeva/gui/GenericOptimizationObjectivesWithParamEditor.java rename to src/eva2/gui/GenericOptimizationObjectivesWithParamEditor.java index fc571670..a64ee8db 100644 --- a/src/javaeva/gui/GenericOptimizationObjectivesWithParamEditor.java +++ b/src/eva2/gui/GenericOptimizationObjectivesWithParamEditor.java @@ -1,9 +1,11 @@ -package javaeva.gui; +package eva2.gui; -import javaeva.server.go.problems.InterfaceOptimizationObjective; -import javaeva.server.go.tools.GeneralGOEProperty; import javax.swing.*; + +import eva2.server.go.problems.InterfaceOptimizationObjective; +import eva2.server.go.tools.GeneralGOEProperty; + import java.beans.*; import java.awt.*; import java.awt.event.ActionListener; diff --git a/src/javaeva/gui/GenericRemoteServersEditor.java b/src/eva2/gui/GenericRemoteServersEditor.java similarity index 99% rename from src/javaeva/gui/GenericRemoteServersEditor.java rename to src/eva2/gui/GenericRemoteServersEditor.java index d0614941..5eb04450 100644 --- a/src/javaeva/gui/GenericRemoteServersEditor.java +++ b/src/eva2/gui/GenericRemoteServersEditor.java @@ -1,8 +1,11 @@ -package javaeva.gui; +package eva2.gui; import wsi.ra.tool.BasicResourceLoader; import javax.swing.*; + +import eva2.server.go.SwingWorker; + import java.beans.PropertyEditor; import java.beans.PropertyChangeSupport; import java.beans.PropertyChangeListener; @@ -12,7 +15,6 @@ import java.io.*; import java.util.Vector; import java.util.Enumeration; -import javaeva.server.go.SwingWorker; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/gui/GenericStringListEditor.java b/src/eva2/gui/GenericStringListEditor.java similarity index 97% rename from src/javaeva/gui/GenericStringListEditor.java rename to src/eva2/gui/GenericStringListEditor.java index 9ec80542..3abce0db 100644 --- a/src/javaeva/gui/GenericStringListEditor.java +++ b/src/eva2/gui/GenericStringListEditor.java @@ -1,9 +1,11 @@ -package javaeva.gui; +package eva2.gui; -import javaeva.server.go.individuals.codings.gp.AbstractGPNode; -import javaeva.server.go.individuals.codings.gp.GPArea; import javax.swing.*; + +import eva2.server.go.individuals.codings.gp.AbstractGPNode; +import eva2.server.go.individuals.codings.gp.GPArea; + import java.beans.PropertyEditor; import java.beans.PropertyChangeSupport; import java.beans.PropertyChangeListener; diff --git a/src/javaeva/gui/GenericWeigthedLPTchebycheffEditor.java b/src/eva2/gui/GenericWeigthedLPTchebycheffEditor.java similarity index 99% rename from src/javaeva/gui/GenericWeigthedLPTchebycheffEditor.java rename to src/eva2/gui/GenericWeigthedLPTchebycheffEditor.java index 90f9e56f..b73c1a01 100644 --- a/src/javaeva/gui/GenericWeigthedLPTchebycheffEditor.java +++ b/src/eva2/gui/GenericWeigthedLPTchebycheffEditor.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; import javax.swing.*; import java.beans.PropertyEditor; diff --git a/src/javaeva/gui/Graph.java b/src/eva2/gui/Graph.java similarity index 99% rename from src/javaeva/gui/Graph.java rename to src/eva2/gui/Graph.java index d62bb677..425da82c 100644 --- a/src/javaeva/gui/Graph.java +++ b/src/eva2/gui/Graph.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; import java.io.Serializable; diff --git a/src/javaeva/gui/GraphPointSet.java b/src/eva2/gui/GraphPointSet.java similarity index 99% rename from src/javaeva/gui/GraphPointSet.java rename to src/eva2/gui/GraphPointSet.java index 6bdbebe0..12cdfe7a 100644 --- a/src/javaeva/gui/GraphPointSet.java +++ b/src/eva2/gui/GraphPointSet.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/gui/GraphWindow.java b/src/eva2/gui/GraphWindow.java similarity index 99% rename from src/javaeva/gui/GraphWindow.java rename to src/eva2/gui/GraphWindow.java index ad095be0..3055e7cf 100644 --- a/src/javaeva/gui/GraphWindow.java +++ b/src/eva2/gui/GraphWindow.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/gui/HtmlDemo.java b/src/eva2/gui/HtmlDemo.java similarity index 95% rename from src/javaeva/gui/HtmlDemo.java rename to src/eva2/gui/HtmlDemo.java index 5cb9377a..f89d3380 100644 --- a/src/javaeva/gui/HtmlDemo.java +++ b/src/eva2/gui/HtmlDemo.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: @@ -12,7 +12,6 @@ package javaeva.gui; /*==========================================================================* * IMPORTS *==========================================================================*/ -import javaeva.tools.EVAHELP; import javax.swing.JFrame; import javax.swing.JScrollPane; import javax.swing.JViewport; @@ -21,6 +20,10 @@ import javax.swing.event.HyperlinkListener; import javax.swing.event.HyperlinkEvent; import javax.swing.text.html.HTMLFrameHyperlinkEvent; import javax.swing.text.html.HTMLDocument; + +import eva2.client.EvAClient; +import eva2.tools.EVAHELP; + import java.awt.Dimension; import java.awt.BorderLayout; import java.io.IOException; @@ -29,7 +32,6 @@ import java.net.MalformedURLException; import java.net.URL; import java.awt.Toolkit; import wsi.ra.tool.BasicResourceLoader; -import javaeva.client.EvAClient; /** * */ @@ -97,7 +99,7 @@ public class HtmlDemo { try { frame.setIconImage(Toolkit.getDefaultToolkit().createImage(bytes)); } catch (java.lang.NullPointerException e) { - System.out.println("Could not find JavaEvA icon, please move rescoure folder to working directory!"); + System.err.println("Could not find EvA2 icon, please move rescoure folder to working directory!"); } JScrollPane scroller = new JScrollPane(); JViewport vp = scroller.getViewport(); diff --git a/src/javaeva/gui/InterfaceDPointWithContent.java b/src/eva2/gui/InterfaceDPointWithContent.java similarity index 82% rename from src/javaeva/gui/InterfaceDPointWithContent.java rename to src/eva2/gui/InterfaceDPointWithContent.java index 33d748cb..3a9aefad 100644 --- a/src/javaeva/gui/InterfaceDPointWithContent.java +++ b/src/eva2/gui/InterfaceDPointWithContent.java @@ -1,7 +1,7 @@ -package javaeva.gui; +package eva2.gui; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.problems.InterfaceOptimizationProblem; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/gui/InterfaceSelectablePointIcon.java b/src/eva2/gui/InterfaceSelectablePointIcon.java similarity index 88% rename from src/javaeva/gui/InterfaceSelectablePointIcon.java rename to src/eva2/gui/InterfaceSelectablePointIcon.java index 822e731a..ba28457c 100644 --- a/src/javaeva/gui/InterfaceSelectablePointIcon.java +++ b/src/eva2/gui/InterfaceSelectablePointIcon.java @@ -1,7 +1,7 @@ -package javaeva.gui; +package eva2.gui; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.mocco.paretofrontviewer.InterfaceRefSolutionListener; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.mocco.paretofrontviewer.InterfaceRefSolutionListener; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/gui/JClassTree.java b/src/eva2/gui/JClassTree.java similarity index 99% rename from src/javaeva/gui/JClassTree.java rename to src/eva2/gui/JClassTree.java index f06195a3..6ad91c06 100644 --- a/src/javaeva/gui/JClassTree.java +++ b/src/eva2/gui/JClassTree.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/gui/JDocFrame.java b/src/eva2/gui/JDocFrame.java similarity index 98% rename from src/javaeva/gui/JDocFrame.java rename to src/eva2/gui/JDocFrame.java index 8886dd11..bfba022b 100644 --- a/src/javaeva/gui/JDocFrame.java +++ b/src/eva2/gui/JDocFrame.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/gui/JEFrame.java b/src/eva2/gui/JEFrame.java similarity index 99% rename from src/javaeva/gui/JEFrame.java rename to src/eva2/gui/JEFrame.java index 852f0e35..833f2608 100644 --- a/src/javaeva/gui/JEFrame.java +++ b/src/eva2/gui/JEFrame.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/gui/JEFrameRegister.java b/src/eva2/gui/JEFrameRegister.java similarity index 98% rename from src/javaeva/gui/JEFrameRegister.java rename to src/eva2/gui/JEFrameRegister.java index 62a29b47..54422fa7 100644 --- a/src/javaeva/gui/JEFrameRegister.java +++ b/src/eva2/gui/JEFrameRegister.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; import java.util.ArrayList; /* * Title: JavaEvA diff --git a/src/javaeva/gui/JExtDesktopPane.java b/src/eva2/gui/JExtDesktopPane.java similarity index 97% rename from src/javaeva/gui/JExtDesktopPane.java rename to src/eva2/gui/JExtDesktopPane.java index 06495e1c..46d82c6e 100644 --- a/src/javaeva/gui/JExtDesktopPane.java +++ b/src/eva2/gui/JExtDesktopPane.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: @@ -65,7 +65,7 @@ public class JExtDesktopPane extends JDesktopPane{ } }); - m_mnuWindow.add(actWindowOverlap = new ExtAction("Ü&berlappend", "Ordnet die Fenster überlappend an"){ + m_mnuWindow.add(actWindowOverlap = new ExtAction("�&berlappend", "Ordnet die Fenster �berlappend an"){ public void actionPerformed(ActionEvent e){ overlapWindows(); } @@ -89,7 +89,7 @@ public class JExtDesktopPane extends JDesktopPane{ JScrollPane pane = new JScrollPane(list); pane.setPreferredSize(new Dimension(pane.getPreferredSize().width, 150)); - if(JOptionPane.showOptionDialog(JExtDesktopPane.this, pane, "Fenster auswählen", JOptionPane.OK_CANCEL_OPTION, + if(JOptionPane.showOptionDialog(JExtDesktopPane.this, pane, "Fenster ausw�hlen", JOptionPane.OK_CANCEL_OPTION, JOptionPane.PLAIN_MESSAGE, null, null, null) == JOptionPane.OK_OPTION) if(list.getSelectedIndex() != -1) selectFrame(frames[list.getSelectedIndex()]); } diff --git a/src/javaeva/gui/JExtFileChooser.java b/src/eva2/gui/JExtFileChooser.java similarity index 85% rename from src/javaeva/gui/JExtFileChooser.java rename to src/eva2/gui/JExtFileChooser.java index c727bc31..1c33e392 100644 --- a/src/javaeva/gui/JExtFileChooser.java +++ b/src/eva2/gui/JExtFileChooser.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: @@ -31,7 +31,7 @@ public class JExtFileChooser extends JFileChooser{ File f = getSelectedFile(); if(f != null && f.exists()) - if(JOptionPane.showConfirmDialog(this, "Die Datei " + f.getPath() + " existiert bereits.\nSoll sie überschrieben werden?", "Achtung", JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE) == JOptionPane.NO_OPTION) return; + if(JOptionPane.showConfirmDialog(this, "Die Datei " + f.getPath() + " existiert bereits.\nSoll sie �berschrieben werden?", "Achtung", JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE) == JOptionPane.NO_OPTION) return; } super.approveSelection(); diff --git a/src/javaeva/gui/JExtMenu.java b/src/eva2/gui/JExtMenu.java similarity index 99% rename from src/javaeva/gui/JExtMenu.java rename to src/eva2/gui/JExtMenu.java index f3b80ce6..24f9c5a9 100644 --- a/src/javaeva/gui/JExtMenu.java +++ b/src/eva2/gui/JExtMenu.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/gui/JExtToolBar.java b/src/eva2/gui/JExtToolBar.java similarity index 99% rename from src/javaeva/gui/JExtToolBar.java rename to src/eva2/gui/JExtToolBar.java index 34671af7..2958aa3d 100644 --- a/src/javaeva/gui/JExtToolBar.java +++ b/src/eva2/gui/JExtToolBar.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/gui/JModuleGeneralPanel.java b/src/eva2/gui/JModuleGeneralPanel.java similarity index 98% rename from src/javaeva/gui/JModuleGeneralPanel.java rename to src/eva2/gui/JModuleGeneralPanel.java index d79cf26a..f40db53e 100644 --- a/src/javaeva/gui/JModuleGeneralPanel.java +++ b/src/eva2/gui/JModuleGeneralPanel.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: @@ -16,7 +16,6 @@ package javaeva.gui; import java.io.Serializable; import java.net.InetAddress; -import javaeva.server.modules.ModuleAdapter; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -25,6 +24,8 @@ import javax.swing.JComponent; import javax.swing.JOptionPane; import javax.swing.JPanel; +import eva2.server.modules.ModuleAdapter; + import wsi.ra.jproxy.RMIProxyLocal; import wsi.ra.jproxy.RemoteStateListener; /*==========================================================================* diff --git a/src/javaeva/gui/JParaPanel.java b/src/eva2/gui/JParaPanel.java similarity index 99% rename from src/javaeva/gui/JParaPanel.java rename to src/eva2/gui/JParaPanel.java index 1eb1f229..2650a6ea 100644 --- a/src/javaeva/gui/JParaPanel.java +++ b/src/eva2/gui/JParaPanel.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA diff --git a/src/javaeva/gui/JTabbedModuleFrame.java b/src/eva2/gui/JTabbedModuleFrame.java similarity index 94% rename from src/javaeva/gui/JTabbedModuleFrame.java rename to src/eva2/gui/JTabbedModuleFrame.java index ef9a154f..f24f6f41 100644 --- a/src/javaeva/gui/JTabbedModuleFrame.java +++ b/src/eva2/gui/JTabbedModuleFrame.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: @@ -12,10 +12,6 @@ package javaeva.gui; /*==========================================================================* * IMPORTS *==========================================================================*/ -import javaeva.gui.JModuleGeneralPanel; -import javaeva.gui.JParaPanel; -import javaeva.server.modules.ModuleAdapter; -import javaeva.client.EvAClient; import java.io.Serializable; import java.awt.*; @@ -24,6 +20,12 @@ import java.awt.print.* ; import javax.swing.*; import javax.swing.border.*; import javax.swing.event.*; + +import eva2.client.EvAClient; +import eva2.gui.JModuleGeneralPanel; +import eva2.gui.JParaPanel; +import eva2.server.modules.ModuleAdapter; + import java.util.ArrayList; import wsi.ra.tool.BasicResourceLoader; /*==========================================================================* @@ -105,7 +107,7 @@ public class JTabbedModuleFrame implements Serializable { try { m_Frame.setIconImage(Toolkit.getDefaultToolkit().createImage(bytes)); } catch (java.lang.NullPointerException e) { - System.out.println("Could not find JavaEvA icon, please move resource folder to working directory!"); + System.out.println("Could not find EvA2 icon, please move resource folder to working directory!"); } JPanel m_SuperPanel = createContentPane(); diff --git a/src/javaeva/gui/JTextEditorInternalFrame.java b/src/eva2/gui/JTextEditorInternalFrame.java similarity index 96% rename from src/javaeva/gui/JTextEditorInternalFrame.java rename to src/eva2/gui/JTextEditorInternalFrame.java index 6e1aa726..03672a6e 100644 --- a/src/javaeva/gui/JTextEditorInternalFrame.java +++ b/src/eva2/gui/JTextEditorInternalFrame.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: @@ -29,7 +29,7 @@ public class JTextEditorInternalFrame extends JDocFrame{ protected UndoManager undo = new UndoManager(); private class UndoAction extends ExtAction{ public UndoAction(){ - super("Rückgängig", new ImageIcon("images/EditUndo.gif"), "Macht die letzte Aktion rückgängig", + super("R�ckg�ngig", new ImageIcon("images/EditUndo.gif"), "Macht die letzte Aktion r�ckg�ngig", KeyStroke.getKeyStroke(KeyEvent.VK_Z, Event.CTRL_MASK)); setEnabled(false); } @@ -51,7 +51,7 @@ public class JTextEditorInternalFrame extends JDocFrame{ } else{ setEnabled(false); - putValue(Action.NAME, "Rückgängig"); + putValue(Action.NAME, "R�ckg�ngig"); } } } // end of inner class UndoAction @@ -171,9 +171,9 @@ public class JTextEditorInternalFrame extends JDocFrame{ keyActions = keys.getKeyStrokesForAction(a); if(keyActions != null && keyActions.length > 0) a.putValue(ExtAction.KEYSTROKE, keyActions[0]); a.putValue(Action.SMALL_ICON, new ImageIcon("images/EditPaste.gif")); - a.putValue(ExtAction.CAPTION, "Einfügen"); + a.putValue(ExtAction.CAPTION, "Einf�gen"); a.putValue(ExtAction.MNEMONIC, new Character('e')); - a.putValue(ExtAction.TOOLTIP, "Fügt Text aus der Zwischenablage ein"); + a.putValue(ExtAction.TOOLTIP, "F�gt Text aus der Zwischenablage ein"); mnuEdit.add(a); barEdit.add(a); diff --git a/src/javaeva/gui/JTextoutputFrame.java b/src/eva2/gui/JTextoutputFrame.java similarity index 96% rename from src/javaeva/gui/JTextoutputFrame.java rename to src/eva2/gui/JTextoutputFrame.java index a0a8f024..bba7b411 100644 --- a/src/javaeva/gui/JTextoutputFrame.java +++ b/src/eva2/gui/JTextoutputFrame.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: @@ -25,8 +25,6 @@ import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.io.Serializable; -import javaeva.client.EvAClient; -import javaeva.tools.MultirunRefiner; import javax.swing.BorderFactory; import javax.swing.JFrame; @@ -38,6 +36,9 @@ import javax.swing.JViewport; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; +import eva2.client.EvAClient; +import eva2.tools.MultirunRefiner; + import wsi.ra.tool.BasicResourceLoader; /*==========================================================================* * CLASS DECLARATION @@ -110,7 +111,7 @@ Serializable { try { frame.setIconImage(Toolkit.getDefaultToolkit().createImage(bytes)); } catch (java.lang.NullPointerException e) { - System.out.println("Could not find JavaEvA icon, please move resource folder to working directory!"); + System.out.println("Could not find EvA2 icon, please move resource folder to working directory!"); } frame.addWindowListener(new WindowAdapter() { public void windowClosing(WindowEvent e) { diff --git a/src/javaeva/gui/JTextoutputFrameInterface.java b/src/eva2/gui/JTextoutputFrameInterface.java similarity index 92% rename from src/javaeva/gui/JTextoutputFrameInterface.java rename to src/eva2/gui/JTextoutputFrameInterface.java index eef53e02..e7834708 100644 --- a/src/javaeva/gui/JTextoutputFrameInterface.java +++ b/src/eva2/gui/JTextoutputFrameInterface.java @@ -1,6 +1,6 @@ -package javaeva.gui; +package eva2.gui; -import javaeva.server.stat.InterfaceTextListener; +import eva2.server.stat.InterfaceTextListener; /* * Title: JavaEvA diff --git a/src/javaeva/gui/LogPanel.java b/src/eva2/gui/LogPanel.java similarity index 95% rename from src/javaeva/gui/LogPanel.java rename to src/eva2/gui/LogPanel.java index 775ff4a2..baa465eb 100644 --- a/src/javaeva/gui/LogPanel.java +++ b/src/eva2/gui/LogPanel.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: @@ -17,9 +17,11 @@ import java.text.*; import java.awt.*; import javax.swing.*; import javax.swing.event.*; + +import eva2.client.EvAClient; + import java.awt.event.*; import wsi.ra.tool.BasicResourceLoader; -import javaeva.client.EvAClient; /*==========================================================================* * CLASS DECLARATION *==========================================================================*/ @@ -97,7 +99,7 @@ public class LogPanel extends JPanel { try { frame.setIconImage(Toolkit.getDefaultToolkit().createImage(bytes)); } catch (java.lang.NullPointerException e) { - System.out.println("Could not find JavaEvA icon, please move rescoure folder to working directory!"); + System.out.println("Could not find EvA2 icon, please move rescoure folder to working directory!"); } LogPanel panel = new LogPanel(); frame.getContentPane().add(panel, BorderLayout.CENTER); diff --git a/src/javaeva/gui/Mnemonic.java b/src/eva2/gui/Mnemonic.java similarity index 97% rename from src/javaeva/gui/Mnemonic.java rename to src/eva2/gui/Mnemonic.java index 994951bc..7e50f95c 100644 --- a/src/javaeva/gui/Mnemonic.java +++ b/src/eva2/gui/Mnemonic.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/gui/MultiLineString.java b/src/eva2/gui/MultiLineString.java similarity index 95% rename from src/javaeva/gui/MultiLineString.java rename to src/eva2/gui/MultiLineString.java index 1e54f7ef..ad15e38d 100644 --- a/src/javaeva/gui/MultiLineString.java +++ b/src/eva2/gui/MultiLineString.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /** *

Title: The JavaEvA

diff --git a/src/javaeva/gui/MultiLineStringEditor.java b/src/eva2/gui/MultiLineStringEditor.java similarity index 99% rename from src/javaeva/gui/MultiLineStringEditor.java rename to src/eva2/gui/MultiLineStringEditor.java index 1109cc67..c31e5a07 100644 --- a/src/javaeva/gui/MultiLineStringEditor.java +++ b/src/eva2/gui/MultiLineStringEditor.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; import java.beans.*; import java.awt.*; diff --git a/src/javaeva/gui/Plot.java b/src/eva2/gui/Plot.java similarity index 98% rename from src/javaeva/gui/Plot.java rename to src/eva2/gui/Plot.java index 2e936e35..79a8355e 100644 --- a/src/javaeva/gui/Plot.java +++ b/src/eva2/gui/Plot.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: @@ -34,7 +34,6 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.Serializable; -import javaeva.client.EvAClient; import javax.swing.JButton; import javax.swing.JFileChooser; @@ -44,6 +43,8 @@ import javax.swing.JPanel; import com.sun.image.codec.jpeg.JPEGCodec; import com.sun.image.codec.jpeg.JPEGImageEncoder; + +import eva2.client.EvAClient; import wsi.ra.chart2d.DPointSet; import wsi.ra.tool.BasicResourceLoader; /*==========================================================================* @@ -109,7 +110,7 @@ public class Plot implements PlotInterface, Serializable { try { m_Frame.setIconImage(Toolkit.getDefaultToolkit().createImage(bytes)); } catch (java.lang.NullPointerException e) { - System.out.println("Could not find JavaEvA icon, please move rescoure folder to working directory!"); + System.out.println("Could not find EvA2 icon, please move rescoure folder to working directory!"); } m_ButtonPanel = new JPanel(); diff --git a/src/javaeva/gui/PlotInterface.java b/src/eva2/gui/PlotInterface.java similarity index 98% rename from src/javaeva/gui/PlotInterface.java rename to src/eva2/gui/PlotInterface.java index 4b303d82..f8797c47 100644 --- a/src/javaeva/gui/PlotInterface.java +++ b/src/eva2/gui/PlotInterface.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/gui/PropertyBoolSelector.java b/src/eva2/gui/PropertyBoolSelector.java similarity index 98% rename from src/javaeva/gui/PropertyBoolSelector.java rename to src/eva2/gui/PropertyBoolSelector.java index 97cd1120..25a45d71 100644 --- a/src/javaeva/gui/PropertyBoolSelector.java +++ b/src/eva2/gui/PropertyBoolSelector.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/gui/PropertyDialog.java b/src/eva2/gui/PropertyDialog.java similarity index 92% rename from src/javaeva/gui/PropertyDialog.java rename to src/eva2/gui/PropertyDialog.java index 231dded1..9eefb2e1 100644 --- a/src/javaeva/gui/PropertyDialog.java +++ b/src/eva2/gui/PropertyDialog.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: @@ -12,16 +12,18 @@ package javaeva.gui; /*==========================================================================* * IMPORTS *==========================================================================*/ -import javaeva.tools.EVAHELP; import java.awt.Component; import java.awt.Toolkit; import java.beans.PropertyEditor; import javax.swing.JFrame; + +import eva2.client.EvAClient; +import eva2.tools.EVAHELP; + import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.awt.BorderLayout; import wsi.ra.tool.BasicResourceLoader; -import javaeva.client.EvAClient; /*==========================================================================* * CLASS DECLARATION *==========================================================================*/ @@ -41,7 +43,7 @@ public class PropertyDialog extends JEFrame { try { setIconImage(Toolkit.getDefaultToolkit().createImage(bytes)); } catch (java.lang.NullPointerException e) { - System.out.println("Could not find JavaEvA icon, please move rescoure folder to working directory!"); + System.out.println("Could not find EvA2 icon, please move rescoure folder to working directory!"); } //System.out.println("PropertyDialog.Constructor of "+ Title); addWindowListener(new WindowAdapter() { diff --git a/src/javaeva/gui/PropertyDoubleArray.java b/src/eva2/gui/PropertyDoubleArray.java similarity index 98% rename from src/javaeva/gui/PropertyDoubleArray.java rename to src/eva2/gui/PropertyDoubleArray.java index f48d4459..f4b6b78d 100644 --- a/src/javaeva/gui/PropertyDoubleArray.java +++ b/src/eva2/gui/PropertyDoubleArray.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/gui/PropertyEditorProvider.java b/src/eva2/gui/PropertyEditorProvider.java similarity index 96% rename from src/javaeva/gui/PropertyEditorProvider.java rename to src/eva2/gui/PropertyEditorProvider.java index d8a0e3e6..7aea23aa 100644 --- a/src/javaeva/gui/PropertyEditorProvider.java +++ b/src/eva2/gui/PropertyEditorProvider.java @@ -1,13 +1,14 @@ -package javaeva.gui; +package eva2.gui; import java.awt.Color; import java.beans.PropertyDescriptor; import java.beans.PropertyEditor; import java.beans.PropertyEditorManager; -import javaeva.server.go.InterfaceTerminator; -import javaeva.server.go.individuals.codings.gp.GPArea; -import javaeva.tools.SelectedTag; +import eva2.server.go.InterfaceTerminator; +import eva2.server.go.individuals.codings.gp.GPArea; +import eva2.tools.SelectedTag; + import sun.beans.editors.DoubleEditor; import sun.beans.editors.IntEditor; @@ -162,6 +163,6 @@ public class PropertyEditorProvider { PropertyEditorManager.registerEditor(PropertyRemoteServers.class , GenericRemoteServersEditor.class); PropertyEditorManager.registerEditor(PropertyOptimizationObjectives.class , GenericOptimizationObjectivesEditor.class); PropertyEditorManager.registerEditor(PropertyOptimizationObjectivesWithParam.class , GenericOptimizationObjectivesWithParamEditor.class); - PropertyEditorManager.registerEditor(javaeva.gui.MultiLineString.class, javaeva.gui.MultiLineStringEditor.class); + PropertyEditorManager.registerEditor(eva2.gui.MultiLineString.class, eva2.gui.MultiLineStringEditor.class); } } diff --git a/src/javaeva/gui/PropertyEpsilonConstraint.java b/src/eva2/gui/PropertyEpsilonConstraint.java similarity index 97% rename from src/javaeva/gui/PropertyEpsilonConstraint.java rename to src/eva2/gui/PropertyEpsilonConstraint.java index 3a05327e..e63ace5d 100644 --- a/src/javaeva/gui/PropertyEpsilonConstraint.java +++ b/src/eva2/gui/PropertyEpsilonConstraint.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/gui/PropertyEpsilonThreshold.java b/src/eva2/gui/PropertyEpsilonThreshold.java similarity index 98% rename from src/javaeva/gui/PropertyEpsilonThreshold.java rename to src/eva2/gui/PropertyEpsilonThreshold.java index 26d8d2da..8f0a58be 100644 --- a/src/javaeva/gui/PropertyEpsilonThreshold.java +++ b/src/eva2/gui/PropertyEpsilonThreshold.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/gui/PropertyFilePath.java b/src/eva2/gui/PropertyFilePath.java similarity index 98% rename from src/javaeva/gui/PropertyFilePath.java rename to src/eva2/gui/PropertyFilePath.java index fc2a50e8..7867fe2f 100644 --- a/src/javaeva/gui/PropertyFilePath.java +++ b/src/eva2/gui/PropertyFilePath.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/gui/PropertyIntArray.java b/src/eva2/gui/PropertyIntArray.java similarity index 97% rename from src/javaeva/gui/PropertyIntArray.java rename to src/eva2/gui/PropertyIntArray.java index b0c9a44e..897a4b5d 100644 --- a/src/javaeva/gui/PropertyIntArray.java +++ b/src/eva2/gui/PropertyIntArray.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/gui/PropertyOptimizationObjectives.java b/src/eva2/gui/PropertyOptimizationObjectives.java similarity index 97% rename from src/javaeva/gui/PropertyOptimizationObjectives.java rename to src/eva2/gui/PropertyOptimizationObjectives.java index 21e4c145..ec32b311 100644 --- a/src/javaeva/gui/PropertyOptimizationObjectives.java +++ b/src/eva2/gui/PropertyOptimizationObjectives.java @@ -1,6 +1,6 @@ -package javaeva.gui; +package eva2.gui; -import javaeva.server.go.problems.InterfaceOptimizationObjective; +import eva2.server.go.problems.InterfaceOptimizationObjective; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/gui/PropertyOptimizationObjectivesWithParam.java b/src/eva2/gui/PropertyOptimizationObjectivesWithParam.java similarity index 98% rename from src/javaeva/gui/PropertyOptimizationObjectivesWithParam.java rename to src/eva2/gui/PropertyOptimizationObjectivesWithParam.java index 186d2a63..620a527f 100644 --- a/src/javaeva/gui/PropertyOptimizationObjectivesWithParam.java +++ b/src/eva2/gui/PropertyOptimizationObjectivesWithParam.java @@ -1,6 +1,6 @@ -package javaeva.gui; +package eva2.gui; -import javaeva.server.go.problems.InterfaceOptimizationObjective; +import eva2.server.go.problems.InterfaceOptimizationObjective; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/gui/PropertyPanel.java b/src/eva2/gui/PropertyPanel.java similarity index 98% rename from src/javaeva/gui/PropertyPanel.java rename to src/eva2/gui/PropertyPanel.java index 36e9e8c5..01b1eba0 100644 --- a/src/javaeva/gui/PropertyPanel.java +++ b/src/eva2/gui/PropertyPanel.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: @@ -19,10 +19,11 @@ import java.awt.Rectangle; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.beans.PropertyEditor; -import javaeva.tools.EVAHELP; import javax.swing.BorderFactory; import javax.swing.JPanel; + +import eva2.tools.EVAHELP; /*==========================================================================* * CLASS DECLARATION *==========================================================================*/ diff --git a/src/javaeva/gui/PropertyRemoteServers.java b/src/eva2/gui/PropertyRemoteServers.java similarity index 99% rename from src/javaeva/gui/PropertyRemoteServers.java rename to src/eva2/gui/PropertyRemoteServers.java index 942224c6..024a10fe 100644 --- a/src/javaeva/gui/PropertyRemoteServers.java +++ b/src/eva2/gui/PropertyRemoteServers.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; //import javaeva.tools.ServerStarter; import java.rmi.Naming; diff --git a/src/javaeva/gui/PropertySheetPanel.java b/src/eva2/gui/PropertySheetPanel.java similarity index 99% rename from src/javaeva/gui/PropertySheetPanel.java rename to src/eva2/gui/PropertySheetPanel.java index 00b5b06b..a1ba898f 100644 --- a/src/javaeva/gui/PropertySheetPanel.java +++ b/src/eva2/gui/PropertySheetPanel.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: @@ -36,8 +36,6 @@ import java.beans.PropertyVetoException; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import javaeva.tools.EVAHELP; -import javaeva.tools.StringTools; import javax.swing.BorderFactory; import javax.swing.JButton; @@ -46,6 +44,9 @@ import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JTextArea; import javax.swing.SwingConstants; + +import eva2.tools.EVAHELP; +import eva2.tools.StringTools; /*==========================================================================* * CLASS DECLARATION *==========================================================================*/ diff --git a/src/javaeva/gui/PropertySheetPanelStat.java b/src/eva2/gui/PropertySheetPanelStat.java similarity index 98% rename from src/javaeva/gui/PropertySheetPanelStat.java rename to src/eva2/gui/PropertySheetPanelStat.java index 971aeeb5..2e91943f 100644 --- a/src/javaeva/gui/PropertySheetPanelStat.java +++ b/src/eva2/gui/PropertySheetPanelStat.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: @@ -18,8 +18,9 @@ import java.awt.event.*; import java.beans.*; import java.lang.reflect.*; import javax.swing.*; + +import eva2.tools.EVAHELP; import sun.beans.editors.*; -import javaeva.tools.EVAHELP; import java.io.Serializable; /*==========================================================================* * CLASS DECLARATION diff --git a/src/javaeva/gui/PropertySlider.java b/src/eva2/gui/PropertySlider.java similarity index 99% rename from src/javaeva/gui/PropertySlider.java rename to src/eva2/gui/PropertySlider.java index a7ffaf87..1e7140af 100644 --- a/src/javaeva/gui/PropertySlider.java +++ b/src/eva2/gui/PropertySlider.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/gui/PropertyStringList.java b/src/eva2/gui/PropertyStringList.java similarity index 98% rename from src/javaeva/gui/PropertyStringList.java rename to src/eva2/gui/PropertyStringList.java index 9af38fb2..58717403 100644 --- a/src/javaeva/gui/PropertyStringList.java +++ b/src/eva2/gui/PropertyStringList.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/gui/PropertyText.java b/src/eva2/gui/PropertyText.java similarity index 98% rename from src/javaeva/gui/PropertyText.java rename to src/eva2/gui/PropertyText.java index daebca19..2306821b 100644 --- a/src/javaeva/gui/PropertyText.java +++ b/src/eva2/gui/PropertyText.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/gui/PropertyValueSelector.java b/src/eva2/gui/PropertyValueSelector.java similarity index 98% rename from src/javaeva/gui/PropertyValueSelector.java rename to src/eva2/gui/PropertyValueSelector.java index 7c04caee..11985e17 100644 --- a/src/javaeva/gui/PropertyValueSelector.java +++ b/src/eva2/gui/PropertyValueSelector.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/gui/PropertyWeightedLPTchebycheff.java b/src/eva2/gui/PropertyWeightedLPTchebycheff.java similarity index 97% rename from src/javaeva/gui/PropertyWeightedLPTchebycheff.java rename to src/eva2/gui/PropertyWeightedLPTchebycheff.java index 9f350129..8ea601e3 100644 --- a/src/javaeva/gui/PropertyWeightedLPTchebycheff.java +++ b/src/eva2/gui/PropertyWeightedLPTchebycheff.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/gui/SerializedObject.java b/src/eva2/gui/SerializedObject.java similarity index 99% rename from src/javaeva/gui/SerializedObject.java rename to src/eva2/gui/SerializedObject.java index a4393f3e..e72cb9bd 100644 --- a/src/javaeva/gui/SerializedObject.java +++ b/src/eva2/gui/SerializedObject.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/gui/StatisticsEditor.java b/src/eva2/gui/StatisticsEditor.java similarity index 97% rename from src/javaeva/gui/StatisticsEditor.java rename to src/eva2/gui/StatisticsEditor.java index 66eccafe..5cf58aa6 100644 --- a/src/javaeva/gui/StatisticsEditor.java +++ b/src/eva2/gui/StatisticsEditor.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: @@ -16,7 +16,8 @@ package javaeva.gui; import java.beans.*; import java.awt.*; import javax.swing.*; -import javaeva.server.stat.GenericStatistics; + +import eva2.server.stat.GenericStatistics; /*==========================================================================* * CLASS DECLARATION diff --git a/src/javaeva/gui/TagEditor.java b/src/eva2/gui/TagEditor.java similarity index 94% rename from src/javaeva/gui/TagEditor.java rename to src/eva2/gui/TagEditor.java index f2ce0e68..ee0ed550 100644 --- a/src/javaeva/gui/TagEditor.java +++ b/src/eva2/gui/TagEditor.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: @@ -12,16 +12,17 @@ package javaeva.gui; /*==========================================================================* * IMPORTS *==========================================================================*/ -import javaeva.tools.SelectedTag; -import javaeva.tools.Tag; import java.awt.BorderLayout; import java.awt.event.*; import java.awt.Toolkit; import java.beans.*; import javax.swing.*; + +import eva2.client.EvAClient; +import eva2.tools.SelectedTag; +import eva2.tools.Tag; import wsi.ra.tool.BasicResourceLoader; -import javaeva.client.EvAClient; /*==========================================================================* * CLASS DECLARATION *==========================================================================*/ @@ -126,7 +127,7 @@ public class TagEditor extends PropertyEditorSupport { try { f.setIconImage(Toolkit.getDefaultToolkit().createImage(bytes)); } catch (java.lang.NullPointerException e) { - System.out.println("Could not find JavaEvA icon, please move rescoure folder to working directory!"); + System.out.println("Could not find EvA2 icon, please move rescoure folder to working directory!"); } f.addWindowListener(new WindowAdapter() { public void windowClosing(WindowEvent e) { diff --git a/src/javaeva/gui/TopoPlot.java b/src/eva2/gui/TopoPlot.java similarity index 98% rename from src/javaeva/gui/TopoPlot.java rename to src/eva2/gui/TopoPlot.java index 6b123155..738648bf 100644 --- a/src/javaeva/gui/TopoPlot.java +++ b/src/eva2/gui/TopoPlot.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: @@ -15,7 +15,8 @@ package javaeva.gui; import wsi.ra.chart2d.*; import java.awt.*; -import javaeva.server.go.problems.Interface2DBorderProblem; +import eva2.server.go.problems.Interface2DBorderProblem; + import wsi.ra.diagram.ColorBarCalculator; /*==========================================================================* diff --git a/src/javaeva/gui/TreeElement.java b/src/eva2/gui/TreeElement.java similarity index 96% rename from src/javaeva/gui/TreeElement.java rename to src/eva2/gui/TreeElement.java index ac4405d9..f51bd5fd 100644 --- a/src/javaeva/gui/TreeElement.java +++ b/src/eva2/gui/TreeElement.java @@ -1,4 +1,4 @@ -package javaeva.gui; +package eva2.gui; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/gui/WindowCloseAction.java b/src/eva2/gui/WindowCloseAction.java similarity index 99% rename from src/javaeva/gui/WindowCloseAction.java rename to src/eva2/gui/WindowCloseAction.java index 91315e07..754917f4 100644 --- a/src/javaeva/gui/WindowCloseAction.java +++ b/src/eva2/gui/WindowCloseAction.java @@ -1,3 +1,4 @@ +package eva2.gui; //package javaeva.gui; ///*==========================================================================* // * IMPORTS diff --git a/src/javaeva/server/EvAMainAdapter.java b/src/eva2/server/EvAMainAdapter.java similarity index 93% rename from src/javaeva/server/EvAMainAdapter.java rename to src/eva2/server/EvAMainAdapter.java index c093878e..4c3ffa89 100644 --- a/src/javaeva/server/EvAMainAdapter.java +++ b/src/eva2/server/EvAMainAdapter.java @@ -1,4 +1,4 @@ -package javaeva.server; +package eva2.server; /** * Title: javaeva * Description: API for distributed and parallel computing. @@ -12,7 +12,7 @@ package javaeva.server; * IMPORTS *==========================================================================*/ -import javaeva.server.modules.ModuleAdapter; +import eva2.server.modules.ModuleAdapter; import wsi.ra.jproxy.MainAdapter; import wsi.ra.jproxy.MainAdapterClient; /*==========================================================================* diff --git a/src/javaeva/server/EvAMainAdapterImpl.java b/src/eva2/server/EvAMainAdapterImpl.java similarity index 93% rename from src/javaeva/server/EvAMainAdapterImpl.java rename to src/eva2/server/EvAMainAdapterImpl.java index a5a90a07..4e6eb27e 100644 --- a/src/javaeva/server/EvAMainAdapterImpl.java +++ b/src/eva2/server/EvAMainAdapterImpl.java @@ -1,4 +1,4 @@ -package javaeva.server; +package eva2.server; /** * Title: The JProxy Framework @@ -12,8 +12,8 @@ package javaeva.server; /*==========================================================================* * IMPORTS *==========================================================================*/ -import javaeva.client.EvAClient; -import javaeva.server.modules.ModuleAdapter; +import eva2.client.EvAClient; +import eva2.server.modules.ModuleAdapter; import wsi.ra.jproxy.MainAdapterClient; import wsi.ra.jproxy.MainAdapterImpl; /*==========================================================================* diff --git a/src/javaeva/server/EvAServer.java b/src/eva2/server/EvAServer.java similarity index 94% rename from src/javaeva/server/EvAServer.java rename to src/eva2/server/EvAServer.java index 64fdeb86..cff80a89 100644 --- a/src/javaeva/server/EvAServer.java +++ b/src/eva2/server/EvAServer.java @@ -1,4 +1,4 @@ -package javaeva.server; +package eva2.server; /* * Title: JavaEvA * Description: @@ -108,8 +108,9 @@ public class EvAServer { } if (TRACE) System.out.println(" start multiServers int i= "+i); try { - System.out.println("Calling the command:"+"java -cp \".:../lib/jdom.jar\" javaeva.server.EvAServer nomulti"); - Process pro = Runtime.getRuntime().exec("java -cp \".:../lib/jdom.jar:../lib/log4j.jar\" javaeva.server.EvAServer nomulti"); + String cmd = "java -cp \".\" eva2.server.EvAServer nomulti"; + System.out.println("Calling the command:"+cmd); + Process pro = Runtime.getRuntime().exec(cmd); //Process pro = Runtime.getRuntime().exec("server"); BufferedReader in = new BufferedReader ( new InputStreamReader (pro.getInputStream())); //pro diff --git a/src/javaeva/server/ModuleServer.java b/src/eva2/server/ModuleServer.java similarity index 73% rename from src/javaeva/server/ModuleServer.java rename to src/eva2/server/ModuleServer.java index fe6d5f9c..05c22d89 100644 --- a/src/javaeva/server/ModuleServer.java +++ b/src/eva2/server/ModuleServer.java @@ -1,4 +1,4 @@ -package javaeva.server; +package eva2.server; /* * Title: JavaEvA @@ -18,13 +18,11 @@ import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Properties; -import javaeva.server.modules.ModuleAdapter; -import javaeva.tools.EVAERROR; -import javaeva.tools.EVAHELP; -import javaeva.tools.ReflectPackage; - import wsi.ra.jproxy.MainAdapterClient; import wsi.ra.jproxy.RMIProxyLocal; +import eva2.server.modules.ModuleAdapter; +import eva2.tools.EVAERROR; +import eva2.tools.ReflectPackage; /*==========================================================================* * CLASS DECLARATION @@ -35,8 +33,8 @@ import wsi.ra.jproxy.RMIProxyLocal; public class ModuleServer { public static boolean TRACE = false; private int m_InstanceCounter = 0; - private ArrayList m_ModuleClassList; - private ArrayList m_RunnungModules; + private ArrayList> m_ModuleClassList; +// private ArrayList m_RunnungModules; private ModuleAdapter m_ModuleAdapter; private int m_ModuleAdapterCounter = 0; @@ -49,26 +47,26 @@ public class ModuleServer { if (m_InstanceCounter > 0) { EVAERROR.EXIT("ModuleServer twice created"); } - m_RunnungModules = new ArrayList(); - m_ModuleClassList = new ArrayList(); +// m_RunnungModules = new ArrayList(); + m_ModuleClassList = new ArrayList>(); String modulePckg = null; - Class filterBy = null; + Class filterBy = null; try { modulePckg = EvAProps.getProperty("ModulePackage"); filterBy = Class.forName(EvAProps.getProperty("ModuleFilterClass")); } catch(Exception e) { - System.err.println("Couldnt load modules:" + e.getMessage()); - System.err.println("module path was " + modulePckg); + System.err.println("Creating ModuleServer failed: couldnt load modules:" + e.getMessage()); + System.err.println("module path was " + modulePckg + ", is it valid?"); System.err.println("filter class path was " + ((filterBy==null) ? "null" : filterBy.getName())); - e.printStackTrace(); +// e.printStackTrace(); } // this gets a list of all valid modules from the package - Class[] classes = ReflectPackage.getAssignableClassesInPackage(modulePckg, filterBy, true, true); + Class[] classes = ReflectPackage.getAssignableClassesInPackage(modulePckg, filterBy, true, true); for (Object cls : classes) { - if (TRACE) System.out.println("- " + ((Class)cls).getName()); - m_ModuleClassList.add((Class)cls); + if (TRACE) System.out.println("- " + ((Class)cls).getName()); + m_ModuleClassList.add((Class)cls); } m_InstanceCounter++; @@ -81,7 +79,7 @@ public class ModuleServer { ArrayList ModuleNameList = new ArrayList(); for (int i = 0; i < m_ModuleClassList.size(); i++) { try { - Class Modul = (Class) m_ModuleClassList.get(i); + Class Modul = (Class) m_ModuleClassList.get(i); Method[] methods = Modul.getDeclaredMethods(); for (int ii = 0; ii < methods.length; ii++) { if (methods[ii].getName().equals("getName") == true) { @@ -101,16 +99,16 @@ public class ModuleServer { // and the running modules // @todo running modules sind abgeschaltet - for (int i = 0; i < m_RunnungModules.size(); i++) { - String AdapterName = null; - try { - AdapterName = ( (ModuleAdapter) m_RunnungModules.get(i)).getAdapterName(); - } - catch (Exception ee) { - System.err.println("Error: GetAdapterName" + ee.getMessage()); - } - ModuleNameList.add(AdapterName); - } +// for (int i = 0; i < m_RunnungModules.size(); i++) { +// String AdapterName = null; +// try { +// AdapterName = ( (ModuleAdapter) m_RunnungModules.get(i)).getAdapterName(); +// } +// catch (Exception ee) { +// System.err.println("Error: GetAdapterName" + ee.getMessage()); +// } +// ModuleNameList.add(AdapterName); +// } String[] x = new String[ModuleNameList.size()]; ModuleNameList.toArray(x); @@ -134,7 +132,7 @@ public class ModuleServer { selectedModuleName); } String moduleName; - Class module; + Class module; Method[] methods; for (int i = 0; i < m_ModuleClassList.size(); i++) { moduleName = null; @@ -159,9 +157,9 @@ public class ModuleServer { selectedModuleName); // create a module instance - Constructor[] Constructor = module.getConstructors(); + Constructor[] Constructor = module.getConstructors(); Object[] Para = new Object[2]; - Class paramTypes[] = (Constructor[0]).getParameterTypes(); + Class paramTypes[] = (Constructor[0]).getParameterTypes(); Para[0] = paramTypes[0].cast(adapterName); Para[1] = paramTypes[1].cast(Client); m_ModuleAdapter = (ModuleAdapter) Constructor[0].newInstance(Para); @@ -184,21 +182,21 @@ public class ModuleServer { return (ModuleAdapter) m_ModuleAdapter; } } - // @todo running modules sind gerade noch abgeschaltet - for (int i = 0; i < m_RunnungModules.size(); i++) { - try { - adapterName = ( (ModuleAdapter) m_RunnungModules.get(i)).getAdapterName(); - } - catch (Exception e) { - System.out.println("Error : GetAdapterName" + e); - } - if (adapterName.equals(selectedModuleName)) { - if (TRACE) - System.out.println(" Choose a running Module!!! " + adapterName); - m_ModuleAdapter = ( (ModuleAdapter) m_RunnungModules.get(i)); - return (ModuleAdapter) m_ModuleAdapter; - } - } +// // @todo running modules sind gerade noch abgeschaltet +// for (int i = 0; i < m_RunnungModules.size(); i++) { +// try { +// adapterName = ( (ModuleAdapter) m_RunnungModules.get(i)).getAdapterName(); +// } +// catch (Exception e) { +// System.out.println("Error : GetAdapterName" + e); +// } +// if (adapterName.equals(selectedModuleName)) { +// if (TRACE) +// System.out.println(" Choose a running Module!!! " + adapterName); +// m_ModuleAdapter = ( (ModuleAdapter) m_RunnungModules.get(i)); +// return (ModuleAdapter) m_ModuleAdapter; +// } +// } System.err.println("NO VALID MODULE DEFINED: " + selectedModuleName); return null; diff --git a/src/javaeva/server/RMIServerEvA.java b/src/eva2/server/RMIServerEvA.java similarity index 96% rename from src/javaeva/server/RMIServerEvA.java rename to src/eva2/server/RMIServerEvA.java index b9c8b408..c233a036 100644 --- a/src/javaeva/server/RMIServerEvA.java +++ b/src/eva2/server/RMIServerEvA.java @@ -1,4 +1,4 @@ -package javaeva.server; +package eva2.server; /** * Title: The JProxy Framework * Description: API for distributed and parallel computing. @@ -16,7 +16,8 @@ import java.net.MalformedURLException; import java.rmi.Naming; import java.rmi.RemoteException; import java.rmi.registry.Registry; -import javaeva.client.EvAComAdapter; + +import eva2.client.EvAComAdapter; import wsi.ra.jproxy.RMIProxyLocal; import wsi.ra.jproxy.RMIServer; diff --git a/src/javaeva/server/go/CrossoverInterface.java b/src/eva2/server/go/CrossoverInterface.java similarity index 91% rename from src/javaeva/server/go/CrossoverInterface.java rename to src/eva2/server/go/CrossoverInterface.java index 80b0b5a7..a660a79b 100644 --- a/src/javaeva/server/go/CrossoverInterface.java +++ b/src/eva2/server/go/CrossoverInterface.java @@ -1,4 +1,4 @@ -package javaeva.server.go; +package eva2.server.go; /* * Title: JavaEvA * Description: @@ -12,7 +12,7 @@ package javaeva.server.go; /*==========================================================================* * IMPORTS *==========================================================================*/ -import javaeva.server.stat.InterfaceStatistics; +import eva2.server.stat.InterfaceStatistics; /*==========================================================================* * INTERFACE DECLARATION *==========================================================================*/ diff --git a/src/javaeva/server/go/GOStandaloneVersion.java b/src/eva2/server/go/GOStandaloneVersion.java similarity index 95% rename from src/javaeva/server/go/GOStandaloneVersion.java rename to src/eva2/server/go/GOStandaloneVersion.java index 60580b89..995f4612 100644 --- a/src/javaeva/server/go/GOStandaloneVersion.java +++ b/src/eva2/server/go/GOStandaloneVersion.java @@ -1,4 +1,4 @@ -package javaeva.server.go; +package eva2.server.go; import java.awt.BorderLayout; import java.awt.List; @@ -15,26 +15,6 @@ import java.net.InetAddress; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; -import javaeva.client.EvAClient; -import javaeva.gui.JParaPanel; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.ESIndividualDoubleData; -import javaeva.server.go.individuals.GAIndividualDoubleData; -import javaeva.server.go.individuals.InterfaceDataTypeDouble; -import javaeva.server.go.operators.crossover.CrossoverGANPoint; -import javaeva.server.go.operators.mutation.InterfaceMutation; -import javaeva.server.go.operators.mutation.MutateESLocal; -import javaeva.server.go.operators.mutation.MutateESStandard; -import javaeva.server.go.operators.selection.SelectTournament; -import javaeva.server.go.operators.terminators.EvaluationTerminator; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.F1Problem; -import javaeva.server.go.strategies.EvolutionStrategies; -import javaeva.server.go.strategies.GeneticAlgorithm; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.server.go.tools.RandomNumberGenerator; -import javaeva.server.modules.GOParameters; -import javaeva.tools.TokenHolder; import javax.swing.JButton; import javax.swing.JComponent; @@ -45,6 +25,27 @@ import javax.swing.JProgressBar; import javax.swing.JTabbedPane; import javax.swing.SwingUtilities; +import eva2.client.EvAClient; +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.CrossoverGANPoint; +import eva2.server.go.operators.mutation.InterfaceMutation; +import eva2.server.go.operators.mutation.MutateESLocal; +import eva2.server.go.operators.mutation.MutateESStandard; +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.go.tools.RandomNumberGenerator; +import eva2.server.modules.GOParameters; +import eva2.tools.TokenHolder; + import wsi.ra.jproxy.ThreadProxy; /** @@ -92,7 +93,7 @@ public class GOStandaloneVersion implements InterfaceGOStandalone, InterfacePopu transient private boolean m_ContinueFlag; // Plot Panel stuff - transient private javaeva.gui.Plot m_Plot; + transient private eva2.gui.Plot m_Plot; transient private ArrayList m_PerformedRuns = new ArrayList(); transient private ArrayList m_TmpData; transient private BufferedWriter m_OutputFile; @@ -167,13 +168,13 @@ public class GOStandaloneVersion implements InterfaceGOStandalone, InterfacePopu // build the Options Panel JParaPanel paraPanel = new JParaPanel(this, "MyGUI"); Class object = null, editor = null; - String tmp = "javaeva.server.oa.go.Tools.InterfaceTest"; + String tmp = "eva2.server.oa.go.Tools.InterfaceTest"; try { object = Class.forName(tmp); } catch(java.lang.ClassNotFoundException e) { System.out.println("No Class found for " + tmp); } - tmp = "javaeva.gui.GenericObjectEditor"; + tmp = "eva2.gui.GenericObjectEditor"; try { editor = Class.forName(tmp); } catch(java.lang.ClassNotFoundException e) { @@ -181,7 +182,7 @@ public class GOStandaloneVersion implements InterfaceGOStandalone, InterfacePopu } if ((object != null) && (editor != null)) paraPanel.registerEditor(object, editor); this.m_O1 = (paraPanel.installActions()); - EvAClient.setProperty("javaeva.server.oa.go.Tools.InterfaceTest", "javaeva.server.oa.go.Tools.Test1,javaeva.server.oa.go.Tools.Test2"); + EvAClient.setProperty("eva2.server.oa.go.Tools.InterfaceTest", "eva2.server.oa.go.Tools.Test1,eva2.server.oa.go.Tools.Test2"); this.m_OptionsPanel = new JTabbedPane(); JParaPanel paraPanel2 = new JParaPanel(this.m_GO, "MyGUI"); this.m_O2 = (paraPanel2.installActions()); @@ -201,7 +202,7 @@ public class GOStandaloneVersion implements InterfaceGOStandalone, InterfacePopu double[] tmpD = new double[2]; tmpD[0] = 1; tmpD[1] = 1; - this.m_Plot = new javaeva.gui.Plot("EA Lecture Plot", "Function calls", "Fitness", true); + this.m_Plot = new eva2.gui.Plot("EA Lecture Plot", "Function calls", "Fitness", true); // validate and show this.m_Frame.validate(); this.m_Frame.setVisible(true); @@ -337,7 +338,7 @@ public class GOStandaloneVersion implements InterfaceGOStandalone, InterfacePopu this.m_GO.getOptimizer().getPopulation().setPopulationSize(50); F1Problem problem = new F1Problem(); tmpIndy = new ESIndividualDoubleData(); - ((ESIndividualDoubleData)tmpIndy).setMutationOperator(new MutateESLocal()); + ((AbstractEAIndividual)tmpIndy).setMutationOperator(new MutateESLocal()); ((F1Problem)problem).setEAIndividual(tmpIndy); //((FGRNInferringProblem)this.m_Problem).setUseHEigenMatrix(true); //((FGRNInferringProblem)this.m_Problem).setUseOnlyPositiveNumbers(true); diff --git a/src/javaeva/server/go/IndividualInterface.java b/src/eva2/server/go/IndividualInterface.java similarity index 97% rename from src/javaeva/server/go/IndividualInterface.java rename to src/eva2/server/go/IndividualInterface.java index 281dd9a0..58755965 100644 --- a/src/javaeva/server/go/IndividualInterface.java +++ b/src/eva2/server/go/IndividualInterface.java @@ -1,4 +1,4 @@ -package javaeva.server.go; +package eva2.server.go; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/server/go/InterfaceGOParameters.java b/src/eva2/server/go/InterfaceGOParameters.java similarity index 90% rename from src/javaeva/server/go/InterfaceGOParameters.java rename to src/eva2/server/go/InterfaceGOParameters.java index 58833525..76d94dd8 100644 --- a/src/javaeva/server/go/InterfaceGOParameters.java +++ b/src/eva2/server/go/InterfaceGOParameters.java @@ -1,9 +1,9 @@ -package javaeva.server.go; +package eva2.server.go; -import javaeva.gui.GenericObjectEditor; -import javaeva.server.go.operators.postprocess.InterfacePostProcessParams; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.strategies.InterfaceOptimizer; +import eva2.gui.GenericObjectEditor; +import eva2.server.go.operators.postprocess.InterfacePostProcessParams; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.strategies.InterfaceOptimizer; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/InterfaceGOStandalone.java b/src/eva2/server/go/InterfaceGOStandalone.java similarity index 90% rename from src/javaeva/server/go/InterfaceGOStandalone.java rename to src/eva2/server/go/InterfaceGOStandalone.java index 5971ee48..0fc93c49 100644 --- a/src/javaeva/server/go/InterfaceGOStandalone.java +++ b/src/eva2/server/go/InterfaceGOStandalone.java @@ -1,4 +1,4 @@ -package javaeva.server.go; +package eva2.server.go; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/InterfacePopulationChangedEventListener.java b/src/eva2/server/go/InterfacePopulationChangedEventListener.java similarity index 94% rename from src/javaeva/server/go/InterfacePopulationChangedEventListener.java rename to src/eva2/server/go/InterfacePopulationChangedEventListener.java index 4e021463..63ccb0ba 100644 --- a/src/javaeva/server/go/InterfacePopulationChangedEventListener.java +++ b/src/eva2/server/go/InterfacePopulationChangedEventListener.java @@ -1,4 +1,4 @@ -package javaeva.server.go; +package eva2.server.go; /** diff --git a/src/javaeva/server/go/InterfaceProcessor.java b/src/eva2/server/go/InterfaceProcessor.java similarity index 97% rename from src/javaeva/server/go/InterfaceProcessor.java rename to src/eva2/server/go/InterfaceProcessor.java index 06f62978..75dd786c 100644 --- a/src/javaeva/server/go/InterfaceProcessor.java +++ b/src/eva2/server/go/InterfaceProcessor.java @@ -1,4 +1,4 @@ -package javaeva.server.go; +package eva2.server.go; import wsi.ra.jproxy.RemoteStateListener; diff --git a/src/javaeva/server/go/InterfaceTerminator.java b/src/eva2/server/go/InterfaceTerminator.java similarity index 97% rename from src/javaeva/server/go/InterfaceTerminator.java rename to src/eva2/server/go/InterfaceTerminator.java index ab5e506c..dfcbb4df 100644 --- a/src/javaeva/server/go/InterfaceTerminator.java +++ b/src/eva2/server/go/InterfaceTerminator.java @@ -1,4 +1,4 @@ -package javaeva.server.go; +package eva2.server.go; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/server/go/MOCCOStandalone.java b/src/eva2/server/go/MOCCOStandalone.java similarity index 93% rename from src/javaeva/server/go/MOCCOStandalone.java rename to src/eva2/server/go/MOCCOStandalone.java index 447f30ae..b49900f2 100644 --- a/src/javaeva/server/go/MOCCOStandalone.java +++ b/src/eva2/server/go/MOCCOStandalone.java @@ -1,36 +1,38 @@ -package javaeva.server.go; +package eva2.server.go; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.mocco.InterfaceProcessElement; -import javaeva.server.go.mocco.MOCCOChooseMOStrategy; -import javaeva.server.go.mocco.MOCCOChooseReferencePoint; -import javaeva.server.go.mocco.MOCCOChooseReferenceSolution; -import javaeva.server.go.mocco.MOCCOInitialPopulationSize; -import javaeva.server.go.mocco.MOCCOParameterizeGDF; -import javaeva.server.go.mocco.MOCCOParameterizeMO; -import javaeva.server.go.mocco.MOCCOParameterizeRefPoint; -import javaeva.server.go.mocco.MOCCOParameterizeSO; -import javaeva.server.go.mocco.MOCCOParameterizeSTEP; -import javaeva.server.go.mocco.MOCCOParameterizeTchebycheff; -import javaeva.server.go.mocco.MOCCOProblemInitialization; -import javaeva.server.go.mocco.MOCCOProblemRedefinition; -import javaeva.server.go.mocco.MOCCOState; -import javaeva.server.go.mocco.paretofrontviewer.MOCCOViewer; -import javaeva.server.go.operators.moso.InterfaceMOSOConverter; -import javaeva.server.go.operators.moso.MOSOWeightedFitness; -import javaeva.server.go.operators.terminators.EvaluationTerminator; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.AbstractMultiObjectiveOptimizationProblem; -import javaeva.server.go.problems.InterfaceMultiObjectiveDeNovoProblem; -import javaeva.server.go.problems.InterfaceOptimizationObjective; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.problems.TF1Problem; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.server.go.strategies.IslandModelEA; -import javaeva.server.go.tools.GeneralGOEProperty; -import javaeva.gui.*; import javax.swing.*; + +import eva2.gui.*; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.mocco.InterfaceProcessElement; +import eva2.server.go.mocco.MOCCOChooseMOStrategy; +import eva2.server.go.mocco.MOCCOChooseReferencePoint; +import eva2.server.go.mocco.MOCCOChooseReferenceSolution; +import eva2.server.go.mocco.MOCCOInitialPopulationSize; +import eva2.server.go.mocco.MOCCOParameterizeGDF; +import eva2.server.go.mocco.MOCCOParameterizeMO; +import eva2.server.go.mocco.MOCCOParameterizeRefPoint; +import eva2.server.go.mocco.MOCCOParameterizeSO; +import eva2.server.go.mocco.MOCCOParameterizeSTEP; +import eva2.server.go.mocco.MOCCOParameterizeTchebycheff; +import eva2.server.go.mocco.MOCCOProblemInitialization; +import eva2.server.go.mocco.MOCCOProblemRedefinition; +import eva2.server.go.mocco.MOCCOState; +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.AbstractMultiObjectiveOptimizationProblem; +import eva2.server.go.problems.InterfaceMultiObjectiveDeNovoProblem; +import eva2.server.go.problems.InterfaceOptimizationObjective; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.problems.TF1Problem; +import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.server.go.strategies.IslandModelEA; +import eva2.server.go.tools.GeneralGOEProperty; + import java.io.*; import java.awt.*; import java.awt.event.*; diff --git a/src/javaeva/server/go/MutationInterface.java b/src/eva2/server/go/MutationInterface.java similarity index 91% rename from src/javaeva/server/go/MutationInterface.java rename to src/eva2/server/go/MutationInterface.java index 34a38b81..e4970b32 100644 --- a/src/javaeva/server/go/MutationInterface.java +++ b/src/eva2/server/go/MutationInterface.java @@ -1,4 +1,4 @@ -package javaeva.server.go; +package eva2.server.go; /* * Title: JavaEvA * Description: @@ -12,7 +12,7 @@ package javaeva.server.go; /*==========================================================================* * IMPORTS *==========================================================================*/ -import javaeva.server.stat.InterfaceStatistics; +import eva2.server.stat.InterfaceStatistics; /*==========================================================================* * INTERFACE DECLARATION *==========================================================================*/ diff --git a/src/javaeva/server/go/PopulationInterface.java b/src/eva2/server/go/PopulationInterface.java similarity index 98% rename from src/javaeva/server/go/PopulationInterface.java rename to src/eva2/server/go/PopulationInterface.java index 68e3ed3a..8450edf0 100644 --- a/src/javaeva/server/go/PopulationInterface.java +++ b/src/eva2/server/go/PopulationInterface.java @@ -1,4 +1,4 @@ -package javaeva.server.go; +package eva2.server.go; /* * Title: JavaEvA diff --git a/src/javaeva/server/go/SelectionInterface.java b/src/eva2/server/go/SelectionInterface.java similarity index 91% rename from src/javaeva/server/go/SelectionInterface.java rename to src/eva2/server/go/SelectionInterface.java index 100164c5..315fdb84 100644 --- a/src/javaeva/server/go/SelectionInterface.java +++ b/src/eva2/server/go/SelectionInterface.java @@ -1,4 +1,4 @@ -package javaeva.server.go; +package eva2.server.go; /* * Title: JavaEvA * Description: @@ -12,7 +12,7 @@ package javaeva.server.go; /*==========================================================================* * IMPORTS *==========================================================================*/ -import javaeva.server.stat.InterfaceStatistics; +import eva2.server.stat.InterfaceStatistics; /*==========================================================================* * INTERFACE DECLARATION *==========================================================================*/ diff --git a/src/javaeva/server/go/SwingWorker.java b/src/eva2/server/go/SwingWorker.java similarity index 99% rename from src/javaeva/server/go/SwingWorker.java rename to src/eva2/server/go/SwingWorker.java index 92cffc26..b8aafdc3 100644 --- a/src/javaeva/server/go/SwingWorker.java +++ b/src/eva2/server/go/SwingWorker.java @@ -1,4 +1,4 @@ -package javaeva.server.go; +package eva2.server.go; import javax.swing.SwingUtilities; /** diff --git a/src/javaeva/server/go/individuals/AbstractEAIndividual.java b/src/eva2/server/go/individuals/AbstractEAIndividual.java similarity index 85% rename from src/javaeva/server/go/individuals/AbstractEAIndividual.java rename to src/eva2/server/go/individuals/AbstractEAIndividual.java index b09289ce..5797ed1a 100644 --- a/src/javaeva/server/go/individuals/AbstractEAIndividual.java +++ b/src/eva2/server/go/individuals/AbstractEAIndividual.java @@ -1,21 +1,23 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; -import javaeva.gui.BeanInspector; -import javaeva.server.go.IndividualInterface; -import javaeva.server.go.individuals.codings.gp.InterfaceProgram; -import javaeva.server.go.operators.constraint.InterfaceConstraint; -import javaeva.server.go.operators.crossover.CrossoverGADefault; -import javaeva.server.go.operators.crossover.InterfaceCrossover; -import javaeva.server.go.operators.crossover.NoCrossover; -import javaeva.server.go.operators.mutation.InterfaceMutation; -import javaeva.server.go.operators.mutation.MutateGADefault; -import javaeva.server.go.operators.mutation.NoMutation; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.GONamingBox; import java.util.ArrayList; import java.util.BitSet; +import java.util.LinkedList; +import java.util.List; + +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.mutation.InterfaceMutation; +import eva2.server.go.operators.mutation.NoMutation; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.GONamingBox; +import eva2.server.go.tools.RandomNumberGenerator; /** This is the abstract EA individual implementing the most important methods giving * access to mutation and crossover rates and operators, fitness values and selection @@ -33,10 +35,15 @@ import java.util.BitSet; */ public abstract class AbstractEAIndividual implements IndividualInterface, java.io.Serializable { - public int m_FunctionCalls = 0; // ist irgendwie eine Kr�cke + public int m_FunctionCalls = 0; // TODO ist irgendwie eine Kruecke protected int m_ObjectIncrement = 5; protected int m_Age = 0; - protected String m_Name = GONamingBox.getRandomName(); +// protected String m_Name = GONamingBox.getRandomName(); + + private long m_ID = 0; + private static long m_IDcounter = 0; + private int logParentLen = 10; + private LinkedList heritage = null; protected double[] m_Fitness = new double[1]; private double m_ConstraintViolation = 0; @@ -50,7 +57,17 @@ public abstract class AbstractEAIndividual implements IndividualInterface, java. protected InterfaceCrossover m_CrossoverOperator = new NoCrossover(); protected String[] m_Identifiers = new String[m_ObjectIncrement]; protected Object[] m_Objects = new Object[m_ObjectIncrement]; + + public AbstractEAIndividual() { + m_IDcounter++; + m_ID = m_IDcounter; +// System.out.println("my id is " + m_ID); + } + public long getIndyID() { + return m_ID; + } + /** This method will enable you to clone a given individual * @return The clone */ @@ -91,12 +108,13 @@ public abstract class AbstractEAIndividual implements IndividualInterface, java. * @param individual The individual to clone. */ public void cloneAEAObjects(AbstractEAIndividual individual) { - m_Name = new String(individual.m_Name); +// m_Name = new String(individual.m_Name); m_Identifiers = new String[individual.m_Identifiers.length]; m_Objects = new Object[individual.m_Identifiers.length]; m_ConstraintViolation = individual.m_ConstraintViolation; m_AreaConst4ParallelViolated = individual.m_AreaConst4ParallelViolated; m_Marked = individual.m_Marked; + if (individual.heritage != null) heritage = new LinkedList(individual.heritage); System.arraycopy(individual.m_Identifiers,0,m_Identifiers,0,individual.m_Identifiers.length); System.arraycopy(individual.m_Objects,0,m_Objects,0,individual.m_Objects.length); } @@ -152,9 +170,9 @@ public abstract class AbstractEAIndividual implements IndividualInterface, java. return "AbstractEAIndividual"; } - public String getIndividualName() { - return this.m_Name; - } +// public String getIndividualName() { +// return this.m_Name; +// } /** This method is used when a new offspring is created * the increment the name. @@ -224,15 +242,102 @@ public abstract class AbstractEAIndividual implements IndividualInterface, java. /** This method will mutate the individual randomly */ - public abstract void mutate(); - - /** This method will mate the Individual with given other individuals - * of the same type. - * @param partners The possible partners - * @return offsprings - */ - public abstract AbstractEAIndividual[] mateWith(Population partners); + public void mutate() { + if (RandomNumberGenerator.flipCoin(this.m_MutationProbability)) this.m_MutationOperator.mutate(this); + } + /** + * This method will mate the Individual with given other individuals + * of the same type with the individuals crossover probability and operator. + * The default operation is implemented here. Specialized individuals may + * override. + * + * @param partners The possible partners + * @return offsprings + */ + public AbstractEAIndividual[] mateWith(Population partners) { + AbstractEAIndividual[] result; + if (RandomNumberGenerator.flipCoin(this.m_CrossoverProbability)) { + result = this.m_CrossoverOperator.mate(this, partners); + if (logParentLen > 0) { + for (int i = 0; i < result.length; i++) { + result[i].setParents(this, partners); + } + } + } else { + // simply return a number of perfect clones + result = new AbstractEAIndividual[partners.size() +1]; + result[0] = (AbstractEAIndividual)this.clone(); + for (int i = 0; i < partners.size(); i++) { + result[i+1] = (AbstractEAIndividual) ((AbstractEAIndividual)partners.get(i)).clone(); + } + if (logParentLen > 0) { + result[0].setParent(this); + for (int i = 0; i < partners.size(); i++) { + result[i+1].setParent(partners.getEAIndividual(i)); + } + } + } +// for (int i = 0; i < result.length; i++) { +// result[i].giveNewName(); +// } + return result; + } + + /** + * Toggle the parent logging mechanism. It keeps track of the ancestor IDs of an individual + * if mutation/crossover are used. Set the desired length of logging history (generations) or + * set it to 0 to deactivate heritage logging. + * + * @param logPs + */ + public void setLogHeritagetLen(int logLen) { + logParentLen = logLen; + } + + /** + * Add an ancestor generation with multiple parents. + * + * @param parents + */ + private void setParents(AbstractEAIndividual parent, Population parents) { + if (heritage == null) heritage = new LinkedList(); + Long[] parentIDs = new Long[1+parents.size()]; + parentIDs[0] = parent.getIndyID(); + for (int i=0; i logParentLen) heritage.remove(0); + } + + /** + * Add an ancestor generation with only one parent. + * + * @param parent + */ + protected void setParent(AbstractEAIndividual parent) { + if (heritage == null) heritage = new LinkedList(); + Long[] parentID = new Long[1]; + parentID[0] = parent.getIndyID(); + addHeritage(parentID); + } + + public List getHeritageList() { + return heritage; + } + + /** + * Returns the last set of parental IDs or null if none are available. + * @return the last set of parental IDs or null if none are available + */ + public Long[] getHeritage() { + if (heritage != null) return heritage.getLast(); + else return null; + } + /** This method will allow you to get the current age of an individual * Zero means it has not even been evaluated. * @return The current age. @@ -638,7 +743,7 @@ public abstract class AbstractEAIndividual implements IndividualInterface, java. public abstract String getStringRepresentation(); /** - * This method creates a default String representation for a number Individual interfaces + * This method creates a default String representation for an AbstractEAIndividual * with genotype and fitness representation. * * @param individual The individual that is to be shown. @@ -649,6 +754,10 @@ public abstract class AbstractEAIndividual implements IndividualInterface, java. sb.append(", fitness: "); sb.append(BeanInspector.toString(individual.getFitness())); + sb.append(", ID: "); + sb.append(individual.getIndyID()); + sb.append(", parents: "); + sb.append(BeanInspector.toString(individual.getHeritage())); return sb.toString(); } @@ -741,5 +850,6 @@ public abstract class AbstractEAIndividual implements IndividualInterface, java. public boolean isDominant(IndividualInterface indy) { return isDominatingDebConstraints((AbstractEAIndividual)indy); } + } \ No newline at end of file diff --git a/src/javaeva/server/go/individuals/AbstractEAIndividualComparator.java b/src/eva2/server/go/individuals/AbstractEAIndividualComparator.java similarity index 97% rename from src/javaeva/server/go/individuals/AbstractEAIndividualComparator.java rename to src/eva2/server/go/individuals/AbstractEAIndividualComparator.java index eab91a87..e32f8e8b 100644 --- a/src/javaeva/server/go/individuals/AbstractEAIndividualComparator.java +++ b/src/eva2/server/go/individuals/AbstractEAIndividualComparator.java @@ -1,4 +1,4 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; import java.util.Comparator; diff --git a/src/javaeva/server/go/individuals/ESIndividualBinaryData.java b/src/eva2/server/go/individuals/ESIndividualBinaryData.java similarity index 88% rename from src/javaeva/server/go/individuals/ESIndividualBinaryData.java rename to src/eva2/server/go/individuals/ESIndividualBinaryData.java index 7305a92c..14c68979 100644 --- a/src/javaeva/server/go/individuals/ESIndividualBinaryData.java +++ b/src/eva2/server/go/individuals/ESIndividualBinaryData.java @@ -1,14 +1,14 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; import java.util.BitSet; -import javaeva.server.go.IndividualInterface; -import javaeva.server.go.operators.crossover.CrossoverESDefault; -import javaeva.server.go.operators.mutation.InterfaceMutation; -import javaeva.server.go.operators.mutation.MutateESGlobal; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.IndividualInterface; +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.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; + /** This individual uses a real-valued genotype to code for binary values, either * by using a threshold value of by interpreting the double value as probability. @@ -197,34 +197,6 @@ public class ESIndividualBinaryData extends AbstractEAIndividual implements Inte this.m_CrossoverOperator.init(this, opt); } - - /** This method will mutate the individual randomly - */ - public void mutate() { - if (RandomNumberGenerator.flipCoin(this.m_MutationProbability)) this.m_MutationOperator.mutate(this); - } - - /** This method will mate the Individual with given other individuals - * of the same type. - * @param partners The possible partners - * @return offsprings - */ - public AbstractEAIndividual[] mateWith(Population partners) { - AbstractEAIndividual[] result; - if (RandomNumberGenerator.flipCoin(this.m_CrossoverProbability)) { - result = this.m_CrossoverOperator.mate(this, partners); - } else { - // simply return a number of perfect clones - result = new AbstractEAIndividual[partners.size() +1]; - result[0] = (AbstractEAIndividual)this.clone(); - for (int i = 0; i < partners.size(); i++) { - result[i+1] = (AbstractEAIndividual) ((AbstractEAIndividual)partners.get(i)).clone(); - } - } - for (int i = 0; i < result.length; i++) result[i].giveNewName(); - return result; - } - /** This method will return a string description of the GAIndividal * noteably the Genotype. * @return A descriptive string diff --git a/src/javaeva/server/go/individuals/ESIndividualDoubleData.java b/src/eva2/server/go/individuals/ESIndividualDoubleData.java similarity index 89% rename from src/javaeva/server/go/individuals/ESIndividualDoubleData.java rename to src/eva2/server/go/individuals/ESIndividualDoubleData.java index 50575fd4..3e577c42 100644 --- a/src/javaeva/server/go/individuals/ESIndividualDoubleData.java +++ b/src/eva2/server/go/individuals/ESIndividualDoubleData.java @@ -1,15 +1,15 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; -import javaeva.server.go.IndividualInterface; -import javaeva.server.go.operators.crossover.CrossoverESDefault; -import javaeva.server.go.operators.mutation.InterfaceMutation; -import javaeva.server.go.operators.mutation.MutateESGlobal; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.Arrays; +import eva2.server.go.IndividualInterface; +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.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; + /** This individual uses a real-valued genotype to code for double values. * Created by IntelliJ IDEA. * User: streiche @@ -222,33 +222,6 @@ public class ESIndividualDoubleData extends AbstractEAIndividual implements Inte this.m_CrossoverOperator.init(this, opt); } - /** This method will mutate the individual randomly - */ - public void mutate() { - if (RandomNumberGenerator.flipCoin(this.m_MutationProbability)) this.m_MutationOperator.mutate(this); - } - - /** This method will mate the Individual with given other individuals - * of the same type. - * @param partners The possible partners - * @return offsprings - */ - public AbstractEAIndividual[] mateWith(Population partners) { - AbstractEAIndividual[] result; - if (RandomNumberGenerator.flipCoin(this.m_CrossoverProbability)) { - result = this.m_CrossoverOperator.mate(this, partners); - } else { - // simply return a number of perfect clones - result = new AbstractEAIndividual[partners.size() +1]; - result[0] = (AbstractEAIndividual)this.clone(); - for (int i = 0; i < partners.size(); i++) { - result[i+1] = (AbstractEAIndividual) ((AbstractEAIndividual)partners.get(i)).clone(); - } - } - for (int i = 0; i < result.length; i++) result[i].giveNewName(); - return result; - } - /** This method will return a string description of the GAIndividal * noteably the Genotype. * @return A descriptive string diff --git a/src/javaeva/server/go/individuals/ESIndividualIntegerData.java b/src/eva2/server/go/individuals/ESIndividualIntegerData.java similarity index 88% rename from src/javaeva/server/go/individuals/ESIndividualIntegerData.java rename to src/eva2/server/go/individuals/ESIndividualIntegerData.java index 4c7745e7..488ff628 100644 --- a/src/javaeva/server/go/individuals/ESIndividualIntegerData.java +++ b/src/eva2/server/go/individuals/ESIndividualIntegerData.java @@ -1,15 +1,15 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; -import javaeva.server.go.IndividualInterface; -import javaeva.server.go.operators.crossover.CrossoverESDefault; -import javaeva.server.go.operators.mutation.InterfaceMutation; -import javaeva.server.go.operators.mutation.MutateESGlobal; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.Arrays; +import eva2.server.go.IndividualInterface; +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.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; + /** This individual uses a real-valued genotype to code for integer values. * Created by IntelliJ IDEA. * User: streiche @@ -211,33 +211,6 @@ public class ESIndividualIntegerData extends AbstractEAIndividual implements Int this.m_CrossoverOperator.init(this, opt); } - /** This method will mutate the individual randomly - */ - public void mutate() { - if (RandomNumberGenerator.flipCoin(this.m_MutationProbability)) this.m_MutationOperator.mutate(this); - } - - /** This method will mate the Individual with given other individuals - * of the same type. - * @param partners The possible partners - * @return offsprings - */ - public AbstractEAIndividual[] mateWith(Population partners) { - AbstractEAIndividual[] result; - if (RandomNumberGenerator.flipCoin(this.m_CrossoverProbability)) { - result = this.m_CrossoverOperator.mate(this, partners); - } else { - // simply return a number of perfect clones - result = new AbstractEAIndividual[partners.size() +1]; - result[0] = (AbstractEAIndividual)this.clone(); - for (int i = 0; i < partners.size(); i++) { - result[i+1] = (AbstractEAIndividual) ((AbstractEAIndividual)partners.get(i)).clone(); - } - } - for (int i = 0; i < result.length; i++) result[i].giveNewName(); - return result; - } - /** This method will return a string description of the GAIndividal * noteably the Genotype. * @return A descriptive string diff --git a/src/javaeva/server/go/individuals/ESIndividualPermutationData.java b/src/eva2/server/go/individuals/ESIndividualPermutationData.java similarity index 90% rename from src/javaeva/server/go/individuals/ESIndividualPermutationData.java rename to src/eva2/server/go/individuals/ESIndividualPermutationData.java index 5dc81920..36c489ae 100644 --- a/src/javaeva/server/go/individuals/ESIndividualPermutationData.java +++ b/src/eva2/server/go/individuals/ESIndividualPermutationData.java @@ -1,12 +1,11 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; -import javaeva.server.go.IndividualInterface; -import javaeva.server.go.operators.crossover.CrossoverESDefault; -import javaeva.server.go.operators.mutation.InterfaceMutation; -import javaeva.server.go.operators.mutation.MutateESGlobal; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.IndividualInterface; +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.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; /** This individual uses a real-valued genotype to code for a permutations, * the sorting of the real-valued genotype gives the permutation. @@ -241,33 +240,6 @@ public class ESIndividualPermutationData extends AbstractEAIndividual implements this.m_CrossoverOperator.init(this, opt); } - /** This method will mutate the individual randomly - */ - public void mutate() { - if (RandomNumberGenerator.flipCoin(this.m_MutationProbability)) this.m_MutationOperator.mutate(this); - } - - /** This method will mate the Individual with given other individuals - * of the same type. - * @param partners The possible partners - * @return offsprings - */ - public AbstractEAIndividual[] mateWith(Population partners) { - AbstractEAIndividual[] result; - if (RandomNumberGenerator.flipCoin(this.m_CrossoverProbability)) { - result = this.m_CrossoverOperator.mate(this, partners); - } else { - // simply return a number of perfect clones - result = new AbstractEAIndividual[partners.size() +1]; - result[0] = (AbstractEAIndividual)this.clone(); - for (int i = 0; i < partners.size(); i++) { - result[i+1] = (AbstractEAIndividual) ((AbstractEAIndividual)partners.get(i)).clone(); - } - } - for (int i = 0; i < result.length; i++) result[i].giveNewName(); - return result; - } - /** This method will return a string description of the GAIndividal * noteably the Genotype. * @return A descriptive string diff --git a/src/javaeva/server/go/individuals/GAESIndividualBinaryDoubleData.java b/src/eva2/server/go/individuals/GAESIndividualBinaryDoubleData.java similarity index 98% rename from src/javaeva/server/go/individuals/GAESIndividualBinaryDoubleData.java rename to src/eva2/server/go/individuals/GAESIndividualBinaryDoubleData.java index cbe91d12..ae6e75c9 100644 --- a/src/javaeva/server/go/individuals/GAESIndividualBinaryDoubleData.java +++ b/src/eva2/server/go/individuals/GAESIndividualBinaryDoubleData.java @@ -1,12 +1,13 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; -import javaeva.server.go.operators.mutation.InterfaceMutation; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.BitSet; +import eva2.server.go.operators.mutation.InterfaceMutation; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; + /** This individual combines a binary and a real-valued phenotype. * Created by IntelliJ IDEA. * User: streiche diff --git a/src/javaeva/server/go/individuals/GAIndividualBinaryData.java b/src/eva2/server/go/individuals/GAIndividualBinaryData.java similarity index 84% rename from src/javaeva/server/go/individuals/GAIndividualBinaryData.java rename to src/eva2/server/go/individuals/GAIndividualBinaryData.java index fbfc5f55..6bf197ee 100644 --- a/src/javaeva/server/go/individuals/GAIndividualBinaryData.java +++ b/src/eva2/server/go/individuals/GAIndividualBinaryData.java @@ -1,19 +1,19 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; -import javaeva.server.go.operators.crossover.CrossoverGADefault; -import javaeva.server.go.operators.crossover.CrossoverGANPoint; -import javaeva.server.go.operators.crossover.InterfaceCrossover; -import javaeva.server.go.operators.crossover.NoCrossover; -import javaeva.server.go.operators.mutation.InterfaceMutation; -import javaeva.server.go.operators.mutation.MutateGADefault; -import javaeva.server.go.operators.mutation.MutateGAStandard; -import javaeva.server.go.operators.mutation.NoMutation; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.BitSet; +import eva2.server.go.operators.crossover.CrossoverGADefault; +import eva2.server.go.operators.crossover.CrossoverGANPoint; +import eva2.server.go.operators.crossover.InterfaceCrossover; +import eva2.server.go.operators.crossover.NoCrossover; +import eva2.server.go.operators.mutation.InterfaceMutation; +import eva2.server.go.operators.mutation.MutateGADefault; +import eva2.server.go.operators.mutation.MutateGAStandard; +import eva2.server.go.operators.mutation.NoMutation; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; + /** This individual uses a binary genotype to code for binary values. * Created by IntelliJ IDEA. * User: streiche @@ -121,33 +121,6 @@ public class GAIndividualBinaryData extends AbstractEAIndividual implements Inte this.m_CrossoverOperator.init(this, opt); } - /** This method will mutate the individual randomly - */ - public void mutate() { - if (RandomNumberGenerator.flipCoin(this.m_MutationProbability)) this.m_MutationOperator.mutate(this); - } - - /** This method will mate the Individual with given other individuals - * of the same type. - * @param partners The possible partners - * @return offsprings - */ - public AbstractEAIndividual[] mateWith(Population partners) { - AbstractEAIndividual[] result; - if (RandomNumberGenerator.flipCoin(this.m_CrossoverProbability)) { - result = this.m_CrossoverOperator.mate(this, partners); - } else { - // simply return a number of perfect clones - result = new AbstractEAIndividual[partners.size() +1]; - result[0] = (AbstractEAIndividual)this.clone(); - for (int i = 0; i < partners.size(); i++) { - result[i+1] = (AbstractEAIndividual) ((AbstractEAIndividual)partners.get(i)).clone(); - } - } - for (int i = 0; i < result.length; i++) result[i].giveNewName(); - return result; - } - /** This method can be used to read the current fitness of the individual. * Please note that the fitness can be based on multiple criteria therefore * double[] is used instead of a single double. diff --git a/src/javaeva/server/go/individuals/GAIndividualDoubleData.java b/src/eva2/server/go/individuals/GAIndividualDoubleData.java similarity index 88% rename from src/javaeva/server/go/individuals/GAIndividualDoubleData.java rename to src/eva2/server/go/individuals/GAIndividualDoubleData.java index c2639281..7fe576ec 100644 --- a/src/javaeva/server/go/individuals/GAIndividualDoubleData.java +++ b/src/eva2/server/go/individuals/GAIndividualDoubleData.java @@ -1,19 +1,19 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; -import javaeva.server.go.individuals.codings.ga.GAStandardCodingDouble; -import javaeva.server.go.individuals.codings.ga.InterfaceGADoubleCoding; -import javaeva.server.go.operators.crossover.CrossoverGADefault; -import javaeva.server.go.operators.crossover.CrossoverGANPoint; -import javaeva.server.go.operators.crossover.InterfaceCrossover; -import javaeva.server.go.operators.mutation.InterfaceMutation; -import javaeva.server.go.operators.mutation.MutateGADefault; -import javaeva.server.go.operators.mutation.MutateGAStandard; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.BitSet; +import eva2.server.go.individuals.codings.ga.GAStandardCodingDouble; +import eva2.server.go.individuals.codings.ga.InterfaceGADoubleCoding; +import eva2.server.go.operators.crossover.CrossoverGADefault; +import eva2.server.go.operators.crossover.CrossoverGANPoint; +import eva2.server.go.operators.crossover.InterfaceCrossover; +import eva2.server.go.operators.mutation.InterfaceMutation; +import eva2.server.go.operators.mutation.MutateGADefault; +import eva2.server.go.operators.mutation.MutateGAStandard; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; + /** This individual uses a binary genotype to code for double values * using two alternative encodings. * Created by IntelliJ IDEA. @@ -237,33 +237,6 @@ public class GAIndividualDoubleData extends AbstractEAIndividual implements Inte this.m_CrossoverOperator.init(this, opt); } - /** This method will mutate the individual randomly - */ - public void mutate() { - if (RandomNumberGenerator.flipCoin(this.m_MutationProbability)) this.m_MutationOperator.mutate(this); - } - - /** This method will mate the Individual with given other individuals - * of the same type. - * @param partners The possible partners - * @return offsprings - */ - public AbstractEAIndividual[] mateWith(Population partners) { - AbstractEAIndividual[] result; - if (RandomNumberGenerator.flipCoin(this.m_CrossoverProbability)) { - result = this.m_CrossoverOperator.mate(this, partners); - } else { - // simply return a number of perfect clones - result = new AbstractEAIndividual[partners.size() +1]; - result[0] = (AbstractEAIndividual)this.clone(); - for (int i = 0; i < partners.size(); i++) { - result[i+1] = (AbstractEAIndividual) ((AbstractEAIndividual)partners.get(i)).clone(); - } - } - for (int i = 0; i < result.length; i++) result[i].giveNewName(); - return result; - } - /** This method will return a string description of the GAIndividal * noteably the Genotype. * @return A descriptive string diff --git a/src/javaeva/server/go/individuals/GAIndividualIntegerData.java b/src/eva2/server/go/individuals/GAIndividualIntegerData.java similarity index 89% rename from src/javaeva/server/go/individuals/GAIndividualIntegerData.java rename to src/eva2/server/go/individuals/GAIndividualIntegerData.java index 1f54fd1c..e2872604 100644 --- a/src/javaeva/server/go/individuals/GAIndividualIntegerData.java +++ b/src/eva2/server/go/individuals/GAIndividualIntegerData.java @@ -1,18 +1,18 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; -import javaeva.server.go.individuals.codings.ga.GAStandardCodingDouble; -import javaeva.server.go.individuals.codings.ga.GAStandardCodingInteger; -import javaeva.server.go.individuals.codings.ga.InterfaceGADoubleCoding; -import javaeva.server.go.individuals.codings.ga.InterfaceGAIntegerCoding; -import javaeva.server.go.operators.crossover.CrossoverGANPoint; -import javaeva.server.go.operators.mutation.InterfaceMutation; -import javaeva.server.go.operators.mutation.MutateGAStandard; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.BitSet; +import eva2.server.go.individuals.codings.ga.GAStandardCodingDouble; +import eva2.server.go.individuals.codings.ga.GAStandardCodingInteger; +import eva2.server.go.individuals.codings.ga.InterfaceGADoubleCoding; +import eva2.server.go.individuals.codings.ga.InterfaceGAIntegerCoding; +import eva2.server.go.operators.crossover.CrossoverGANPoint; +import eva2.server.go.operators.mutation.InterfaceMutation; +import eva2.server.go.operators.mutation.MutateGAStandard; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; + /** This individual uses a binary genotype to code for binary values using * two alternative encodings. * Created by IntelliJ IDEA. @@ -238,34 +238,6 @@ public class GAIndividualIntegerData extends AbstractEAIndividual implements Int this.m_CrossoverOperator.init(this, opt); } - /** This method will mutate the individual randomly - */ - public void mutate() { - if (RandomNumberGenerator.flipCoin(this.m_MutationProbability)) this.m_MutationOperator.mutate(this); - } - - /** This method will mate the Individual with given other individuals - * of the same type. - * @param partners The possible partners - * @return offsprings - */ - public AbstractEAIndividual[] mateWith(Population partners) { - AbstractEAIndividual[] result; - if (RandomNumberGenerator.flipCoin(this.m_CrossoverProbability)) { - result = this.m_CrossoverOperator.mate(this, partners); - } else { - // simply return a number of perfect clones - result = new AbstractEAIndividual[partners.size() +1]; - result[0] = (AbstractEAIndividual)this.clone(); - for (int i = 0; i < partners.size(); i++) { - result[i+1] = (AbstractEAIndividual) ((AbstractEAIndividual)partners.get(i)).clone(); - } - return result; - } - for (int i = 0; i < result.length; i++) result[i].giveNewName(); - return result; - } - /** This method will return a string description of the GAIndividal * noteably the Genotype. * @return A descriptive string diff --git a/src/javaeva/server/go/individuals/GAPIndividualProgramData.java b/src/eva2/server/go/individuals/GAPIndividualProgramData.java similarity index 94% rename from src/javaeva/server/go/individuals/GAPIndividualProgramData.java rename to src/eva2/server/go/individuals/GAPIndividualProgramData.java index d83b375a..87e0e42c 100644 --- a/src/javaeva/server/go/individuals/GAPIndividualProgramData.java +++ b/src/eva2/server/go/individuals/GAPIndividualProgramData.java @@ -1,20 +1,21 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; -import javaeva.server.go.individuals.codings.gp.AbstractGPNode; -import javaeva.server.go.individuals.codings.gp.GPArea; -import javaeva.server.go.individuals.codings.gp.InterfaceProgram; -import javaeva.server.go.operators.crossover.CrossoverESDefault; -import javaeva.server.go.operators.crossover.CrossoverGPDefault; -import javaeva.server.go.operators.crossover.InterfaceCrossover; -import javaeva.server.go.operators.mutation.InterfaceMutation; -import javaeva.server.go.operators.mutation.MutateESDefault; -import javaeva.server.go.operators.mutation.MutateGPDefault; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.ArrayList; +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.CrossoverESDefault; +import eva2.server.go.operators.crossover.CrossoverGPDefault; +import eva2.server.go.operators.crossover.InterfaceCrossover; +import eva2.server.go.operators.mutation.InterfaceMutation; +import eva2.server.go.operators.mutation.MutateESDefault; +import eva2.server.go.operators.mutation.MutateGPDefault; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; + /** This individual combines a real-valued phenotype with a tree-based phenotype. * Created by IntelliJ IDEA. * User: streiche diff --git a/src/javaeva/server/go/individuals/GEIndividualProgramData.java b/src/eva2/server/go/individuals/GEIndividualProgramData.java similarity index 94% rename from src/javaeva/server/go/individuals/GEIndividualProgramData.java rename to src/eva2/server/go/individuals/GEIndividualProgramData.java index 3e4a94ba..ec93abb4 100644 --- a/src/javaeva/server/go/individuals/GEIndividualProgramData.java +++ b/src/eva2/server/go/individuals/GEIndividualProgramData.java @@ -1,18 +1,18 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; -import javaeva.server.go.individuals.codings.gp.AbstractGPNode; -import javaeva.server.go.individuals.codings.gp.GPArea; -import javaeva.server.go.individuals.codings.gp.InterfaceProgram; -import javaeva.server.go.operators.crossover.CrossoverGADefault; -import javaeva.server.go.operators.mutation.InterfaceMutation; -import javaeva.server.go.operators.mutation.MutateGADefault; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.BitSet; import java.util.ArrayList; +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.MutateGADefault; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; + /** This individual uses a binary genotype to code for a tree-based representation * using a BNF grammar, see also Grammatical Evolution. * Created by IntelliJ IDEA. @@ -526,33 +526,6 @@ public class GEIndividualProgramData extends AbstractEAIndividual implements Int this.m_CrossoverOperator.init(this, opt); } - /** This method will mutate the individual randomly - */ - public void mutate() { - if (RandomNumberGenerator.flipCoin(this.m_MutationProbability)) this.m_MutationOperator.mutate(this); - } - - /** This method will mate the Individual with given other individuals - * of the same type. - * @param partners The possible partners - * @return offsprings - */ - public AbstractEAIndividual[] mateWith(Population partners) { - AbstractEAIndividual[] result; - if (RandomNumberGenerator.flipCoin(this.m_CrossoverProbability)) { - result = this.m_CrossoverOperator.mate(this, partners); - } else { - // simply return a number of perfect clones - result = new AbstractEAIndividual[partners.size() +1]; - result[0] = (AbstractEAIndividual)this.clone(); - for (int i = 0; i < partners.size(); i++) { - result[i+1] = (AbstractEAIndividual) ((AbstractEAIndividual)partners.get(i)).clone(); - } - } - for (int i = 0; i < result.length; i++) result[i].giveNewName(); - return result; - } - /** This method will return a string description of the GAIndividal * noteably the Genotype. * @return A descriptive string diff --git a/src/javaeva/server/go/individuals/GIIndividualIntegerData.java b/src/eva2/server/go/individuals/GIIndividualIntegerData.java similarity index 88% rename from src/javaeva/server/go/individuals/GIIndividualIntegerData.java rename to src/eva2/server/go/individuals/GIIndividualIntegerData.java index ae710444..e2646436 100644 --- a/src/javaeva/server/go/individuals/GIIndividualIntegerData.java +++ b/src/eva2/server/go/individuals/GIIndividualIntegerData.java @@ -1,11 +1,10 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; -import javaeva.server.go.operators.crossover.CrossoverGIDefault; -import javaeva.server.go.operators.mutation.InterfaceMutation; -import javaeva.server.go.operators.mutation.MutateGIDefault; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.operators.crossover.CrossoverGIDefault; +import eva2.server.go.operators.mutation.InterfaceMutation; +import eva2.server.go.operators.mutation.MutateGIDefault; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; /** This individual uses a integer genotype to code for integer values. * Created by IntelliJ IDEA. @@ -217,34 +216,6 @@ public class GIIndividualIntegerData extends AbstractEAIndividual implements Int this.m_CrossoverOperator.init(this, opt); } - /** This method will mutate the individual randomly - */ - public void mutate() { - if (RandomNumberGenerator.flipCoin(this.m_MutationProbability)) this.m_MutationOperator.mutate(this); - } - - /** This method will mate the Individual with given other individuals - * of the same type. - * @param partners The possible partners - * @return offsprings - */ - public AbstractEAIndividual[] mateWith(Population partners) { - AbstractEAIndividual[] result; - if (RandomNumberGenerator.flipCoin(this.m_CrossoverProbability)) { - result = this.m_CrossoverOperator.mate(this, partners); - } else { - // simply return a number of perfect clones - result = new AbstractEAIndividual[partners.size() +1]; - result[0] = (AbstractEAIndividual)this.clone(); - for (int i = 0; i < partners.size(); i++) { - result[i+1] = (AbstractEAIndividual) ((AbstractEAIndividual)partners.get(i)).clone(); - } - return result; - } - for (int i = 0; i < result.length; i++) result[i].giveNewName(); - return result; - } - /** This method will return a string description of the GAIndividal * noteably the Genotype. * @return A descriptive string diff --git a/src/javaeva/server/go/individuals/GIOBGAIndividualIntegerPermutationData.java b/src/eva2/server/go/individuals/GIOBGAIndividualIntegerPermutationData.java similarity index 98% rename from src/javaeva/server/go/individuals/GIOBGAIndividualIntegerPermutationData.java rename to src/eva2/server/go/individuals/GIOBGAIndividualIntegerPermutationData.java index eccd7dd9..c322a051 100644 --- a/src/javaeva/server/go/individuals/GIOBGAIndividualIntegerPermutationData.java +++ b/src/eva2/server/go/individuals/GIOBGAIndividualIntegerPermutationData.java @@ -1,12 +1,13 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; -import javaeva.server.go.operators.mutation.InterfaceMutation; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.BitSet; +import eva2.server.go.operators.mutation.InterfaceMutation; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; + /** This individual combines a binary and a real-valued phenotype. * Created by IntelliJ IDEA. * User: streiche diff --git a/src/javaeva/server/go/individuals/GPIndividualProgramData.java b/src/eva2/server/go/individuals/GPIndividualProgramData.java similarity index 88% rename from src/javaeva/server/go/individuals/GPIndividualProgramData.java rename to src/eva2/server/go/individuals/GPIndividualProgramData.java index 5ec97626..a16fd841 100644 --- a/src/javaeva/server/go/individuals/GPIndividualProgramData.java +++ b/src/eva2/server/go/individuals/GPIndividualProgramData.java @@ -1,17 +1,19 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; -import javaeva.server.go.individuals.codings.gp.AbstractGPNode; -import javaeva.server.go.individuals.codings.gp.GPArea; -import javaeva.server.go.individuals.codings.gp.InterfaceProgram; -import javaeva.server.go.operators.crossover.CrossoverGPDefault; -import javaeva.server.go.operators.mutation.InterfaceMutation; -import javaeva.server.go.operators.mutation.MutateGPDefault; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.ArrayList; +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.MutateGPDefault; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; +import eva2.tools.EVAERROR; +import eva2.tools.EVAHELP; + /** This individual uses a tree-based genotype to code for program trees. * Created by IntelliJ IDEA. * User: streiche @@ -31,6 +33,7 @@ public class GPIndividualProgramData extends AbstractEAIndividual implements Int public GPIndividualProgramData() { this.m_Area = new GPArea[1]; + m_Area[0] = new GPArea(); this.m_Genotype = new AbstractGPNode[1]; this.m_MutationOperator = new MutateGPDefault(); this.m_CrossoverOperator = new CrossoverGPDefault(); @@ -216,33 +219,6 @@ public class GPIndividualProgramData extends AbstractEAIndividual implements Int this.m_CrossoverOperator.init(this, opt); } - /** This method will mutate the individual randomly - */ - public void mutate() { - if (RandomNumberGenerator.flipCoin(this.m_MutationProbability)) this.m_MutationOperator.mutate(this); - } - - /** This method will mate the Individual with given other individuals - * of the same type. - * @param partners The possible partners - * @return offsprings - */ - public AbstractEAIndividual[] mateWith(Population partners) { - AbstractEAIndividual[] result; - if (RandomNumberGenerator.flipCoin(this.m_CrossoverProbability)) { - result = this.m_CrossoverOperator.mate(this, partners); - } else { - // simply return a number of perfect clones - result = new AbstractEAIndividual[partners.size() +1]; - result[0] = (AbstractEAIndividual)this.clone(); - for (int i = 0; i < partners.size(); i++) { - result[i+1] = (AbstractEAIndividual) ((AbstractEAIndividual)partners.get(i)).clone(); - } - } - for (int i = 0; i < result.length; i++) result[i].giveNewName(); - return result; - } - /** This method will return a string description of the GAIndividal * noteably the Genotype. * @return A descriptive string @@ -311,8 +287,9 @@ public class GPIndividualProgramData extends AbstractEAIndividual implements Int */ public void defaultInit() { for (int i = 0; i < this.m_Area.length; i++) { - if (this.m_Area[i] == null) System.out.println("GPIndividualProgramData.defaultInit(): Area["+i+"] == null !!"); - else { + if (this.m_Area[i] == null) { + EVAERROR.errorMsgOnce("Error in GPIndividualProgramData.defaultInit(): Area["+i+"] == null !!"); + } else { this.m_Genotype[i] = (AbstractGPNode)(this.m_Area[i].getRandomNonTerminal()).clone(); this.m_Genotype[i].setDepth(0); int targetDepth = RandomNumberGenerator.randomInt(1, this.m_InitDepth); diff --git a/src/javaeva/server/go/individuals/InterfaceDataTypeBinary.java b/src/eva2/server/go/individuals/InterfaceDataTypeBinary.java similarity index 97% rename from src/javaeva/server/go/individuals/InterfaceDataTypeBinary.java rename to src/eva2/server/go/individuals/InterfaceDataTypeBinary.java index 5b4f5d14..59c86368 100644 --- a/src/javaeva/server/go/individuals/InterfaceDataTypeBinary.java +++ b/src/eva2/server/go/individuals/InterfaceDataTypeBinary.java @@ -1,4 +1,4 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; import java.util.BitSet; diff --git a/src/javaeva/server/go/individuals/InterfaceDataTypeDouble.java b/src/eva2/server/go/individuals/InterfaceDataTypeDouble.java similarity index 98% rename from src/javaeva/server/go/individuals/InterfaceDataTypeDouble.java rename to src/eva2/server/go/individuals/InterfaceDataTypeDouble.java index 1c425db0..259e6e8c 100644 --- a/src/javaeva/server/go/individuals/InterfaceDataTypeDouble.java +++ b/src/eva2/server/go/individuals/InterfaceDataTypeDouble.java @@ -1,4 +1,4 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; /** This interface gives access to a double phenotype and except * for problemspecific operators should only be used by the diff --git a/src/javaeva/server/go/individuals/InterfaceDataTypeInteger.java b/src/eva2/server/go/individuals/InterfaceDataTypeInteger.java similarity index 97% rename from src/javaeva/server/go/individuals/InterfaceDataTypeInteger.java rename to src/eva2/server/go/individuals/InterfaceDataTypeInteger.java index 6dd85757..05e765b2 100644 --- a/src/javaeva/server/go/individuals/InterfaceDataTypeInteger.java +++ b/src/eva2/server/go/individuals/InterfaceDataTypeInteger.java @@ -1,4 +1,4 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; /** This interface gives access to a integer phenotype and except * for problemspecific operators should only be used by the diff --git a/src/javaeva/server/go/individuals/InterfaceDataTypePermutation.java b/src/eva2/server/go/individuals/InterfaceDataTypePermutation.java similarity index 97% rename from src/javaeva/server/go/individuals/InterfaceDataTypePermutation.java rename to src/eva2/server/go/individuals/InterfaceDataTypePermutation.java index 273c9e5f..25746a18 100644 --- a/src/javaeva/server/go/individuals/InterfaceDataTypePermutation.java +++ b/src/eva2/server/go/individuals/InterfaceDataTypePermutation.java @@ -1,4 +1,4 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; /** This interface gives access to a permutation phenotype and except diff --git a/src/javaeva/server/go/individuals/InterfaceDataTypeProgram.java b/src/eva2/server/go/individuals/InterfaceDataTypeProgram.java similarity index 94% rename from src/javaeva/server/go/individuals/InterfaceDataTypeProgram.java rename to src/eva2/server/go/individuals/InterfaceDataTypeProgram.java index 09170868..b2400585 100644 --- a/src/javaeva/server/go/individuals/InterfaceDataTypeProgram.java +++ b/src/eva2/server/go/individuals/InterfaceDataTypeProgram.java @@ -1,6 +1,6 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; -import javaeva.server.go.individuals.codings.gp.InterfaceProgram; +import eva2.server.go.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/javaeva/server/go/individuals/InterfaceESIndividual.java b/src/eva2/server/go/individuals/InterfaceESIndividual.java similarity index 97% rename from src/javaeva/server/go/individuals/InterfaceESIndividual.java rename to src/eva2/server/go/individuals/InterfaceESIndividual.java index f7e03ef6..5544c588 100644 --- a/src/javaeva/server/go/individuals/InterfaceESIndividual.java +++ b/src/eva2/server/go/individuals/InterfaceESIndividual.java @@ -1,4 +1,4 @@ -package javaeva.server.go.individuals; +package eva2.server.go.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/javaeva/server/go/individuals/InterfaceGAIndividual.java b/src/eva2/server/go/individuals/InterfaceGAIndividual.java similarity index 97% rename from src/javaeva/server/go/individuals/InterfaceGAIndividual.java rename to src/eva2/server/go/individuals/InterfaceGAIndividual.java index 6f861348..73361a27 100644 --- a/src/javaeva/server/go/individuals/InterfaceGAIndividual.java +++ b/src/eva2/server/go/individuals/InterfaceGAIndividual.java @@ -1,4 +1,4 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; import java.util.BitSet; diff --git a/src/javaeva/server/go/individuals/InterfaceGIIndividual.java b/src/eva2/server/go/individuals/InterfaceGIIndividual.java similarity index 98% rename from src/javaeva/server/go/individuals/InterfaceGIIndividual.java rename to src/eva2/server/go/individuals/InterfaceGIIndividual.java index 8f81bba3..4efd0ece 100644 --- a/src/javaeva/server/go/individuals/InterfaceGIIndividual.java +++ b/src/eva2/server/go/individuals/InterfaceGIIndividual.java @@ -1,4 +1,4 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; import java.util.BitSet; diff --git a/src/javaeva/server/go/individuals/InterfaceGPIndividual.java b/src/eva2/server/go/individuals/InterfaceGPIndividual.java similarity index 92% rename from src/javaeva/server/go/individuals/InterfaceGPIndividual.java rename to src/eva2/server/go/individuals/InterfaceGPIndividual.java index 840cb2f9..b6751617 100644 --- a/src/javaeva/server/go/individuals/InterfaceGPIndividual.java +++ b/src/eva2/server/go/individuals/InterfaceGPIndividual.java @@ -1,6 +1,6 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; -import javaeva.server.go.individuals.codings.gp.AbstractGPNode; +import eva2.server.go.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/javaeva/server/go/individuals/InterfaceOBGAIndividual.java b/src/eva2/server/go/individuals/InterfaceOBGAIndividual.java similarity index 95% rename from src/javaeva/server/go/individuals/InterfaceOBGAIndividual.java rename to src/eva2/server/go/individuals/InterfaceOBGAIndividual.java index d4eced4f..87271113 100644 --- a/src/javaeva/server/go/individuals/InterfaceOBGAIndividual.java +++ b/src/eva2/server/go/individuals/InterfaceOBGAIndividual.java @@ -1,4 +1,4 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; /** This interface gives access to a permutation genotype and should * only be used by mutation and crossover operators. diff --git a/src/javaeva/server/go/individuals/OBGAIndividualPermutationData.java b/src/eva2/server/go/individuals/OBGAIndividualPermutationData.java similarity index 81% rename from src/javaeva/server/go/individuals/OBGAIndividualPermutationData.java rename to src/eva2/server/go/individuals/OBGAIndividualPermutationData.java index b10f67ec..1bc073d1 100644 --- a/src/javaeva/server/go/individuals/OBGAIndividualPermutationData.java +++ b/src/eva2/server/go/individuals/OBGAIndividualPermutationData.java @@ -1,14 +1,14 @@ -package javaeva.server.go.individuals; +package eva2.server.go.individuals; -import javaeva.server.go.operators.crossover.CrossoverOBGAPMX; -import javaeva.server.go.operators.mutation.InterfaceMutation; -import javaeva.server.go.operators.mutation.MutateOBGAFlip; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.ArrayList; +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.server.go.tools.RandomNumberGenerator; + /** This individual uses a permutation based genotype to code for * permutations. *

Title: The JavaEvA

@@ -113,44 +113,7 @@ public class OBGAIndividualPermutationData extends AbstractEAIndividual implemen this.m_CrossoverOperator.init(this, opt); } - /** This method will mutate the individual randomly - */ - public void mutate() { - if (RandomNumberGenerator.flipCoin(this.m_MutationProbability)) { - /*System.out.println("BEFORE: " +getStringRepresentation());*/ - this.m_MutationOperator.mutate(this); - /*System.out.println("AFTER: " +getStringRepresentation());*/ - } - } - - /** This method will mate the Individual with given other individuals - * of the same type. - * @param partners The possible partners - * @return offsprings - */ - public AbstractEAIndividual[] mateWith(Population partners) { - AbstractEAIndividual[] result; - if (RandomNumberGenerator.flipCoin(this.m_CrossoverProbability)) { - /** System.out.println("BEFORE CROSSOVER"); - System.out.println(this.getStringRepresentation()); - System.out.println(((OBGAIndividualPermutationData) partners.get(0)).getStringRepresentation());*/ - result = this.m_CrossoverOperator.mate(this, partners); - /** System.out.println("AFTER CROSSOVER"); - System.out.println(this.getStringRepresentation()); - System.out.println(((OBGAIndividualPermutationData) partners.get(0)).getStringRepresentation());*/ - } else { - result = new AbstractEAIndividual[partners.size() + 1]; - result[0] = (AbstractEAIndividual)this.clone(); - for (int i = 0; i < partners.size(); i++) { - result[i + 1] = (AbstractEAIndividual) ( (AbstractEAIndividual) partners.get(i)).clone(); - } - - } - for (int i = 0; i < result.length; i++) result[i].giveNewName(); - return result; - } - - /** This method can be used to read the current fitness of the individual. + /** This method can be used to read the current fitness of the individual. * Please note that the fitness can be based on multiple criteria therefore * double[] is used instead of a single double. * @return The complete fitness array diff --git a/src/javaeva/server/go/individuals/codings/ga/GAGrayCodingDouble.java b/src/eva2/server/go/individuals/codings/ga/GAGrayCodingDouble.java similarity index 97% rename from src/javaeva/server/go/individuals/codings/ga/GAGrayCodingDouble.java rename to src/eva2/server/go/individuals/codings/ga/GAGrayCodingDouble.java index 724bd220..16c723a9 100644 --- a/src/javaeva/server/go/individuals/codings/ga/GAGrayCodingDouble.java +++ b/src/eva2/server/go/individuals/codings/ga/GAGrayCodingDouble.java @@ -1,9 +1,10 @@ -package javaeva.server.go.individuals.codings.ga; +package eva2.server.go.individuals.codings.ga; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.BitSet; +import eva2.server.go.tools.RandomNumberGenerator; + /** This gives the gray coding for double with a variable number of bits for coding * As far as i recall the least significant bit is to the left. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/individuals/codings/ga/GAGrayCodingInteger.java b/src/eva2/server/go/individuals/codings/ga/GAGrayCodingInteger.java similarity index 98% rename from src/javaeva/server/go/individuals/codings/ga/GAGrayCodingInteger.java rename to src/eva2/server/go/individuals/codings/ga/GAGrayCodingInteger.java index 381ad4cc..c7627b97 100644 --- a/src/javaeva/server/go/individuals/codings/ga/GAGrayCodingInteger.java +++ b/src/eva2/server/go/individuals/codings/ga/GAGrayCodingInteger.java @@ -1,4 +1,4 @@ -package javaeva.server.go.individuals.codings.ga; +package eva2.server.go.individuals.codings.ga; import java.util.BitSet; diff --git a/src/javaeva/server/go/individuals/codings/ga/GAStandardCodingDouble.java b/src/eva2/server/go/individuals/codings/ga/GAStandardCodingDouble.java similarity index 99% rename from src/javaeva/server/go/individuals/codings/ga/GAStandardCodingDouble.java rename to src/eva2/server/go/individuals/codings/ga/GAStandardCodingDouble.java index ebd443f4..1c35b732 100644 --- a/src/javaeva/server/go/individuals/codings/ga/GAStandardCodingDouble.java +++ b/src/eva2/server/go/individuals/codings/ga/GAStandardCodingDouble.java @@ -1,4 +1,4 @@ -package javaeva.server.go.individuals.codings.ga; +package eva2.server.go.individuals.codings.ga; import java.util.BitSet; diff --git a/src/javaeva/server/go/individuals/codings/ga/GAStandardCodingInteger.java b/src/eva2/server/go/individuals/codings/ga/GAStandardCodingInteger.java similarity index 98% rename from src/javaeva/server/go/individuals/codings/ga/GAStandardCodingInteger.java rename to src/eva2/server/go/individuals/codings/ga/GAStandardCodingInteger.java index cf1ea1ff..b7d457a6 100644 --- a/src/javaeva/server/go/individuals/codings/ga/GAStandardCodingInteger.java +++ b/src/eva2/server/go/individuals/codings/ga/GAStandardCodingInteger.java @@ -1,9 +1,10 @@ -package javaeva.server.go.individuals.codings.ga; +package eva2.server.go.individuals.codings.ga; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.BitSet; +import eva2.server.go.tools.RandomNumberGenerator; + /** The traditional binary coding for integer number, no variable number of bits here, sorry. * Created by IntelliJ IDEA. * User: streiche diff --git a/src/javaeva/server/go/individuals/codings/ga/InterfaceGADoubleCoding.java b/src/eva2/server/go/individuals/codings/ga/InterfaceGADoubleCoding.java similarity index 96% rename from src/javaeva/server/go/individuals/codings/ga/InterfaceGADoubleCoding.java rename to src/eva2/server/go/individuals/codings/ga/InterfaceGADoubleCoding.java index fb5a19f4..9dd075ae 100644 --- a/src/javaeva/server/go/individuals/codings/ga/InterfaceGADoubleCoding.java +++ b/src/eva2/server/go/individuals/codings/ga/InterfaceGADoubleCoding.java @@ -1,4 +1,4 @@ -package javaeva.server.go.individuals.codings.ga; +package eva2.server.go.individuals.codings.ga; import java.util.BitSet; diff --git a/src/javaeva/server/go/individuals/codings/ga/InterfaceGAIntegerCoding.java b/src/eva2/server/go/individuals/codings/ga/InterfaceGAIntegerCoding.java similarity index 97% rename from src/javaeva/server/go/individuals/codings/ga/InterfaceGAIntegerCoding.java rename to src/eva2/server/go/individuals/codings/ga/InterfaceGAIntegerCoding.java index 0f8dad74..3d0be3a7 100644 --- a/src/javaeva/server/go/individuals/codings/ga/InterfaceGAIntegerCoding.java +++ b/src/eva2/server/go/individuals/codings/ga/InterfaceGAIntegerCoding.java @@ -1,4 +1,4 @@ -package javaeva.server.go.individuals.codings.ga; +package eva2.server.go.individuals.codings.ga; import java.util.BitSet; diff --git a/src/javaeva/server/go/individuals/codings/gp/AbstractGPNode.java b/src/eva2/server/go/individuals/codings/gp/AbstractGPNode.java similarity index 98% rename from src/javaeva/server/go/individuals/codings/gp/AbstractGPNode.java rename to src/eva2/server/go/individuals/codings/gp/AbstractGPNode.java index 7d921d84..10d6372e 100644 --- a/src/javaeva/server/go/individuals/codings/gp/AbstractGPNode.java +++ b/src/eva2/server/go/individuals/codings/gp/AbstractGPNode.java @@ -1,9 +1,10 @@ -package javaeva.server.go.individuals.codings.gp; +package eva2.server.go.individuals.codings.gp; -import javaeva.server.go.problems.InterfaceProgramProblem; import java.util.ArrayList; +import eva2.server.go.problems.InterfaceProgramProblem; + /** This gives an abstract node, with default functionality for get and set methods. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/individuals/codings/gp/GPArea.java b/src/eva2/server/go/individuals/codings/gp/GPArea.java similarity index 97% rename from src/javaeva/server/go/individuals/codings/gp/GPArea.java rename to src/eva2/server/go/individuals/codings/gp/GPArea.java index 2ce0dcbb..87f36052 100644 --- a/src/javaeva/server/go/individuals/codings/gp/GPArea.java +++ b/src/eva2/server/go/individuals/codings/gp/GPArea.java @@ -1,9 +1,10 @@ -package javaeva.server.go.individuals.codings.gp; +package eva2.server.go.individuals.codings.gp; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.ArrayList; +import eva2.server.go.tools.RandomNumberGenerator; + /** This class gives the area of GPNodes for a GP problem. The area gives * the range of possible nodes to select from for a GP. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/individuals/codings/gp/GPNodeAdd.java b/src/eva2/server/go/individuals/codings/gp/GPNodeAdd.java similarity index 95% rename from src/javaeva/server/go/individuals/codings/gp/GPNodeAdd.java rename to src/eva2/server/go/individuals/codings/gp/GPNodeAdd.java index 9c57669a..f4d0041a 100644 --- a/src/javaeva/server/go/individuals/codings/gp/GPNodeAdd.java +++ b/src/eva2/server/go/individuals/codings/gp/GPNodeAdd.java @@ -1,9 +1,10 @@ -package javaeva.server.go.individuals.codings.gp; +package eva2.server.go.individuals.codings.gp; -import javaeva.server.go.problems.InterfaceProgramProblem; import java.util.ArrayList; +import eva2.server.go.problems.InterfaceProgramProblem; + /** A simple add node with two arguments. * Created by IntelliJ IDEA. * User: streiche diff --git a/src/javaeva/server/go/individuals/codings/gp/GPNodeCos.java b/src/eva2/server/go/individuals/codings/gp/GPNodeCos.java similarity index 95% rename from src/javaeva/server/go/individuals/codings/gp/GPNodeCos.java rename to src/eva2/server/go/individuals/codings/gp/GPNodeCos.java index 24188908..53d70e16 100644 --- a/src/javaeva/server/go/individuals/codings/gp/GPNodeCos.java +++ b/src/eva2/server/go/individuals/codings/gp/GPNodeCos.java @@ -1,6 +1,6 @@ -package javaeva.server.go.individuals.codings.gp; +package eva2.server.go.individuals.codings.gp; -import javaeva.server.go.problems.InterfaceProgramProblem; +import eva2.server.go.problems.InterfaceProgramProblem; /** A cos node with on argument. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/individuals/codings/gp/GPNodeDiv.java b/src/eva2/server/go/individuals/codings/gp/GPNodeDiv.java similarity index 96% rename from src/javaeva/server/go/individuals/codings/gp/GPNodeDiv.java rename to src/eva2/server/go/individuals/codings/gp/GPNodeDiv.java index 4a516ee3..4ccda857 100644 --- a/src/javaeva/server/go/individuals/codings/gp/GPNodeDiv.java +++ b/src/eva2/server/go/individuals/codings/gp/GPNodeDiv.java @@ -1,6 +1,6 @@ -package javaeva.server.go.individuals.codings.gp; +package eva2.server.go.individuals.codings.gp; -import javaeva.server.go.problems.InterfaceProgramProblem; +import eva2.server.go.problems.InterfaceProgramProblem; /** A division node with two arguments and secure division. If diff --git a/src/javaeva/server/go/individuals/codings/gp/GPNodeExp.java b/src/eva2/server/go/individuals/codings/gp/GPNodeExp.java similarity index 95% rename from src/javaeva/server/go/individuals/codings/gp/GPNodeExp.java rename to src/eva2/server/go/individuals/codings/gp/GPNodeExp.java index f571b0d7..aa4f3168 100644 --- a/src/javaeva/server/go/individuals/codings/gp/GPNodeExp.java +++ b/src/eva2/server/go/individuals/codings/gp/GPNodeExp.java @@ -1,6 +1,6 @@ -package javaeva.server.go.individuals.codings.gp; +package eva2.server.go.individuals.codings.gp; -import javaeva.server.go.problems.InterfaceProgramProblem; +import eva2.server.go.problems.InterfaceProgramProblem; /** An exponent node with one argument. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/individuals/codings/gp/GPNodeFlowExec2.java b/src/eva2/server/go/individuals/codings/gp/GPNodeFlowExec2.java similarity index 95% rename from src/javaeva/server/go/individuals/codings/gp/GPNodeFlowExec2.java rename to src/eva2/server/go/individuals/codings/gp/GPNodeFlowExec2.java index 12233fc0..4d229c8e 100644 --- a/src/javaeva/server/go/individuals/codings/gp/GPNodeFlowExec2.java +++ b/src/eva2/server/go/individuals/codings/gp/GPNodeFlowExec2.java @@ -1,6 +1,6 @@ -package javaeva.server.go.individuals.codings.gp; +package eva2.server.go.individuals.codings.gp; -import javaeva.server.go.problems.InterfaceProgramProblem; +import eva2.server.go.problems.InterfaceProgramProblem; /** This nodes executes both arguments. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/individuals/codings/gp/GPNodeFlowExec3.java b/src/eva2/server/go/individuals/codings/gp/GPNodeFlowExec3.java similarity index 95% rename from src/javaeva/server/go/individuals/codings/gp/GPNodeFlowExec3.java rename to src/eva2/server/go/individuals/codings/gp/GPNodeFlowExec3.java index 1e03f425..fb61bc23 100644 --- a/src/javaeva/server/go/individuals/codings/gp/GPNodeFlowExec3.java +++ b/src/eva2/server/go/individuals/codings/gp/GPNodeFlowExec3.java @@ -1,6 +1,6 @@ -package javaeva.server.go.individuals.codings.gp; +package eva2.server.go.individuals.codings.gp; -import javaeva.server.go.problems.InterfaceProgramProblem; +import eva2.server.go.problems.InterfaceProgramProblem; /** This node executes all three arguments. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/individuals/codings/gp/GPNodeInput.java b/src/eva2/server/go/individuals/codings/gp/GPNodeInput.java similarity index 96% rename from src/javaeva/server/go/individuals/codings/gp/GPNodeInput.java rename to src/eva2/server/go/individuals/codings/gp/GPNodeInput.java index 5172419f..30ec843f 100644 --- a/src/javaeva/server/go/individuals/codings/gp/GPNodeInput.java +++ b/src/eva2/server/go/individuals/codings/gp/GPNodeInput.java @@ -1,6 +1,6 @@ -package javaeva.server.go.individuals.codings.gp; +package eva2.server.go.individuals.codings.gp; -import javaeva.server.go.problems.InterfaceProgramProblem; +import eva2.server.go.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/javaeva/server/go/individuals/codings/gp/GPNodeMult.java b/src/eva2/server/go/individuals/codings/gp/GPNodeMult.java similarity index 95% rename from src/javaeva/server/go/individuals/codings/gp/GPNodeMult.java rename to src/eva2/server/go/individuals/codings/gp/GPNodeMult.java index 994f4cc3..403c545a 100644 --- a/src/javaeva/server/go/individuals/codings/gp/GPNodeMult.java +++ b/src/eva2/server/go/individuals/codings/gp/GPNodeMult.java @@ -1,6 +1,6 @@ -package javaeva.server.go.individuals.codings.gp; +package eva2.server.go.individuals.codings.gp; -import javaeva.server.go.problems.InterfaceProgramProblem; +import eva2.server.go.problems.InterfaceProgramProblem; /** A multiplicator node taking to arguments. diff --git a/src/javaeva/server/go/individuals/codings/gp/GPNodeOutput.java b/src/eva2/server/go/individuals/codings/gp/GPNodeOutput.java similarity index 95% rename from src/javaeva/server/go/individuals/codings/gp/GPNodeOutput.java rename to src/eva2/server/go/individuals/codings/gp/GPNodeOutput.java index 997b354f..999f49e2 100644 --- a/src/javaeva/server/go/individuals/codings/gp/GPNodeOutput.java +++ b/src/eva2/server/go/individuals/codings/gp/GPNodeOutput.java @@ -1,6 +1,6 @@ -package javaeva.server.go.individuals.codings.gp; +package eva2.server.go.individuals.codings.gp; -import javaeva.server.go.problems.InterfaceProgramProblem; +import eva2.server.go.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/javaeva/server/go/individuals/codings/gp/GPNodePow2.java b/src/eva2/server/go/individuals/codings/gp/GPNodePow2.java similarity index 95% rename from src/javaeva/server/go/individuals/codings/gp/GPNodePow2.java rename to src/eva2/server/go/individuals/codings/gp/GPNodePow2.java index 1ae1d0f3..cb7faa05 100644 --- a/src/javaeva/server/go/individuals/codings/gp/GPNodePow2.java +++ b/src/eva2/server/go/individuals/codings/gp/GPNodePow2.java @@ -1,6 +1,6 @@ -package javaeva.server.go.individuals.codings.gp; +package eva2.server.go.individuals.codings.gp; -import javaeva.server.go.problems.InterfaceProgramProblem; +import eva2.server.go.problems.InterfaceProgramProblem; /** This node puts the argument to the power of two. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/individuals/codings/gp/GPNodePow3.java b/src/eva2/server/go/individuals/codings/gp/GPNodePow3.java similarity index 95% rename from src/javaeva/server/go/individuals/codings/gp/GPNodePow3.java rename to src/eva2/server/go/individuals/codings/gp/GPNodePow3.java index 7f6a8e19..2cc59fc0 100644 --- a/src/javaeva/server/go/individuals/codings/gp/GPNodePow3.java +++ b/src/eva2/server/go/individuals/codings/gp/GPNodePow3.java @@ -1,6 +1,6 @@ -package javaeva.server.go.individuals.codings.gp; +package eva2.server.go.individuals.codings.gp; -import javaeva.server.go.problems.InterfaceProgramProblem; +import eva2.server.go.problems.InterfaceProgramProblem; /** This argument puts the argument to the power of three. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/individuals/codings/gp/GPNodeSin.java b/src/eva2/server/go/individuals/codings/gp/GPNodeSin.java similarity index 95% rename from src/javaeva/server/go/individuals/codings/gp/GPNodeSin.java rename to src/eva2/server/go/individuals/codings/gp/GPNodeSin.java index 7427bc32..e0418a47 100644 --- a/src/javaeva/server/go/individuals/codings/gp/GPNodeSin.java +++ b/src/eva2/server/go/individuals/codings/gp/GPNodeSin.java @@ -1,6 +1,6 @@ -package javaeva.server.go.individuals.codings.gp; +package eva2.server.go.individuals.codings.gp; -import javaeva.server.go.problems.InterfaceProgramProblem; +import eva2.server.go.problems.InterfaceProgramProblem; /** A sinus node taking one argument. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/individuals/codings/gp/GPNodeSqrt.java b/src/eva2/server/go/individuals/codings/gp/GPNodeSqrt.java similarity index 95% rename from src/javaeva/server/go/individuals/codings/gp/GPNodeSqrt.java rename to src/eva2/server/go/individuals/codings/gp/GPNodeSqrt.java index 329e7c3f..74aff88c 100644 --- a/src/javaeva/server/go/individuals/codings/gp/GPNodeSqrt.java +++ b/src/eva2/server/go/individuals/codings/gp/GPNodeSqrt.java @@ -1,6 +1,6 @@ -package javaeva.server.go.individuals.codings.gp; +package eva2.server.go.individuals.codings.gp; -import javaeva.server.go.problems.InterfaceProgramProblem; +import eva2.server.go.problems.InterfaceProgramProblem; /** A square root node taking one argument. Secure operation is guaranteed * by using the absolute value only. diff --git a/src/javaeva/server/go/individuals/codings/gp/GPNodeSub.java b/src/eva2/server/go/individuals/codings/gp/GPNodeSub.java similarity index 96% rename from src/javaeva/server/go/individuals/codings/gp/GPNodeSub.java rename to src/eva2/server/go/individuals/codings/gp/GPNodeSub.java index 0e46f06e..c836aafa 100644 --- a/src/javaeva/server/go/individuals/codings/gp/GPNodeSub.java +++ b/src/eva2/server/go/individuals/codings/gp/GPNodeSub.java @@ -1,6 +1,6 @@ -package javaeva.server.go.individuals.codings.gp; +package eva2.server.go.individuals.codings.gp; -import javaeva.server.go.problems.InterfaceProgramProblem; +import eva2.server.go.problems.InterfaceProgramProblem; /** A substraction node using two arguments. diff --git a/src/javaeva/server/go/individuals/codings/gp/InterfaceProgram.java b/src/eva2/server/go/individuals/codings/gp/InterfaceProgram.java similarity index 78% rename from src/javaeva/server/go/individuals/codings/gp/InterfaceProgram.java rename to src/eva2/server/go/individuals/codings/gp/InterfaceProgram.java index 9cb553e5..3e239b69 100644 --- a/src/javaeva/server/go/individuals/codings/gp/InterfaceProgram.java +++ b/src/eva2/server/go/individuals/codings/gp/InterfaceProgram.java @@ -1,4 +1,4 @@ -package javaeva.server.go.individuals.codings.gp; +package eva2.server.go.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(javaeva.server.go.problems.InterfaceProgramProblem environment); + public Object evaluate(eva2.server.go.problems.InterfaceProgramProblem environment); /** This method returns a string representation of the current program. * @return string diff --git a/src/javaeva/server/go/mocco/InterfaceProcessElement.java b/src/eva2/server/go/mocco/InterfaceProcessElement.java similarity index 93% rename from src/javaeva/server/go/mocco/InterfaceProcessElement.java rename to src/eva2/server/go/mocco/InterfaceProcessElement.java index f3e1b629..524e4ab6 100644 --- a/src/javaeva/server/go/mocco/InterfaceProcessElement.java +++ b/src/eva2/server/go/mocco/InterfaceProcessElement.java @@ -1,4 +1,4 @@ -package javaeva.server.go.mocco; +package eva2.server.go.mocco; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/mocco/MOCCOChooseMOStrategy.java b/src/eva2/server/go/mocco/MOCCOChooseMOStrategy.java similarity index 99% rename from src/javaeva/server/go/mocco/MOCCOChooseMOStrategy.java rename to src/eva2/server/go/mocco/MOCCOChooseMOStrategy.java index df4d6c91..e4905cc4 100644 --- a/src/javaeva/server/go/mocco/MOCCOChooseMOStrategy.java +++ b/src/eva2/server/go/mocco/MOCCOChooseMOStrategy.java @@ -1,8 +1,10 @@ -package javaeva.server.go.mocco; +package eva2.server.go.mocco; -import javaeva.server.go.MOCCOStandalone; import javax.swing.*; + +import eva2.server.go.MOCCOStandalone; + import java.awt.*; import java.awt.event.ActionListener; import java.awt.event.ActionEvent; diff --git a/src/javaeva/server/go/mocco/MOCCOChooseReferencePoint.java b/src/eva2/server/go/mocco/MOCCOChooseReferencePoint.java similarity index 94% rename from src/javaeva/server/go/mocco/MOCCOChooseReferencePoint.java rename to src/eva2/server/go/mocco/MOCCOChooseReferencePoint.java index a0303113..e35de1d1 100644 --- a/src/javaeva/server/go/mocco/MOCCOChooseReferencePoint.java +++ b/src/eva2/server/go/mocco/MOCCOChooseReferencePoint.java @@ -1,11 +1,13 @@ -package javaeva.server.go.mocco; +package eva2.server.go.mocco; -import javaeva.server.go.MOCCOStandalone; -import javaeva.server.go.mocco.paretofrontviewer.InterfaceRefPointListener; -import javaeva.server.go.problems.InterfaceMultiObjectiveDeNovoProblem; -import javaeva.server.go.problems.InterfaceOptimizationObjective; import javax.swing.*; + +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 java.awt.*; import java.awt.event.ActionListener; import java.awt.event.ActionEvent; diff --git a/src/javaeva/server/go/mocco/MOCCOChooseReferenceSolution.java b/src/eva2/server/go/mocco/MOCCOChooseReferenceSolution.java similarity index 93% rename from src/javaeva/server/go/mocco/MOCCOChooseReferenceSolution.java rename to src/eva2/server/go/mocco/MOCCOChooseReferenceSolution.java index bce6bceb..9aa56452 100644 --- a/src/javaeva/server/go/mocco/MOCCOChooseReferenceSolution.java +++ b/src/eva2/server/go/mocco/MOCCOChooseReferenceSolution.java @@ -1,13 +1,15 @@ -package javaeva.server.go.mocco; +package eva2.server.go.mocco; -import javaeva.server.go.MOCCOStandalone; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.mocco.paretofrontviewer.InterfaceRefSolutionListener; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceMultiObjectiveDeNovoProblem; -import javaeva.server.go.problems.InterfaceOptimizationObjective; import javax.swing.*; + +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 java.awt.*; import java.awt.event.ActionListener; import java.awt.event.ActionEvent; diff --git a/src/javaeva/server/go/mocco/MOCCOInitialPopulationSize.java b/src/eva2/server/go/mocco/MOCCOInitialPopulationSize.java similarity index 94% rename from src/javaeva/server/go/mocco/MOCCOInitialPopulationSize.java rename to src/eva2/server/go/mocco/MOCCOInitialPopulationSize.java index 8446d89d..77d096bf 100644 --- a/src/javaeva/server/go/mocco/MOCCOInitialPopulationSize.java +++ b/src/eva2/server/go/mocco/MOCCOInitialPopulationSize.java @@ -1,10 +1,12 @@ -package javaeva.server.go.mocco; +package eva2.server.go.mocco; -import javaeva.server.go.MOCCOStandalone; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.gui.JParaPanel; import javax.swing.*; + +import eva2.gui.JParaPanel; +import eva2.server.go.MOCCOStandalone; +import eva2.server.go.problems.InterfaceOptimizationProblem; + import java.awt.*; import java.awt.event.ActionListener; import java.awt.event.ActionEvent; diff --git a/src/javaeva/server/go/mocco/MOCCOParameterizeGDF.java b/src/eva2/server/go/mocco/MOCCOParameterizeGDF.java similarity index 93% rename from src/javaeva/server/go/mocco/MOCCOParameterizeGDF.java rename to src/eva2/server/go/mocco/MOCCOParameterizeGDF.java index ba27a8dd..54ad67cb 100644 --- a/src/javaeva/server/go/mocco/MOCCOParameterizeGDF.java +++ b/src/eva2/server/go/mocco/MOCCOParameterizeGDF.java @@ -1,20 +1,22 @@ -package javaeva.server.go.mocco; +package eva2.server.go.mocco; -import javaeva.server.go.MOCCOStandalone; -import javaeva.server.go.InterfaceTerminator; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.moso.MOSOWeightedFitness; -import javaeva.server.go.problems.AbstractMultiObjectiveOptimizationProblem; -import javaeva.server.go.problems.InterfaceMultiObjectiveDeNovoProblem; -import javaeva.server.go.problems.InterfaceOptimizationObjective; -import javaeva.server.go.strategies.GeneticAlgorithm; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.server.go.tools.GeneralGOEProperty; -import javaeva.gui.PropertyDoubleArray; -import javaeva.gui.GenericObjectEditor; -import javaeva.gui.PropertyEditorProvider; import javax.swing.*; + +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.GeneralGOEProperty; + import java.awt.*; import java.awt.event.ActionListener; import java.awt.event.ActionEvent; diff --git a/src/javaeva/server/go/mocco/MOCCOParameterizeMO.java b/src/eva2/server/go/mocco/MOCCOParameterizeMO.java similarity index 93% rename from src/javaeva/server/go/mocco/MOCCOParameterizeMO.java rename to src/eva2/server/go/mocco/MOCCOParameterizeMO.java index 86db7744..e5ca1d91 100644 --- a/src/javaeva/server/go/mocco/MOCCOParameterizeMO.java +++ b/src/eva2/server/go/mocco/MOCCOParameterizeMO.java @@ -1,16 +1,18 @@ -package javaeva.server.go.mocco; +package eva2.server.go.mocco; -import javaeva.server.go.MOCCOStandalone; -import javaeva.server.go.InterfaceTerminator; -import javaeva.server.go.populations.Population; -import javaeva.server.go.strategies.GeneticAlgorithm; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.server.go.strategies.MultiObjectiveEA; -import javaeva.server.go.tools.GeneralGOEProperty; -import javaeva.gui.GenericObjectEditor; -import javaeva.gui.PropertyEditorProvider; import javax.swing.*; + +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.GeneralGOEProperty; + import java.awt.*; import java.awt.event.ActionListener; import java.awt.event.ActionEvent; diff --git a/src/javaeva/server/go/mocco/MOCCOParameterizeRefPoint.java b/src/eva2/server/go/mocco/MOCCOParameterizeRefPoint.java similarity index 95% rename from src/javaeva/server/go/mocco/MOCCOParameterizeRefPoint.java rename to src/eva2/server/go/mocco/MOCCOParameterizeRefPoint.java index 159cea23..83e6ca5d 100644 --- a/src/javaeva/server/go/mocco/MOCCOParameterizeRefPoint.java +++ b/src/eva2/server/go/mocco/MOCCOParameterizeRefPoint.java @@ -1,18 +1,20 @@ -package javaeva.server.go.mocco; +package eva2.server.go.mocco; -import javaeva.server.go.MOCCOStandalone; -import javaeva.server.go.InterfaceTerminator; -import javaeva.server.go.operators.migration.SOBestMigration; -import javaeva.server.go.operators.moso.MOSOLpMetric; -import javaeva.server.go.problems.AbstractMultiObjectiveOptimizationProblem; -import javaeva.server.go.strategies.IslandModelEA; -import javaeva.server.go.tools.GeneralGOEProperty; -import javaeva.server.go.tools.RandomNumberGenerator; -import javaeva.gui.PropertyEditorProvider; -import javaeva.gui.PropertyRemoteServers; -import javaeva.gui.GenericObjectEditor; import javax.swing.*; + +import eva2.gui.GenericObjectEditor; +import eva2.gui.PropertyEditorProvider; +import eva2.gui.PropertyRemoteServers; +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.GeneralGOEProperty; +import eva2.server.go.tools.RandomNumberGenerator; + import java.awt.*; import java.awt.event.ActionListener; import java.awt.event.ActionEvent; diff --git a/src/javaeva/server/go/mocco/MOCCOParameterizeSO.java b/src/eva2/server/go/mocco/MOCCOParameterizeSO.java similarity index 92% rename from src/javaeva/server/go/mocco/MOCCOParameterizeSO.java rename to src/eva2/server/go/mocco/MOCCOParameterizeSO.java index 909479c9..ea7dedc0 100644 --- a/src/javaeva/server/go/mocco/MOCCOParameterizeSO.java +++ b/src/eva2/server/go/mocco/MOCCOParameterizeSO.java @@ -1,15 +1,17 @@ -package javaeva.server.go.mocco; +package eva2.server.go.mocco; -import javaeva.server.go.MOCCOStandalone; -import javaeva.server.go.InterfaceTerminator; -import javaeva.server.go.strategies.GeneticAlgorithm; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.server.go.strategies.MultiObjectiveEA; -import javaeva.server.go.tools.GeneralGOEProperty; -import javaeva.gui.GenericObjectEditor; -import javaeva.gui.PropertyEditorProvider; import javax.swing.*; + +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.GeneralGOEProperty; + import java.awt.*; import java.awt.event.ActionListener; import java.awt.event.ActionEvent; diff --git a/src/javaeva/server/go/mocco/MOCCOParameterizeSTEP.java b/src/eva2/server/go/mocco/MOCCOParameterizeSTEP.java similarity index 95% rename from src/javaeva/server/go/mocco/MOCCOParameterizeSTEP.java rename to src/eva2/server/go/mocco/MOCCOParameterizeSTEP.java index 5233d3d0..35186855 100644 --- a/src/javaeva/server/go/mocco/MOCCOParameterizeSTEP.java +++ b/src/eva2/server/go/mocco/MOCCOParameterizeSTEP.java @@ -1,20 +1,22 @@ -package javaeva.server.go.mocco; +package eva2.server.go.mocco; -import javaeva.server.go.MOCCOStandalone; -import javaeva.server.go.InterfaceTerminator; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.moso.MOSOWeightedFitness; -import javaeva.server.go.problems.AbstractMultiObjectiveOptimizationProblem; -import javaeva.server.go.problems.InterfaceMultiObjectiveDeNovoProblem; -import javaeva.server.go.problems.InterfaceOptimizationObjective; -import javaeva.server.go.strategies.GeneticAlgorithm; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.server.go.tools.GeneralGOEProperty; -import javaeva.gui.PropertyDoubleArray; -import javaeva.gui.GenericObjectEditor; -import javaeva.gui.PropertyEditorProvider; import javax.swing.*; + +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.GeneralGOEProperty; + import java.awt.*; import java.awt.event.ActionListener; import java.awt.event.ActionEvent; diff --git a/src/javaeva/server/go/mocco/MOCCOParameterizeTchebycheff.java b/src/eva2/server/go/mocco/MOCCOParameterizeTchebycheff.java similarity index 95% rename from src/javaeva/server/go/mocco/MOCCOParameterizeTchebycheff.java rename to src/eva2/server/go/mocco/MOCCOParameterizeTchebycheff.java index f3b0606a..ee7ce8ec 100644 --- a/src/javaeva/server/go/mocco/MOCCOParameterizeTchebycheff.java +++ b/src/eva2/server/go/mocco/MOCCOParameterizeTchebycheff.java @@ -1,18 +1,20 @@ -package javaeva.server.go.mocco; +package eva2.server.go.mocco; -import javaeva.server.go.MOCCOStandalone; -import javaeva.server.go.InterfaceTerminator; -import javaeva.server.go.operators.migration.SOBestMigration; -import javaeva.server.go.operators.moso.MOSOWeightedLPTchebycheff; -import javaeva.server.go.problems.AbstractMultiObjectiveOptimizationProblem; -import javaeva.server.go.strategies.IslandModelEA; -import javaeva.server.go.tools.GeneralGOEProperty; -import javaeva.server.go.tools.RandomNumberGenerator; -import javaeva.gui.PropertyEditorProvider; -import javaeva.gui.PropertyRemoteServers; -import javaeva.gui.GenericObjectEditor; import javax.swing.*; + +import eva2.gui.GenericObjectEditor; +import eva2.gui.PropertyEditorProvider; +import eva2.gui.PropertyRemoteServers; +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.GeneralGOEProperty; +import eva2.server.go.tools.RandomNumberGenerator; + import java.awt.*; import java.awt.event.ActionListener; import java.awt.event.ActionEvent; diff --git a/src/javaeva/server/go/mocco/MOCCOPhase.java b/src/eva2/server/go/mocco/MOCCOPhase.java similarity index 94% rename from src/javaeva/server/go/mocco/MOCCOPhase.java rename to src/eva2/server/go/mocco/MOCCOPhase.java index c8d8fd5d..6c346cf3 100644 --- a/src/javaeva/server/go/mocco/MOCCOPhase.java +++ b/src/eva2/server/go/mocco/MOCCOPhase.java @@ -1,22 +1,23 @@ -package javaeva.server.go.mocco; +package eva2.server.go.mocco; import java.awt.BorderLayout; import java.awt.Font; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import javaeva.gui.PropertyBoolSelector; -import javaeva.gui.PropertyPanel; -import javaeva.gui.PropertyText; -import javaeva.gui.PropertyValueSelector; -import javaeva.server.go.MOCCOStandalone; -import javaeva.server.go.tools.GeneralGOEProperty; import javax.swing.BorderFactory; import javax.swing.JComponent; import javax.swing.JPanel; import javax.swing.JTextArea; +import eva2.gui.PropertyBoolSelector; +import eva2.gui.PropertyPanel; +import eva2.gui.PropertyText; +import eva2.gui.PropertyValueSelector; +import eva2.server.go.MOCCOStandalone; +import eva2.server.go.tools.GeneralGOEProperty; + /** * Created by IntelliJ IDEA. * User: streiche diff --git a/src/javaeva/server/go/mocco/MOCCOProblemInitialization.java b/src/eva2/server/go/mocco/MOCCOProblemInitialization.java similarity index 87% rename from src/javaeva/server/go/mocco/MOCCOProblemInitialization.java rename to src/eva2/server/go/mocco/MOCCOProblemInitialization.java index 813611f9..6720f8bd 100644 --- a/src/javaeva/server/go/mocco/MOCCOProblemInitialization.java +++ b/src/eva2/server/go/mocco/MOCCOProblemInitialization.java @@ -1,14 +1,16 @@ -package javaeva.server.go.mocco; +package eva2.server.go.mocco; -import javaeva.server.go.MOCCOStandalone; -import javaeva.server.go.problems.InterfaceMultiObjectiveDeNovoProblem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.GeneralGOEProperty; -import javaeva.tools.ReflectPackage; -import javaeva.gui.JParaPanel; -import javaeva.gui.GenericObjectEditor; import javax.swing.*; + +import eva2.gui.GenericObjectEditor; +import eva2.gui.JParaPanel; +import eva2.server.go.MOCCOStandalone; +import eva2.server.go.problems.InterfaceMultiObjectiveDeNovoProblem; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.GeneralGOEProperty; +import eva2.tools.ReflectPackage; + import java.awt.event.ActionListener; import java.awt.event.ActionEvent; import java.awt.*; @@ -57,7 +59,7 @@ public class MOCCOProblemInitialization extends MOCCOPhase implements InterfaceP // this.m_ProblemChooser.setModel(new DefaultComboBoxModel(this.getClassAlternatives4("javaeva.server.oa.go.OptimizationProblems.InterfaceMultiObjectiveDeNovoProblem"))); Class[] altern = null; try { - altern = ReflectPackage.getAssignableClassesInPackage("javaeva.server.oa.go.OptimizationProblems", Class.forName("javaeva.server.oa.go.OptimizationProblems.InterfaceMultiObjectiveDeNovoProblem"), true, true); + altern = ReflectPackage.getAssignableClassesInPackage("eva2.server.oa.go.OptimizationProblems", Class.forName("eva2.server.oa.go.OptimizationProblems.InterfaceMultiObjectiveDeNovoProblem"), true, true); } catch (ClassNotFoundException e) { // TODO Auto-generated catch block e.printStackTrace(); diff --git a/src/javaeva/server/go/mocco/MOCCOProblemRedefinition.java b/src/eva2/server/go/mocco/MOCCOProblemRedefinition.java similarity index 95% rename from src/javaeva/server/go/mocco/MOCCOProblemRedefinition.java rename to src/eva2/server/go/mocco/MOCCOProblemRedefinition.java index 22039eae..b5889b08 100644 --- a/src/javaeva/server/go/mocco/MOCCOProblemRedefinition.java +++ b/src/eva2/server/go/mocco/MOCCOProblemRedefinition.java @@ -1,10 +1,12 @@ -package javaeva.server.go.mocco; +package eva2.server.go.mocco; -import javaeva.server.go.MOCCOStandalone; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.gui.JParaPanel; import javax.swing.*; + +import eva2.gui.JParaPanel; +import eva2.server.go.MOCCOStandalone; +import eva2.server.go.problems.InterfaceOptimizationProblem; + import java.awt.*; import java.awt.event.ActionListener; import java.awt.event.ActionEvent; diff --git a/src/javaeva/server/go/mocco/MOCCOState.java b/src/eva2/server/go/mocco/MOCCOState.java similarity index 93% rename from src/javaeva/server/go/mocco/MOCCOState.java rename to src/eva2/server/go/mocco/MOCCOState.java index 9ad1a951..1732d795 100644 --- a/src/javaeva/server/go/mocco/MOCCOState.java +++ b/src/eva2/server/go/mocco/MOCCOState.java @@ -1,19 +1,21 @@ -package javaeva.server.go.mocco; +package eva2.server.go.mocco; -import javaeva.server.go.InterfaceTerminator; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.archiving.ArchivingAllDominating; -import javaeva.server.go.operators.terminators.EvaluationTerminator; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.AbstractMultiObjectiveOptimizationProblem; -import javaeva.server.go.problems.InterfaceMultiObjectiveDeNovoProblem; -import javaeva.server.go.problems.InterfaceOptimizationObjective; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.strategies.GeneticAlgorithm; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.server.go.strategies.MultiObjectiveEA; import javax.swing.*; + +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.GeneticAlgorithm; +import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.server.go.strategies.MultiObjectiveEA; + import java.util.ArrayList; import java.awt.*; import java.awt.event.ActionListener; diff --git a/src/javaeva/server/go/mocco/paretofrontviewer/InterfaceParetoFrontView.java b/src/eva2/server/go/mocco/paretofrontviewer/InterfaceParetoFrontView.java similarity index 88% rename from src/javaeva/server/go/mocco/paretofrontviewer/InterfaceParetoFrontView.java rename to src/eva2/server/go/mocco/paretofrontviewer/InterfaceParetoFrontView.java index 8871be31..3aedf460 100644 --- a/src/javaeva/server/go/mocco/paretofrontviewer/InterfaceParetoFrontView.java +++ b/src/eva2/server/go/mocco/paretofrontviewer/InterfaceParetoFrontView.java @@ -1,4 +1,4 @@ -package javaeva.server.go.mocco.paretofrontviewer; +package eva2.server.go.mocco.paretofrontviewer; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/mocco/paretofrontviewer/InterfaceRefPointListener.java b/src/eva2/server/go/mocco/paretofrontviewer/InterfaceRefPointListener.java similarity index 88% rename from src/javaeva/server/go/mocco/paretofrontviewer/InterfaceRefPointListener.java rename to src/eva2/server/go/mocco/paretofrontviewer/InterfaceRefPointListener.java index 597121c9..d9a6e453 100644 --- a/src/javaeva/server/go/mocco/paretofrontviewer/InterfaceRefPointListener.java +++ b/src/eva2/server/go/mocco/paretofrontviewer/InterfaceRefPointListener.java @@ -1,4 +1,4 @@ -package javaeva.server.go.mocco.paretofrontviewer; +package eva2.server.go.mocco.paretofrontviewer; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/mocco/paretofrontviewer/InterfaceRefSolutionListener.java b/src/eva2/server/go/mocco/paretofrontviewer/InterfaceRefSolutionListener.java similarity index 79% rename from src/javaeva/server/go/mocco/paretofrontviewer/InterfaceRefSolutionListener.java rename to src/eva2/server/go/mocco/paretofrontviewer/InterfaceRefSolutionListener.java index f6d13e03..120d77e4 100644 --- a/src/javaeva/server/go/mocco/paretofrontviewer/InterfaceRefSolutionListener.java +++ b/src/eva2/server/go/mocco/paretofrontviewer/InterfaceRefSolutionListener.java @@ -1,6 +1,6 @@ -package javaeva.server.go.mocco.paretofrontviewer; +package eva2.server.go.mocco.paretofrontviewer; -import javaeva.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.AbstractEAIndividual; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/mocco/paretofrontviewer/MOCCOViewer.java b/src/eva2/server/go/mocco/paretofrontviewer/MOCCOViewer.java similarity index 98% rename from src/javaeva/server/go/mocco/paretofrontviewer/MOCCOViewer.java rename to src/eva2/server/go/mocco/paretofrontviewer/MOCCOViewer.java index abe8531e..bbc25cc8 100644 --- a/src/javaeva/server/go/mocco/paretofrontviewer/MOCCOViewer.java +++ b/src/eva2/server/go/mocco/paretofrontviewer/MOCCOViewer.java @@ -1,16 +1,18 @@ -package javaeva.server.go.mocco.paretofrontviewer; +package eva2.server.go.mocco.paretofrontviewer; -import javaeva.server.go.MOCCOStandalone; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceMultiObjectiveDeNovoProblem; -import javaeva.server.go.problems.InterfaceOptimizationObjective; -import javaeva.gui.FunctionArea; -import javaeva.gui.GraphPointSet; -import javaeva.gui.Chart2DDPointContentSelectable; -import javaeva.gui.InterfaceDPointWithContent; import javax.swing.*; + +import eva2.gui.Chart2DDPointContentSelectable; +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 java.awt.*; import java.awt.event.ActionListener; import java.awt.event.ActionEvent; diff --git a/src/javaeva/server/go/mocco/paretofrontviewer/ParetoFrontView2D.java b/src/eva2/server/go/mocco/paretofrontviewer/ParetoFrontView2D.java similarity index 98% rename from src/javaeva/server/go/mocco/paretofrontviewer/ParetoFrontView2D.java rename to src/eva2/server/go/mocco/paretofrontviewer/ParetoFrontView2D.java index 90957839..f601c4f5 100644 --- a/src/javaeva/server/go/mocco/paretofrontviewer/ParetoFrontView2D.java +++ b/src/eva2/server/go/mocco/paretofrontviewer/ParetoFrontView2D.java @@ -1,12 +1,14 @@ -package javaeva.server.go.mocco.paretofrontviewer; +package eva2.server.go.mocco.paretofrontviewer; -import javaeva.gui.*; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceMultiObjectiveDeNovoProblem; -import javaeva.server.go.problems.InterfaceOptimizationObjective; import javax.swing.*; + +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 java.awt.*; import java.awt.event.ActionListener; import java.awt.event.ActionEvent; diff --git a/src/javaeva/server/go/mocco/paretofrontviewer/ParetoFrontViewParallelAxsis.java b/src/eva2/server/go/mocco/paretofrontviewer/ParetoFrontViewParallelAxsis.java similarity index 92% rename from src/javaeva/server/go/mocco/paretofrontviewer/ParetoFrontViewParallelAxsis.java rename to src/eva2/server/go/mocco/paretofrontviewer/ParetoFrontViewParallelAxsis.java index 8297bd0c..a59f55e0 100644 --- a/src/javaeva/server/go/mocco/paretofrontviewer/ParetoFrontViewParallelAxsis.java +++ b/src/eva2/server/go/mocco/paretofrontviewer/ParetoFrontViewParallelAxsis.java @@ -1,4 +1,4 @@ -package javaeva.server.go.mocco.paretofrontviewer; +package eva2.server.go.mocco.paretofrontviewer; import javax.swing.*; diff --git a/src/javaeva/server/go/mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java b/src/eva2/server/go/mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java similarity index 98% rename from src/javaeva/server/go/mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java rename to src/eva2/server/go/mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java index 896dcb77..ead04483 100644 --- a/src/javaeva/server/go/mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java +++ b/src/eva2/server/go/mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java @@ -1,13 +1,14 @@ -package javaeva.server.go.mocco.paretofrontviewer; +package eva2.server.go.mocco.paretofrontviewer; -import javaeva.gui.*; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceMultiObjectiveDeNovoProblem; -import javaeva.server.go.problems.InterfaceOptimizationObjective; import javax.swing.*; +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 wsi.ra.chart2d.ScaledBorder; import wsi.ra.chart2d.DPoint; import wsi.ra.chart2d.DPointIcon; diff --git a/src/javaeva/server/go/operators/archiving/AbstractArchiving.java b/src/eva2/server/go/operators/archiving/AbstractArchiving.java similarity index 95% rename from src/javaeva/server/go/operators/archiving/AbstractArchiving.java rename to src/eva2/server/go/operators/archiving/AbstractArchiving.java index 412cb144..c7eca643 100644 --- a/src/javaeva/server/go/operators/archiving/AbstractArchiving.java +++ b/src/eva2/server/go/operators/archiving/AbstractArchiving.java @@ -1,9 +1,9 @@ -package javaeva.server.go.operators.archiving; +package eva2.server.go.operators.archiving; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.ESIndividualDoubleData; -import javaeva.server.go.populations.Population; -import javaeva.gui.*; +import eva2.gui.*; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.ESIndividualDoubleData; +import eva2.server.go.populations.Population; import wsi.ra.chart2d.DPoint; import wsi.ra.chart2d.DPointIcon; @@ -19,7 +19,7 @@ import wsi.ra.chart2d.DPointIcon; public abstract class AbstractArchiving implements InterfaceArchiving, java.io.Serializable { protected boolean m_Debug = false; - transient protected javaeva.gui.Plot m_Plot = null; + transient protected eva2.gui.Plot m_Plot = null; protected int p = 0; public boolean m_ObeyDebsConstViolationPrinciple = true; diff --git a/src/javaeva/server/go/operators/archiving/ArchivingAllDominating.java b/src/eva2/server/go/operators/archiving/ArchivingAllDominating.java similarity index 94% rename from src/javaeva/server/go/operators/archiving/ArchivingAllDominating.java rename to src/eva2/server/go/operators/archiving/ArchivingAllDominating.java index bfa7cd20..abe4496e 100644 --- a/src/javaeva/server/go/operators/archiving/ArchivingAllDominating.java +++ b/src/eva2/server/go/operators/archiving/ArchivingAllDominating.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.archiving; +package eva2.server.go.operators.archiving; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.selection.SelectBestIndividuals; -import javaeva.server.go.populations.Population; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.selection.SelectBestIndividuals; +import eva2.server.go.populations.Population; /** This simple strategy simply archives all Pareto optimal solutions. This method is * very prone to OutOfMemory errors! diff --git a/src/javaeva/server/go/operators/archiving/ArchivingMOMAIIAllDominating.java b/src/eva2/server/go/operators/archiving/ArchivingMOMAIIAllDominating.java similarity index 94% rename from src/javaeva/server/go/operators/archiving/ArchivingMOMAIIAllDominating.java rename to src/eva2/server/go/operators/archiving/ArchivingMOMAIIAllDominating.java index a24a9068..0c1e4d26 100644 --- a/src/javaeva/server/go/operators/archiving/ArchivingMOMAIIAllDominating.java +++ b/src/eva2/server/go/operators/archiving/ArchivingMOMAIIAllDominating.java @@ -1,6 +1,6 @@ -package javaeva.server.go.operators.archiving; +package eva2.server.go.operators.archiving; -import javaeva.server.go.populations.Population; +import eva2.server.go.populations.Population; /** This class is under construction and should be able to archive * individuals, which actually give a set of solutions. @@ -13,7 +13,7 @@ import javaeva.server.go.populations.Population; public class ArchivingMOMAIIAllDominating implements InterfaceArchiving, java.io.Serializable { protected boolean m_Debug = false; - transient protected javaeva.gui.Plot m_Plot = null; + transient protected eva2.gui.Plot m_Plot = null; protected int p = 0; public ArchivingMOMAIIAllDominating() { diff --git a/src/javaeva/server/go/operators/archiving/ArchivingMaxiMin.java b/src/eva2/server/go/operators/archiving/ArchivingMaxiMin.java similarity index 95% rename from src/javaeva/server/go/operators/archiving/ArchivingMaxiMin.java rename to src/eva2/server/go/operators/archiving/ArchivingMaxiMin.java index f9bd80ab..c1c579df 100644 --- a/src/javaeva/server/go/operators/archiving/ArchivingMaxiMin.java +++ b/src/eva2/server/go/operators/archiving/ArchivingMaxiMin.java @@ -1,14 +1,15 @@ -package javaeva.server.go.operators.archiving; +package eva2.server.go.operators.archiving; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.moso.MOSOMaxiMin; -import javaeva.server.go.operators.selection.InterfaceSelection; -import javaeva.server.go.operators.selection.SelectBestIndividuals; -import javaeva.server.go.populations.Population; -import javaeva.gui.Chart2DDPointIconCross; import java.util.ArrayList; +import eva2.gui.Chart2DDPointIconCross; +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 wsi.ra.chart2d.DPointIcon; /** Another simple archiving strategy not based on dominace but on the MaxiMin diff --git a/src/javaeva/server/go/operators/archiving/ArchivingNSGA.java b/src/eva2/server/go/operators/archiving/ArchivingNSGA.java similarity index 94% rename from src/javaeva/server/go/operators/archiving/ArchivingNSGA.java rename to src/eva2/server/go/operators/archiving/ArchivingNSGA.java index 56a3b907..99d750bf 100644 --- a/src/javaeva/server/go/operators/archiving/ArchivingNSGA.java +++ b/src/eva2/server/go/operators/archiving/ArchivingNSGA.java @@ -1,10 +1,11 @@ -package javaeva.server.go.operators.archiving; +package eva2.server.go.operators.archiving; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; import java.util.ArrayList; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; + /** The non dominated sorting GA archiving method, based on dominace sorting. * Created by IntelliJ IDEA. * User: streiche diff --git a/src/javaeva/server/go/operators/archiving/ArchivingNSGAII.java b/src/eva2/server/go/operators/archiving/ArchivingNSGAII.java similarity index 94% rename from src/javaeva/server/go/operators/archiving/ArchivingNSGAII.java rename to src/eva2/server/go/operators/archiving/ArchivingNSGAII.java index a0477c12..9b167602 100644 --- a/src/javaeva/server/go/operators/archiving/ArchivingNSGAII.java +++ b/src/eva2/server/go/operators/archiving/ArchivingNSGAII.java @@ -1,14 +1,15 @@ -package javaeva.server.go.operators.archiving; +package eva2.server.go.operators.archiving; -import javaeva.server.go.IndividualInterface; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.ESIndividualDoubleData; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; -import javaeva.gui.*; import java.util.ArrayList; +import eva2.gui.*; +import eva2.server.go.IndividualInterface; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.ESIndividualDoubleData; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; + import wsi.ra.chart2d.DPoint; import wsi.ra.chart2d.DPointIcon; @@ -46,7 +47,7 @@ public class ArchivingNSGAII extends ArchivingNSGA implements java.io.Serializab double[] tmpD = new double[2]; tmpD[0] = 0; tmpD[1] = 0; - this.m_Plot = new javaeva.gui.Plot("Debug NSGAII", "Y1", "Y2", tmpD, tmpD); + this.m_Plot = new eva2.gui.Plot("Debug NSGAII", "Y1", "Y2", tmpD, tmpD); System.out.println("Population size: " + pop.size()); // plot the population this.m_Plot.setUnconnectedPoint(0, 0, 11); diff --git a/src/javaeva/server/go/operators/archiving/ArchivingPESAII.java b/src/eva2/server/go/operators/archiving/ArchivingPESAII.java similarity index 97% rename from src/javaeva/server/go/operators/archiving/ArchivingPESAII.java rename to src/eva2/server/go/operators/archiving/ArchivingPESAII.java index c66d4b18..bcb26f8a 100644 --- a/src/javaeva/server/go/operators/archiving/ArchivingPESAII.java +++ b/src/eva2/server/go/operators/archiving/ArchivingPESAII.java @@ -1,10 +1,5 @@ -package javaeva.server.go.operators.archiving; +package eva2.server.go.operators.archiving; -import javaeva.server.go.IndividualInterface; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; -import javaeva.gui.*; import wsi.ra.chart2d.DPointIcon; import wsi.ra.chart2d.DPoint; import wsi.ra.chart2d.DLine; @@ -12,6 +7,12 @@ import wsi.ra.chart2d.DLine; import java.util.ArrayList; import java.awt.*; +import eva2.gui.*; +import eva2.server.go.IndividualInterface; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; + /** The Pareto envelope sorting algorithm using a hybergrid and * the so called squezze factor. * Created by IntelliJ IDEA. @@ -47,7 +48,7 @@ public class ArchivingPESAII extends AbstractArchiving implements java.io.Serial //////////////////////////////////////////////////////////////////////////////////// if (this.m_Debug) { - this.m_Plot = new javaeva.gui.Plot("Debug SPEAII", "Y1", "Y2"); + this.m_Plot = new eva2.gui.Plot("Debug SPEAII", "Y1", "Y2"); System.out.println("Population size: " + pop.size()); // plot the population this.m_Plot.setUnconnectedPoint(0, 0, 11); diff --git a/src/javaeva/server/go/operators/archiving/ArchivingSPEAII.java b/src/eva2/server/go/operators/archiving/ArchivingSPEAII.java similarity index 97% rename from src/javaeva/server/go/operators/archiving/ArchivingSPEAII.java rename to src/eva2/server/go/operators/archiving/ArchivingSPEAII.java index dfaccc7f..cb52fdbe 100644 --- a/src/javaeva/server/go/operators/archiving/ArchivingSPEAII.java +++ b/src/eva2/server/go/operators/archiving/ArchivingSPEAII.java @@ -1,18 +1,19 @@ -package javaeva.server.go.operators.archiving; +package eva2.server.go.operators.archiving; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.ESIndividualDoubleData; -import javaeva.server.go.operators.distancemetric.InterfaceDistanceMetric; -import javaeva.server.go.operators.distancemetric.ObjectiveSpaceMetric; -import javaeva.server.go.operators.selection.InterfaceSelection; -import javaeva.server.go.operators.selection.SelectBestIndividuals; -import javaeva.server.go.populations.Population; -import javaeva.gui.*; import wsi.ra.chart2d.DPoint; import wsi.ra.chart2d.DPointIcon; import java.awt.*; +import eva2.gui.*; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.ESIndividualDoubleData; +import eva2.server.go.operators.distancemetric.InterfaceDistanceMetric; +import eva2.server.go.operators.distancemetric.ObjectiveSpaceMetric; +import eva2.server.go.operators.selection.InterfaceSelection; +import eva2.server.go.operators.selection.SelectBestIndividuals; +import eva2.server.go.populations.Population; + /** The strength Pareto EA in it's second version, which is based on * dominance counts. * Created by IntelliJ IDEA. @@ -48,7 +49,7 @@ public class ArchivingSPEAII extends AbstractArchiving implements java.io.Serial //////////////////////////////////////////////////////////////////////////////////// if (this.m_Debug) { - this.m_Plot = new javaeva.gui.Plot("Debug SPEAII", "Y1", "Y2"); + this.m_Plot = new eva2.gui.Plot("Debug SPEAII", "Y1", "Y2"); System.out.println("Population size: " + pop.size()); // plot the population this.m_Plot.setUnconnectedPoint(0, 0, 11); @@ -346,7 +347,7 @@ public class ArchivingSPEAII extends AbstractArchiving implements java.io.Serial } if (this.soutDebug) { for (int i = 0; i < result.length; i++) System.out.println("Result "+i+": "+result[i]); - this.m_Plot = new javaeva.gui.Plot("Debug SPEAII", "Y1", "Y2"); + this.m_Plot = new eva2.gui.Plot("Debug SPEAII", "Y1", "Y2"); this.m_Plot.setUnconnectedPoint(0, 0, 11); this.m_Plot.setUnconnectedPoint(1.2, 2.0, 11); GraphPointSet mySet = new GraphPointSet(10, this.m_Plot.getFunctionArea()); diff --git a/src/javaeva/server/go/operators/archiving/InformationRetrievalInserting.java b/src/eva2/server/go/operators/archiving/InformationRetrievalInserting.java similarity index 95% rename from src/javaeva/server/go/operators/archiving/InformationRetrievalInserting.java rename to src/eva2/server/go/operators/archiving/InformationRetrievalInserting.java index 5f4ab7d8..68f03135 100644 --- a/src/javaeva/server/go/operators/archiving/InformationRetrievalInserting.java +++ b/src/eva2/server/go/operators/archiving/InformationRetrievalInserting.java @@ -1,6 +1,6 @@ -package javaeva.server.go.operators.archiving; +package eva2.server.go.operators.archiving; -import javaeva.server.go.populations.Population; +import eva2.server.go.populations.Population; /** This information retrieval inserts the retrieved * solutions, by removing random individuals from the diff --git a/src/javaeva/server/go/operators/archiving/InformationRetrievalNone.java b/src/eva2/server/go/operators/archiving/InformationRetrievalNone.java similarity index 93% rename from src/javaeva/server/go/operators/archiving/InformationRetrievalNone.java rename to src/eva2/server/go/operators/archiving/InformationRetrievalNone.java index 46fb7783..38129f19 100644 --- a/src/javaeva/server/go/operators/archiving/InformationRetrievalNone.java +++ b/src/eva2/server/go/operators/archiving/InformationRetrievalNone.java @@ -1,6 +1,6 @@ -package javaeva.server.go.operators.archiving; +package eva2.server.go.operators.archiving; -import javaeva.server.go.populations.Population; +import eva2.server.go.populations.Population; /** This class allows no information retrieval and thus no elitism * for MOEAs. diff --git a/src/javaeva/server/go/operators/archiving/InformationRetrievalReplacing.java b/src/eva2/server/go/operators/archiving/InformationRetrievalReplacing.java similarity index 92% rename from src/javaeva/server/go/operators/archiving/InformationRetrievalReplacing.java rename to src/eva2/server/go/operators/archiving/InformationRetrievalReplacing.java index 1a2b240a..5cd17ba4 100644 --- a/src/javaeva/server/go/operators/archiving/InformationRetrievalReplacing.java +++ b/src/eva2/server/go/operators/archiving/InformationRetrievalReplacing.java @@ -1,7 +1,7 @@ -package javaeva.server.go.operators.archiving; +package eva2.server.go.operators.archiving; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; /** This information retrieval method simply add the retrieved solutions * to the current population. diff --git a/src/javaeva/server/go/operators/archiving/InterfaceArchiving.java b/src/eva2/server/go/operators/archiving/InterfaceArchiving.java similarity index 88% rename from src/javaeva/server/go/operators/archiving/InterfaceArchiving.java rename to src/eva2/server/go/operators/archiving/InterfaceArchiving.java index 7f5c4645..cd046e71 100644 --- a/src/javaeva/server/go/operators/archiving/InterfaceArchiving.java +++ b/src/eva2/server/go/operators/archiving/InterfaceArchiving.java @@ -1,6 +1,6 @@ -package javaeva.server.go.operators.archiving; +package eva2.server.go.operators.archiving; -import javaeva.server.go.populations.Population; +import eva2.server.go.populations.Population; /** This Interface give the general methods required for a archiving method. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/archiving/InterfaceInformationRetrieval.java b/src/eva2/server/go/operators/archiving/InterfaceInformationRetrieval.java similarity index 87% rename from src/javaeva/server/go/operators/archiving/InterfaceInformationRetrieval.java rename to src/eva2/server/go/operators/archiving/InterfaceInformationRetrieval.java index 4b8a5b12..cf56ddfb 100644 --- a/src/javaeva/server/go/operators/archiving/InterfaceInformationRetrieval.java +++ b/src/eva2/server/go/operators/archiving/InterfaceInformationRetrieval.java @@ -1,6 +1,6 @@ -package javaeva.server.go.operators.archiving; +package eva2.server.go.operators.archiving; -import javaeva.server.go.populations.Population; +import eva2.server.go.populations.Population; /** This interface gives the necessary methods for an information * retrieval algorithm. diff --git a/src/javaeva/server/go/operators/archiving/InterfaceRemoveSurplusIndividuals.java b/src/eva2/server/go/operators/archiving/InterfaceRemoveSurplusIndividuals.java similarity index 87% rename from src/javaeva/server/go/operators/archiving/InterfaceRemoveSurplusIndividuals.java rename to src/eva2/server/go/operators/archiving/InterfaceRemoveSurplusIndividuals.java index 930e5fae..50dab8f3 100644 --- a/src/javaeva/server/go/operators/archiving/InterfaceRemoveSurplusIndividuals.java +++ b/src/eva2/server/go/operators/archiving/InterfaceRemoveSurplusIndividuals.java @@ -1,6 +1,6 @@ -package javaeva.server.go.operators.archiving; +package eva2.server.go.operators.archiving; -import javaeva.server.go.populations.Population; +import eva2.server.go.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/javaeva/server/go/operators/archiving/RemoveSurplusIndividualsDynamicHyperCube.java b/src/eva2/server/go/operators/archiving/RemoveSurplusIndividualsDynamicHyperCube.java similarity index 95% rename from src/javaeva/server/go/operators/archiving/RemoveSurplusIndividualsDynamicHyperCube.java rename to src/eva2/server/go/operators/archiving/RemoveSurplusIndividualsDynamicHyperCube.java index cbc319e8..c787d291 100644 --- a/src/javaeva/server/go/operators/archiving/RemoveSurplusIndividualsDynamicHyperCube.java +++ b/src/eva2/server/go/operators/archiving/RemoveSurplusIndividualsDynamicHyperCube.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.archiving; +package eva2.server.go.operators.archiving; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; /** This class removes surplus individuals based on bounding * hybercube, which can be calculated in objective or decision diff --git a/src/javaeva/server/go/operators/archiving/RemoveSurplusIndividualsStaticHyperCube.java b/src/eva2/server/go/operators/archiving/RemoveSurplusIndividualsStaticHyperCube.java similarity index 92% rename from src/javaeva/server/go/operators/archiving/RemoveSurplusIndividualsStaticHyperCube.java rename to src/eva2/server/go/operators/archiving/RemoveSurplusIndividualsStaticHyperCube.java index fa3d598e..2e749aab 100644 --- a/src/javaeva/server/go/operators/archiving/RemoveSurplusIndividualsStaticHyperCube.java +++ b/src/eva2/server/go/operators/archiving/RemoveSurplusIndividualsStaticHyperCube.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.archiving; +package eva2.server.go.operators.archiving; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; /** This class removes surplus individuals based on bounding * hybercube, which can be calculated in objective or decision diff --git a/src/javaeva/server/go/operators/classification/ClassificationSelfOrganizingMaps.java b/src/eva2/server/go/operators/classification/ClassificationSelfOrganizingMaps.java similarity index 99% rename from src/javaeva/server/go/operators/classification/ClassificationSelfOrganizingMaps.java rename to src/eva2/server/go/operators/classification/ClassificationSelfOrganizingMaps.java index f05c0a5c..f530e766 100644 --- a/src/javaeva/server/go/operators/classification/ClassificationSelfOrganizingMaps.java +++ b/src/eva2/server/go/operators/classification/ClassificationSelfOrganizingMaps.java @@ -1,8 +1,9 @@ -package javaeva.server.go.operators.classification; +package eva2.server.go.operators.classification; -import javaeva.server.go.tools.RandomNumberGenerator; -import javaeva.gui.Chart2DDPointIconCross; import javax.swing.*; + +import eva2.gui.Chart2DDPointIconCross; +import eva2.server.go.tools.RandomNumberGenerator; import wsi.ra.chart2d.*; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; diff --git a/src/javaeva/server/go/operators/classification/InterfaceClassification.java b/src/eva2/server/go/operators/classification/InterfaceClassification.java similarity index 95% rename from src/javaeva/server/go/operators/classification/InterfaceClassification.java rename to src/eva2/server/go/operators/classification/InterfaceClassification.java index 8da2dba9..e0069b63 100644 --- a/src/javaeva/server/go/operators/classification/InterfaceClassification.java +++ b/src/eva2/server/go/operators/classification/InterfaceClassification.java @@ -1,4 +1,4 @@ -package javaeva.server.go.operators.classification; +package eva2.server.go.operators.classification; /** An interface for classification methods, currently under construction. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/cluster/ClusteringDensityBased.java b/src/eva2/server/go/operators/cluster/ClusteringDensityBased.java similarity index 97% rename from src/javaeva/server/go/operators/cluster/ClusteringDensityBased.java rename to src/eva2/server/go/operators/cluster/ClusteringDensityBased.java index 3ae8de0a..166d37a1 100644 --- a/src/javaeva/server/go/operators/cluster/ClusteringDensityBased.java +++ b/src/eva2/server/go/operators/cluster/ClusteringDensityBased.java @@ -1,11 +1,12 @@ -package javaeva.server.go.operators.cluster; +package eva2.server.go.operators.cluster; import java.util.ArrayList; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.distancemetric.InterfaceDistanceMetric; -import javaeva.server.go.operators.distancemetric.PhenotypeMetric; -import javaeva.server.go.populations.Population; +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; + /** The DBSCAN method. As far as I recall this is an hierachical * clustering method like the single-link method. diff --git a/src/javaeva/server/go/operators/cluster/ClusteringKMeans.java b/src/eva2/server/go/operators/cluster/ClusteringKMeans.java similarity index 94% rename from src/javaeva/server/go/operators/cluster/ClusteringKMeans.java rename to src/eva2/server/go/operators/cluster/ClusteringKMeans.java index f961add5..5367ae93 100644 --- a/src/javaeva/server/go/operators/cluster/ClusteringKMeans.java +++ b/src/eva2/server/go/operators/cluster/ClusteringKMeans.java @@ -1,15 +1,15 @@ -package javaeva.server.go.operators.cluster; +package eva2.server.go.operators.cluster; -import javaeva.gui.Chart2DDPointIconCircle; -import javaeva.gui.Chart2DDPointIconText; -import javaeva.gui.GraphPointSet; -import javaeva.gui.Plot; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.ESIndividualDoubleData; -import javaeva.server.go.individuals.InterfaceDataTypeDouble; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.F1Problem; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.gui.Chart2DDPointIconCircle; +import eva2.gui.Chart2DDPointIconText; +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.server.go.tools.RandomNumberGenerator; import wsi.ra.chart2d.DPoint; /** The k-mean clustering algorithms. I guess it is not a hierachical @@ -116,7 +116,7 @@ public class ClusteringKMeans implements InterfaceClustering, java.io.Serializab double[] tmpD = new double[2]; tmpD[0] = 0; tmpD[1] = 0; - plot = new javaeva.gui.Plot("Debugging K-Means Clustering", "Y1", "Y2", tmpD, tmpD); + plot = new eva2.gui.Plot("Debugging K-Means Clustering", "Y1", "Y2", tmpD, tmpD); for (int i = 0; i < pop.size(); i++) { double[] x = ((InterfaceDataTypeDouble)pop.get(i)).getDoubleData(); @@ -147,7 +147,7 @@ public class ClusteringKMeans implements InterfaceClustering, java.io.Serializab double[] tmpD = new double[2]; tmpD[0] = 0; tmpD[1] = 0; - plot = new javaeva.gui.Plot("Debugging Cluster", "Y1", "Y2", tmpD, tmpD); + plot = new eva2.gui.Plot("Debugging Cluster", "Y1", "Y2", tmpD, tmpD); GraphPointSet mySet; DPoint myPoint; Chart2DDPointIconText tmp; @@ -181,7 +181,7 @@ public class ClusteringKMeans implements InterfaceClustering, java.io.Serializab double[] tmpD = new double[2]; tmpD[0] = 0; tmpD[1] = 0; - plot = new javaeva.gui.Plot("Debugging Clustering Separation", "Y1", "Y2", tmpD, tmpD); + plot = new eva2.gui.Plot("Debugging Clustering Separation", "Y1", "Y2", tmpD, tmpD); GraphPointSet mySet; DPoint myPoint; Chart2DDPointIconText tmp; diff --git a/src/javaeva/server/go/operators/cluster/ClusteringXMeans.java b/src/eva2/server/go/operators/cluster/ClusteringXMeans.java similarity index 95% rename from src/javaeva/server/go/operators/cluster/ClusteringXMeans.java rename to src/eva2/server/go/operators/cluster/ClusteringXMeans.java index b2ba82b8..8e326daa 100644 --- a/src/javaeva/server/go/operators/cluster/ClusteringXMeans.java +++ b/src/eva2/server/go/operators/cluster/ClusteringXMeans.java @@ -1,15 +1,15 @@ -package javaeva.server.go.operators.cluster; +package eva2.server.go.operators.cluster; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.ESIndividualDoubleData; -import javaeva.server.go.individuals.InterfaceDataTypeDouble; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.F1Problem; -import javaeva.server.go.tools.RandomNumberGenerator; -import javaeva.gui.Plot; -import javaeva.gui.GraphPointSet; -import javaeva.gui.Chart2DDPointIconText; -import javaeva.gui.Chart2DDPointIconCircle; +import eva2.gui.Chart2DDPointIconCircle; +import eva2.gui.Chart2DDPointIconText; +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.server.go.tools.RandomNumberGenerator; import wsi.ra.chart2d.DPoint; /** The x-means clustering method should be able to determine a @@ -82,7 +82,7 @@ public class ClusteringXMeans implements InterfaceClustering, java.io.Serializab double[] tmpD = new double[2], x; tmpD[0] = 0; tmpD[1] = 0; - plot = new javaeva.gui.Plot("K="+(i+1)+" reaches BIC = "+tmpBIC, "Y1", "Y2", tmpD, tmpD); + plot = new eva2.gui.Plot("K="+(i+1)+" reaches BIC = "+tmpBIC, "Y1", "Y2", tmpD, tmpD); GraphPointSet mySet; DPoint myPoint; Chart2DDPointIconText tmp; diff --git a/src/javaeva/server/go/operators/cluster/InterfaceClustering.java b/src/eva2/server/go/operators/cluster/InterfaceClustering.java similarity index 91% rename from src/javaeva/server/go/operators/cluster/InterfaceClustering.java rename to src/eva2/server/go/operators/cluster/InterfaceClustering.java index 048e6072..f27f1438 100644 --- a/src/javaeva/server/go/operators/cluster/InterfaceClustering.java +++ b/src/eva2/server/go/operators/cluster/InterfaceClustering.java @@ -1,7 +1,7 @@ -package javaeva.server.go.operators.cluster; +package eva2.server.go.operators.cluster; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; /** * This the interface to clustering algorithms, but since there diff --git a/src/javaeva/server/go/operators/constraint/ConstBelongsToDifferentClass.java b/src/eva2/server/go/operators/constraint/ConstBelongsToDifferentClass.java similarity index 94% rename from src/javaeva/server/go/operators/constraint/ConstBelongsToDifferentClass.java rename to src/eva2/server/go/operators/constraint/ConstBelongsToDifferentClass.java index d4fa11f0..4eb31467 100644 --- a/src/javaeva/server/go/operators/constraint/ConstBelongsToDifferentClass.java +++ b/src/eva2/server/go/operators/constraint/ConstBelongsToDifferentClass.java @@ -1,7 +1,7 @@ -package javaeva.server.go.operators.constraint; +package eva2.server.go.operators.constraint; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceDataTypeDouble; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceDataTypeDouble; /** This area constraint for parallelization is based on * the class type an individual belongs to. diff --git a/src/javaeva/server/go/operators/constraint/ConstObjectivesInEqualityBiggerThanLinear.java b/src/eva2/server/go/operators/constraint/ConstObjectivesInEqualityBiggerThanLinear.java similarity index 92% rename from src/javaeva/server/go/operators/constraint/ConstObjectivesInEqualityBiggerThanLinear.java rename to src/eva2/server/go/operators/constraint/ConstObjectivesInEqualityBiggerThanLinear.java index 912e89f5..79143a57 100644 --- a/src/javaeva/server/go/operators/constraint/ConstObjectivesInEqualityBiggerThanLinear.java +++ b/src/eva2/server/go/operators/constraint/ConstObjectivesInEqualityBiggerThanLinear.java @@ -1,6 +1,6 @@ -package javaeva.server.go.operators.constraint; +package eva2.server.go.operators.constraint; -import javaeva.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.AbstractEAIndividual; /** This area constraint for parallelization is based on * a line constraint diff --git a/src/javaeva/server/go/operators/constraint/ConstObjectivesInEqualityBiggerThanSurface.java b/src/eva2/server/go/operators/constraint/ConstObjectivesInEqualityBiggerThanSurface.java similarity index 95% rename from src/javaeva/server/go/operators/constraint/ConstObjectivesInEqualityBiggerThanSurface.java rename to src/eva2/server/go/operators/constraint/ConstObjectivesInEqualityBiggerThanSurface.java index 4f31f494..8aa68545 100644 --- a/src/javaeva/server/go/operators/constraint/ConstObjectivesInEqualityBiggerThanSurface.java +++ b/src/eva2/server/go/operators/constraint/ConstObjectivesInEqualityBiggerThanSurface.java @@ -1,6 +1,6 @@ -package javaeva.server.go.operators.constraint; +package eva2.server.go.operators.constraint; -import javaeva.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.AbstractEAIndividual; /** This area constraint for parallelization is based on * a surface constraint diff --git a/src/javaeva/server/go/operators/constraint/ConstObjectivesInEqualityLesserThanLinear.java b/src/eva2/server/go/operators/constraint/ConstObjectivesInEqualityLesserThanLinear.java similarity index 92% rename from src/javaeva/server/go/operators/constraint/ConstObjectivesInEqualityLesserThanLinear.java rename to src/eva2/server/go/operators/constraint/ConstObjectivesInEqualityLesserThanLinear.java index 2a7f39c4..b487f87f 100644 --- a/src/javaeva/server/go/operators/constraint/ConstObjectivesInEqualityLesserThanLinear.java +++ b/src/eva2/server/go/operators/constraint/ConstObjectivesInEqualityLesserThanLinear.java @@ -1,6 +1,6 @@ -package javaeva.server.go.operators.constraint; +package eva2.server.go.operators.constraint; -import javaeva.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.AbstractEAIndividual; /** This area constraint for parallelization is based on * a line constraint diff --git a/src/javaeva/server/go/operators/constraint/ConstObjectivesInEqualitySmallerThanSurface.java b/src/eva2/server/go/operators/constraint/ConstObjectivesInEqualitySmallerThanSurface.java similarity index 95% rename from src/javaeva/server/go/operators/constraint/ConstObjectivesInEqualitySmallerThanSurface.java rename to src/eva2/server/go/operators/constraint/ConstObjectivesInEqualitySmallerThanSurface.java index 10a7a78b..f423de17 100644 --- a/src/javaeva/server/go/operators/constraint/ConstObjectivesInEqualitySmallerThanSurface.java +++ b/src/eva2/server/go/operators/constraint/ConstObjectivesInEqualitySmallerThanSurface.java @@ -1,6 +1,6 @@ -package javaeva.server.go.operators.constraint; +package eva2.server.go.operators.constraint; -import javaeva.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.AbstractEAIndividual; /** This area constraint for parallelization is based on * a surface constraint diff --git a/src/javaeva/server/go/operators/constraint/InterfaceConstraint.java b/src/eva2/server/go/operators/constraint/InterfaceConstraint.java similarity index 87% rename from src/javaeva/server/go/operators/constraint/InterfaceConstraint.java rename to src/eva2/server/go/operators/constraint/InterfaceConstraint.java index 868e7218..394d104e 100644 --- a/src/javaeva/server/go/operators/constraint/InterfaceConstraint.java +++ b/src/eva2/server/go/operators/constraint/InterfaceConstraint.java @@ -1,6 +1,6 @@ -package javaeva.server.go.operators.constraint; +package eva2.server.go.operators.constraint; -import javaeva.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.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/javaeva/server/go/operators/crossover/CrossoverEAMixer.java b/src/eva2/server/go/operators/crossover/CrossoverEAMixer.java similarity index 95% rename from src/javaeva/server/go/operators/crossover/CrossoverEAMixer.java rename to src/eva2/server/go/operators/crossover/CrossoverEAMixer.java index 2e6de195..eecbfd14 100644 --- a/src/javaeva/server/go/operators/crossover/CrossoverEAMixer.java +++ b/src/eva2/server/go/operators/crossover/CrossoverEAMixer.java @@ -1,12 +1,13 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; import java.util.ArrayList; -import javaeva.gui.GenericObjectEditor; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.gui.GenericObjectEditor; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; + /** * Created by IntelliJ IDEA. @@ -24,7 +25,7 @@ public class CrossoverEAMixer implements InterfaceCrossover, java.io.Serializabl public CrossoverEAMixer() { InterfaceCrossover[] tmpList; - ArrayList crossers = GenericObjectEditor.getClassesFromProperties("javaeva.server.go.operators.crossover.InterfaceCrossover"); + ArrayList crossers = GenericObjectEditor.getClassesFromProperties("eva2.server.go.operators.crossover.InterfaceCrossover"); tmpList = new InterfaceCrossover[crossers.size()]; for (int i = 0; i < crossers.size(); i++) { if (((String)crossers.get(i)).equals(this.getClass().getName())) continue; diff --git a/src/javaeva/server/go/operators/crossover/CrossoverESArithmetical.java b/src/eva2/server/go/operators/crossover/CrossoverESArithmetical.java similarity index 93% rename from src/javaeva/server/go/operators/crossover/CrossoverESArithmetical.java rename to src/eva2/server/go/operators/crossover/CrossoverESArithmetical.java index ee434862..e04b7289 100644 --- a/src/javaeva/server/go/operators/crossover/CrossoverESArithmetical.java +++ b/src/eva2/server/go/operators/crossover/CrossoverESArithmetical.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +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.server.go.tools.RandomNumberGenerator; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/crossover/CrossoverESBLXAlpha.java b/src/eva2/server/go/operators/crossover/CrossoverESBLXAlpha.java similarity index 94% rename from src/javaeva/server/go/operators/crossover/CrossoverESBLXAlpha.java rename to src/eva2/server/go/operators/crossover/CrossoverESBLXAlpha.java index f0a5a71d..53c61090 100644 --- a/src/javaeva/server/go/operators/crossover/CrossoverESBLXAlpha.java +++ b/src/eva2/server/go/operators/crossover/CrossoverESBLXAlpha.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +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.server.go.tools.RandomNumberGenerator; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/crossover/CrossoverESDefault.java b/src/eva2/server/go/operators/crossover/CrossoverESDefault.java similarity index 87% rename from src/javaeva/server/go/operators/crossover/CrossoverESDefault.java rename to src/eva2/server/go/operators/crossover/CrossoverESDefault.java index 80bde793..9341dc07 100644 --- a/src/javaeva/server/go/operators/crossover/CrossoverESDefault.java +++ b/src/eva2/server/go/operators/crossover/CrossoverESDefault.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +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.server.go.tools.RandomNumberGenerator; /** * Created by IntelliJ IDEA. @@ -29,8 +29,9 @@ public class CrossoverESDefault implements InterfaceCrossover, java.io.Serializa return new CrossoverESDefault(this); } - /** This method performs crossover on two individuals. If the individuals do - * not implement InterfaceGAIndividual, then nothing will happen. + /** + * This method performs crossover on two individuals. If the individuals do + * not implement InterfaceESIndividual, then nothing will happen. * @param indy1 The first individual * @param partners The second individual */ @@ -49,9 +50,10 @@ public class CrossoverESDefault implements InterfaceCrossover, java.io.Serializa if ((indy1 instanceof InterfaceESIndividual) && (partners.get(0) instanceof InterfaceESIndividual)) { int crossoverpoint = RandomNumberGenerator.randomInt(0,((InterfaceESIndividual)indy1).getDGenotype().length-1); boolean switcher = RandomNumberGenerator.randomBoolean(); - parents = new double[partners.size()+1][]; - children = new double[partners.size()+1][]; + parents = new double[result.length][]; + children = new double[result.length][]; for (int i = 0; i < result.length; i++) { + // first clone all data arrays parents[i] = new double[((InterfaceESIndividual)result[i]).getDGenotype().length]; children[i] = new double[parents[i].length]; System.arraycopy(((InterfaceESIndividual)result[i]).getDGenotype(), 0, parents[i], 0, parents[i].length); @@ -62,7 +64,7 @@ public class CrossoverESDefault implements InterfaceCrossover, java.io.Serializa if ((i < crossoverpoint)^(switcher)) { // do nothing } else { - // exchange + // exchange circular among the parents for (int j = 0; j < children.length-1; j++) { children[j][i] = parents[j+1][i]; } diff --git a/src/javaeva/server/go/operators/crossover/CrossoverESFlat.java b/src/eva2/server/go/operators/crossover/CrossoverESFlat.java similarity index 93% rename from src/javaeva/server/go/operators/crossover/CrossoverESFlat.java rename to src/eva2/server/go/operators/crossover/CrossoverESFlat.java index 826bedac..d1806c50 100644 --- a/src/javaeva/server/go/operators/crossover/CrossoverESFlat.java +++ b/src/eva2/server/go/operators/crossover/CrossoverESFlat.java @@ -1,14 +1,15 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; -import javaeva.gui.Plot; import javax.swing.*; +import eva2.gui.Plot; +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.server.go.tools.RandomNumberGenerator; + /** * Created by IntelliJ IDEA. * User: streiche diff --git a/src/javaeva/server/go/operators/crossover/CrossoverESIntermediate.java b/src/eva2/server/go/operators/crossover/CrossoverESIntermediate.java similarity index 94% rename from src/javaeva/server/go/operators/crossover/CrossoverESIntermediate.java rename to src/eva2/server/go/operators/crossover/CrossoverESIntermediate.java index f51e5e67..51204955 100644 --- a/src/javaeva/server/go/operators/crossover/CrossoverESIntermediate.java +++ b/src/eva2/server/go/operators/crossover/CrossoverESIntermediate.java @@ -1,9 +1,9 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceESIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/crossover/CrossoverESNPointDiscrete.java b/src/eva2/server/go/operators/crossover/CrossoverESNPointDiscrete.java similarity index 94% rename from src/javaeva/server/go/operators/crossover/CrossoverESNPointDiscrete.java rename to src/eva2/server/go/operators/crossover/CrossoverESNPointDiscrete.java index 09ec432d..43410dc8 100644 --- a/src/javaeva/server/go/operators/crossover/CrossoverESNPointDiscrete.java +++ b/src/eva2/server/go/operators/crossover/CrossoverESNPointDiscrete.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +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.server.go.tools.RandomNumberGenerator; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/crossover/CrossoverESNPointDiscreteDislocation.java b/src/eva2/server/go/operators/crossover/CrossoverESNPointDiscreteDislocation.java similarity index 95% rename from src/javaeva/server/go/operators/crossover/CrossoverESNPointDiscreteDislocation.java rename to src/eva2/server/go/operators/crossover/CrossoverESNPointDiscreteDislocation.java index 8ea48d1c..a34e23c3 100644 --- a/src/javaeva/server/go/operators/crossover/CrossoverESNPointDiscreteDislocation.java +++ b/src/eva2/server/go/operators/crossover/CrossoverESNPointDiscreteDislocation.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +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.server.go.tools.RandomNumberGenerator; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/crossover/CrossoverESPCX.java b/src/eva2/server/go/operators/crossover/CrossoverESPCX.java similarity index 96% rename from src/javaeva/server/go/operators/crossover/CrossoverESPCX.java rename to src/eva2/server/go/operators/crossover/CrossoverESPCX.java index d9722ffe..4fcc3ee6 100644 --- a/src/javaeva/server/go/operators/crossover/CrossoverESPCX.java +++ b/src/eva2/server/go/operators/crossover/CrossoverESPCX.java @@ -1,16 +1,17 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.ESIndividualDoubleData; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.F1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; -import javaeva.gui.Plot; import java.util.ArrayList; +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.server.go.tools.RandomNumberGenerator; + /** * Created by IntelliJ IDEA. * User: streiche @@ -329,7 +330,7 @@ public class CrossoverESPCX implements InterfaceCrossover, java.io.Serializable tmpD[0] = 1; tmpD[1] = 1; if (plotFlag) { - plot = new javaeva.gui.Plot("SBX Test", "x", "y", true); + plot = new eva2.gui.Plot("SBX Test", "x", "y", true); tmpD = indy1.getDoubleData(); plot.setUnconnectedPoint(tmpD[0], tmpD[1], 0); tmpD = indy2.getDoubleData(); diff --git a/src/javaeva/server/go/operators/crossover/CrossoverESSBX.java b/src/eva2/server/go/operators/crossover/CrossoverESSBX.java similarity index 93% rename from src/javaeva/server/go/operators/crossover/CrossoverESSBX.java rename to src/eva2/server/go/operators/crossover/CrossoverESSBX.java index 2326f111..0d59204a 100644 --- a/src/javaeva/server/go/operators/crossover/CrossoverESSBX.java +++ b/src/eva2/server/go/operators/crossover/CrossoverESSBX.java @@ -1,13 +1,13 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.ESIndividualDoubleData; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.F1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; -import javaeva.gui.Plot; +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.server.go.tools.RandomNumberGenerator; /** * Created by IntelliJ IDEA. @@ -145,7 +145,7 @@ public class CrossoverESSBX implements InterfaceCrossover, java.io.Serializable pop.add(indy3); tmpD[0] = 1; tmpD[1] = 1; - Plot plot = new javaeva.gui.Plot("SBX Test", "x", "y", true); + Plot plot = new eva2.gui.Plot("SBX Test", "x", "y", true); tmpD = indy1.getDoubleData(); plot.setUnconnectedPoint(tmpD[0], tmpD[1], 0); tmpD = indy2.getDoubleData(); diff --git a/src/javaeva/server/go/operators/crossover/CrossoverESSPX.java b/src/eva2/server/go/operators/crossover/CrossoverESSPX.java similarity index 95% rename from src/javaeva/server/go/operators/crossover/CrossoverESSPX.java rename to src/eva2/server/go/operators/crossover/CrossoverESSPX.java index 86bf5cc9..cdb85c0f 100644 --- a/src/javaeva/server/go/operators/crossover/CrossoverESSPX.java +++ b/src/eva2/server/go/operators/crossover/CrossoverESSPX.java @@ -1,16 +1,17 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.ESIndividualDoubleData; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.F1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; -import javaeva.gui.Plot; import java.util.ArrayList; +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.server.go.tools.RandomNumberGenerator; + /** * Created by IntelliJ IDEA. * User: streiche @@ -229,7 +230,7 @@ public class CrossoverESSPX implements InterfaceCrossover, java.io.Serializable tmpD[0] = 1; tmpD[1] = 1; if (plotFlag) { - plot = new javaeva.gui.Plot("SBX Test", "x", "y", true); + plot = new eva2.gui.Plot("SBX Test", "x", "y", true); tmpD = indy1.getDoubleData(); plot.setUnconnectedPoint(tmpD[0], tmpD[1], 0); tmpD = indy2.getDoubleData(); diff --git a/src/javaeva/server/go/operators/crossover/CrossoverESUNDX.java b/src/eva2/server/go/operators/crossover/CrossoverESUNDX.java similarity index 96% rename from src/javaeva/server/go/operators/crossover/CrossoverESUNDX.java rename to src/eva2/server/go/operators/crossover/CrossoverESUNDX.java index 5701ec9d..2b844a80 100644 --- a/src/javaeva/server/go/operators/crossover/CrossoverESUNDX.java +++ b/src/eva2/server/go/operators/crossover/CrossoverESUNDX.java @@ -1,16 +1,17 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.ESIndividualDoubleData; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.F1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; -import javaeva.gui.Plot; import java.util.ArrayList; +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.server.go.tools.RandomNumberGenerator; + /** * Created by IntelliJ IDEA. * User: streiche @@ -329,7 +330,7 @@ public class CrossoverESUNDX implements InterfaceCrossover, java.io.Serializable tmpD[0] = 1; tmpD[1] = 1; if (plotFlag) { - plot = new javaeva.gui.Plot("SBX Test", "x", "y", true); + plot = new eva2.gui.Plot("SBX Test", "x", "y", true); tmpD = indy1.getDoubleData(); plot.setUnconnectedPoint(tmpD[0], tmpD[1], 0); tmpD = indy2.getDoubleData(); diff --git a/src/javaeva/server/go/operators/crossover/CrossoverESUniformDiscrete.java b/src/eva2/server/go/operators/crossover/CrossoverESUniformDiscrete.java similarity index 93% rename from src/javaeva/server/go/operators/crossover/CrossoverESUniformDiscrete.java rename to src/eva2/server/go/operators/crossover/CrossoverESUniformDiscrete.java index d574596f..55981c20 100644 --- a/src/javaeva/server/go/operators/crossover/CrossoverESUniformDiscrete.java +++ b/src/eva2/server/go/operators/crossover/CrossoverESUniformDiscrete.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +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.server.go.tools.RandomNumberGenerator; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/crossover/CrossoverGABitSimulated.java b/src/eva2/server/go/operators/crossover/CrossoverGABitSimulated.java similarity index 93% rename from src/javaeva/server/go/operators/crossover/CrossoverGABitSimulated.java rename to src/eva2/server/go/operators/crossover/CrossoverGABitSimulated.java index af1923a3..fc01c674 100644 --- a/src/javaeva/server/go/operators/crossover/CrossoverGABitSimulated.java +++ b/src/eva2/server/go/operators/crossover/CrossoverGABitSimulated.java @@ -1,13 +1,14 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.BitSet; +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.server.go.tools.RandomNumberGenerator; + /** * Created by IntelliJ IDEA. * User: streiche diff --git a/src/javaeva/server/go/operators/crossover/CrossoverGADefault.java b/src/eva2/server/go/operators/crossover/CrossoverGADefault.java similarity index 92% rename from src/javaeva/server/go/operators/crossover/CrossoverGADefault.java rename to src/eva2/server/go/operators/crossover/CrossoverGADefault.java index 3a54436d..02ad1a01 100644 --- a/src/javaeva/server/go/operators/crossover/CrossoverGADefault.java +++ b/src/eva2/server/go/operators/crossover/CrossoverGADefault.java @@ -1,13 +1,14 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.BitSet; +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.server.go.tools.RandomNumberGenerator; + /** * Created by IntelliJ IDEA. User: streiche Date: 03.04.2003 Time: 10:34:17 To * change this template use Options | File Templates. diff --git a/src/javaeva/server/go/operators/crossover/CrossoverGANPoint.java b/src/eva2/server/go/operators/crossover/CrossoverGANPoint.java similarity index 94% rename from src/javaeva/server/go/operators/crossover/CrossoverGANPoint.java rename to src/eva2/server/go/operators/crossover/CrossoverGANPoint.java index 83f0a1a8..0f66b9f1 100644 --- a/src/javaeva/server/go/operators/crossover/CrossoverGANPoint.java +++ b/src/eva2/server/go/operators/crossover/CrossoverGANPoint.java @@ -1,13 +1,14 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.BitSet; +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.server.go.tools.RandomNumberGenerator; + /** * Created by IntelliJ IDEA. * User: streiche diff --git a/src/javaeva/server/go/operators/crossover/CrossoverGAUniform.java b/src/eva2/server/go/operators/crossover/CrossoverGAUniform.java similarity index 93% rename from src/javaeva/server/go/operators/crossover/CrossoverGAUniform.java rename to src/eva2/server/go/operators/crossover/CrossoverGAUniform.java index c99bd5fc..f3871b30 100644 --- a/src/javaeva/server/go/operators/crossover/CrossoverGAUniform.java +++ b/src/eva2/server/go/operators/crossover/CrossoverGAUniform.java @@ -1,13 +1,14 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.BitSet; +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.server.go.tools.RandomNumberGenerator; + /** * Created by IntelliJ IDEA. * User: streiche diff --git a/src/javaeva/server/go/operators/crossover/CrossoverGIDefault.java b/src/eva2/server/go/operators/crossover/CrossoverGIDefault.java similarity index 94% rename from src/javaeva/server/go/operators/crossover/CrossoverGIDefault.java rename to src/eva2/server/go/operators/crossover/CrossoverGIDefault.java index d7fd5799..3c926339 100644 --- a/src/javaeva/server/go/operators/crossover/CrossoverGIDefault.java +++ b/src/eva2/server/go/operators/crossover/CrossoverGIDefault.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGIIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +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.server.go.tools.RandomNumberGenerator; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/crossover/CrossoverGINPoint.java b/src/eva2/server/go/operators/crossover/CrossoverGINPoint.java similarity index 94% rename from src/javaeva/server/go/operators/crossover/CrossoverGINPoint.java rename to src/eva2/server/go/operators/crossover/CrossoverGINPoint.java index a920a7ec..66203821 100644 --- a/src/javaeva/server/go/operators/crossover/CrossoverGINPoint.java +++ b/src/eva2/server/go/operators/crossover/CrossoverGINPoint.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGIIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +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.server.go.tools.RandomNumberGenerator; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/crossover/CrossoverGINPointVL.java b/src/eva2/server/go/operators/crossover/CrossoverGINPointVL.java similarity index 96% rename from src/javaeva/server/go/operators/crossover/CrossoverGINPointVL.java rename to src/eva2/server/go/operators/crossover/CrossoverGINPointVL.java index ccb59f60..736ee8fd 100644 --- a/src/javaeva/server/go/operators/crossover/CrossoverGINPointVL.java +++ b/src/eva2/server/go/operators/crossover/CrossoverGINPointVL.java @@ -1,14 +1,15 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGIIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.BitSet; import java.util.ArrayList; +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.server.go.tools.RandomNumberGenerator; + /** * Created by IntelliJ IDEA. * User: streiche diff --git a/src/javaeva/server/go/operators/crossover/CrossoverGIUniform.java b/src/eva2/server/go/operators/crossover/CrossoverGIUniform.java similarity index 93% rename from src/javaeva/server/go/operators/crossover/CrossoverGIUniform.java rename to src/eva2/server/go/operators/crossover/CrossoverGIUniform.java index 1cbdd77b..58505cae 100644 --- a/src/javaeva/server/go/operators/crossover/CrossoverGIUniform.java +++ b/src/eva2/server/go/operators/crossover/CrossoverGIUniform.java @@ -1,13 +1,14 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGIIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.BitSet; +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.server.go.tools.RandomNumberGenerator; + /** * Created by IntelliJ IDEA. * User: streiche diff --git a/src/javaeva/server/go/operators/crossover/CrossoverGPDefault.java b/src/eva2/server/go/operators/crossover/CrossoverGPDefault.java similarity index 93% rename from src/javaeva/server/go/operators/crossover/CrossoverGPDefault.java rename to src/eva2/server/go/operators/crossover/CrossoverGPDefault.java index 88cae997..acbb9e8a 100644 --- a/src/javaeva/server/go/operators/crossover/CrossoverGPDefault.java +++ b/src/eva2/server/go/operators/crossover/CrossoverGPDefault.java @@ -1,14 +1,15 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGPIndividual; -import javaeva.server.go.individuals.codings.gp.AbstractGPNode; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.ArrayList; +import eva2.server.go.individuals.AbstractEAIndividual; +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.server.go.tools.RandomNumberGenerator; + /** * Created by IntelliJ IDEA. * User: streiche diff --git a/src/javaeva/server/go/operators/crossover/CrossoverOBGAPMX.java b/src/eva2/server/go/operators/crossover/CrossoverOBGAPMX.java similarity index 89% rename from src/javaeva/server/go/operators/crossover/CrossoverOBGAPMX.java rename to src/eva2/server/go/operators/crossover/CrossoverOBGAPMX.java index dde2c344..27a006d0 100644 --- a/src/javaeva/server/go/operators/crossover/CrossoverOBGAPMX.java +++ b/src/eva2/server/go/operators/crossover/CrossoverOBGAPMX.java @@ -1,12 +1,12 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceDataTypePermutation; -import javaeva.server.go.individuals.InterfaceOBGAIndividual; -import javaeva.server.go.operators.crossover.InterfaceCrossover; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceDataTypePermutation; +import eva2.server.go.individuals.InterfaceOBGAIndividual; +import eva2.server.go.operators.crossover.InterfaceCrossover; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; /** *

Title: The JavaEvA

diff --git a/src/javaeva/server/go/operators/crossover/CrossoverOBGAPMXUniform.java b/src/eva2/server/go/operators/crossover/CrossoverOBGAPMXUniform.java similarity index 90% rename from src/javaeva/server/go/operators/crossover/CrossoverOBGAPMXUniform.java rename to src/eva2/server/go/operators/crossover/CrossoverOBGAPMXUniform.java index 75218a8f..38763ea5 100644 --- a/src/javaeva/server/go/operators/crossover/CrossoverOBGAPMXUniform.java +++ b/src/eva2/server/go/operators/crossover/CrossoverOBGAPMXUniform.java @@ -1,11 +1,11 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceOBGAIndividual; -import javaeva.server.go.operators.crossover.InterfaceCrossover; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceOBGAIndividual; +import eva2.server.go.operators.crossover.InterfaceCrossover; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; /** *

Title: The JavaEvA

diff --git a/src/javaeva/server/go/operators/crossover/InterfaceCrossover.java b/src/eva2/server/go/operators/crossover/InterfaceCrossover.java similarity index 87% rename from src/javaeva/server/go/operators/crossover/InterfaceCrossover.java rename to src/eva2/server/go/operators/crossover/InterfaceCrossover.java index d3cb3303..bf311be5 100644 --- a/src/javaeva/server/go/operators/crossover/InterfaceCrossover.java +++ b/src/eva2/server/go/operators/crossover/InterfaceCrossover.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; /** diff --git a/src/javaeva/server/go/operators/crossover/NoCrossover.java b/src/eva2/server/go/operators/crossover/NoCrossover.java similarity index 93% rename from src/javaeva/server/go/operators/crossover/NoCrossover.java rename to src/eva2/server/go/operators/crossover/NoCrossover.java index 71812edf..d8143dfb 100644 --- a/src/javaeva/server/go/operators/crossover/NoCrossover.java +++ b/src/eva2/server/go/operators/crossover/NoCrossover.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/crossover/PropertyCrossoverMixer.java b/src/eva2/server/go/operators/crossover/PropertyCrossoverMixer.java similarity index 99% rename from src/javaeva/server/go/operators/crossover/PropertyCrossoverMixer.java rename to src/eva2/server/go/operators/crossover/PropertyCrossoverMixer.java index b8d1cc32..ffb981dd 100644 --- a/src/javaeva/server/go/operators/crossover/PropertyCrossoverMixer.java +++ b/src/eva2/server/go/operators/crossover/PropertyCrossoverMixer.java @@ -1,4 +1,4 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/crossover/PropertyCrossoverMixerEditor.java b/src/eva2/server/go/operators/crossover/PropertyCrossoverMixerEditor.java similarity index 99% rename from src/javaeva/server/go/operators/crossover/PropertyCrossoverMixerEditor.java rename to src/eva2/server/go/operators/crossover/PropertyCrossoverMixerEditor.java index 30d97fbb..7a8bc501 100644 --- a/src/javaeva/server/go/operators/crossover/PropertyCrossoverMixerEditor.java +++ b/src/eva2/server/go/operators/crossover/PropertyCrossoverMixerEditor.java @@ -1,10 +1,12 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.server.go.tools.GeneralGEOFaker; -import javaeva.server.go.tools.GeneralGOEProperty; -import javaeva.gui.*; import javax.swing.*; + +import eva2.gui.*; +import eva2.server.go.tools.GeneralGEOFaker; +import eva2.server.go.tools.GeneralGOEProperty; + import java.beans.*; import java.awt.*; import java.awt.event.ActionListener; diff --git a/src/javaeva/server/go/operators/crossover/TestESCrossover.java b/src/eva2/server/go/operators/crossover/TestESCrossover.java similarity index 91% rename from src/javaeva/server/go/operators/crossover/TestESCrossover.java rename to src/eva2/server/go/operators/crossover/TestESCrossover.java index 6e0e894c..c03b2fc0 100644 --- a/src/javaeva/server/go/operators/crossover/TestESCrossover.java +++ b/src/eva2/server/go/operators/crossover/TestESCrossover.java @@ -1,16 +1,18 @@ -package javaeva.server.go.operators.crossover; +package eva2.server.go.operators.crossover; -import javaeva.gui.Plot; -import javaeva.gui.JParaPanel; -import javaeva.server.go.SwingWorker; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.ESIndividualDoubleData; -import javaeva.server.go.individuals.InterfaceDataTypeDouble; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.F1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; import javax.swing.*; + +import eva2.gui.JParaPanel; +import eva2.gui.Plot; +import eva2.server.go.SwingWorker; +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 java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.awt.event.ActionListener; @@ -85,7 +87,7 @@ public class TestESCrossover implements java.io.Serializable { double[] tmpD = new double[2]; tmpD[0] = 0; tmpD[1] = 0; - this.m_Plot = new javaeva.gui.Plot("ES Crossover Testert", "x", "y", tmpD, tmpD); + this.m_Plot = new eva2.gui.Plot("ES Crossover Testert", "x", "y", tmpD, tmpD); // validate and show this.m_Frame.validate(); this.m_Frame.setVisible(true); @@ -148,12 +150,12 @@ public class TestESCrossover implements java.io.Serializable { double[] tmpD = new double[2]; tmpD[0] = 1; tmpD[1] = 1; - ((ESIndividualDoubleData)tmpIndyD).initByValue(tmpD, m_Problem); + ((AbstractEAIndividual)tmpIndyD).initByValue(tmpD, m_Problem); tmpIndyEA = (AbstractEAIndividual)((AbstractEAIndividual)tmpIndyD).clone(); tmpD = new double[2]; tmpD[0] = -1; tmpD[1] = -1; - ((ESIndividualDoubleData)tmpIndyEA).initByValue(tmpD, m_Problem); + ((AbstractEAIndividual)tmpIndyEA).initByValue(tmpD, m_Problem); m_Partners.addIndividual(tmpIndyEA); m_Daddy = (AbstractEAIndividual)((AbstractEAIndividual)tmpIndyD).clone(); @@ -191,18 +193,18 @@ public class TestESCrossover implements java.io.Serializable { double[] tmpD = new double[2]; tmpD[0] = 0.5; tmpD[1] = 1.1; - ((ESIndividualDoubleData)tmpIndyD).initByValue(tmpD, m_Problem); + ((AbstractEAIndividual)tmpIndyD).initByValue(tmpD, m_Problem); tmpIndyEA = (AbstractEAIndividual)((AbstractEAIndividual)tmpIndyD).clone(); tmpD = new double[2]; tmpD[0] = 0.1; tmpD[1] = -0.65; - ((ESIndividualDoubleData)tmpIndyEA).initByValue(tmpD, m_Problem); + ((AbstractEAIndividual)tmpIndyEA).initByValue(tmpD, m_Problem); m_Partners.addIndividual(tmpIndyEA); tmpIndyEA = (AbstractEAIndividual)((AbstractEAIndividual)tmpIndyD).clone(); tmpD = new double[2]; tmpD[0] = -0.85; tmpD[1] = 0.3; - ((ESIndividualDoubleData)tmpIndyEA).initByValue(tmpD, m_Problem); + ((AbstractEAIndividual)tmpIndyEA).initByValue(tmpD, m_Problem); m_Partners.addIndividual(tmpIndyEA); m_Daddy = (AbstractEAIndividual)((AbstractEAIndividual)tmpIndyD).clone(); diff --git a/src/javaeva/server/go/operators/distancemetric/GenotypeMetricBitSet.java b/src/eva2/server/go/operators/distancemetric/GenotypeMetricBitSet.java similarity index 90% rename from src/javaeva/server/go/operators/distancemetric/GenotypeMetricBitSet.java rename to src/eva2/server/go/operators/distancemetric/GenotypeMetricBitSet.java index c4382724..df8ce62f 100644 --- a/src/javaeva/server/go/operators/distancemetric/GenotypeMetricBitSet.java +++ b/src/eva2/server/go/operators/distancemetric/GenotypeMetricBitSet.java @@ -1,11 +1,12 @@ -package javaeva.server.go.operators.distancemetric; +package eva2.server.go.operators.distancemetric; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceDataTypeDouble; -import javaeva.server.go.individuals.InterfaceGAIndividual; import java.util.BitSet; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceDataTypeDouble; +import eva2.server.go.individuals.InterfaceGAIndividual; + /** Distance based on a bit-set if any. * Created by IntelliJ IDEA. * User: streiche diff --git a/src/javaeva/server/go/operators/distancemetric/InterfaceDistanceMetric.java b/src/eva2/server/go/operators/distancemetric/InterfaceDistanceMetric.java similarity index 89% rename from src/javaeva/server/go/operators/distancemetric/InterfaceDistanceMetric.java rename to src/eva2/server/go/operators/distancemetric/InterfaceDistanceMetric.java index 0fd98468..9ceb0810 100644 --- a/src/javaeva/server/go/operators/distancemetric/InterfaceDistanceMetric.java +++ b/src/eva2/server/go/operators/distancemetric/InterfaceDistanceMetric.java @@ -1,7 +1,7 @@ -package javaeva.server.go.operators.distancemetric; +package eva2.server.go.operators.distancemetric; -import javaeva.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.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/javaeva/server/go/operators/distancemetric/ObjectiveSpaceMetric.java b/src/eva2/server/go/operators/distancemetric/ObjectiveSpaceMetric.java similarity index 91% rename from src/javaeva/server/go/operators/distancemetric/ObjectiveSpaceMetric.java rename to src/eva2/server/go/operators/distancemetric/ObjectiveSpaceMetric.java index f7281a53..13cb935f 100644 --- a/src/javaeva/server/go/operators/distancemetric/ObjectiveSpaceMetric.java +++ b/src/eva2/server/go/operators/distancemetric/ObjectiveSpaceMetric.java @@ -1,7 +1,7 @@ -package javaeva.server.go.operators.distancemetric; +package eva2.server.go.operators.distancemetric; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceDataTypeDouble; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceDataTypeDouble; /** Objective space metric suited for multi-objective optimization. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/distancemetric/PhenotypeMetric.java b/src/eva2/server/go/operators/distancemetric/PhenotypeMetric.java similarity index 94% rename from src/javaeva/server/go/operators/distancemetric/PhenotypeMetric.java rename to src/eva2/server/go/operators/distancemetric/PhenotypeMetric.java index 31d2a493..ab19f713 100644 --- a/src/javaeva/server/go/operators/distancemetric/PhenotypeMetric.java +++ b/src/eva2/server/go/operators/distancemetric/PhenotypeMetric.java @@ -1,17 +1,18 @@ -package javaeva.server.go.operators.distancemetric; +package eva2.server.go.operators.distancemetric; -import javaeva.gui.BeanInspector; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceDataTypeBinary; -import javaeva.server.go.individuals.InterfaceDataTypeDouble; -import javaeva.server.go.individuals.InterfaceDataTypeInteger; -import javaeva.server.go.individuals.InterfaceDataTypePermutation; -import javaeva.server.go.individuals.InterfaceDataTypeProgram; -import javaeva.server.go.individuals.codings.gp.InterfaceProgram; import java.util.BitSet; +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.server.go.individuals.codings.gp.InterfaceProgram; + /** A phenotype metric suited for some of the most common * data types. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/distancemetric/SigmaSingleMetricGlobalMutation.java b/src/eva2/server/go/operators/distancemetric/SigmaSingleMetricGlobalMutation.java similarity index 92% rename from src/javaeva/server/go/operators/distancemetric/SigmaSingleMetricGlobalMutation.java rename to src/eva2/server/go/operators/distancemetric/SigmaSingleMetricGlobalMutation.java index bcff44b6..a3e56884 100644 --- a/src/javaeva/server/go/operators/distancemetric/SigmaSingleMetricGlobalMutation.java +++ b/src/eva2/server/go/operators/distancemetric/SigmaSingleMetricGlobalMutation.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.distancemetric; +package eva2.server.go.operators.distancemetric; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceDataTypeDouble; -import javaeva.server.go.operators.mutation.MutateESGlobal; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceDataTypeDouble; +import eva2.server.go.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/javaeva/server/go/operators/fitnessmodifier/FitnessAdaptiveClustering.java b/src/eva2/server/go/operators/fitnessmodifier/FitnessAdaptiveClustering.java similarity index 91% rename from src/javaeva/server/go/operators/fitnessmodifier/FitnessAdaptiveClustering.java rename to src/eva2/server/go/operators/fitnessmodifier/FitnessAdaptiveClustering.java index 7cf24d4d..0488411a 100644 --- a/src/javaeva/server/go/operators/fitnessmodifier/FitnessAdaptiveClustering.java +++ b/src/eva2/server/go/operators/fitnessmodifier/FitnessAdaptiveClustering.java @@ -1,9 +1,9 @@ -package javaeva.server.go.operators.fitnessmodifier; +package eva2.server.go.operators.fitnessmodifier; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.cluster.ClusteringDensityBased; -import javaeva.server.go.operators.cluster.InterfaceClustering; -import javaeva.server.go.populations.Population; +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; /** The fitness modifier are defunct and are to be moved to * the selection operators... diff --git a/src/javaeva/server/go/operators/fitnessmodifier/FitnessModifierNone.java b/src/eva2/server/go/operators/fitnessmodifier/FitnessModifierNone.java similarity index 92% rename from src/javaeva/server/go/operators/fitnessmodifier/FitnessModifierNone.java rename to src/eva2/server/go/operators/fitnessmodifier/FitnessModifierNone.java index 88dc5c82..255c2be5 100644 --- a/src/javaeva/server/go/operators/fitnessmodifier/FitnessModifierNone.java +++ b/src/eva2/server/go/operators/fitnessmodifier/FitnessModifierNone.java @@ -1,6 +1,6 @@ -package javaeva.server.go.operators.fitnessmodifier; +package eva2.server.go.operators.fitnessmodifier; -import javaeva.server.go.populations.Population; +import eva2.server.go.populations.Population; /** The fitness modifier are defunct and are to be moved to * the selection operators... diff --git a/src/javaeva/server/go/operators/fitnessmodifier/FitnessSharing.java b/src/eva2/server/go/operators/fitnessmodifier/FitnessSharing.java similarity index 92% rename from src/javaeva/server/go/operators/fitnessmodifier/FitnessSharing.java rename to src/eva2/server/go/operators/fitnessmodifier/FitnessSharing.java index 753fe1c7..f69cfc58 100644 --- a/src/javaeva/server/go/operators/fitnessmodifier/FitnessSharing.java +++ b/src/eva2/server/go/operators/fitnessmodifier/FitnessSharing.java @@ -1,9 +1,9 @@ -package javaeva.server.go.operators.fitnessmodifier; +package eva2.server.go.operators.fitnessmodifier; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.distancemetric.InterfaceDistanceMetric; -import javaeva.server.go.operators.distancemetric.PhenotypeMetric; -import javaeva.server.go.populations.Population; +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; /** The fitness modifier are defunct and are to be moved to * the selection operators... diff --git a/src/javaeva/server/go/operators/fitnessmodifier/InterfaceFitnessModifier.java b/src/eva2/server/go/operators/fitnessmodifier/InterfaceFitnessModifier.java similarity index 85% rename from src/javaeva/server/go/operators/fitnessmodifier/InterfaceFitnessModifier.java rename to src/eva2/server/go/operators/fitnessmodifier/InterfaceFitnessModifier.java index 5fe4345f..c5b3c21b 100644 --- a/src/javaeva/server/go/operators/fitnessmodifier/InterfaceFitnessModifier.java +++ b/src/eva2/server/go/operators/fitnessmodifier/InterfaceFitnessModifier.java @@ -1,6 +1,6 @@ -package javaeva.server.go.operators.fitnessmodifier; +package eva2.server.go.operators.fitnessmodifier; -import javaeva.server.go.populations.Population; +import eva2.server.go.populations.Population; /** The fitness modifier are defunct and are to be moved to * the selection operators... diff --git a/src/javaeva/server/go/operators/migration/InterfaceMigration.java b/src/eva2/server/go/operators/migration/InterfaceMigration.java similarity index 93% rename from src/javaeva/server/go/operators/migration/InterfaceMigration.java rename to src/eva2/server/go/operators/migration/InterfaceMigration.java index 8c4e732a..df85bae6 100644 --- a/src/javaeva/server/go/operators/migration/InterfaceMigration.java +++ b/src/eva2/server/go/operators/migration/InterfaceMigration.java @@ -1,6 +1,6 @@ -package javaeva.server.go.operators.migration; +package eva2.server.go.operators.migration; -import javaeva.server.go.strategies.InterfaceOptimizer; +import eva2.server.go.strategies.InterfaceOptimizer; /** The migration methods give the migration topology * (currently all migration methods are typically fully diff --git a/src/javaeva/server/go/operators/migration/MOBestMigration.java b/src/eva2/server/go/operators/migration/MOBestMigration.java similarity index 92% rename from src/javaeva/server/go/operators/migration/MOBestMigration.java rename to src/eva2/server/go/operators/migration/MOBestMigration.java index 6bfd4e79..d3f32d20 100644 --- a/src/javaeva/server/go/operators/migration/MOBestMigration.java +++ b/src/eva2/server/go/operators/migration/MOBestMigration.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.migration; +package eva2.server.go.operators.migration; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.selection.InterfaceSelection; -import javaeva.server.go.operators.selection.SelectMOMaxiMin; -import javaeva.server.go.populations.Population; -import javaeva.server.go.strategies.InterfaceOptimizer; +import eva2.server.go.individuals.AbstractEAIndividual; +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; /** Migration based on a Multi-criteria selection mechanism * migrating the n best individuals between all populations. diff --git a/src/javaeva/server/go/operators/migration/MOClusteringSeparation.java b/src/eva2/server/go/operators/migration/MOClusteringSeparation.java similarity index 92% rename from src/javaeva/server/go/operators/migration/MOClusteringSeparation.java rename to src/eva2/server/go/operators/migration/MOClusteringSeparation.java index 2f531c38..fca414f0 100644 --- a/src/javaeva/server/go/operators/migration/MOClusteringSeparation.java +++ b/src/eva2/server/go/operators/migration/MOClusteringSeparation.java @@ -1,28 +1,29 @@ -package javaeva.server.go.operators.migration; +package eva2.server.go.operators.migration; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.archiving.ArchivingAllDominating; -import javaeva.server.go.operators.archiving.ArchivingNSGAII; -import javaeva.server.go.operators.archiving.InterfaceArchiving; -import javaeva.server.go.operators.cluster.ClusteringKMeans; -import javaeva.server.go.operators.constraint.ConstBelongsToDifferentClass; -import javaeva.server.go.operators.constraint.ConstObjectivesInEqualityBiggerThanLinear; -import javaeva.server.go.operators.constraint.ConstObjectivesInEqualityLesserThanLinear; -import javaeva.server.go.operators.selection.InterfaceSelection; -import javaeva.server.go.operators.selection.SelectRandom; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.AbstractMultiObjectiveOptimizationProblem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.server.go.strategies.MultiObjectiveEA; -import javaeva.gui.Plot; -import javaeva.gui.GraphPointSet; -import javaeva.gui.Chart2DDPointIconText; -import javaeva.gui.Chart2DDPointIconCircle; import wsi.ra.chart2d.DPoint; import java.io.*; +import eva2.gui.Chart2DDPointIconCircle; +import eva2.gui.Chart2DDPointIconText; +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.ArchivingNSGAII; +import eva2.server.go.operators.archiving.InterfaceArchiving; +import eva2.server.go.operators.cluster.ClusteringKMeans; +import eva2.server.go.operators.constraint.ConstBelongsToDifferentClass; +import eva2.server.go.operators.constraint.ConstObjectivesInEqualityBiggerThanLinear; +import eva2.server.go.operators.constraint.ConstObjectivesInEqualityLesserThanLinear; +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.server.go.strategies.MultiObjectiveEA; + /** This method implements the clustering based subdivision * scheme, this method rearanges the populations and may * impose area constraints on the subpopulations. This method @@ -144,7 +145,7 @@ public class MOClusteringSeparation implements InterfaceMigration, java.io.Seria double[] tmpD = new double[2]; tmpD[0] = 0; tmpD[1] = 0; - plot = new javaeva.gui.Plot("Debugging Clustering Separation", "Y1", "Y2", tmpD, tmpD); + plot = new eva2.gui.Plot("Debugging Clustering Separation", "Y1", "Y2", tmpD, tmpD); GraphPointSet mySet; DPoint myPoint; Chart2DDPointIconText tmp; diff --git a/src/javaeva/server/go/operators/migration/MOConeSeparation.java b/src/eva2/server/go/operators/migration/MOConeSeparation.java similarity index 95% rename from src/javaeva/server/go/operators/migration/MOConeSeparation.java rename to src/eva2/server/go/operators/migration/MOConeSeparation.java index c3ceb25c..23eb2a0d 100644 --- a/src/javaeva/server/go/operators/migration/MOConeSeparation.java +++ b/src/eva2/server/go/operators/migration/MOConeSeparation.java @@ -1,31 +1,32 @@ -package javaeva.server.go.operators.migration; +package eva2.server.go.operators.migration; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.archiving.ArchivingAllDominating; -import javaeva.server.go.operators.archiving.ArchivingNSGAII; -import javaeva.server.go.operators.archiving.InterfaceArchiving; -import javaeva.server.go.operators.cluster.ClusteringKMeans; -import javaeva.server.go.operators.constraint.ConstObjectivesInEqualityBiggerThanLinear; -import javaeva.server.go.operators.constraint.ConstObjectivesInEqualityBiggerThanSurface; -import javaeva.server.go.operators.constraint.ConstObjectivesInEqualityLesserThanLinear; -import javaeva.server.go.operators.constraint.ConstObjectivesInEqualitySmallerThanSurface; -import javaeva.server.go.operators.selection.InterfaceSelection; -import javaeva.server.go.operators.selection.SelectMOMaxiMin; -import javaeva.server.go.operators.selection.SelectRandom; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.AbstractMultiObjectiveOptimizationProblem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.server.go.strategies.MultiObjectiveEA; -import javaeva.gui.Plot; -import javaeva.gui.GraphPointSet; -import javaeva.gui.Chart2DDPointIconText; -import javaeva.gui.Chart2DDPointIconCircle; import wsi.ra.chart2d.DPoint; import java.io.*; import java.util.ArrayList; +import eva2.gui.Chart2DDPointIconCircle; +import eva2.gui.Chart2DDPointIconText; +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.ArchivingNSGAII; +import eva2.server.go.operators.archiving.InterfaceArchiving; +import eva2.server.go.operators.cluster.ClusteringKMeans; +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.SelectMOMaxiMin; +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.server.go.strategies.MultiObjectiveEA; + /** This method implements the cone separation subdivision * scheme, this method rearanges the populations and may * impose area constraints on the subpopulations. @@ -205,7 +206,7 @@ public class MOConeSeparation implements InterfaceMigration, java.io.Serializabl double[] tmpD = new double[2]; tmpD[0] = 0; tmpD[1] = 0; - plot = new javaeva.gui.Plot("Debugging Cone Separation", "Y1", "Y2", tmpD, tmpD); + plot = new eva2.gui.Plot("Debugging Cone Separation", "Y1", "Y2", tmpD, tmpD); GraphPointSet mySet; DPoint myPoint; Chart2DDPointIconText tmp; diff --git a/src/javaeva/server/go/operators/migration/MOXMeansSeparation.java b/src/eva2/server/go/operators/migration/MOXMeansSeparation.java similarity index 93% rename from src/javaeva/server/go/operators/migration/MOXMeansSeparation.java rename to src/eva2/server/go/operators/migration/MOXMeansSeparation.java index eb5a832e..eafb5344 100644 --- a/src/javaeva/server/go/operators/migration/MOXMeansSeparation.java +++ b/src/eva2/server/go/operators/migration/MOXMeansSeparation.java @@ -1,25 +1,26 @@ -package javaeva.server.go.operators.migration; +package eva2.server.go.operators.migration; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.archiving.ArchivingAllDominating; -import javaeva.server.go.operators.archiving.ArchivingNSGAII; -import javaeva.server.go.operators.cluster.ClusteringXMeans; -import javaeva.server.go.operators.constraint.ConstBelongsToDifferentClass; -import javaeva.server.go.operators.selection.InterfaceSelection; -import javaeva.server.go.operators.selection.SelectRandom; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.AbstractMultiObjectiveOptimizationProblem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.server.go.strategies.MultiObjectiveEA; -import javaeva.gui.Plot; -import javaeva.gui.GraphPointSet; -import javaeva.gui.Chart2DDPointIconText; -import javaeva.gui.Chart2DDPointIconCircle; import wsi.ra.chart2d.DPoint; import java.io.*; +import eva2.gui.Chart2DDPointIconCircle; +import eva2.gui.Chart2DDPointIconText; +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.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.server.go.strategies.MultiObjectiveEA; + /** This method implements the clustering based subdivision * scheme suited to identify uni- and multi-modal search spaces * under development and currently defunct. @@ -143,7 +144,7 @@ public class MOXMeansSeparation implements InterfaceMigration, java.io.Serializa double[] tmpD = new double[2]; tmpD[0] = 0; tmpD[1] = 0; - plot = new javaeva.gui.Plot("Debugging Clustering Separation", "Y1", "Y2", tmpD, tmpD); + plot = new eva2.gui.Plot("Debugging Clustering Separation", "Y1", "Y2", tmpD, tmpD); GraphPointSet mySet; DPoint myPoint; Chart2DDPointIconText tmp; diff --git a/src/javaeva/server/go/operators/migration/SOBestMigration.java b/src/eva2/server/go/operators/migration/SOBestMigration.java similarity index 91% rename from src/javaeva/server/go/operators/migration/SOBestMigration.java rename to src/eva2/server/go/operators/migration/SOBestMigration.java index ceaccbf5..8c7bae1d 100644 --- a/src/javaeva/server/go/operators/migration/SOBestMigration.java +++ b/src/eva2/server/go/operators/migration/SOBestMigration.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.migration; +package eva2.server.go.operators.migration; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.selection.InterfaceSelection; -import javaeva.server.go.operators.selection.SelectBestIndividuals; -import javaeva.server.go.populations.Population; -import javaeva.server.go.strategies.InterfaceOptimizer; +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; /** Simple single-objective migration scheme. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/migration/SOMONoMigration.java b/src/eva2/server/go/operators/migration/SOMONoMigration.java similarity index 86% rename from src/javaeva/server/go/operators/migration/SOMONoMigration.java rename to src/eva2/server/go/operators/migration/SOMONoMigration.java index 1233f721..08be7425 100644 --- a/src/javaeva/server/go/operators/migration/SOMONoMigration.java +++ b/src/eva2/server/go/operators/migration/SOMONoMigration.java @@ -1,9 +1,9 @@ -package javaeva.server.go.operators.migration; +package eva2.server.go.operators.migration; -import javaeva.server.go.operators.selection.InterfaceSelection; -import javaeva.server.go.operators.selection.SelectMOMaxiMin; -import javaeva.server.go.populations.Population; -import javaeva.server.go.strategies.InterfaceOptimizer; +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; /** Implements no migration as reference. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/moso/InterfaceMOSOConverter.java b/src/eva2/server/go/operators/moso/InterfaceMOSOConverter.java similarity index 92% rename from src/javaeva/server/go/operators/moso/InterfaceMOSOConverter.java rename to src/eva2/server/go/operators/moso/InterfaceMOSOConverter.java index 040b14b6..43e492ca 100644 --- a/src/javaeva/server/go/operators/moso/InterfaceMOSOConverter.java +++ b/src/eva2/server/go/operators/moso/InterfaceMOSOConverter.java @@ -1,7 +1,7 @@ -package javaeva.server.go.operators.moso; +package eva2.server.go.operators.moso; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.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/javaeva/server/go/operators/moso/MOSODynamicallyWeightedFitness.java b/src/eva2/server/go/operators/moso/MOSODynamicallyWeightedFitness.java similarity index 95% rename from src/javaeva/server/go/operators/moso/MOSODynamicallyWeightedFitness.java rename to src/eva2/server/go/operators/moso/MOSODynamicallyWeightedFitness.java index 45973ce5..579be6ce 100644 --- a/src/javaeva/server/go/operators/moso/MOSODynamicallyWeightedFitness.java +++ b/src/eva2/server/go/operators/moso/MOSODynamicallyWeightedFitness.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.moso; +package eva2.server.go.operators.moso; -import javaeva.gui.PropertyDoubleArray; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; +import eva2.gui.PropertyDoubleArray; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/moso/MOSOEpsilonConstraint.java b/src/eva2/server/go/operators/moso/MOSOEpsilonConstraint.java similarity index 94% rename from src/javaeva/server/go/operators/moso/MOSOEpsilonConstraint.java rename to src/eva2/server/go/operators/moso/MOSOEpsilonConstraint.java index 6ba17b66..09276d1a 100644 --- a/src/javaeva/server/go/operators/moso/MOSOEpsilonConstraint.java +++ b/src/eva2/server/go/operators/moso/MOSOEpsilonConstraint.java @@ -1,9 +1,9 @@ -package javaeva.server.go.operators.moso; +package eva2.server.go.operators.moso; -import javaeva.gui.PropertyEpsilonThreshold; -import javaeva.gui.PropertyEpsilonConstraint; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; +import eva2.gui.PropertyEpsilonConstraint; +import eva2.gui.PropertyEpsilonThreshold; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/moso/MOSOEpsilonThreshold.java b/src/eva2/server/go/operators/moso/MOSOEpsilonThreshold.java similarity index 95% rename from src/javaeva/server/go/operators/moso/MOSOEpsilonThreshold.java rename to src/eva2/server/go/operators/moso/MOSOEpsilonThreshold.java index a2fcef7c..41582483 100644 --- a/src/javaeva/server/go/operators/moso/MOSOEpsilonThreshold.java +++ b/src/eva2/server/go/operators/moso/MOSOEpsilonThreshold.java @@ -1,9 +1,9 @@ -package javaeva.server.go.operators.moso; +package eva2.server.go.operators.moso; -import javaeva.gui.PropertyDoubleArray; -import javaeva.gui.PropertyEpsilonThreshold; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; +import eva2.gui.PropertyDoubleArray; +import eva2.gui.PropertyEpsilonThreshold; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/moso/MOSOGoalProgramming.java b/src/eva2/server/go/operators/moso/MOSOGoalProgramming.java similarity index 95% rename from src/javaeva/server/go/operators/moso/MOSOGoalProgramming.java rename to src/eva2/server/go/operators/moso/MOSOGoalProgramming.java index 91375e64..fd39419c 100644 --- a/src/javaeva/server/go/operators/moso/MOSOGoalProgramming.java +++ b/src/eva2/server/go/operators/moso/MOSOGoalProgramming.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.moso; +package eva2.server.go.operators.moso; -import javaeva.gui.PropertyDoubleArray; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; +import eva2.gui.PropertyDoubleArray; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/moso/MOSOLpMetric.java b/src/eva2/server/go/operators/moso/MOSOLpMetric.java similarity index 96% rename from src/javaeva/server/go/operators/moso/MOSOLpMetric.java rename to src/eva2/server/go/operators/moso/MOSOLpMetric.java index bbaa28eb..3d3b5043 100644 --- a/src/javaeva/server/go/operators/moso/MOSOLpMetric.java +++ b/src/eva2/server/go/operators/moso/MOSOLpMetric.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.moso; +package eva2.server.go.operators.moso; -import javaeva.gui.PropertyDoubleArray; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; +import eva2.gui.PropertyDoubleArray; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/moso/MOSOMOGARankBased.java b/src/eva2/server/go/operators/moso/MOSOMOGARankBased.java similarity index 93% rename from src/javaeva/server/go/operators/moso/MOSOMOGARankBased.java rename to src/eva2/server/go/operators/moso/MOSOMOGARankBased.java index 0eea374a..ac5db9e0 100644 --- a/src/javaeva/server/go/operators/moso/MOSOMOGARankBased.java +++ b/src/eva2/server/go/operators/moso/MOSOMOGARankBased.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.moso; +package eva2.server.go.operators.moso; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.archiving.ArchivingNSGAII; -import javaeva.server.go.populations.Population; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.archiving.ArchivingNSGAII; +import eva2.server.go.populations.Population; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/moso/MOSOMaxiMin.java b/src/eva2/server/go/operators/moso/MOSOMaxiMin.java similarity index 94% rename from src/javaeva/server/go/operators/moso/MOSOMaxiMin.java rename to src/eva2/server/go/operators/moso/MOSOMaxiMin.java index ddb47040..7630c8e2 100644 --- a/src/javaeva/server/go/operators/moso/MOSOMaxiMin.java +++ b/src/eva2/server/go/operators/moso/MOSOMaxiMin.java @@ -1,11 +1,11 @@ -package javaeva.server.go.operators.moso; +package eva2.server.go.operators.moso; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; -import javaeva.gui.GraphPointSet; -import javaeva.gui.Chart2DDPointIconText; -import javaeva.gui.Chart2DDPointIconCircle; +import eva2.gui.Chart2DDPointIconCircle; +import eva2.gui.Chart2DDPointIconText; +import eva2.gui.GraphPointSet; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; import wsi.ra.chart2d.DPoint; /** @@ -18,7 +18,7 @@ import wsi.ra.chart2d.DPoint; public class MOSOMaxiMin implements InterfaceMOSOConverter, java.io.Serializable { private int m_OutputDimension = 2; - transient protected javaeva.gui.Plot m_Plot = null; + transient protected eva2.gui.Plot m_Plot = null; public MOSOMaxiMin() { } diff --git a/src/javaeva/server/go/operators/moso/MOSONoConvert.java b/src/eva2/server/go/operators/moso/MOSONoConvert.java similarity index 92% rename from src/javaeva/server/go/operators/moso/MOSONoConvert.java rename to src/eva2/server/go/operators/moso/MOSONoConvert.java index 4bd7507b..1a124f83 100644 --- a/src/javaeva/server/go/operators/moso/MOSONoConvert.java +++ b/src/eva2/server/go/operators/moso/MOSONoConvert.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.moso; +package eva2.server.go.operators.moso; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/moso/MOSORandomChoice.java b/src/eva2/server/go/operators/moso/MOSORandomChoice.java similarity index 93% rename from src/javaeva/server/go/operators/moso/MOSORandomChoice.java rename to src/eva2/server/go/operators/moso/MOSORandomChoice.java index 4879b515..56c46223 100644 --- a/src/javaeva/server/go/operators/moso/MOSORandomChoice.java +++ b/src/eva2/server/go/operators/moso/MOSORandomChoice.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.moso; +package eva2.server.go.operators.moso; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/moso/MOSORandomWeight.java b/src/eva2/server/go/operators/moso/MOSORandomWeight.java similarity index 92% rename from src/javaeva/server/go/operators/moso/MOSORandomWeight.java rename to src/eva2/server/go/operators/moso/MOSORandomWeight.java index 5ae4a4bb..d4614dd0 100644 --- a/src/javaeva/server/go/operators/moso/MOSORandomWeight.java +++ b/src/eva2/server/go/operators/moso/MOSORandomWeight.java @@ -1,9 +1,9 @@ -package javaeva.server.go.operators.moso; +package eva2.server.go.operators.moso; -import javaeva.gui.PropertyDoubleArray; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.gui.PropertyDoubleArray; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/moso/MOSORankbased.java b/src/eva2/server/go/operators/moso/MOSORankbased.java similarity index 90% rename from src/javaeva/server/go/operators/moso/MOSORankbased.java rename to src/eva2/server/go/operators/moso/MOSORankbased.java index eb2883ac..8b8963da 100644 --- a/src/javaeva/server/go/operators/moso/MOSORankbased.java +++ b/src/eva2/server/go/operators/moso/MOSORankbased.java @@ -1,9 +1,9 @@ -package javaeva.server.go.operators.moso; +package eva2.server.go.operators.moso; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.archiving.ArchivingNSGAII; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.archiving.ArchivingNSGAII; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/moso/MOSOUtilityFunction.java b/src/eva2/server/go/operators/moso/MOSOUtilityFunction.java similarity index 96% rename from src/javaeva/server/go/operators/moso/MOSOUtilityFunction.java rename to src/eva2/server/go/operators/moso/MOSOUtilityFunction.java index 53b731c8..fca17366 100644 --- a/src/javaeva/server/go/operators/moso/MOSOUtilityFunction.java +++ b/src/eva2/server/go/operators/moso/MOSOUtilityFunction.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.moso; +package eva2.server.go.operators.moso; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/moso/MOSOWeightedFitness.java b/src/eva2/server/go/operators/moso/MOSOWeightedFitness.java similarity index 95% rename from src/javaeva/server/go/operators/moso/MOSOWeightedFitness.java rename to src/eva2/server/go/operators/moso/MOSOWeightedFitness.java index 8475027e..c50cef05 100644 --- a/src/javaeva/server/go/operators/moso/MOSOWeightedFitness.java +++ b/src/eva2/server/go/operators/moso/MOSOWeightedFitness.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.moso; +package eva2.server.go.operators.moso; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.gui.PropertyDoubleArray; +import eva2.gui.PropertyDoubleArray; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/moso/MOSOWeightedLPTchebycheff.java b/src/eva2/server/go/operators/moso/MOSOWeightedLPTchebycheff.java similarity index 96% rename from src/javaeva/server/go/operators/moso/MOSOWeightedLPTchebycheff.java rename to src/eva2/server/go/operators/moso/MOSOWeightedLPTchebycheff.java index 70dd70de..c4258020 100644 --- a/src/javaeva/server/go/operators/moso/MOSOWeightedLPTchebycheff.java +++ b/src/eva2/server/go/operators/moso/MOSOWeightedLPTchebycheff.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.moso; +package eva2.server.go.operators.moso; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.gui.PropertyWeightedLPTchebycheff; +import eva2.gui.PropertyWeightedLPTchebycheff; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/mutation/InterfaceMutation.java b/src/eva2/server/go/operators/mutation/InterfaceMutation.java similarity index 88% rename from src/javaeva/server/go/operators/mutation/InterfaceMutation.java rename to src/eva2/server/go/operators/mutation/InterfaceMutation.java index a85706bd..420238d2 100644 --- a/src/javaeva/server/go/operators/mutation/InterfaceMutation.java +++ b/src/eva2/server/go/operators/mutation/InterfaceMutation.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; /** diff --git a/src/javaeva/server/go/operators/mutation/MutateEAMixer.java b/src/eva2/server/go/operators/mutation/MutateEAMixer.java similarity index 95% rename from src/javaeva/server/go/operators/mutation/MutateEAMixer.java rename to src/eva2/server/go/operators/mutation/MutateEAMixer.java index 117c7ecc..25ed7ba0 100644 --- a/src/javaeva/server/go/operators/mutation/MutateEAMixer.java +++ b/src/eva2/server/go/operators/mutation/MutateEAMixer.java @@ -1,12 +1,13 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; import java.util.ArrayList; -import javaeva.gui.GenericObjectEditor; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.gui.GenericObjectEditor; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; + /** * Created by IntelliJ IDEA. @@ -24,7 +25,7 @@ public class MutateEAMixer implements InterfaceMutation, java.io.Serializable { public MutateEAMixer() { InterfaceMutation[] tmpList; - ArrayList mutators = GenericObjectEditor.getClassesFromProperties("javaeva.server.go.operators.mutation.InterfaceMutation"); + ArrayList mutators = GenericObjectEditor.getClassesFromProperties("eva2.server.go.operators.mutation.InterfaceMutation"); tmpList = new InterfaceMutation[mutators.size()]; for (int i = 0; i < mutators.size(); i++) { if (((String)mutators.get(i)).equals(this.getClass().getName())) continue; diff --git a/src/javaeva/server/go/operators/mutation/MutateESCorrolated.java b/src/eva2/server/go/operators/mutation/MutateESCorrolated.java similarity index 97% rename from src/javaeva/server/go/operators/mutation/MutateESCorrolated.java rename to src/eva2/server/go/operators/mutation/MutateESCorrolated.java index cffcd74a..77b4887d 100644 --- a/src/javaeva/server/go/operators/mutation/MutateESCorrolated.java +++ b/src/eva2/server/go/operators/mutation/MutateESCorrolated.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +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.server.go.tools.RandomNumberGenerator; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/mutation/MutateESCovarianceMartixAdaption.java b/src/eva2/server/go/operators/mutation/MutateESCovarianceMartixAdaption.java similarity index 97% rename from src/javaeva/server/go/operators/mutation/MutateESCovarianceMartixAdaption.java rename to src/eva2/server/go/operators/mutation/MutateESCovarianceMartixAdaption.java index 9dcabb78..9b31b3ee 100644 --- a/src/javaeva/server/go/operators/mutation/MutateESCovarianceMartixAdaption.java +++ b/src/eva2/server/go/operators/mutation/MutateESCovarianceMartixAdaption.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +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.server.go.tools.RandomNumberGenerator; import wsi.ra.math.Jama.EigenvalueDecomposition; import wsi.ra.math.Jama.Matrix; diff --git a/src/javaeva/server/go/operators/mutation/MutateESDefault.java b/src/eva2/server/go/operators/mutation/MutateESDefault.java similarity index 90% rename from src/javaeva/server/go/operators/mutation/MutateESDefault.java rename to src/eva2/server/go/operators/mutation/MutateESDefault.java index 027cb429..8364c01f 100644 --- a/src/javaeva/server/go/operators/mutation/MutateESDefault.java +++ b/src/eva2/server/go/operators/mutation/MutateESDefault.java @@ -1,9 +1,9 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceESIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; /** diff --git a/src/javaeva/server/go/operators/mutation/MutateESDerandomized.java b/src/eva2/server/go/operators/mutation/MutateESDerandomized.java similarity index 95% rename from src/javaeva/server/go/operators/mutation/MutateESDerandomized.java rename to src/eva2/server/go/operators/mutation/MutateESDerandomized.java index 7a04dcab..39ba851e 100644 --- a/src/javaeva/server/go/operators/mutation/MutateESDerandomized.java +++ b/src/eva2/server/go/operators/mutation/MutateESDerandomized.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +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.server.go.tools.RandomNumberGenerator; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/mutation/MutateESFixedStepSize.java b/src/eva2/server/go/operators/mutation/MutateESFixedStepSize.java similarity index 92% rename from src/javaeva/server/go/operators/mutation/MutateESFixedStepSize.java rename to src/eva2/server/go/operators/mutation/MutateESFixedStepSize.java index 6f3f910a..a56b2d60 100644 --- a/src/javaeva/server/go/operators/mutation/MutateESFixedStepSize.java +++ b/src/eva2/server/go/operators/mutation/MutateESFixedStepSize.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +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.server.go.tools.RandomNumberGenerator; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/mutation/MutateESGlobal.java b/src/eva2/server/go/operators/mutation/MutateESGlobal.java similarity index 95% rename from src/javaeva/server/go/operators/mutation/MutateESGlobal.java rename to src/eva2/server/go/operators/mutation/MutateESGlobal.java index 83af62e8..a512ff1d 100644 --- a/src/javaeva/server/go/operators/mutation/MutateESGlobal.java +++ b/src/eva2/server/go/operators/mutation/MutateESGlobal.java @@ -1,13 +1,14 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; import java.util.ArrayList; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; -import javaeva.tools.SelectedTag; +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.server.go.tools.RandomNumberGenerator; +import eva2.tools.SelectedTag; + /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/mutation/MutateESLocal.java b/src/eva2/server/go/operators/mutation/MutateESLocal.java similarity index 95% rename from src/javaeva/server/go/operators/mutation/MutateESLocal.java rename to src/eva2/server/go/operators/mutation/MutateESLocal.java index 5f4d4d00..90c5f238 100644 --- a/src/javaeva/server/go/operators/mutation/MutateESLocal.java +++ b/src/eva2/server/go/operators/mutation/MutateESLocal.java @@ -1,16 +1,17 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceDataTypeDouble; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; -import javaeva.tools.SelectedTag; -import javaeva.tools.Tag; import java.util.ArrayList; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceDataTypeDouble; +import eva2.server.go.individuals.InterfaceESIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; +import eva2.tools.SelectedTag; +import eva2.tools.Tag; + /** * Created by IntelliJ IDEA. * User: streiche diff --git a/src/javaeva/server/go/operators/mutation/MutateESMainVectorAdaption.java b/src/eva2/server/go/operators/mutation/MutateESMainVectorAdaption.java similarity index 96% rename from src/javaeva/server/go/operators/mutation/MutateESMainVectorAdaption.java rename to src/eva2/server/go/operators/mutation/MutateESMainVectorAdaption.java index 327e9dca..e3e0c93b 100644 --- a/src/javaeva/server/go/operators/mutation/MutateESMainVectorAdaption.java +++ b/src/eva2/server/go/operators/mutation/MutateESMainVectorAdaption.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +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.server.go.tools.RandomNumberGenerator; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/mutation/MutateESMutativeStepSizeControl.java b/src/eva2/server/go/operators/mutation/MutateESMutativeStepSizeControl.java similarity index 94% rename from src/javaeva/server/go/operators/mutation/MutateESMutativeStepSizeControl.java rename to src/eva2/server/go/operators/mutation/MutateESMutativeStepSizeControl.java index c8587ada..103399aa 100644 --- a/src/javaeva/server/go/operators/mutation/MutateESMutativeStepSizeControl.java +++ b/src/eva2/server/go/operators/mutation/MutateESMutativeStepSizeControl.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +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.server.go.tools.RandomNumberGenerator; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/mutation/MutateESStandard.java b/src/eva2/server/go/operators/mutation/MutateESStandard.java similarity index 91% rename from src/javaeva/server/go/operators/mutation/MutateESStandard.java rename to src/eva2/server/go/operators/mutation/MutateESStandard.java index 4b258341..7a16db68 100644 --- a/src/javaeva/server/go/operators/mutation/MutateESStandard.java +++ b/src/eva2/server/go/operators/mutation/MutateESStandard.java @@ -1,11 +1,11 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceDataTypeDouble; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceDataTypeDouble; +import eva2.server.go.individuals.InterfaceESIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/mutation/MutateESSuccessRule.java b/src/eva2/server/go/operators/mutation/MutateESSuccessRule.java similarity index 94% rename from src/javaeva/server/go/operators/mutation/MutateESSuccessRule.java rename to src/eva2/server/go/operators/mutation/MutateESSuccessRule.java index 3ab68de0..c781f472 100644 --- a/src/javaeva/server/go/operators/mutation/MutateESSuccessRule.java +++ b/src/eva2/server/go/operators/mutation/MutateESSuccessRule.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +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.server.go.tools.RandomNumberGenerator; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/mutation/MutateGAAdaptive.java b/src/eva2/server/go/operators/mutation/MutateGAAdaptive.java similarity index 94% rename from src/javaeva/server/go/operators/mutation/MutateGAAdaptive.java rename to src/eva2/server/go/operators/mutation/MutateGAAdaptive.java index de2b2fcf..8b1e9f9c 100644 --- a/src/javaeva/server/go/operators/mutation/MutateGAAdaptive.java +++ b/src/eva2/server/go/operators/mutation/MutateGAAdaptive.java @@ -1,13 +1,14 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.BitSet; +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.server.go.tools.RandomNumberGenerator; + /** * The mutation probability is adapted using a parameter tau and stored in the individual. * Better mutation probabilities are selected indirectly as they produce better offspring. diff --git a/src/javaeva/server/go/operators/mutation/MutateGADefault.java b/src/eva2/server/go/operators/mutation/MutateGADefault.java similarity index 90% rename from src/javaeva/server/go/operators/mutation/MutateGADefault.java rename to src/eva2/server/go/operators/mutation/MutateGADefault.java index da085b44..40d18303 100644 --- a/src/javaeva/server/go/operators/mutation/MutateGADefault.java +++ b/src/eva2/server/go/operators/mutation/MutateGADefault.java @@ -1,9 +1,9 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceGAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; /** diff --git a/src/javaeva/server/go/operators/mutation/MutateGAInvertBits.java b/src/eva2/server/go/operators/mutation/MutateGAInvertBits.java similarity index 94% rename from src/javaeva/server/go/operators/mutation/MutateGAInvertBits.java rename to src/eva2/server/go/operators/mutation/MutateGAInvertBits.java index 7e8e1cf9..6b1b2522 100644 --- a/src/javaeva/server/go/operators/mutation/MutateGAInvertBits.java +++ b/src/eva2/server/go/operators/mutation/MutateGAInvertBits.java @@ -1,13 +1,14 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.BitSet; +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.server.go.tools.RandomNumberGenerator; + /** * Created by IntelliJ IDEA. * User: streiche diff --git a/src/javaeva/server/go/operators/mutation/MutateGAStandard.java b/src/eva2/server/go/operators/mutation/MutateGAStandard.java similarity index 92% rename from src/javaeva/server/go/operators/mutation/MutateGAStandard.java rename to src/eva2/server/go/operators/mutation/MutateGAStandard.java index de772d03..73842741 100644 --- a/src/javaeva/server/go/operators/mutation/MutateGAStandard.java +++ b/src/eva2/server/go/operators/mutation/MutateGAStandard.java @@ -1,13 +1,14 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.BitSet; +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.server.go.tools.RandomNumberGenerator; + /** * Created by IntelliJ IDEA. * User: streiche diff --git a/src/javaeva/server/go/operators/mutation/MutateGASwapBits.java b/src/eva2/server/go/operators/mutation/MutateGASwapBits.java similarity index 92% rename from src/javaeva/server/go/operators/mutation/MutateGASwapBits.java rename to src/eva2/server/go/operators/mutation/MutateGASwapBits.java index 4b257432..14c3fc3f 100644 --- a/src/javaeva/server/go/operators/mutation/MutateGASwapBits.java +++ b/src/eva2/server/go/operators/mutation/MutateGASwapBits.java @@ -1,13 +1,14 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.BitSet; +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.server.go.tools.RandomNumberGenerator; + /** * Created by IntelliJ IDEA. * User: streiche diff --git a/src/javaeva/server/go/operators/mutation/MutateGIDefault.java b/src/eva2/server/go/operators/mutation/MutateGIDefault.java similarity index 90% rename from src/javaeva/server/go/operators/mutation/MutateGIDefault.java rename to src/eva2/server/go/operators/mutation/MutateGIDefault.java index 195e364f..0a1462b3 100644 --- a/src/javaeva/server/go/operators/mutation/MutateGIDefault.java +++ b/src/eva2/server/go/operators/mutation/MutateGIDefault.java @@ -1,9 +1,9 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGIIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceGIIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/mutation/MutateGIInsertDelete.java b/src/eva2/server/go/operators/mutation/MutateGIInsertDelete.java similarity index 94% rename from src/javaeva/server/go/operators/mutation/MutateGIInsertDelete.java rename to src/eva2/server/go/operators/mutation/MutateGIInsertDelete.java index 4bce1409..05cda601 100644 --- a/src/javaeva/server/go/operators/mutation/MutateGIInsertDelete.java +++ b/src/eva2/server/go/operators/mutation/MutateGIInsertDelete.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGIIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +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.server.go.tools.RandomNumberGenerator; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/mutation/MutateGIInvert.java b/src/eva2/server/go/operators/mutation/MutateGIInvert.java similarity index 92% rename from src/javaeva/server/go/operators/mutation/MutateGIInvert.java rename to src/eva2/server/go/operators/mutation/MutateGIInvert.java index 6ffc0816..4daaa58b 100644 --- a/src/javaeva/server/go/operators/mutation/MutateGIInvert.java +++ b/src/eva2/server/go/operators/mutation/MutateGIInvert.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGIIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +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.server.go.tools.RandomNumberGenerator; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/mutation/MutateGINominal.java b/src/eva2/server/go/operators/mutation/MutateGINominal.java similarity index 92% rename from src/javaeva/server/go/operators/mutation/MutateGINominal.java rename to src/eva2/server/go/operators/mutation/MutateGINominal.java index 7d135382..ee9eb993 100644 --- a/src/javaeva/server/go/operators/mutation/MutateGINominal.java +++ b/src/eva2/server/go/operators/mutation/MutateGINominal.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGIIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +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.server.go.tools.RandomNumberGenerator; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/mutation/MutateGIOrdinal.java b/src/eva2/server/go/operators/mutation/MutateGIOrdinal.java similarity index 93% rename from src/javaeva/server/go/operators/mutation/MutateGIOrdinal.java rename to src/eva2/server/go/operators/mutation/MutateGIOrdinal.java index 95a83b21..e36f119c 100644 --- a/src/javaeva/server/go/operators/mutation/MutateGIOrdinal.java +++ b/src/eva2/server/go/operators/mutation/MutateGIOrdinal.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGIIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +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.server.go.tools.RandomNumberGenerator; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/mutation/MutateGITranslocate.java b/src/eva2/server/go/operators/mutation/MutateGITranslocate.java similarity index 93% rename from src/javaeva/server/go/operators/mutation/MutateGITranslocate.java rename to src/eva2/server/go/operators/mutation/MutateGITranslocate.java index 15b2b84f..a9cd8607 100644 --- a/src/javaeva/server/go/operators/mutation/MutateGITranslocate.java +++ b/src/eva2/server/go/operators/mutation/MutateGITranslocate.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGIIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +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.server.go.tools.RandomNumberGenerator; /** diff --git a/src/javaeva/server/go/operators/mutation/MutateGPAdaptive.java b/src/eva2/server/go/operators/mutation/MutateGPAdaptive.java similarity index 93% rename from src/javaeva/server/go/operators/mutation/MutateGPAdaptive.java rename to src/eva2/server/go/operators/mutation/MutateGPAdaptive.java index 7d02b7c9..d8698dad 100644 --- a/src/javaeva/server/go/operators/mutation/MutateGPAdaptive.java +++ b/src/eva2/server/go/operators/mutation/MutateGPAdaptive.java @@ -1,14 +1,15 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGAIndividual; -import javaeva.server.go.individuals.InterfaceGPIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.BitSet; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceGAIndividual; +import eva2.server.go.individuals.InterfaceGPIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; + /** * Created by IntelliJ IDEA. * User: streiche diff --git a/src/javaeva/server/go/operators/mutation/MutateGPDefault.java b/src/eva2/server/go/operators/mutation/MutateGPDefault.java similarity index 91% rename from src/javaeva/server/go/operators/mutation/MutateGPDefault.java rename to src/eva2/server/go/operators/mutation/MutateGPDefault.java index caa4b250..b02267fc 100644 --- a/src/javaeva/server/go/operators/mutation/MutateGPDefault.java +++ b/src/eva2/server/go/operators/mutation/MutateGPDefault.java @@ -1,9 +1,9 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGPIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceGPIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/mutation/MutateGPSingleNode.java b/src/eva2/server/go/operators/mutation/MutateGPSingleNode.java similarity index 89% rename from src/javaeva/server/go/operators/mutation/MutateGPSingleNode.java rename to src/eva2/server/go/operators/mutation/MutateGPSingleNode.java index 3e46b69f..68254275 100644 --- a/src/javaeva/server/go/operators/mutation/MutateGPSingleNode.java +++ b/src/eva2/server/go/operators/mutation/MutateGPSingleNode.java @@ -1,16 +1,17 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceDataTypeProgram; -import javaeva.server.go.individuals.InterfaceGPIndividual; -import javaeva.server.go.individuals.codings.gp.AbstractGPNode; -import javaeva.server.go.individuals.codings.gp.GPArea; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.ArrayList; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceDataTypeProgram; +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.server.go.tools.RandomNumberGenerator; + /** * Created by IntelliJ IDEA. * User: streiche diff --git a/src/javaeva/server/go/operators/mutation/MutateOBGAFlip.java b/src/eva2/server/go/operators/mutation/MutateOBGAFlip.java similarity index 87% rename from src/javaeva/server/go/operators/mutation/MutateOBGAFlip.java rename to src/eva2/server/go/operators/mutation/MutateOBGAFlip.java index 567f12c2..cb5d014c 100644 --- a/src/javaeva/server/go/operators/mutation/MutateOBGAFlip.java +++ b/src/eva2/server/go/operators/mutation/MutateOBGAFlip.java @@ -1,11 +1,11 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceDataTypePermutation; -import javaeva.server.go.individuals.InterfaceOBGAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +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.server.go.tools.RandomNumberGenerator; /** diff --git a/src/javaeva/server/go/operators/mutation/MutateOBGAInversion.java b/src/eva2/server/go/operators/mutation/MutateOBGAInversion.java similarity index 87% rename from src/javaeva/server/go/operators/mutation/MutateOBGAInversion.java rename to src/eva2/server/go/operators/mutation/MutateOBGAInversion.java index 399fd791..0785c2ac 100644 --- a/src/javaeva/server/go/operators/mutation/MutateOBGAInversion.java +++ b/src/eva2/server/go/operators/mutation/MutateOBGAInversion.java @@ -1,11 +1,11 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceDataTypePermutation; -import javaeva.server.go.individuals.InterfaceOBGAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +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.server.go.tools.RandomNumberGenerator; /** diff --git a/src/javaeva/server/go/operators/mutation/NoMutation.java b/src/eva2/server/go/operators/mutation/NoMutation.java similarity index 91% rename from src/javaeva/server/go/operators/mutation/NoMutation.java rename to src/eva2/server/go/operators/mutation/NoMutation.java index 58b6d43b..ca48721d 100644 --- a/src/javaeva/server/go/operators/mutation/NoMutation.java +++ b/src/eva2/server/go/operators/mutation/NoMutation.java @@ -1,9 +1,9 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/mutation/PropertyMutationMixer.java b/src/eva2/server/go/operators/mutation/PropertyMutationMixer.java similarity index 99% rename from src/javaeva/server/go/operators/mutation/PropertyMutationMixer.java rename to src/eva2/server/go/operators/mutation/PropertyMutationMixer.java index fdade689..a91fb05f 100644 --- a/src/javaeva/server/go/operators/mutation/PropertyMutationMixer.java +++ b/src/eva2/server/go/operators/mutation/PropertyMutationMixer.java @@ -1,4 +1,4 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/mutation/PropertyMutationMixerEditor.java b/src/eva2/server/go/operators/mutation/PropertyMutationMixerEditor.java similarity index 99% rename from src/javaeva/server/go/operators/mutation/PropertyMutationMixerEditor.java rename to src/eva2/server/go/operators/mutation/PropertyMutationMixerEditor.java index bc8b61c5..9aaf3ee5 100644 --- a/src/javaeva/server/go/operators/mutation/PropertyMutationMixerEditor.java +++ b/src/eva2/server/go/operators/mutation/PropertyMutationMixerEditor.java @@ -1,9 +1,11 @@ -package javaeva.server.go.operators.mutation; +package eva2.server.go.operators.mutation; -import javaeva.server.go.tools.GeneralGEOFaker; -import javaeva.server.go.tools.GeneralGOEProperty; -import javaeva.gui.*; import javax.swing.*; + +import eva2.gui.*; +import eva2.server.go.tools.GeneralGEOFaker; +import eva2.server.go.tools.GeneralGOEProperty; + import java.beans.*; import java.awt.*; import java.awt.event.ActionListener; diff --git a/src/javaeva/server/go/operators/paretofrontmetrics/InterfaceParetoFrontMetric.java b/src/eva2/server/go/operators/paretofrontmetrics/InterfaceParetoFrontMetric.java similarity index 75% rename from src/javaeva/server/go/operators/paretofrontmetrics/InterfaceParetoFrontMetric.java rename to src/eva2/server/go/operators/paretofrontmetrics/InterfaceParetoFrontMetric.java index 1b47739c..a48e566d 100644 --- a/src/javaeva/server/go/operators/paretofrontmetrics/InterfaceParetoFrontMetric.java +++ b/src/eva2/server/go/operators/paretofrontmetrics/InterfaceParetoFrontMetric.java @@ -1,7 +1,7 @@ -package javaeva.server.go.operators.paretofrontmetrics; +package eva2.server.go.operators.paretofrontmetrics; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.AbstractMultiObjectiveOptimizationProblem; /** Interface for general Pareto front methods. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/paretofrontmetrics/MetricD1ApproxParetoFront.java b/src/eva2/server/go/operators/paretofrontmetrics/MetricD1ApproxParetoFront.java similarity index 90% rename from src/javaeva/server/go/operators/paretofrontmetrics/MetricD1ApproxParetoFront.java rename to src/eva2/server/go/operators/paretofrontmetrics/MetricD1ApproxParetoFront.java index aab11e29..9b5aa0d9 100644 --- a/src/javaeva/server/go/operators/paretofrontmetrics/MetricD1ApproxParetoFront.java +++ b/src/eva2/server/go/operators/paretofrontmetrics/MetricD1ApproxParetoFront.java @@ -1,14 +1,15 @@ -package javaeva.server.go.operators.paretofrontmetrics; +package eva2.server.go.operators.paretofrontmetrics; -import javaeva.gui.PropertyFilePath; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.archiving.ArchivingAllDominating; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.AbstractMultiObjectiveOptimizationProblem; -import javaeva.server.go.tools.FileLoader; import java.util.ArrayList; +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.FileLoader; + /** The D1* Pareto front metric requires a refrence Pareto front * and calculate the distance between the true Pareto front and * the current solution. @@ -18,7 +19,7 @@ import java.util.ArrayList; * Time: 13:57:28 * To change this template use File | Settings | File Templates. */ -public class MetricD1ApproxParetoFront implements javaeva.server.go.operators.paretofrontmetrics.InterfaceParetoFrontMetric, java.io.Serializable { +public class MetricD1ApproxParetoFront implements eva2.server.go.operators.paretofrontmetrics.InterfaceParetoFrontMetric, java.io.Serializable { private String base = System.getProperty("user.dir"); private String FS = System.getProperty("file.separator"); diff --git a/src/javaeva/server/go/operators/paretofrontmetrics/MetricD1TrueParetoFront.java b/src/eva2/server/go/operators/paretofrontmetrics/MetricD1TrueParetoFront.java similarity index 90% rename from src/javaeva/server/go/operators/paretofrontmetrics/MetricD1TrueParetoFront.java rename to src/eva2/server/go/operators/paretofrontmetrics/MetricD1TrueParetoFront.java index 2a0ded6a..e8aadb01 100644 --- a/src/javaeva/server/go/operators/paretofrontmetrics/MetricD1TrueParetoFront.java +++ b/src/eva2/server/go/operators/paretofrontmetrics/MetricD1TrueParetoFront.java @@ -1,14 +1,15 @@ -package javaeva.server.go.operators.paretofrontmetrics; +package eva2.server.go.operators.paretofrontmetrics; -import javaeva.gui.PropertyFilePath; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.archiving.ArchivingAllDominating; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.AbstractMultiObjectiveOptimizationProblem; -import javaeva.server.go.tools.FileLoader; import java.util.ArrayList; +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.FileLoader; + /** The D1 Pareto front metric requires a refrence Pareto front * and calculate the distance between the current solution and * the true Pareto front. @@ -18,7 +19,7 @@ import java.util.ArrayList; * Time: 13:57:13 * To change this template use File | Settings | File Templates. */ -public class MetricD1TrueParetoFront implements javaeva.server.go.operators.paretofrontmetrics.InterfaceParetoFrontMetric, java.io.Serializable { +public class MetricD1TrueParetoFront implements eva2.server.go.operators.paretofrontmetrics.InterfaceParetoFrontMetric, java.io.Serializable { private String base = System.getProperty("user.dir"); private String FS = System.getProperty("file.separator"); diff --git a/src/javaeva/server/go/operators/paretofrontmetrics/MetricErrorRatio.java b/src/eva2/server/go/operators/paretofrontmetrics/MetricErrorRatio.java similarity index 92% rename from src/javaeva/server/go/operators/paretofrontmetrics/MetricErrorRatio.java rename to src/eva2/server/go/operators/paretofrontmetrics/MetricErrorRatio.java index 23653dc3..4fb26c88 100644 --- a/src/javaeva/server/go/operators/paretofrontmetrics/MetricErrorRatio.java +++ b/src/eva2/server/go/operators/paretofrontmetrics/MetricErrorRatio.java @@ -1,4 +1,4 @@ -package javaeva.server.go.operators.paretofrontmetrics; +package eva2.server.go.operators.paretofrontmetrics; import wsi.ra.tool.ResourceLoader; @@ -6,12 +6,13 @@ import java.io.ByteArrayInputStream; import java.util.Properties; import java.util.ArrayList; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.archiving.ArchivingAllDominating; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.AbstractMultiObjectiveOptimizationProblem; -import javaeva.server.go.tools.FileLoader; -import javaeva.gui.PropertyFilePath; +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.FileLoader; + /** The error ratio metric only suited for small discrete * Pareto fronts, since it calculates the intersection between @@ -22,7 +23,7 @@ import javaeva.gui.PropertyFilePath; * Time: 17:22:23 * To change this template use File | Settings | File Templates. */ -public class MetricErrorRatio implements javaeva.server.go.operators.paretofrontmetrics.InterfaceParetoFrontMetric, java.io.Serializable { +public class MetricErrorRatio implements eva2.server.go.operators.paretofrontmetrics.InterfaceParetoFrontMetric, java.io.Serializable { private String base = System.getProperty("user.dir"); private String FS = System.getProperty("file.separator"); diff --git a/src/javaeva/server/go/operators/paretofrontmetrics/MetricMaximumParetoFrontError.java b/src/eva2/server/go/operators/paretofrontmetrics/MetricMaximumParetoFrontError.java similarity index 90% rename from src/javaeva/server/go/operators/paretofrontmetrics/MetricMaximumParetoFrontError.java rename to src/eva2/server/go/operators/paretofrontmetrics/MetricMaximumParetoFrontError.java index 8ef90d4a..8062ebb2 100644 --- a/src/javaeva/server/go/operators/paretofrontmetrics/MetricMaximumParetoFrontError.java +++ b/src/eva2/server/go/operators/paretofrontmetrics/MetricMaximumParetoFrontError.java @@ -1,14 +1,15 @@ -package javaeva.server.go.operators.paretofrontmetrics; +package eva2.server.go.operators.paretofrontmetrics; -import javaeva.gui.PropertyFilePath; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.archiving.ArchivingAllDominating; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.AbstractMultiObjectiveOptimizationProblem; -import javaeva.server.go.tools.FileLoader; import java.util.ArrayList; +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.FileLoader; + /** Maximum Pareto Front Error gives the maximum distance of all minimum distances of each * element in the current solution to the true Pareto front. * Created by IntelliJ IDEA. @@ -17,7 +18,7 @@ import java.util.ArrayList; * Time: 13:25:44 * To change this template use File | Settings | File Templates. */ -public class MetricMaximumParetoFrontError implements javaeva.server.go.operators.paretofrontmetrics.InterfaceParetoFrontMetric, java.io.Serializable { +public class MetricMaximumParetoFrontError implements eva2.server.go.operators.paretofrontmetrics.InterfaceParetoFrontMetric, java.io.Serializable { private String base = System.getProperty("user.dir"); private String FS = System.getProperty("file.separator"); diff --git a/src/javaeva/server/go/operators/paretofrontmetrics/MetricOverallNonDominatedVectors.java b/src/eva2/server/go/operators/paretofrontmetrics/MetricOverallNonDominatedVectors.java similarity index 87% rename from src/javaeva/server/go/operators/paretofrontmetrics/MetricOverallNonDominatedVectors.java rename to src/eva2/server/go/operators/paretofrontmetrics/MetricOverallNonDominatedVectors.java index cdf0d032..e847d80e 100644 --- a/src/javaeva/server/go/operators/paretofrontmetrics/MetricOverallNonDominatedVectors.java +++ b/src/eva2/server/go/operators/paretofrontmetrics/MetricOverallNonDominatedVectors.java @@ -1,9 +1,9 @@ -package javaeva.server.go.operators.paretofrontmetrics; +package eva2.server.go.operators.paretofrontmetrics; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.archiving.ArchivingAllDominating; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.AbstractMultiObjectiveOptimizationProblem; +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; /** Overall Non-Dom. Vector Generation calculates simply the number of * non-dominated solutions in the current soltuion set. diff --git a/src/javaeva/server/go/operators/paretofrontmetrics/MetricS.java b/src/eva2/server/go/operators/paretofrontmetrics/MetricS.java similarity index 95% rename from src/javaeva/server/go/operators/paretofrontmetrics/MetricS.java rename to src/eva2/server/go/operators/paretofrontmetrics/MetricS.java index b847b65a..cc7a179e 100644 --- a/src/javaeva/server/go/operators/paretofrontmetrics/MetricS.java +++ b/src/eva2/server/go/operators/paretofrontmetrics/MetricS.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.paretofrontmetrics; +package eva2.server.go.operators.paretofrontmetrics; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.ESIndividualDoubleData; -import javaeva.server.go.operators.archiving.ArchivingAllDominating; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.AbstractMultiObjectiveOptimizationProblem; +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; /** S-Metric calculates the hyper-volume covered between the current solutions and a reference point. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/paretofrontmetrics/MetricSWithReference.java b/src/eva2/server/go/operators/paretofrontmetrics/MetricSWithReference.java similarity index 95% rename from src/javaeva/server/go/operators/paretofrontmetrics/MetricSWithReference.java rename to src/eva2/server/go/operators/paretofrontmetrics/MetricSWithReference.java index a696790f..f48e6613 100644 --- a/src/javaeva/server/go/operators/paretofrontmetrics/MetricSWithReference.java +++ b/src/eva2/server/go/operators/paretofrontmetrics/MetricSWithReference.java @@ -1,15 +1,16 @@ -package javaeva.server.go.operators.paretofrontmetrics; +package eva2.server.go.operators.paretofrontmetrics; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.ESIndividualDoubleData; -import javaeva.server.go.operators.archiving.ArchivingAllDominating; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.AbstractMultiObjectiveOptimizationProblem; -import javaeva.server.go.tools.FileLoader; -import javaeva.gui.PropertyFilePath; import java.util.ArrayList; +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.FileLoader; + /** S-Metric calculates the hyper-volume covered between the current solutions and a reference point. * But here the difference to a given hybervolume is to be minimized. * Created by IntelliJ IDEA. @@ -108,7 +109,7 @@ public class MetricSWithReference implements InterfaceParetoFrontMetric, java.io double smetric = this.calculateSMetric(pop, this.m_ObjectiveSpaceRange, this.m_ObjectiveSpaceRange.length); if (this.m_ReferenceSMetric < 0) { Population tmpPop = new Population(); - ESIndividualDoubleData tmpIndy; + AbstractEAIndividual tmpIndy; tmpPop.setPopulationSize(this.m_Reference.length); tmpPop.clear(); for (int i = 0; i < this.m_Reference.length; i++) { diff --git a/src/javaeva/server/go/operators/postprocess/InterfacePostProcessParams.java b/src/eva2/server/go/operators/postprocess/InterfacePostProcessParams.java similarity index 94% rename from src/javaeva/server/go/operators/postprocess/InterfacePostProcessParams.java rename to src/eva2/server/go/operators/postprocess/InterfacePostProcessParams.java index d5598845..76069582 100644 --- a/src/javaeva/server/go/operators/postprocess/InterfacePostProcessParams.java +++ b/src/eva2/server/go/operators/postprocess/InterfacePostProcessParams.java @@ -1,4 +1,4 @@ -package javaeva.server.go.operators.postprocess; +package eva2.server.go.operators.postprocess; /** * Parameters for an optional post processing of found solutions. Mainly contains diff --git a/src/javaeva/server/go/operators/postprocess/PostProcess.java b/src/eva2/server/go/operators/postprocess/PostProcess.java similarity index 95% rename from src/javaeva/server/go/operators/postprocess/PostProcess.java rename to src/eva2/server/go/operators/postprocess/PostProcess.java index e6fe5508..c64211eb 100644 --- a/src/javaeva/server/go/operators/postprocess/PostProcess.java +++ b/src/eva2/server/go/operators/postprocess/PostProcess.java @@ -1,27 +1,28 @@ -package javaeva.server.go.operators.postprocess; +package eva2.server.go.operators.postprocess; import java.util.Collection; -import javaeva.OptimizerFactory; -import javaeva.OptimizerRunnable; -import javaeva.gui.BeanInspector; -import javaeva.server.go.InterfaceTerminator; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.cluster.ClusteringDensityBased; -import javaeva.server.go.operators.cluster.InterfaceClustering; -import javaeva.server.go.operators.distancemetric.InterfaceDistanceMetric; -import javaeva.server.go.operators.distancemetric.PhenotypeMetric; -import javaeva.server.go.operators.mutation.InterfaceMutation; -import javaeva.server.go.operators.mutation.MutateESFixedStepSize; -import javaeva.server.go.operators.terminators.EvaluationTerminator; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.AbstractMultiModalProblemKnown; -import javaeva.server.go.problems.AbstractOptimizationProblem; -import javaeva.server.go.problems.FM0Problem; -import javaeva.server.go.problems.InterfaceMultimodalProblemKnown; -import javaeva.server.go.strategies.HillClimbing; -import javaeva.server.stat.InterfaceTextListener; -import javaeva.tools.Pair; +import eva2.OptimizerFactory; +import eva2.OptimizerRunnable; +import eva2.gui.BeanInspector; +import eva2.server.go.InterfaceTerminator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.cluster.ClusteringDensityBased; +import eva2.server.go.operators.cluster.InterfaceClustering; +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.terminators.EvaluationTerminator; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.AbstractMultiModalProblemKnown; +import eva2.server.go.problems.AbstractOptimizationProblem; +import eva2.server.go.problems.FM0Problem; +import eva2.server.go.problems.InterfaceMultimodalProblemKnown; +import eva2.server.go.strategies.HillClimbing; +import eva2.server.stat.InterfaceTextListener; +import eva2.tools.Pair; + /** * Postprocess a population / list of individuals to find out a set of distinct optima. diff --git a/src/javaeva/server/go/operators/postprocess/PostProcessParams.java b/src/eva2/server/go/operators/postprocess/PostProcessParams.java similarity index 96% rename from src/javaeva/server/go/operators/postprocess/PostProcessParams.java rename to src/eva2/server/go/operators/postprocess/PostProcessParams.java index 8795a069..d2ba5a81 100644 --- a/src/javaeva/server/go/operators/postprocess/PostProcessParams.java +++ b/src/eva2/server/go/operators/postprocess/PostProcessParams.java @@ -1,8 +1,9 @@ -package javaeva.server.go.operators.postprocess; +package eva2.server.go.operators.postprocess; import java.io.Serializable; -import javaeva.gui.GenericObjectEditor; +import eva2.gui.GenericObjectEditor; + public class PostProcessParams implements InterfacePostProcessParams, Serializable { diff --git a/src/javaeva/server/go/operators/selection/InterfaceSelection.java b/src/eva2/server/go/operators/selection/InterfaceSelection.java similarity index 93% rename from src/javaeva/server/go/operators/selection/InterfaceSelection.java rename to src/eva2/server/go/operators/selection/InterfaceSelection.java index 39b27309..6c524160 100644 --- a/src/javaeva/server/go/operators/selection/InterfaceSelection.java +++ b/src/eva2/server/go/operators/selection/InterfaceSelection.java @@ -1,7 +1,7 @@ -package javaeva.server.go.operators.selection; +package eva2.server.go.operators.selection; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; /** Selection methods have to implement on the one hand the diff --git a/src/javaeva/server/go/operators/selection/MOMultipleSolutions.java b/src/eva2/server/go/operators/selection/MOMultipleSolutions.java similarity index 96% rename from src/javaeva/server/go/operators/selection/MOMultipleSolutions.java rename to src/eva2/server/go/operators/selection/MOMultipleSolutions.java index 4464b70f..253bdae1 100644 --- a/src/javaeva/server/go/operators/selection/MOMultipleSolutions.java +++ b/src/eva2/server/go/operators/selection/MOMultipleSolutions.java @@ -1,4 +1,4 @@ -package javaeva.server.go.operators.selection; +package eva2.server.go.operators.selection; import java.util.ArrayList; diff --git a/src/javaeva/server/go/operators/selection/MOSolution.java b/src/eva2/server/go/operators/selection/MOSolution.java similarity index 93% rename from src/javaeva/server/go/operators/selection/MOSolution.java rename to src/eva2/server/go/operators/selection/MOSolution.java index 483edf80..87077fbd 100644 --- a/src/javaeva/server/go/operators/selection/MOSolution.java +++ b/src/eva2/server/go/operators/selection/MOSolution.java @@ -1,4 +1,4 @@ -package javaeva.server.go.operators.selection; +package eva2.server.go.operators.selection; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/selection/SelectAll.java b/src/eva2/server/go/operators/selection/SelectAll.java similarity index 94% rename from src/javaeva/server/go/operators/selection/SelectAll.java rename to src/eva2/server/go/operators/selection/SelectAll.java index 72ddee13..6aedd69c 100644 --- a/src/javaeva/server/go/operators/selection/SelectAll.java +++ b/src/eva2/server/go/operators/selection/SelectAll.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.selection; +package eva2.server.go.operators.selection; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; /** Simple method to selecet all. * In case of multiple fitness values the selection diff --git a/src/javaeva/server/go/operators/selection/SelectBest.java b/src/eva2/server/go/operators/selection/SelectBest.java similarity index 96% rename from src/javaeva/server/go/operators/selection/SelectBest.java rename to src/eva2/server/go/operators/selection/SelectBest.java index 20a68c2c..b9bc36e1 100644 --- a/src/javaeva/server/go/operators/selection/SelectBest.java +++ b/src/eva2/server/go/operators/selection/SelectBest.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.selection; +package eva2.server.go.operators.selection; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; /** Select best individual multiple times if necessary. diff --git a/src/javaeva/server/go/operators/selection/SelectBestIndividuals.java b/src/eva2/server/go/operators/selection/SelectBestIndividuals.java similarity index 97% rename from src/javaeva/server/go/operators/selection/SelectBestIndividuals.java rename to src/eva2/server/go/operators/selection/SelectBestIndividuals.java index 6eef2cc5..806d49d5 100644 --- a/src/javaeva/server/go/operators/selection/SelectBestIndividuals.java +++ b/src/eva2/server/go/operators/selection/SelectBestIndividuals.java @@ -1,11 +1,12 @@ -package javaeva.server.go.operators.selection; +package eva2.server.go.operators.selection; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.ArrayList; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; + /** Select the best individuals. * In case of multiple fitness values the selection * critria is selected randomly for each selection event. diff --git a/src/javaeva/server/go/operators/selection/SelectEPTournaments.java b/src/eva2/server/go/operators/selection/SelectEPTournaments.java similarity index 97% rename from src/javaeva/server/go/operators/selection/SelectEPTournaments.java rename to src/eva2/server/go/operators/selection/SelectEPTournaments.java index 71850524..3a584189 100644 --- a/src/javaeva/server/go/operators/selection/SelectEPTournaments.java +++ b/src/eva2/server/go/operators/selection/SelectEPTournaments.java @@ -1,11 +1,12 @@ -package javaeva.server.go.operators.selection; +package eva2.server.go.operators.selection; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.ArrayList; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; + /** This method implements the multiple tournament scheme * for EP. * In case of multiple fitness values the selection diff --git a/src/javaeva/server/go/operators/selection/SelectHomologousMate.java b/src/eva2/server/go/operators/selection/SelectHomologousMate.java similarity index 91% rename from src/javaeva/server/go/operators/selection/SelectHomologousMate.java rename to src/eva2/server/go/operators/selection/SelectHomologousMate.java index 1b3239cd..68e11883 100644 --- a/src/javaeva/server/go/operators/selection/SelectHomologousMate.java +++ b/src/eva2/server/go/operators/selection/SelectHomologousMate.java @@ -1,12 +1,13 @@ -package javaeva.server.go.operators.selection; +package eva2.server.go.operators.selection; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.distancemetric.InterfaceDistanceMetric; -import javaeva.server.go.operators.distancemetric.ObjectiveSpaceMetric; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.ArrayList; +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.server.go.tools.RandomNumberGenerator; + /** An experimential implementation for mating restriction. * Possibly defunct. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/selection/SelectMOMAIIDominanceCounter.java b/src/eva2/server/go/operators/selection/SelectMOMAIIDominanceCounter.java similarity index 96% rename from src/javaeva/server/go/operators/selection/SelectMOMAIIDominanceCounter.java rename to src/eva2/server/go/operators/selection/SelectMOMAIIDominanceCounter.java index ac613498..11e5a600 100644 --- a/src/javaeva/server/go/operators/selection/SelectMOMAIIDominanceCounter.java +++ b/src/eva2/server/go/operators/selection/SelectMOMAIIDominanceCounter.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.selection; +package eva2.server.go.operators.selection; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.moso.MOSOMaxiMin; -import javaeva.server.go.populations.Population; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.moso.MOSOMaxiMin; +import eva2.server.go.populations.Population; /** Experimental selection mechanism for MOMA II where * a single individual is a whole set of Pareto optimal diff --git a/src/javaeva/server/go/operators/selection/SelectMOMaxiMin.java b/src/eva2/server/go/operators/selection/SelectMOMaxiMin.java similarity index 94% rename from src/javaeva/server/go/operators/selection/SelectMOMaxiMin.java rename to src/eva2/server/go/operators/selection/SelectMOMaxiMin.java index 8a5be112..e6034f22 100644 --- a/src/javaeva/server/go/operators/selection/SelectMOMaxiMin.java +++ b/src/eva2/server/go/operators/selection/SelectMOMaxiMin.java @@ -1,9 +1,9 @@ -package javaeva.server.go.operators.selection; +package eva2.server.go.operators.selection; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.moso.MOSOMaxiMin; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.moso.MOSOMaxiMin; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; /** A multi-objective selection criterion based on the maximin * method. diff --git a/src/javaeva/server/go/operators/selection/SelectMONSGAIICrowedTournament.java b/src/eva2/server/go/operators/selection/SelectMONSGAIICrowedTournament.java similarity index 96% rename from src/javaeva/server/go/operators/selection/SelectMONSGAIICrowedTournament.java rename to src/eva2/server/go/operators/selection/SelectMONSGAIICrowedTournament.java index 19c73821..db253a9c 100644 --- a/src/javaeva/server/go/operators/selection/SelectMONSGAIICrowedTournament.java +++ b/src/eva2/server/go/operators/selection/SelectMONSGAIICrowedTournament.java @@ -1,9 +1,9 @@ -package javaeva.server.go.operators.selection; +package eva2.server.go.operators.selection; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.archiving.ArchivingNSGAII; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.archiving.ArchivingNSGAII; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; /** The infamous NSGA-II selection scheme for multi-objective * optimization based on Pareto ranks and hybergrids. diff --git a/src/javaeva/server/go/operators/selection/SelectMONonDominated.java b/src/eva2/server/go/operators/selection/SelectMONonDominated.java similarity index 96% rename from src/javaeva/server/go/operators/selection/SelectMONonDominated.java rename to src/eva2/server/go/operators/selection/SelectMONonDominated.java index f8ba2327..92f813bf 100644 --- a/src/javaeva/server/go/operators/selection/SelectMONonDominated.java +++ b/src/eva2/server/go/operators/selection/SelectMONonDominated.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.selection; +package eva2.server.go.operators.selection; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; /** This multi-objective selection method preferrs non-dominated * individuals over dominated ones. Actually, this fails in case diff --git a/src/javaeva/server/go/operators/selection/SelectMOPESA.java b/src/eva2/server/go/operators/selection/SelectMOPESA.java similarity index 93% rename from src/javaeva/server/go/operators/selection/SelectMOPESA.java rename to src/eva2/server/go/operators/selection/SelectMOPESA.java index f628674e..99e9f2b2 100644 --- a/src/javaeva/server/go/operators/selection/SelectMOPESA.java +++ b/src/eva2/server/go/operators/selection/SelectMOPESA.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.selection; +package eva2.server.go.operators.selection; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.archiving.ArchivingPESAII; -import javaeva.server.go.operators.moso.MOSOMaxiMin; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.archiving.ArchivingPESAII; +import eva2.server.go.operators.moso.MOSOMaxiMin; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; /** The multi-objective PESA selection method. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/selection/SelectMOPESAII.java b/src/eva2/server/go/operators/selection/SelectMOPESAII.java similarity index 95% rename from src/javaeva/server/go/operators/selection/SelectMOPESAII.java rename to src/eva2/server/go/operators/selection/SelectMOPESAII.java index 3b00dc30..b9f6f067 100644 --- a/src/javaeva/server/go/operators/selection/SelectMOPESAII.java +++ b/src/eva2/server/go/operators/selection/SelectMOPESAII.java @@ -1,14 +1,15 @@ -package javaeva.server.go.operators.selection; +package eva2.server.go.operators.selection; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.archiving.ArchivingPESAII; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.Hashtable; import java.util.ArrayList; import java.util.Enumeration; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.archiving.ArchivingPESAII; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; + /** The multi-objective PESA II selection criteria based on a n-dimensional * grid using a squezzing factor. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/selection/SelectMOSPEAII.java b/src/eva2/server/go/operators/selection/SelectMOSPEAII.java similarity index 91% rename from src/javaeva/server/go/operators/selection/SelectMOSPEAII.java rename to src/eva2/server/go/operators/selection/SelectMOSPEAII.java index d290156a..219f4053 100644 --- a/src/javaeva/server/go/operators/selection/SelectMOSPEAII.java +++ b/src/eva2/server/go/operators/selection/SelectMOSPEAII.java @@ -1,14 +1,14 @@ -package javaeva.server.go.operators.selection; +package eva2.server.go.operators.selection; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.archiving.ArchivingNSGAII; -import javaeva.server.go.operators.archiving.ArchivingSPEAII; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; -import javaeva.gui.GraphPointSet; -import javaeva.gui.Chart2DDPointIconText; -import javaeva.gui.Chart2DDPointIconCircle; -import javaeva.gui.Plot; +import eva2.gui.Chart2DDPointIconCircle; +import eva2.gui.Chart2DDPointIconText; +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.archiving.ArchivingSPEAII; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; import wsi.ra.chart2d.DPoint; /** The SPEA II selection criteria using strength and raw fitness to determine @@ -80,7 +80,7 @@ public class SelectMOSPEAII implements InterfaceSelection, java.io.Serializable double[] tmpD = new double[2]; tmpD[0] = 0; tmpD[1] = 0; - Plot plot = new javaeva.gui.Plot("Debug SPEAIISelect", "Y1", "Y2", tmpD, tmpD); + Plot plot = new eva2.gui.Plot("Debug SPEAIISelect", "Y1", "Y2", tmpD, tmpD); plot.setUnconnectedPoint(0, 0, 11); plot.setUnconnectedPoint(1.2, 10, 11); GraphPointSet mySet = new GraphPointSet(10, plot.getFunctionArea()); diff --git a/src/javaeva/server/go/operators/selection/SelectParticleWheel.java b/src/eva2/server/go/operators/selection/SelectParticleWheel.java similarity index 92% rename from src/javaeva/server/go/operators/selection/SelectParticleWheel.java rename to src/eva2/server/go/operators/selection/SelectParticleWheel.java index ad6ba5c4..2e788891 100644 --- a/src/javaeva/server/go/operators/selection/SelectParticleWheel.java +++ b/src/eva2/server/go/operators/selection/SelectParticleWheel.java @@ -1,11 +1,11 @@ -package javaeva.server.go.operators.selection; +package eva2.server.go.operators.selection; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.selection.probability.InterfaceSelectionProbability; -import javaeva.server.go.operators.selection.probability.SelProbBoltzman; -import javaeva.server.go.operators.selection.probability.SelProbStandard; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.selection.probability.InterfaceSelectionProbability; +import eva2.server.go.operators.selection.probability.SelProbBoltzman; +import eva2.server.go.operators.selection.probability.SelProbStandard; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; /** This method implements the roulette wheel selection for diff --git a/src/javaeva/server/go/operators/selection/SelectRandom.java b/src/eva2/server/go/operators/selection/SelectRandom.java similarity index 95% rename from src/javaeva/server/go/operators/selection/SelectRandom.java rename to src/eva2/server/go/operators/selection/SelectRandom.java index f92f699a..8f089653 100644 --- a/src/javaeva/server/go/operators/selection/SelectRandom.java +++ b/src/eva2/server/go/operators/selection/SelectRandom.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.selection; +package eva2.server.go.operators.selection; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; /** Random selection typically used for ES a mating selection. diff --git a/src/javaeva/server/go/operators/selection/SelectTournament.java b/src/eva2/server/go/operators/selection/SelectTournament.java similarity index 96% rename from src/javaeva/server/go/operators/selection/SelectTournament.java rename to src/eva2/server/go/operators/selection/SelectTournament.java index 47dfa400..1be04074 100644 --- a/src/javaeva/server/go/operators/selection/SelectTournament.java +++ b/src/eva2/server/go/operators/selection/SelectTournament.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.selection; +package eva2.server.go.operators.selection; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; /** Tournament selection within a given tournament group size, * also scaling invariant. diff --git a/src/javaeva/server/go/operators/selection/SelectXProbRouletteWheel.java b/src/eva2/server/go/operators/selection/SelectXProbRouletteWheel.java similarity index 96% rename from src/javaeva/server/go/operators/selection/SelectXProbRouletteWheel.java rename to src/eva2/server/go/operators/selection/SelectXProbRouletteWheel.java index f48df4bd..0fa4c3bc 100644 --- a/src/javaeva/server/go/operators/selection/SelectXProbRouletteWheel.java +++ b/src/eva2/server/go/operators/selection/SelectXProbRouletteWheel.java @@ -1,10 +1,10 @@ -package javaeva.server.go.operators.selection; +package eva2.server.go.operators.selection; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.selection.probability.InterfaceSelectionProbability; -import javaeva.server.go.operators.selection.probability.SelProbStandard; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; +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.server.go.tools.RandomNumberGenerator; class treeElement implements java.io.Serializable { diff --git a/src/javaeva/server/go/operators/selection/probability/AbstractSelProb.java b/src/eva2/server/go/operators/selection/probability/AbstractSelProb.java similarity index 97% rename from src/javaeva/server/go/operators/selection/probability/AbstractSelProb.java rename to src/eva2/server/go/operators/selection/probability/AbstractSelProb.java index 714c2ae0..33c1ee3c 100644 --- a/src/javaeva/server/go/operators/selection/probability/AbstractSelProb.java +++ b/src/eva2/server/go/operators/selection/probability/AbstractSelProb.java @@ -1,10 +1,11 @@ -package javaeva.server.go.operators.selection.probability; +package eva2.server.go.operators.selection.probability; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; import java.util.ArrayList; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; + /** This abstract implementation gives some general * methods for retrieving and cleaning fitness values. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/selection/probability/InterfaceSelectionProbability.java b/src/eva2/server/go/operators/selection/probability/InterfaceSelectionProbability.java similarity index 94% rename from src/javaeva/server/go/operators/selection/probability/InterfaceSelectionProbability.java rename to src/eva2/server/go/operators/selection/probability/InterfaceSelectionProbability.java index ef7360a6..76121693 100644 --- a/src/javaeva/server/go/operators/selection/probability/InterfaceSelectionProbability.java +++ b/src/eva2/server/go/operators/selection/probability/InterfaceSelectionProbability.java @@ -1,6 +1,6 @@ -package javaeva.server.go.operators.selection.probability; +package eva2.server.go.operators.selection.probability; -import javaeva.server.go.populations.Population; +import eva2.server.go.populations.Population; /** The interface for methods with calculate the selection * propability from the fitness values. While the fitness diff --git a/src/javaeva/server/go/operators/selection/probability/SelProbBoltzman.java b/src/eva2/server/go/operators/selection/probability/SelProbBoltzman.java similarity index 98% rename from src/javaeva/server/go/operators/selection/probability/SelProbBoltzman.java rename to src/eva2/server/go/operators/selection/probability/SelProbBoltzman.java index 19f44f20..3acd8ca5 100644 --- a/src/javaeva/server/go/operators/selection/probability/SelProbBoltzman.java +++ b/src/eva2/server/go/operators/selection/probability/SelProbBoltzman.java @@ -1,7 +1,7 @@ -package javaeva.server.go.operators.selection.probability; +package eva2.server.go.operators.selection.probability; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.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/javaeva/server/go/operators/selection/probability/SelProbFitnessSharing.java b/src/eva2/server/go/operators/selection/probability/SelProbFitnessSharing.java similarity index 93% rename from src/javaeva/server/go/operators/selection/probability/SelProbFitnessSharing.java rename to src/eva2/server/go/operators/selection/probability/SelProbFitnessSharing.java index 16e180bd..8ada3c0b 100644 --- a/src/javaeva/server/go/operators/selection/probability/SelProbFitnessSharing.java +++ b/src/eva2/server/go/operators/selection/probability/SelProbFitnessSharing.java @@ -1,9 +1,9 @@ -package javaeva.server.go.operators.selection.probability; +package eva2.server.go.operators.selection.probability; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.distancemetric.InterfaceDistanceMetric; -import javaeva.server.go.operators.distancemetric.PhenotypeMetric; -import javaeva.server.go.populations.Population; +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; /** Here we have the infamous fitness sharing method. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/selection/probability/SelProbInvertByMax.java b/src/eva2/server/go/operators/selection/probability/SelProbInvertByMax.java similarity index 95% rename from src/javaeva/server/go/operators/selection/probability/SelProbInvertByMax.java rename to src/eva2/server/go/operators/selection/probability/SelProbInvertByMax.java index 18f7f775..ad71bf28 100644 --- a/src/javaeva/server/go/operators/selection/probability/SelProbInvertByMax.java +++ b/src/eva2/server/go/operators/selection/probability/SelProbInvertByMax.java @@ -1,7 +1,7 @@ -package javaeva.server.go.operators.selection.probability; +package eva2.server.go.operators.selection.probability; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; /** * Scale the fitness of a maximization problem by inverting it by the maximum fitness, diff --git a/src/javaeva/server/go/operators/selection/probability/SelProbLinearRanking.java b/src/eva2/server/go/operators/selection/probability/SelProbLinearRanking.java similarity index 97% rename from src/javaeva/server/go/operators/selection/probability/SelProbLinearRanking.java rename to src/eva2/server/go/operators/selection/probability/SelProbLinearRanking.java index 7bd39a61..d46f64cb 100644 --- a/src/javaeva/server/go/operators/selection/probability/SelProbLinearRanking.java +++ b/src/eva2/server/go/operators/selection/probability/SelProbLinearRanking.java @@ -1,7 +1,7 @@ -package javaeva.server.go.operators.selection.probability; +package eva2.server.go.operators.selection.probability; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; /** A linear ranking method with offsets. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/selection/probability/SelProbNonLinearRanking.java b/src/eva2/server/go/operators/selection/probability/SelProbNonLinearRanking.java similarity index 97% rename from src/javaeva/server/go/operators/selection/probability/SelProbNonLinearRanking.java rename to src/eva2/server/go/operators/selection/probability/SelProbNonLinearRanking.java index 9e46854f..f280fdc6 100644 --- a/src/javaeva/server/go/operators/selection/probability/SelProbNonLinearRanking.java +++ b/src/eva2/server/go/operators/selection/probability/SelProbNonLinearRanking.java @@ -1,7 +1,7 @@ -package javaeva.server.go.operators.selection.probability; +package eva2.server.go.operators.selection.probability; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; /** A non-linear ranking, which is difficult to tune to * the given optimization problem i guess. diff --git a/src/javaeva/server/go/operators/selection/probability/SelProbRanking.java b/src/eva2/server/go/operators/selection/probability/SelProbRanking.java similarity index 95% rename from src/javaeva/server/go/operators/selection/probability/SelProbRanking.java rename to src/eva2/server/go/operators/selection/probability/SelProbRanking.java index 469091c5..51b4e62d 100644 --- a/src/javaeva/server/go/operators/selection/probability/SelProbRanking.java +++ b/src/eva2/server/go/operators/selection/probability/SelProbRanking.java @@ -1,7 +1,7 @@ -package javaeva.server.go.operators.selection.probability; +package eva2.server.go.operators.selection.probability; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; /** Ranking for calculating the selection probability. * This truly scaling invariant. diff --git a/src/javaeva/server/go/operators/selection/probability/SelProbStandard.java b/src/eva2/server/go/operators/selection/probability/SelProbStandard.java similarity index 96% rename from src/javaeva/server/go/operators/selection/probability/SelProbStandard.java rename to src/eva2/server/go/operators/selection/probability/SelProbStandard.java index 8a795679..45c07cf5 100644 --- a/src/javaeva/server/go/operators/selection/probability/SelProbStandard.java +++ b/src/eva2/server/go/operators/selection/probability/SelProbStandard.java @@ -1,7 +1,7 @@ -package javaeva.server.go.operators.selection.probability; +package eva2.server.go.operators.selection.probability; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; /** A simple sum to calculate the selection probability. * diff --git a/src/javaeva/server/go/operators/selection/probability/SelProbStandardScaling.java b/src/eva2/server/go/operators/selection/probability/SelProbStandardScaling.java similarity index 97% rename from src/javaeva/server/go/operators/selection/probability/SelProbStandardScaling.java rename to src/eva2/server/go/operators/selection/probability/SelProbStandardScaling.java index 7ddd49b7..dc5a2323 100644 --- a/src/javaeva/server/go/operators/selection/probability/SelProbStandardScaling.java +++ b/src/eva2/server/go/operators/selection/probability/SelProbStandardScaling.java @@ -1,7 +1,7 @@ -package javaeva.server.go.operators.selection.probability; +package eva2.server.go.operators.selection.probability; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; /** A simple sum with a scaling factor. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/selection/replacement/InterfaceReplacement.java b/src/eva2/server/go/operators/selection/replacement/InterfaceReplacement.java similarity index 80% rename from src/javaeva/server/go/operators/selection/replacement/InterfaceReplacement.java rename to src/eva2/server/go/operators/selection/replacement/InterfaceReplacement.java index d133dbc2..613761de 100644 --- a/src/javaeva/server/go/operators/selection/replacement/InterfaceReplacement.java +++ b/src/eva2/server/go/operators/selection/replacement/InterfaceReplacement.java @@ -1,7 +1,7 @@ -package javaeva.server.go.operators.selection.replacement; +package eva2.server.go.operators.selection.replacement; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; /** Replacement schemes for the steady-state GA. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/selection/replacement/PreplacePreselection.java b/src/eva2/server/go/operators/selection/replacement/PreplacePreselection.java similarity index 90% rename from src/javaeva/server/go/operators/selection/replacement/PreplacePreselection.java rename to src/eva2/server/go/operators/selection/replacement/PreplacePreselection.java index 885fe13d..c53f5b1c 100644 --- a/src/javaeva/server/go/operators/selection/replacement/PreplacePreselection.java +++ b/src/eva2/server/go/operators/selection/replacement/PreplacePreselection.java @@ -1,7 +1,7 @@ -package javaeva.server.go.operators.selection.replacement; +package eva2.server.go.operators.selection.replacement; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; /** The preselection replacement scheme replaces the worst parent in case * the offspring is better. diff --git a/src/javaeva/server/go/operators/selection/replacement/ReplaceDeterministicCrowding.java b/src/eva2/server/go/operators/selection/replacement/ReplaceDeterministicCrowding.java similarity index 89% rename from src/javaeva/server/go/operators/selection/replacement/ReplaceDeterministicCrowding.java rename to src/eva2/server/go/operators/selection/replacement/ReplaceDeterministicCrowding.java index 8eeb6610..01e1f4f6 100644 --- a/src/javaeva/server/go/operators/selection/replacement/ReplaceDeterministicCrowding.java +++ b/src/eva2/server/go/operators/selection/replacement/ReplaceDeterministicCrowding.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.selection.replacement; +package eva2.server.go.operators.selection.replacement; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.distancemetric.PhenotypeMetric; -import javaeva.server.go.populations.Population; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.distancemetric.PhenotypeMetric; +import eva2.server.go.populations.Population; /** The deterministic crowiding method replaces the most similar parent if better * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/selection/replacement/ReplaceRandom.java b/src/eva2/server/go/operators/selection/replacement/ReplaceRandom.java similarity index 86% rename from src/javaeva/server/go/operators/selection/replacement/ReplaceRandom.java rename to src/eva2/server/go/operators/selection/replacement/ReplaceRandom.java index 4cbae5b1..e6042dfc 100644 --- a/src/javaeva/server/go/operators/selection/replacement/ReplaceRandom.java +++ b/src/eva2/server/go/operators/selection/replacement/ReplaceRandom.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.selection.replacement; +package eva2.server.go.operators.selection.replacement; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; /** Random replacement. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/selection/replacement/ReplaceWorst.java b/src/eva2/server/go/operators/selection/replacement/ReplaceWorst.java similarity index 87% rename from src/javaeva/server/go/operators/selection/replacement/ReplaceWorst.java rename to src/eva2/server/go/operators/selection/replacement/ReplaceWorst.java index 79d42c76..30a59fae 100644 --- a/src/javaeva/server/go/operators/selection/replacement/ReplaceWorst.java +++ b/src/eva2/server/go/operators/selection/replacement/ReplaceWorst.java @@ -1,8 +1,8 @@ -package javaeva.server.go.operators.selection.replacement; +package eva2.server.go.operators.selection.replacement; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.tools.RandomNumberGenerator; /** This method replaces the worst indvidual in the population. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/selection/replacement/ReplaceWorstParent.java b/src/eva2/server/go/operators/selection/replacement/ReplaceWorstParent.java similarity index 91% rename from src/javaeva/server/go/operators/selection/replacement/ReplaceWorstParent.java rename to src/eva2/server/go/operators/selection/replacement/ReplaceWorstParent.java index 9e0ae820..c1722d36 100644 --- a/src/javaeva/server/go/operators/selection/replacement/ReplaceWorstParent.java +++ b/src/eva2/server/go/operators/selection/replacement/ReplaceWorstParent.java @@ -1,7 +1,7 @@ -package javaeva.server.go.operators.selection.replacement; +package eva2.server.go.operators.selection.replacement; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.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/javaeva/server/go/operators/selection/replacement/ReplacementCrowding.java b/src/eva2/server/go/operators/selection/replacement/ReplacementCrowding.java similarity index 89% rename from src/javaeva/server/go/operators/selection/replacement/ReplacementCrowding.java rename to src/eva2/server/go/operators/selection/replacement/ReplacementCrowding.java index 51d258f1..80fbf7f8 100644 --- a/src/javaeva/server/go/operators/selection/replacement/ReplacementCrowding.java +++ b/src/eva2/server/go/operators/selection/replacement/ReplacementCrowding.java @@ -1,9 +1,9 @@ -package javaeva.server.go.operators.selection.replacement; +package eva2.server.go.operators.selection.replacement; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.distancemetric.PhenotypeMetric; -import javaeva.server.go.operators.selection.SelectRandom; -import javaeva.server.go.populations.Population; +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; /** This crowding method replaces the most similar individual from a random group if better. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/operators/terminators/CombinedTerminator.java b/src/eva2/server/go/operators/terminators/CombinedTerminator.java similarity index 94% rename from src/javaeva/server/go/operators/terminators/CombinedTerminator.java rename to src/eva2/server/go/operators/terminators/CombinedTerminator.java index a6d07246..1c70a80d 100644 --- a/src/javaeva/server/go/operators/terminators/CombinedTerminator.java +++ b/src/eva2/server/go/operators/terminators/CombinedTerminator.java @@ -1,10 +1,11 @@ -package javaeva.server.go.operators.terminators; +package eva2.server.go.operators.terminators; import java.io.Serializable; -import javaeva.server.go.InterfaceTerminator; -import javaeva.server.go.PopulationInterface; -import javaeva.tools.SelectedTag; +import eva2.server.go.InterfaceTerminator; +import eva2.server.go.PopulationInterface; +import eva2.tools.SelectedTag; + public class CombinedTerminator implements InterfaceTerminator, Serializable { /** diff --git a/src/javaeva/server/go/operators/terminators/EvaluationTerminator.java b/src/eva2/server/go/operators/terminators/EvaluationTerminator.java similarity index 94% rename from src/javaeva/server/go/operators/terminators/EvaluationTerminator.java rename to src/eva2/server/go/operators/terminators/EvaluationTerminator.java index fb164849..909adcec 100644 --- a/src/javaeva/server/go/operators/terminators/EvaluationTerminator.java +++ b/src/eva2/server/go/operators/terminators/EvaluationTerminator.java @@ -1,4 +1,4 @@ -package javaeva.server.go.operators.terminators; +package eva2.server.go.operators.terminators; /* * Title: JavaEvA * Description: @@ -14,8 +14,9 @@ package javaeva.server.go.operators.terminators; *==========================================================================*/ import java.io.Serializable; -import javaeva.server.go.PopulationInterface; -import javaeva.server.go.InterfaceTerminator; +import eva2.server.go.InterfaceTerminator; +import eva2.server.go.PopulationInterface; + /*==========================================================================* * CLASS DECLARATION *==========================================================================*/ diff --git a/src/javaeva/server/go/operators/terminators/FitnessConvergenceTerminator.java b/src/eva2/server/go/operators/terminators/FitnessConvergenceTerminator.java similarity index 94% rename from src/javaeva/server/go/operators/terminators/FitnessConvergenceTerminator.java rename to src/eva2/server/go/operators/terminators/FitnessConvergenceTerminator.java index b264c7d8..303ea3a6 100644 --- a/src/javaeva/server/go/operators/terminators/FitnessConvergenceTerminator.java +++ b/src/eva2/server/go/operators/terminators/FitnessConvergenceTerminator.java @@ -1,4 +1,4 @@ -package javaeva.server.go.operators.terminators; +package eva2.server.go.operators.terminators; /* * Title: JavaEvA @@ -15,13 +15,14 @@ package javaeva.server.go.operators.terminators; *==========================================================================*/ import java.io.Serializable; -import javaeva.gui.BeanInspector; -import javaeva.server.go.IndividualInterface; -import javaeva.server.go.InterfaceTerminator; -import javaeva.server.go.PopulationInterface; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.distancemetric.PhenotypeMetric; -import javaeva.tools.SelectedTag; +import eva2.gui.BeanInspector; +import eva2.server.go.IndividualInterface; +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.tools.SelectedTag; + /*==========================================================================* * CLASS DECLARATION diff --git a/src/javaeva/server/go/operators/terminators/FitnessValueTerminator.java b/src/eva2/server/go/operators/terminators/FitnessValueTerminator.java similarity index 91% rename from src/javaeva/server/go/operators/terminators/FitnessValueTerminator.java rename to src/eva2/server/go/operators/terminators/FitnessValueTerminator.java index d8097f2e..8f2158a7 100644 --- a/src/javaeva/server/go/operators/terminators/FitnessValueTerminator.java +++ b/src/eva2/server/go/operators/terminators/FitnessValueTerminator.java @@ -1,4 +1,4 @@ -package javaeva.server.go.operators.terminators; +package eva2.server.go.operators.terminators; /* * Title: JavaEvA * Description: @@ -14,9 +14,10 @@ package javaeva.server.go.operators.terminators; *==========================================================================*/ import java.io.Serializable; -import javaeva.gui.BeanInspector; -import javaeva.server.go.PopulationInterface; -import javaeva.server.go.InterfaceTerminator; +import eva2.gui.BeanInspector; +import eva2.server.go.InterfaceTerminator; +import eva2.server.go.PopulationInterface; + /*==========================================================================* * CLASS DECLARATION *==========================================================================*/ diff --git a/src/javaeva/server/go/operators/terminators/GenerationTerminator.java b/src/eva2/server/go/operators/terminators/GenerationTerminator.java similarity index 92% rename from src/javaeva/server/go/operators/terminators/GenerationTerminator.java rename to src/eva2/server/go/operators/terminators/GenerationTerminator.java index b83147c5..2148cc0b 100644 --- a/src/javaeva/server/go/operators/terminators/GenerationTerminator.java +++ b/src/eva2/server/go/operators/terminators/GenerationTerminator.java @@ -1,4 +1,4 @@ -package javaeva.server.go.operators.terminators; +package eva2.server.go.operators.terminators; /* * Title: JavaEvA * Description: @@ -14,9 +14,10 @@ package javaeva.server.go.operators.terminators; *==========================================================================*/ import java.io.Serializable; -import javaeva.gui.BeanInspector; -import javaeva.server.go.PopulationInterface; -import javaeva.server.go.InterfaceTerminator; +import eva2.gui.BeanInspector; +import eva2.server.go.InterfaceTerminator; +import eva2.server.go.PopulationInterface; + /*==========================================================================* * CLASS DECLARATION *==========================================================================*/ diff --git a/src/javaeva/server/go/operators/terminators/PhenotypeConvergenceTerminator.java b/src/eva2/server/go/operators/terminators/PhenotypeConvergenceTerminator.java similarity index 81% rename from src/javaeva/server/go/operators/terminators/PhenotypeConvergenceTerminator.java rename to src/eva2/server/go/operators/terminators/PhenotypeConvergenceTerminator.java index 298f81fe..553ca808 100644 --- a/src/javaeva/server/go/operators/terminators/PhenotypeConvergenceTerminator.java +++ b/src/eva2/server/go/operators/terminators/PhenotypeConvergenceTerminator.java @@ -1,11 +1,11 @@ -package javaeva.server.go.operators.terminators; +package eva2.server.go.operators.terminators; -import javaeva.gui.BeanInspector; -import javaeva.server.go.IndividualInterface; -import javaeva.server.go.InterfaceTerminator; -import javaeva.server.go.PopulationInterface; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.distancemetric.PhenotypeMetric; +import eva2.gui.BeanInspector; +import eva2.server.go.IndividualInterface; +import eva2.server.go.InterfaceTerminator; +import eva2.server.go.PopulationInterface; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.distancemetric.PhenotypeMetric; public class PhenotypeConvergenceTerminator extends FitnessConvergenceTerminator implements InterfaceTerminator { AbstractEAIndividual oldIndy = null; diff --git a/src/javaeva/server/go/populations/PBILPopulation.java b/src/eva2/server/go/populations/PBILPopulation.java similarity index 96% rename from src/javaeva/server/go/populations/PBILPopulation.java rename to src/eva2/server/go/populations/PBILPopulation.java index 5920e4d3..d77cc320 100644 --- a/src/javaeva/server/go/populations/PBILPopulation.java +++ b/src/eva2/server/go/populations/PBILPopulation.java @@ -1,11 +1,12 @@ -package javaeva.server.go.populations; +package eva2.server.go.populations; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGAIndividual; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.BitSet; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceGAIndividual; +import eva2.server.go.tools.RandomNumberGenerator; + /** This implementation of Population Based Incremental Learning is only * suited for a BitString based genotyp represenation. * Copyright: Copyright (c) 2003 diff --git a/src/javaeva/server/go/populations/Population.java b/src/eva2/server/go/populations/Population.java similarity index 85% rename from src/javaeva/server/go/populations/Population.java rename to src/eva2/server/go/populations/Population.java index 2b7d52db..06220bc0 100644 --- a/src/javaeva/server/go/populations/Population.java +++ b/src/eva2/server/go/populations/Population.java @@ -1,18 +1,19 @@ -package javaeva.server.go.populations; +package eva2.server.go.populations; import java.util.ArrayList; import java.util.LinkedList; import java.util.List; import java.util.PriorityQueue; -import javaeva.server.go.IndividualInterface; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.PopulationInterface; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.AbstractEAIndividualComparator; -import javaeva.server.go.individuals.GAIndividualBinaryData; -import javaeva.server.go.operators.distancemetric.PhenotypeMetric; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.IndividualInterface; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.PopulationInterface; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.AbstractEAIndividualComparator; +import eva2.server.go.individuals.GAIndividualBinaryData; +import eva2.server.go.operators.distancemetric.PhenotypeMetric; +import eva2.server.go.tools.RandomNumberGenerator; + /** This is a basic implementation for a EA Population. * Copyright: Copyright (c) 2003 @@ -57,8 +58,12 @@ public class Population extends ArrayList implements PopulationInterface, Clonea if (population.get(i) != null) this.add((((AbstractEAIndividual)population.get(i))).clone()); } - if (population.m_Archive != null) this.m_Archive = (Population)population.m_Archive.clone(); - if (population.m_History != null) this.m_History = (ArrayList)population.m_History.clone(); + copyHistAndArchive(population); + } + + public void copyHistAndArchive(Population population) { + if (population.m_Archive != null) this.m_Archive = (Population)population.m_Archive.clone(); + if (population.m_History != null) this.m_History = (ArrayList)population.m_History.clone(); } /** @@ -77,6 +82,21 @@ public class Population extends ArrayList implements PopulationInterface, Clonea public Object clone() { return (Object) new Population(this); } + + /** + * Clone the population without cloning every individual. This produces an empty population + * which can be used to fill with the next generation by an EA and is implemented for efficiency. + * + * @return an empty population with equal members but not containing any individuals + */ + public Population cloneWithoutInds() { + // these two basically clone without cloning every individual + Population res = new Population(); + res.setSameParams(this); + res.copyHistAndArchive(this); + return res; + } + /** This method inits the state of the population AFTER the individuals * have been inited by a problem @@ -265,30 +285,46 @@ public class Population extends ArrayList implements PopulationInterface, Clonea return domSet; } - /** This method will return the index of the current best individual from the - * population. + /** + * This method will return the index of the current best individual from the + * population, yet only the first single criterion is regarded. * @return The index of the best individual. */ public int getIndexOfBestIndividual() { int result = -1; double curBestFitness = Double.POSITIVE_INFINITY; + boolean allViolate = true; for (int i = 0; i < super.size(); i++) { - if ((!((AbstractEAIndividual)super.get(i)).violatesConstraint()) && (((AbstractEAIndividual)super.get(i)).getFitness(0) < curBestFitness)) { - result = i; - curBestFitness = ((AbstractEAIndividual)super.get(i)).getFitness(0); + if (!((AbstractEAIndividual)super.get(i)).violatesConstraint()) { + allViolate = false; + if (getEAIndividual(i).getFitness(0) < curBestFitness) { + result = i; + curBestFitness = getEAIndividual(i).getFitness(0); + } } } - if (result == -1) { - // darn all seem to violate the constraint - // so lets search for the guy who is close to feasible - for (int i = 0; i < super.size(); i++) { - if ((((AbstractEAIndividual)super.get(i)).getConstraintViolation() < curBestFitness)) { - result = i; - curBestFitness = ((AbstractEAIndividual)super.get(i)).getConstraintViolation(); - } - } - System.out.println("Population reports: All individuals violate the constraints, choosing smallest constraint violation."); + if (result < 0) { + if (allViolate) { + // to avoid problems with NaN or infinite fitness value, preselect a random ind. + // TODO: use multi-objective comparison? + result = 0; + curBestFitness = getEAIndividual(0).getConstraintViolation(); + // darn all seem to violate the constraint + // so lets search for the guy who is close to feasible + for (int i = 1; i < super.size(); i++) { + if (getEAIndividual(i).getConstraintViolation() < curBestFitness) { + result = i; + curBestFitness = ((AbstractEAIndividual)super.get(i)).getConstraintViolation(); + } + } + System.err.println("Population reports: All individuals violate the constraints, choosing smallest constraint violation."); + } else { + // not all violate, maybe all are NaN! + // so just select a random one + System.err.println("Population reports: All individuals seem to have NaN or infinite fitness!"); + result = RandomNumberGenerator.randomInt(size()); + } } return result; } @@ -526,6 +562,32 @@ public class Population extends ArrayList implements PopulationInterface, Clonea return strB.toString(); } + public Long[] getIDList() { + Long[] idList = new Long[size()]; + for (int i=0; i 0 ) try { Thread.sleep(sleepTime); } catch(Exception e) {} - if (this.m_Show) this.updateProblemFrame(population); +// /** This method evaluates a given population and set the fitness values +// * accordingly +// * @param population The population that is to be evaluated. +// */ +// public void evaluate(Population population) { +// evaluatePopulationStart(population); +// AbstractEAIndividual tmpIndy; +// +// for (int i = 0; i < population.size(); i++) { +// tmpIndy = (AbstractEAIndividual) population.get(i); +// tmpIndy.resetConstraintViolation(); +// this.evaluate(tmpIndy); +// population.incrFunctionCalls(); +// } +// evaluatePopulationEnd(population); +// //if (sleepTime > 0 ) try { Thread.sleep(sleepTime); } catch(Exception e) {} +//// if (this.m_Show) this.updateProblemFrame(population); +// } + + public void evaluatePopulationEnd(Population pop) { + if (this.m_Show) this.updateProblemFrame(pop); } /** This method evaluate a single individual and sets the fitness values diff --git a/src/javaeva/server/go/problems/FM0Problem.java b/src/eva2/server/go/problems/FM0Problem.java similarity index 93% rename from src/javaeva/server/go/problems/FM0Problem.java rename to src/eva2/server/go/problems/FM0Problem.java index b39b7ed8..688a58c4 100644 --- a/src/javaeva/server/go/problems/FM0Problem.java +++ b/src/eva2/server/go/problems/FM0Problem.java @@ -1,9 +1,11 @@ -package javaeva.server.go.problems; +package eva2.server.go.problems; import java.io.Serializable; -import javaeva.server.go.individuals.ESIndividualDoubleData; -import javaeva.server.go.strategies.InterfaceOptimizer; +import eva2.server.go.individuals.ESIndividualDoubleData; +import eva2.server.go.strategies.InterfaceOptimizer; + +import eva2.server.go.problems.Interface2DBorderProblem; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/problems/Interface2DBorderProblem.java b/src/eva2/server/go/problems/Interface2DBorderProblem.java similarity index 94% rename from src/javaeva/server/go/problems/Interface2DBorderProblem.java rename to src/eva2/server/go/problems/Interface2DBorderProblem.java index f6e48354..db275eda 100644 --- a/src/javaeva/server/go/problems/Interface2DBorderProblem.java +++ b/src/eva2/server/go/problems/Interface2DBorderProblem.java @@ -1,4 +1,4 @@ -package javaeva.server.go.problems; +package eva2.server.go.problems; /** * An interface refactored from InterfaceMultiModalProblem, having only methods used for diff --git a/src/javaeva/server/go/problems/InterfaceAdditionalPopulationInformer.java b/src/eva2/server/go/problems/InterfaceAdditionalPopulationInformer.java similarity index 86% rename from src/javaeva/server/go/problems/InterfaceAdditionalPopulationInformer.java rename to src/eva2/server/go/problems/InterfaceAdditionalPopulationInformer.java index f4fc6704..be896024 100644 --- a/src/javaeva/server/go/problems/InterfaceAdditionalPopulationInformer.java +++ b/src/eva2/server/go/problems/InterfaceAdditionalPopulationInformer.java @@ -1,6 +1,6 @@ -package javaeva.server.go.problems; +package eva2.server.go.problems; -import javaeva.server.go.PopulationInterface; +import eva2.server.go.PopulationInterface; public interface InterfaceAdditionalPopulationInformer { /** This method returns the header for the additional data that is to be written into a file diff --git a/src/javaeva/server/go/problems/InterfaceFirstOrderDerivableProblem.java b/src/eva2/server/go/problems/InterfaceFirstOrderDerivableProblem.java similarity index 90% rename from src/javaeva/server/go/problems/InterfaceFirstOrderDerivableProblem.java rename to src/eva2/server/go/problems/InterfaceFirstOrderDerivableProblem.java index ca455e77..90ff0e3e 100644 --- a/src/javaeva/server/go/problems/InterfaceFirstOrderDerivableProblem.java +++ b/src/eva2/server/go/problems/InterfaceFirstOrderDerivableProblem.java @@ -1,4 +1,4 @@ -package javaeva.server.go.problems; +package eva2.server.go.problems; /** *

Title: The JavaEvA

diff --git a/src/javaeva/server/go/problems/InterfaceHasInitRange.java b/src/eva2/server/go/problems/InterfaceHasInitRange.java similarity index 87% rename from src/javaeva/server/go/problems/InterfaceHasInitRange.java rename to src/eva2/server/go/problems/InterfaceHasInitRange.java index 1c1b08b3..db7e5bcb 100644 --- a/src/javaeva/server/go/problems/InterfaceHasInitRange.java +++ b/src/eva2/server/go/problems/InterfaceHasInitRange.java @@ -1,4 +1,4 @@ -package javaeva.server.go.problems; +package eva2.server.go.problems; /** * An interface for optimization problems having an extra initial range diff --git a/src/javaeva/server/go/problems/InterfaceLocalSearchable.java b/src/eva2/server/go/problems/InterfaceLocalSearchable.java similarity index 70% rename from src/javaeva/server/go/problems/InterfaceLocalSearchable.java rename to src/eva2/server/go/problems/InterfaceLocalSearchable.java index ee706204..980471b6 100644 --- a/src/javaeva/server/go/problems/InterfaceLocalSearchable.java +++ b/src/eva2/server/go/problems/InterfaceLocalSearchable.java @@ -1,7 +1,7 @@ -package javaeva.server.go.problems; +package eva2.server.go.problems; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; /** *

Title: The JavaEvA

diff --git a/src/javaeva/server/go/problems/InterfaceMultiObjectiveDeNovoProblem.java b/src/eva2/server/go/problems/InterfaceMultiObjectiveDeNovoProblem.java similarity index 83% rename from src/javaeva/server/go/problems/InterfaceMultiObjectiveDeNovoProblem.java rename to src/eva2/server/go/problems/InterfaceMultiObjectiveDeNovoProblem.java index 9e21a811..6159c839 100644 --- a/src/javaeva/server/go/problems/InterfaceMultiObjectiveDeNovoProblem.java +++ b/src/eva2/server/go/problems/InterfaceMultiObjectiveDeNovoProblem.java @@ -1,10 +1,12 @@ -package javaeva.server.go.problems; +package eva2.server.go.problems; -import javaeva.server.go.mocco.paretofrontviewer.InterfaceParetoFrontView; -import javaeva.server.go.mocco.paretofrontviewer.MOCCOViewer; +import eva2.server.go.problems.InterfaceOptimizationObjective; import javax.swing.*; +import eva2.server.go.mocco.paretofrontviewer.InterfaceParetoFrontView; +import eva2.server.go.mocco.paretofrontviewer.MOCCOViewer; + /** This is a general interface to access a multi-objective optimization * problem which enables de novo programming and thus MOCCO * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/problems/InterfaceMultimodalProblem.java b/src/eva2/server/go/problems/InterfaceMultimodalProblem.java similarity index 82% rename from src/javaeva/server/go/problems/InterfaceMultimodalProblem.java rename to src/eva2/server/go/problems/InterfaceMultimodalProblem.java index 06444cf3..e286ae8f 100644 --- a/src/javaeva/server/go/problems/InterfaceMultimodalProblem.java +++ b/src/eva2/server/go/problems/InterfaceMultimodalProblem.java @@ -1,4 +1,4 @@ -package javaeva.server.go.problems; +package eva2.server.go.problems; /** * An interface to tag possibly multimodal problems, but without diff --git a/src/javaeva/server/go/problems/InterfaceMultimodalProblemKnown.java b/src/eva2/server/go/problems/InterfaceMultimodalProblemKnown.java similarity index 94% rename from src/javaeva/server/go/problems/InterfaceMultimodalProblemKnown.java rename to src/eva2/server/go/problems/InterfaceMultimodalProblemKnown.java index 2b6f5f64..b6e75013 100644 --- a/src/javaeva/server/go/problems/InterfaceMultimodalProblemKnown.java +++ b/src/eva2/server/go/problems/InterfaceMultimodalProblemKnown.java @@ -1,6 +1,6 @@ -package javaeva.server.go.problems; +package eva2.server.go.problems; -import javaeva.server.go.populations.Population; +import eva2.server.go.populations.Population; /** * A multimodal problem which has knowledge of its optima. diff --git a/src/javaeva/server/go/problems/InterfaceOptimizationObjective.java b/src/eva2/server/go/problems/InterfaceOptimizationObjective.java similarity index 97% rename from src/javaeva/server/go/problems/InterfaceOptimizationObjective.java rename to src/eva2/server/go/problems/InterfaceOptimizationObjective.java index 01bfe79b..f3a48fab 100644 --- a/src/javaeva/server/go/problems/InterfaceOptimizationObjective.java +++ b/src/eva2/server/go/problems/InterfaceOptimizationObjective.java @@ -1,4 +1,4 @@ -package javaeva.server.go.problems; +package eva2.server.go.problems; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/problems/InterfaceOptimizationProblem.java b/src/eva2/server/go/problems/InterfaceOptimizationProblem.java similarity index 92% rename from src/javaeva/server/go/problems/InterfaceOptimizationProblem.java rename to src/eva2/server/go/problems/InterfaceOptimizationProblem.java index 6632331f..2f275b0c 100644 --- a/src/javaeva/server/go/problems/InterfaceOptimizationProblem.java +++ b/src/eva2/server/go/problems/InterfaceOptimizationProblem.java @@ -1,13 +1,14 @@ -package javaeva.server.go.problems; +package eva2.server.go.problems; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.server.stat.InterfaceStatistics; import javax.swing.*; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.server.stat.InterfaceStatistics; + /** * Created by IntelliJ IDEA. * User: streiche diff --git a/src/javaeva/server/go/problems/InterfaceOptimizationTarget.java b/src/eva2/server/go/problems/InterfaceOptimizationTarget.java similarity index 91% rename from src/javaeva/server/go/problems/InterfaceOptimizationTarget.java rename to src/eva2/server/go/problems/InterfaceOptimizationTarget.java index da1c7951..88e224e1 100644 --- a/src/javaeva/server/go/problems/InterfaceOptimizationTarget.java +++ b/src/eva2/server/go/problems/InterfaceOptimizationTarget.java @@ -1,4 +1,4 @@ -package javaeva.server.go.problems; +package eva2.server.go.problems; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/problems/InterfaceProgramProblem.java b/src/eva2/server/go/problems/InterfaceProgramProblem.java similarity index 95% rename from src/javaeva/server/go/problems/InterfaceProgramProblem.java rename to src/eva2/server/go/problems/InterfaceProgramProblem.java index 55c77184..ee7f3ede 100644 --- a/src/javaeva/server/go/problems/InterfaceProgramProblem.java +++ b/src/eva2/server/go/problems/InterfaceProgramProblem.java @@ -1,4 +1,4 @@ -package javaeva.server.go.problems; +package eva2.server.go.problems; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/problems/MatlabEvalMediator.java b/src/eva2/server/go/problems/MatlabEvalMediator.java similarity index 98% rename from src/javaeva/server/go/problems/MatlabEvalMediator.java rename to src/eva2/server/go/problems/MatlabEvalMediator.java index ce67d2d3..0918059d 100644 --- a/src/javaeva/server/go/problems/MatlabEvalMediator.java +++ b/src/eva2/server/go/problems/MatlabEvalMediator.java @@ -1,6 +1,6 @@ -package javaeva.server.go.problems; +package eva2.server.go.problems; -import javaeva.gui.BeanInspector; +import eva2.gui.BeanInspector; /** * This implements a thread acting as a mediator between JavaEvA and Matlab. Thanks to the idea diff --git a/src/javaeva/server/go/problems/MatlabProblem.java b/src/eva2/server/go/problems/MatlabProblem.java similarity index 94% rename from src/javaeva/server/go/problems/MatlabProblem.java rename to src/eva2/server/go/problems/MatlabProblem.java index a176a502..418efbb1 100644 --- a/src/javaeva/server/go/problems/MatlabProblem.java +++ b/src/eva2/server/go/problems/MatlabProblem.java @@ -1,4 +1,4 @@ -package javaeva.server.go.problems; +package eva2.server.go.problems; import java.io.FileNotFoundException; import java.io.FileOutputStream; @@ -7,19 +7,20 @@ import java.io.PrintWriter; import java.io.Serializable; import java.io.StringWriter; -import javaeva.OptimizerFactory; -import javaeva.OptimizerRunnable; -import javaeva.gui.BeanInspector; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.ESIndividualDoubleData; -import javaeva.server.go.individuals.InterfaceDataTypeDouble; -import javaeva.server.go.operators.distancemetric.PhenotypeMetric; -import javaeva.server.go.operators.postprocess.InterfacePostProcessParams; -import javaeva.server.go.operators.postprocess.PostProcess; -import javaeva.server.go.operators.postprocess.PostProcessParams; -import javaeva.server.go.populations.Population; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.server.stat.InterfaceTextListener; +import eva2.OptimizerFactory; +import eva2.OptimizerRunnable; +import eva2.gui.BeanInspector; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.ESIndividualDoubleData; +import eva2.server.go.individuals.InterfaceDataTypeDouble; +import eva2.server.go.operators.distancemetric.PhenotypeMetric; +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.populations.Population; +import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.server.stat.InterfaceTextListener; + public class MatlabProblem extends AbstractProblemDouble implements InterfaceTextListener, Serializable { private static final long serialVersionUID = 4913310869887420815L; diff --git a/src/javaeva/server/go/problems/PSymbolicRegression.java b/src/eva2/server/go/problems/PSymbolicRegression.java similarity index 83% rename from src/javaeva/server/go/problems/PSymbolicRegression.java rename to src/eva2/server/go/problems/PSymbolicRegression.java index 2f2a0cb3..a62731de 100644 --- a/src/javaeva/server/go/problems/PSymbolicRegression.java +++ b/src/eva2/server/go/problems/PSymbolicRegression.java @@ -1,33 +1,30 @@ -package javaeva.server.go.problems; +package eva2.server.go.problems; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.GAPIndividualProgramData; -import javaeva.server.go.individuals.GPIndividualProgramData; -import javaeva.server.go.individuals.InterfaceDataTypeProgram; -import javaeva.server.go.individuals.codings.gp.GPArea; -import javaeva.server.go.individuals.codings.gp.GPNodeAdd; -import javaeva.server.go.individuals.codings.gp.GPNodeCos; -import javaeva.server.go.individuals.codings.gp.GPNodeDiv; -import javaeva.server.go.individuals.codings.gp.GPNodeExp; -import javaeva.server.go.individuals.codings.gp.GPNodeInput; -import javaeva.server.go.individuals.codings.gp.GPNodeMult; -import javaeva.server.go.individuals.codings.gp.GPNodePow2; -import javaeva.server.go.individuals.codings.gp.GPNodePow3; -import javaeva.server.go.individuals.codings.gp.GPNodeSin; -import javaeva.server.go.individuals.codings.gp.GPNodeSqrt; -import javaeva.server.go.individuals.codings.gp.GPNodeSub; -import javaeva.server.go.individuals.codings.gp.InterfaceProgram; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.regression.InterfaceRegressionFunction; -import javaeva.server.go.problems.regression.RFKoza_GPI_10_2; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.server.go.tools.RandomNumberGenerator; - -import javaeva.server.stat.InterfaceStatistics; -import javaeva.gui.Plot; -import javaeva.gui.JEFrame; - -import javax.swing.*; +import eva2.gui.Plot; +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.GPArea; +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.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_10_2; +import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.server.go.tools.RandomNumberGenerator; +import eva2.tools.EVAERROR; /** * Created by IntelliJ IDEA. @@ -57,7 +54,6 @@ public class PSymbolicRegression extends AbstractOptimizationProblem implements public PSymbolicRegression() { this.m_Template = new GPIndividualProgramData(); - this.compileArea(); this.initProblem(); } @@ -100,6 +96,8 @@ public class PSymbolicRegression extends AbstractOptimizationProblem implements /** This method inits the Problem to log multiruns */ public void initProblem() { + this.compileArea(); + if (m_TargetFunction == null) m_TargetFunction = new RFKoza_GPI_10_2(); this.m_OverallBest = null; this.m_C = new double[this.m_NumberOfConstants]; for (int i = 0; i < this.m_C.length; i++) this.m_C[i] = RandomNumberGenerator.randomDouble(-10, 10); @@ -130,7 +128,7 @@ public class PSymbolicRegression extends AbstractOptimizationProblem implements */ public void initPopulation(Population population) { AbstractEAIndividual tmpIndy; -; + population.clear(); GPArea tmpArea[] = new GPArea[1]; @@ -162,31 +160,34 @@ public class PSymbolicRegression extends AbstractOptimizationProblem implements public void evaluate(Population population) { AbstractEAIndividual tmpIndy; + evaluatePopulationStart(population); for (int i = 0; i < population.size(); i++) { tmpIndy = (AbstractEAIndividual) population.get(i); tmpIndy.resetConstraintViolation(); - if ((tmpIndy instanceof GAPIndividualProgramData) && (this.m_UseLocalHillClimbing)) { -// AbstractEAIndividual tmpBestConst = (AbstractEAIndividual)((GAPIndividualProgramData)tmpIndy).getNumbers(); -// AbstractEAIndividual tmpConst; -// this.evaluate(tmpIndy); -// tmpBestConst.SetFitness(0, tmpIndy.getFitness(0)); -// population.incrFunctionCalls(); -// for (int j = 0; j < 10; j++) { -// tmpConst = (AbstractEAIndividual)tmpBestConst.clone(); -// tmpConst.mutate(); -// ((GAPIndividualProgramData)tmpIndy).setNumbers((InterfaceDataTypeDouble)tmpConst); -// this.evaluate(tmpIndy); -// tmpConst.SetFitness(0, tmpIndy.getFitness(0)); -// population.incrFunctionCalls(); -// if (tmpBestConst.getFitness(0) > tmpConst.getFitness(0)) tmpBestConst = (AbstractEAIndividual)tmpConst.clone(); -// } -// ((GAPIndividualProgramData)tmpIndy).setNumbers((InterfaceDataTypeDouble)tmpBestConst); -// tmpIndy.SetFitness(0, tmpBestConst.getFitness(0)); + if ((this.m_UseLocalHillClimbing) && (tmpIndy instanceof GAPIndividualProgramData)) { + AbstractEAIndividual tmpBestConst = (AbstractEAIndividual)((GAPIndividualProgramData)tmpIndy).getNumbers(); + AbstractEAIndividual tmpConst; + this.evaluate(tmpIndy); + tmpBestConst.SetFitness(0, tmpIndy.getFitness(0)); + population.incrFunctionCalls(); + for (int j = 0; j < 10; j++) { + tmpConst = (AbstractEAIndividual)tmpBestConst.clone(); + tmpConst.mutate(); + ((GAPIndividualProgramData)tmpIndy).setNumbers((InterfaceDataTypeDouble)tmpConst); + this.evaluate(tmpIndy); + tmpConst.SetFitness(0, tmpIndy.getFitness(0)); + population.incrFunctionCalls(); + if (tmpBestConst.getFitness(0) > tmpConst.getFitness(0)) tmpBestConst = (AbstractEAIndividual)tmpConst.clone(); + } + ((GAPIndividualProgramData)tmpIndy).setNumbers((InterfaceDataTypeDouble)tmpBestConst); + tmpIndy.SetFitness(0, tmpBestConst.getFitness(0)); } else { + if (m_UseLocalHillClimbing) EVAERROR.errorMsgOnce("Error: local hill climbing only works on GAPIndividualProgramData individuals!"); this.evaluate(tmpIndy); population.incrFunctionCalls(); } } + evaluatePopulationEnd(population); } /** This method evaluate a single individual and sets the fitness values @@ -322,8 +323,8 @@ public class PSymbolicRegression extends AbstractOptimizationProblem implements return "Toggel the use of local hill climbing for inner constants."; } - /** This method allows you to set the number of ephremial constanst. - * @param b The new number of epremial constants. + /** This method allows you to set the number of ephremial constants. + * @param b The new number of ephremial constants. */ public void setNumberOfConstants(int b) { this.m_NumberOfConstants = b; diff --git a/src/javaeva/server/go/problems/SimpleProblemWrapper.java b/src/eva2/server/go/problems/SimpleProblemWrapper.java similarity index 91% rename from src/javaeva/server/go/problems/SimpleProblemWrapper.java rename to src/eva2/server/go/problems/SimpleProblemWrapper.java index 8db417c3..5a333e49 100644 --- a/src/javaeva/server/go/problems/SimpleProblemWrapper.java +++ b/src/eva2/server/go/problems/SimpleProblemWrapper.java @@ -1,18 +1,19 @@ -package javaeva.server.go.problems; +package eva2.server.go.problems; import java.lang.reflect.Method; import java.util.BitSet; -import javaeva.gui.BeanInspector; -import javaeva.gui.GenericObjectEditor; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.ESIndividualDoubleData; -import javaeva.server.go.individuals.GAIndividualBinaryData; -import javaeva.server.go.individuals.InterfaceDataTypeBinary; -import javaeva.server.go.individuals.InterfaceDataTypeDouble; -import javaeva.server.go.populations.Population; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.gui.BeanInspector; +import eva2.gui.GenericObjectEditor; +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.server.go.tools.RandomNumberGenerator; + import simpleprobs.InterfaceSimpleProblem; import simpleprobs.SimpleF1; import simpleprobs.SimpleProblemBinary; diff --git a/src/javaeva/server/go/problems/TF1Problem.java b/src/eva2/server/go/problems/TF1Problem.java similarity index 95% rename from src/javaeva/server/go/problems/TF1Problem.java rename to src/eva2/server/go/problems/TF1Problem.java index c57e9af8..55c1b4b1 100644 --- a/src/javaeva/server/go/problems/TF1Problem.java +++ b/src/eva2/server/go/problems/TF1Problem.java @@ -1,24 +1,25 @@ -package javaeva.server.go.problems; +package eva2.server.go.problems; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.ESIndividualDoubleData; -import javaeva.server.go.individuals.InterfaceDataTypeDouble; -import javaeva.server.go.operators.constraint.InterfaceConstraint; -import javaeva.server.go.operators.moso.InterfaceMOSOConverter; -import javaeva.server.go.operators.paretofrontmetrics.InterfaceParetoFrontMetric; -import javaeva.server.go.populations.Population; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.server.go.tools.RandomNumberGenerator; -import javaeva.gui.GraphPointSet; -import javaeva.gui.Chart2DDPointIconText; -import javaeva.gui.Chart2DDPointIconCircle; -import javaeva.gui.PropertyFilePath; import wsi.ra.chart2d.DPoint; import java.util.ArrayList; import java.awt.Color; import java.io.BufferedWriter; import java.io.FileWriter; +import eva2.gui.Chart2DDPointIconCircle; +import eva2.gui.Chart2DDPointIconText; +import eva2.gui.GraphPointSet; +import eva2.gui.PropertyFilePath; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.ESIndividualDoubleData; +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.server.go.tools.RandomNumberGenerator; + /** * Created by IntelliJ IDEA. * User: streiche @@ -197,7 +198,7 @@ public class TF1Problem extends AbstractMultiObjectiveOptimizationProblem implem * @param plot The plot where you can draw your stuff. * @param index The first index where you can draw your stuff */ - public void drawAdditionalData(javaeva.gui.Plot plot, Population pop, int index) { + public void drawAdditionalData(eva2.gui.Plot plot, Population pop, int index) { double[] tmpFitness; // for example plot the current population //plot.clearGraph(index); diff --git a/src/javaeva/server/go/problems/regression/InterfaceRegressionFunction.java b/src/eva2/server/go/problems/regression/InterfaceRegressionFunction.java similarity index 91% rename from src/javaeva/server/go/problems/regression/InterfaceRegressionFunction.java rename to src/eva2/server/go/problems/regression/InterfaceRegressionFunction.java index 466305d9..c774798e 100644 --- a/src/javaeva/server/go/problems/regression/InterfaceRegressionFunction.java +++ b/src/eva2/server/go/problems/regression/InterfaceRegressionFunction.java @@ -1,4 +1,4 @@ -package javaeva.server.go.problems.regression; +package eva2.server.go.problems.regression; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/problems/regression/RFKoza_GPI_10_1.java b/src/eva2/server/go/problems/regression/RFKoza_GPI_10_1.java similarity index 96% rename from src/javaeva/server/go/problems/regression/RFKoza_GPI_10_1.java rename to src/eva2/server/go/problems/regression/RFKoza_GPI_10_1.java index 0575ba41..e74021ca 100644 --- a/src/javaeva/server/go/problems/regression/RFKoza_GPI_10_1.java +++ b/src/eva2/server/go/problems/regression/RFKoza_GPI_10_1.java @@ -1,4 +1,4 @@ -package javaeva.server.go.problems.regression; +package eva2.server.go.problems.regression; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/problems/regression/RFKoza_GPI_10_2.java b/src/eva2/server/go/problems/regression/RFKoza_GPI_10_2.java similarity index 96% rename from src/javaeva/server/go/problems/regression/RFKoza_GPI_10_2.java rename to src/eva2/server/go/problems/regression/RFKoza_GPI_10_2.java index 1ef28c7a..ff92b885 100644 --- a/src/javaeva/server/go/problems/regression/RFKoza_GPI_10_2.java +++ b/src/eva2/server/go/problems/regression/RFKoza_GPI_10_2.java @@ -1,4 +1,4 @@ -package javaeva.server.go.problems.regression; +package eva2.server.go.problems.regression; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/problems/regression/RFKoza_GPI_7_3.java b/src/eva2/server/go/problems/regression/RFKoza_GPI_7_3.java similarity index 96% rename from src/javaeva/server/go/problems/regression/RFKoza_GPI_7_3.java rename to src/eva2/server/go/problems/regression/RFKoza_GPI_7_3.java index 77ac7364..43a27c12 100644 --- a/src/javaeva/server/go/problems/regression/RFKoza_GPI_7_3.java +++ b/src/eva2/server/go/problems/regression/RFKoza_GPI_7_3.java @@ -1,4 +1,4 @@ -package javaeva.server.go.problems.regression; +package eva2.server.go.problems.regression; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/problems/regression/RFKoza_GPI_7_3_extended.java b/src/eva2/server/go/problems/regression/RFKoza_GPI_7_3_extended.java similarity index 96% rename from src/javaeva/server/go/problems/regression/RFKoza_GPI_7_3_extended.java rename to src/eva2/server/go/problems/regression/RFKoza_GPI_7_3_extended.java index 8a6ef900..52f23a85 100644 --- a/src/javaeva/server/go/problems/regression/RFKoza_GPI_7_3_extended.java +++ b/src/eva2/server/go/problems/regression/RFKoza_GPI_7_3_extended.java @@ -1,4 +1,4 @@ -package javaeva.server.go.problems.regression; +package eva2.server.go.problems.regression; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/problems/regression/RFRaidl_F1.java b/src/eva2/server/go/problems/regression/RFRaidl_F1.java similarity index 96% rename from src/javaeva/server/go/problems/regression/RFRaidl_F1.java rename to src/eva2/server/go/problems/regression/RFRaidl_F1.java index 346704b3..6dc0d6a0 100644 --- a/src/javaeva/server/go/problems/regression/RFRaidl_F1.java +++ b/src/eva2/server/go/problems/regression/RFRaidl_F1.java @@ -1,4 +1,4 @@ -package javaeva.server.go.problems.regression; +package eva2.server.go.problems.regression; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/problems/regression/RFRaidl_F2.java b/src/eva2/server/go/problems/regression/RFRaidl_F2.java similarity index 96% rename from src/javaeva/server/go/problems/regression/RFRaidl_F2.java rename to src/eva2/server/go/problems/regression/RFRaidl_F2.java index 3e5b5566..4ecb0fde 100644 --- a/src/javaeva/server/go/problems/regression/RFRaidl_F2.java +++ b/src/eva2/server/go/problems/regression/RFRaidl_F2.java @@ -1,4 +1,4 @@ -package javaeva.server.go.problems.regression; +package eva2.server.go.problems.regression; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/problems/regression/RFRaidl_F3.java b/src/eva2/server/go/problems/regression/RFRaidl_F3.java similarity index 96% rename from src/javaeva/server/go/problems/regression/RFRaidl_F3.java rename to src/eva2/server/go/problems/regression/RFRaidl_F3.java index c2d643ad..96fda405 100644 --- a/src/javaeva/server/go/problems/regression/RFRaidl_F3.java +++ b/src/eva2/server/go/problems/regression/RFRaidl_F3.java @@ -1,4 +1,4 @@ -package javaeva.server.go.problems.regression; +package eva2.server.go.problems.regression; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/strategies/CHCAdaptiveSearchAlgorithm.java b/src/eva2/server/go/strategies/CHCAdaptiveSearchAlgorithm.java similarity index 94% rename from src/javaeva/server/go/strategies/CHCAdaptiveSearchAlgorithm.java rename to src/eva2/server/go/strategies/CHCAdaptiveSearchAlgorithm.java index d2d81601..34719514 100644 --- a/src/javaeva/server/go/strategies/CHCAdaptiveSearchAlgorithm.java +++ b/src/eva2/server/go/strategies/CHCAdaptiveSearchAlgorithm.java @@ -1,19 +1,20 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGAIndividual; -import javaeva.server.go.operators.selection.InterfaceSelection; -import javaeva.server.go.operators.selection.SelectBest; -import javaeva.server.go.operators.selection.SelectRandom; -import javaeva.server.go.populations.PBILPopulation; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.B1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; import java.util.BitSet; +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.SelectBest; +import eva2.server.go.operators.selection.SelectRandom; +import eva2.server.go.populations.PBILPopulation; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.B1Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; + /** This is an implementation of the CHC Adaptive Search Algorithm by Eselman. It is * limited to binary data and is based on massively distruptive crossover. I'm not * shure whether i've implemented this correctly, but i definetly wasn't able to make @@ -105,7 +106,7 @@ public class CHCAdaptiveSearchAlgorithm implements InterfaceOptimizer, java.io.S * given population of evaluated individuals. */ private Population generateChildren() { - Population result = (Population)this.m_Population.clone(), parents, partners; + Population result = this.m_Population.cloneWithoutInds(), parents, partners; AbstractEAIndividual[] offSprings; AbstractEAIndividual tmpIndy; diff --git a/src/javaeva/server/go/strategies/ClusterBasedNichingEA.java b/src/eva2/server/go/strategies/ClusterBasedNichingEA.java similarity index 97% rename from src/javaeva/server/go/strategies/ClusterBasedNichingEA.java rename to src/eva2/server/go/strategies/ClusterBasedNichingEA.java index 010d227a..3a4edc45 100644 --- a/src/javaeva/server/go/strategies/ClusterBasedNichingEA.java +++ b/src/eva2/server/go/strategies/ClusterBasedNichingEA.java @@ -1,26 +1,27 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; import java.util.ArrayList; -import javaeva.gui.BeanInspector; -import javaeva.gui.Chart2DDPointIconCircle; -import javaeva.gui.Chart2DDPointIconText; -import javaeva.gui.GraphPointSet; -import javaeva.gui.Plot; -import javaeva.gui.TopoPlot; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceDataTypeDouble; -import javaeva.server.go.operators.cluster.ClusteringDensityBased; -import javaeva.server.go.operators.cluster.InterfaceClustering; -import javaeva.server.go.operators.mutation.InterfaceMutation; -import javaeva.server.go.operators.mutation.MutateESGlobal; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.B1Problem; -import javaeva.server.go.problems.Interface2DBorderProblem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.problems.TF1Problem; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.gui.BeanInspector; +import eva2.gui.Chart2DDPointIconCircle; +import eva2.gui.Chart2DDPointIconText; +import eva2.gui.GraphPointSet; +import eva2.gui.Plot; +import eva2.gui.TopoPlot; +import eva2.server.go.InterfacePopulationChangedEventListener; +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.mutation.InterfaceMutation; +import eva2.server.go.operators.mutation.MutateESGlobal; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.B1Problem; +import eva2.server.go.problems.Interface2DBorderProblem; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.problems.TF1Problem; +import eva2.server.go.tools.RandomNumberGenerator; + import wsi.ra.chart2d.DPoint; import wsi.ra.chart2d.DPointIcon; import wsi.ra.chart2d.DPointSet; diff --git a/src/javaeva/server/go/strategies/ClusteringHillClimbing.java b/src/eva2/server/go/strategies/ClusteringHillClimbing.java similarity index 95% rename from src/javaeva/server/go/strategies/ClusteringHillClimbing.java rename to src/eva2/server/go/strategies/ClusteringHillClimbing.java index bff75bc7..c5fd2fb7 100644 --- a/src/javaeva/server/go/strategies/ClusteringHillClimbing.java +++ b/src/eva2/server/go/strategies/ClusteringHillClimbing.java @@ -1,16 +1,17 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; import java.io.Serializable; -import javaeva.gui.GenericObjectEditor; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.operators.mutation.MutateESFixedStepSize; -import javaeva.server.go.operators.postprocess.PostProcess; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.AbstractOptimizationProblem; -import javaeva.server.go.problems.F1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.tools.Pair; +import eva2.gui.GenericObjectEditor; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.operators.mutation.MutateESFixedStepSize; +import eva2.server.go.operators.postprocess.PostProcess; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.AbstractOptimizationProblem; +import eva2.server.go.problems.F1Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.tools.Pair; + /** * The clustering hill climber is similar to a multi-start hill climber. In addition so optimizing diff --git a/src/javaeva/server/go/strategies/DifferentialEvolution.java b/src/eva2/server/go/strategies/DifferentialEvolution.java similarity index 96% rename from src/javaeva/server/go/strategies/DifferentialEvolution.java rename to src/eva2/server/go/strategies/DifferentialEvolution.java index c3597c72..ca4f4d94 100644 --- a/src/javaeva/server/go/strategies/DifferentialEvolution.java +++ b/src/eva2/server/go/strategies/DifferentialEvolution.java @@ -1,17 +1,17 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.operators.selection.replacement.ReplacementCrowding; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.AbstractMultiObjectiveOptimizationProblem; -import javaeva.server.go.problems.AbstractOptimizationProblem; -import javaeva.server.go.problems.F1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; -import javaeva.tools.SelectedTag; -import javaeva.tools.Tag; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceESIndividual; +import eva2.server.go.operators.selection.replacement.ReplacementCrowding; +import eva2.server.go.populations.Population; +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.server.go.tools.RandomNumberGenerator; +import eva2.tools.SelectedTag; +import eva2.tools.Tag; /** Differential evolution implementing DE1 and DE2 following the paper of Storm and * Price and the Trigonometric DE published rectently, which doesn't really work that diff --git a/src/javaeva/server/go/strategies/DynamicParticleSwarmOptimization.java b/src/eva2/server/go/strategies/DynamicParticleSwarmOptimization.java similarity index 97% rename from src/javaeva/server/go/strategies/DynamicParticleSwarmOptimization.java rename to src/eva2/server/go/strategies/DynamicParticleSwarmOptimization.java index 803d53a2..7c17e280 100644 --- a/src/javaeva/server/go/strategies/DynamicParticleSwarmOptimization.java +++ b/src/eva2/server/go/strategies/DynamicParticleSwarmOptimization.java @@ -1,15 +1,15 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; -import javaeva.gui.GenericObjectEditor; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceDataTypeDouble; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.AbstractOptimizationProblem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.AbstractObjectEditor; -import javaeva.server.go.tools.RandomNumberGenerator; -import javaeva.tools.SelectedTag; +import eva2.gui.GenericObjectEditor; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceDataTypeDouble; +import eva2.server.go.individuals.InterfaceESIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.AbstractOptimizationProblem; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.AbstractObjectEditor; +import eva2.server.go.tools.RandomNumberGenerator; +import eva2.tools.SelectedTag; /** * This extends our particle swarm implementation to dynamic optimization problems. diff --git a/src/javaeva/server/go/strategies/EvolutionStrategies.java b/src/eva2/server/go/strategies/EvolutionStrategies.java similarity index 97% rename from src/javaeva/server/go/strategies/EvolutionStrategies.java rename to src/eva2/server/go/strategies/EvolutionStrategies.java index bfffbc6f..150be548 100644 --- a/src/javaeva/server/go/strategies/EvolutionStrategies.java +++ b/src/eva2/server/go/strategies/EvolutionStrategies.java @@ -1,14 +1,14 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.mutation.MutateESSuccessRule; -import javaeva.server.go.operators.selection.InterfaceSelection; -import javaeva.server.go.operators.selection.SelectBestIndividuals; -import javaeva.server.go.operators.selection.SelectRandom; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.B1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.mutation.MutateESSuccessRule; +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.Population; +import eva2.server.go.problems.B1Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; /** Evolution strategies by Rechenberg and Schwefel, but please remember that * this only gives the generation strategy and not the coding. But this is the @@ -138,7 +138,7 @@ public class EvolutionStrategies implements InterfaceOptimizer, java.io.Serializ * given population of evaluated individuals. */ private Population generateChildren() { - Population result = (Population)this.m_Population.clone(), parents; + Population result = this.m_Population.cloneWithoutInds(), parents; AbstractEAIndividual[] offSprings; AbstractEAIndividual tmpIndy; diff --git a/src/javaeva/server/go/strategies/EvolutionStrategiesEditor.java b/src/eva2/server/go/strategies/EvolutionStrategiesEditor.java similarity index 99% rename from src/javaeva/server/go/strategies/EvolutionStrategiesEditor.java rename to src/eva2/server/go/strategies/EvolutionStrategiesEditor.java index dba63727..6d8c1df4 100644 --- a/src/javaeva/server/go/strategies/EvolutionStrategiesEditor.java +++ b/src/eva2/server/go/strategies/EvolutionStrategiesEditor.java @@ -1,4 +1,4 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; //package javaeva.server.oa.go.Strategies; // //import java.awt.BorderLayout; diff --git a/src/javaeva/server/go/strategies/EvolutionaryProgramming.java b/src/eva2/server/go/strategies/EvolutionaryProgramming.java similarity index 93% rename from src/javaeva/server/go/strategies/EvolutionaryProgramming.java rename to src/eva2/server/go/strategies/EvolutionaryProgramming.java index 235a0573..81ef7f4b 100644 --- a/src/javaeva/server/go/strategies/EvolutionaryProgramming.java +++ b/src/eva2/server/go/strategies/EvolutionaryProgramming.java @@ -1,13 +1,13 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.GAIndividualBinaryData; -import javaeva.server.go.operators.selection.InterfaceSelection; -import javaeva.server.go.operators.selection.SelectEPTournaments; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.F1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; +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.SelectEPTournaments; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.F1Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; /** Evolutionary programming by Fogel. Works fine but is actually a quite greedy local search * strategy solely based on mutation. To prevent any confusion, the mutation rate is temporaily @@ -88,7 +88,7 @@ public class EvolutionaryProgramming implements InterfaceOptimizer, java.io.Seri * given population of evaluated individuals. */ private Population generateChildren() { - Population result = (Population)this.m_Population.clone(); + Population result = (Population)this.m_Population.cloneWithoutInds(); AbstractEAIndividual mutant; result.clear(); diff --git a/src/javaeva/server/go/strategies/FloodAlgorithm.java b/src/eva2/server/go/strategies/FloodAlgorithm.java similarity index 96% rename from src/javaeva/server/go/strategies/FloodAlgorithm.java rename to src/eva2/server/go/strategies/FloodAlgorithm.java index ef5ff9e0..07a1d413 100644 --- a/src/javaeva/server/go/strategies/FloodAlgorithm.java +++ b/src/eva2/server/go/strategies/FloodAlgorithm.java @@ -1,11 +1,11 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.GAIndividualBinaryData; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.B1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.GAIndividualBinaryData; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.B1Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; /** The flood algorithm, and alternative to the threshold algorithms. No really * good but commonly known and sometimes even used. Here the problem is to choose diff --git a/src/javaeva/server/go/strategies/GeneticAlgorithm.java b/src/eva2/server/go/strategies/GeneticAlgorithm.java similarity index 90% rename from src/javaeva/server/go/strategies/GeneticAlgorithm.java rename to src/eva2/server/go/strategies/GeneticAlgorithm.java index a32983ef..1d384b04 100644 --- a/src/javaeva/server/go/strategies/GeneticAlgorithm.java +++ b/src/eva2/server/go/strategies/GeneticAlgorithm.java @@ -1,13 +1,13 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.GAIndividualBinaryData; -import javaeva.server.go.operators.selection.InterfaceSelection; -import javaeva.server.go.operators.selection.SelectTournament; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.B1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; +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.populations.Population; +import eva2.server.go.problems.B1Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; /** The traditional genetic algorithms as devised by Holland. To only special here * it the plague factor which reduces the population size to tune from a global to @@ -78,29 +78,29 @@ public class GeneticAlgorithm implements InterfaceOptimizer, java.io.Serializabl population.incrGeneration(); } - /** This method will assign fitness values to all individual in the - * current population. - * @param population The population that is to be evaluated - */ - private void defaultEvaluatePopulation(Population population) { - GAIndividualBinaryData tmpIndy; - for (int i = 0; i < population.size(); i++) { - tmpIndy = (GAIndividualBinaryData) population.get(i); - tmpIndy.SetFitness(0, tmpIndy.defaultEvaulateAsMiniBits()); - population.incrFunctionCalls(); - } - population.incrGeneration(); - } +// /** This method will assign fitness values to all individual in the +// * current population. +// * @param population The population that is to be evaluated +// */ +// private void defaultEvaluatePopulation(Population population) { +// GAIndividualBinaryData tmpIndy; +// for (int i = 0; i < population.size(); i++) { +// tmpIndy = (GAIndividualBinaryData) population.get(i); +// tmpIndy.SetFitness(0, tmpIndy.defaultEvaulateAsMiniBits()); +// population.incrFunctionCalls(); +// } +// population.incrGeneration(); +// } /** This method will generate the offspring population from the * given population of evaluated individuals. */ private Population generateChildren() { - Population result = (Population)this.m_Population.clone(), parents; + Population result = m_Population.cloneWithoutInds(); + Population parents; AbstractEAIndividual[] offSprings; AbstractEAIndividual tmpIndy; - result.clear(); //this.m_NormationOperator.computeSelectionProbability(this.m_Population, "Fitness"); //System.out.println("Population:"+this.m_Population.getSolutionRepresentationFor()); this.m_ParentSelection.prepareSelection(this.m_Population); @@ -124,11 +124,10 @@ public class GeneticAlgorithm implements InterfaceOptimizer, java.io.Serializabl public void optimize() { Population nextGeneration; - AbstractEAIndividual elite; nextGeneration = this.generateChildren(); this.evaluatePopulation(nextGeneration); if (this.m_UseElitism) { - elite = this.m_Population.getBestEAIndividual(); + AbstractEAIndividual elite = this.m_Population.getBestEAIndividual(); if (elite != null) { this.m_Population = nextGeneration; this.m_Population.remove(0);// This implements a random replacement strategy for the elite diff --git a/src/javaeva/server/go/strategies/GeneticAlgorithmEditor.java b/src/eva2/server/go/strategies/GeneticAlgorithmEditor.java similarity index 99% rename from src/javaeva/server/go/strategies/GeneticAlgorithmEditor.java rename to src/eva2/server/go/strategies/GeneticAlgorithmEditor.java index 97c67e95..dc1b86d6 100644 --- a/src/javaeva/server/go/strategies/GeneticAlgorithmEditor.java +++ b/src/eva2/server/go/strategies/GeneticAlgorithmEditor.java @@ -1,4 +1,4 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; //package javaeva.server.oa.go.Strategies; // //import javaeva.server.oa.go.Tools.AbstractObjectEditor; diff --git a/src/javaeva/server/go/strategies/GradientDescentAlgorithm.java b/src/eva2/server/go/strategies/GradientDescentAlgorithm.java similarity index 96% rename from src/javaeva/server/go/strategies/GradientDescentAlgorithm.java rename to src/eva2/server/go/strategies/GradientDescentAlgorithm.java index 6c1bf2ac..4e3e1dda 100644 --- a/src/javaeva/server/go/strategies/GradientDescentAlgorithm.java +++ b/src/eva2/server/go/strategies/GradientDescentAlgorithm.java @@ -1,14 +1,15 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; import java.util.*; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceDataTypeDouble; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.F1Problem; -import javaeva.server.go.problems.InterfaceFirstOrderDerivableProblem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceDataTypeDouble; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.F1Problem; +import eva2.server.go.problems.InterfaceFirstOrderDerivableProblem; +import eva2.server.go.problems.InterfaceOptimizationProblem; + /** A gradient descent algorithm by hannes planatscher don't expect any diff --git a/src/javaeva/server/go/strategies/HillClimbing.java b/src/eva2/server/go/strategies/HillClimbing.java similarity index 95% rename from src/javaeva/server/go/strategies/HillClimbing.java rename to src/eva2/server/go/strategies/HillClimbing.java index b5309e57..ce398bf4 100644 --- a/src/javaeva/server/go/strategies/HillClimbing.java +++ b/src/eva2/server/go/strategies/HillClimbing.java @@ -1,12 +1,12 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; -import javaeva.gui.BeanInspector; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.mutation.InterfaceMutation; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.B1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; +import eva2.gui.BeanInspector; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.mutation.InterfaceMutation; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.B1Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; /** This is a Multi-Start Hill-Climber, here the population size gives the number of diff --git a/src/javaeva/server/go/strategies/InterfaceOptimizer.java b/src/eva2/server/go/strategies/InterfaceOptimizer.java similarity index 91% rename from src/javaeva/server/go/strategies/InterfaceOptimizer.java rename to src/eva2/server/go/strategies/InterfaceOptimizer.java index 52c9c639..180fb598 100644 --- a/src/javaeva/server/go/strategies/InterfaceOptimizer.java +++ b/src/eva2/server/go/strategies/InterfaceOptimizer.java @@ -1,11 +1,12 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; import java.util.List; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; + /** The general interface for optimizers giving the main methods necessary * to perform a population based search. diff --git a/src/javaeva/server/go/strategies/IslandModelEA.java b/src/eva2/server/go/strategies/IslandModelEA.java similarity index 95% rename from src/javaeva/server/go/strategies/IslandModelEA.java rename to src/eva2/server/go/strategies/IslandModelEA.java index bee15af2..fce569b0 100644 --- a/src/javaeva/server/go/strategies/IslandModelEA.java +++ b/src/eva2/server/go/strategies/IslandModelEA.java @@ -1,19 +1,19 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.individuals.ESIndividualDoubleData; -import javaeva.server.go.operators.migration.InterfaceMigration; -import javaeva.server.go.operators.migration.MOBestMigration; -import javaeva.server.go.operators.migration.MOClusteringSeparation; -import javaeva.server.go.operators.migration.MOConeSeparation; -import javaeva.server.go.operators.migration.SOBestMigration; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.F1Problem; -import javaeva.server.go.problems.F8Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.problems.TF1Problem; -import javaeva.gui.Plot; -import javaeva.gui.PropertyRemoteServers; +import eva2.gui.Plot; +import eva2.gui.PropertyRemoteServers; +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.Population; +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 wsi.ra.jproxy.RMIProxyRemoteThread; import wsi.ra.jproxy.RMIProxyLocal; import wsi.ra.jproxy.RMIServer; @@ -87,7 +87,7 @@ public class IslandModelEA implements InterfacePopulationChangedEventListener, I double[] tmpD = new double[2]; tmpD[0] = 0; tmpD[1] = 0; - this.m_Plot = new javaeva.gui.Plot("Island Model EA", "FitnessCalls", "Fitness", tmpD, tmpD); + this.m_Plot = new eva2.gui.Plot("Island Model EA", "FitnessCalls", "Fitness", tmpD, tmpD); } } @@ -145,7 +145,7 @@ public class IslandModelEA implements InterfacePopulationChangedEventListener, I double[] tmpD = new double[2]; tmpD[0] = 0; tmpD[1] = 0; - this.m_Plot = new javaeva.gui.Plot("Island Model EA", "FitnessCalls", "Fitness", tmpD, tmpD); + this.m_Plot = new eva2.gui.Plot("Island Model EA", "FitnessCalls", "Fitness", tmpD, tmpD); } } diff --git a/src/javaeva/server/go/strategies/MemeticAlgorithm.java b/src/eva2/server/go/strategies/MemeticAlgorithm.java similarity index 95% rename from src/javaeva/server/go/strategies/MemeticAlgorithm.java rename to src/eva2/server/go/strategies/MemeticAlgorithm.java index 594d7abb..5d6c40bd 100644 --- a/src/javaeva/server/go/strategies/MemeticAlgorithm.java +++ b/src/eva2/server/go/strategies/MemeticAlgorithm.java @@ -1,15 +1,16 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; import java.util.Hashtable; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.selection.InterfaceSelection; -import javaeva.server.go.operators.selection.SelectBestIndividuals; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.F1Problem; -import javaeva.server.go.problems.InterfaceLocalSearchable; -import javaeva.server.go.problems.InterfaceOptimizationProblem; +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.Population; +import eva2.server.go.problems.F1Problem; +import eva2.server.go.problems.InterfaceLocalSearchable; +import eva2.server.go.problems.InterfaceOptimizationProblem; + /** * A memetic algorithm by hannes planatscher. The local search strategy can only diff --git a/src/javaeva/server/go/strategies/MonteCarloSearch.java b/src/eva2/server/go/strategies/MonteCarloSearch.java similarity index 95% rename from src/javaeva/server/go/strategies/MonteCarloSearch.java rename to src/eva2/server/go/strategies/MonteCarloSearch.java index 0f25e09f..cd1a3d57 100644 --- a/src/javaeva/server/go/strategies/MonteCarloSearch.java +++ b/src/eva2/server/go/strategies/MonteCarloSearch.java @@ -1,11 +1,11 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.GAIndividualBinaryData; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.B1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.GAIndividualBinaryData; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.B1Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; /** The simple random or Monte-Carlo search, simple but useful * to evaluate the complexity of the search space. diff --git a/src/javaeva/server/go/strategies/MultiObjectiveEA.java b/src/eva2/server/go/strategies/MultiObjectiveEA.java similarity index 94% rename from src/javaeva/server/go/strategies/MultiObjectiveEA.java rename to src/eva2/server/go/strategies/MultiObjectiveEA.java index 20598f39..42422431 100644 --- a/src/javaeva/server/go/strategies/MultiObjectiveEA.java +++ b/src/eva2/server/go/strategies/MultiObjectiveEA.java @@ -1,15 +1,15 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.archiving.ArchivingNSGAII; -import javaeva.server.go.operators.archiving.InformationRetrievalInserting; -import javaeva.server.go.operators.archiving.InterfaceArchiving; -import javaeva.server.go.operators.archiving.InterfaceInformationRetrieval; -import javaeva.server.go.operators.selection.SelectMONonDominated; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.FM0Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.individuals.AbstractEAIndividual; +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.Population; +import eva2.server.go.problems.FM0Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; /** A generic framework for multi-objecitve optimization, you need * to specify an optimization strategy (like GA), an archiver and diff --git a/src/javaeva/server/go/strategies/MultiObjectiveMemeticAlgorithmII.java b/src/eva2/server/go/strategies/MultiObjectiveMemeticAlgorithmII.java similarity index 91% rename from src/javaeva/server/go/strategies/MultiObjectiveMemeticAlgorithmII.java rename to src/eva2/server/go/strategies/MultiObjectiveMemeticAlgorithmII.java index 018071a6..ac581f5b 100644 --- a/src/javaeva/server/go/strategies/MultiObjectiveMemeticAlgorithmII.java +++ b/src/eva2/server/go/strategies/MultiObjectiveMemeticAlgorithmII.java @@ -1,16 +1,16 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.archiving.ArchivingMOMAIIAllDominating; -import javaeva.server.go.operators.archiving.InformationRetrievalInserting; -import javaeva.server.go.operators.archiving.InterfaceArchiving; -import javaeva.server.go.operators.archiving.InterfaceInformationRetrieval; -import javaeva.server.go.operators.selection.SelectMOMAIIDominanceCounter; -import javaeva.server.go.operators.selection.SelectMONonDominated; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.FM0Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.operators.archiving.ArchivingMOMAIIAllDominating; +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.SelectMOMAIIDominanceCounter; +import eva2.server.go.operators.selection.SelectMONonDominated; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.FM0Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; /** This is still under construction. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/strategies/ParticleFilterOptimization.java b/src/eva2/server/go/strategies/ParticleFilterOptimization.java similarity index 93% rename from src/javaeva/server/go/strategies/ParticleFilterOptimization.java rename to src/eva2/server/go/strategies/ParticleFilterOptimization.java index 06681cd4..55777c0f 100644 --- a/src/javaeva/server/go/strategies/ParticleFilterOptimization.java +++ b/src/eva2/server/go/strategies/ParticleFilterOptimization.java @@ -1,20 +1,21 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; -import javaeva.gui.GenericObjectEditor; -import javaeva.gui.Plot; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceDataTypeDouble; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.operators.mutation.MutateESFixedStepSize; -import javaeva.server.go.operators.selection.InterfaceSelection; -import javaeva.server.go.operators.selection.SelectXProbRouletteWheel; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.F1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; import java.util.ArrayList; +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.individuals.InterfaceESIndividual; +import eva2.server.go.operators.mutation.MutateESFixedStepSize; +import eva2.server.go.operators.selection.InterfaceSelection; +import eva2.server.go.operators.selection.SelectXProbRouletteWheel; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.F1Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; + /** This is a Particel Filter implemented by Frank Senke, only some documentation * here and not throughfully checked, whether this works on arbitrary problem * instances. @@ -302,7 +303,7 @@ public class ParticleFilterOptimization implements InterfaceOptimizer, java.io.S range[0][1] = 0; range[1] = range[0]; // this is evil } - myPlot = new javaeva.gui.Plot("PF", "x1", "x2", true); + myPlot = new eva2.gui.Plot("PF", "x1", "x2", true); } } diff --git a/src/javaeva/server/go/strategies/ParticleSwarmOptimization.java b/src/eva2/server/go/strategies/ParticleSwarmOptimization.java similarity index 98% rename from src/javaeva/server/go/strategies/ParticleSwarmOptimization.java rename to src/eva2/server/go/strategies/ParticleSwarmOptimization.java index a825ed35..8e04f9e5 100644 --- a/src/javaeva/server/go/strategies/ParticleSwarmOptimization.java +++ b/src/eva2/server/go/strategies/ParticleSwarmOptimization.java @@ -1,29 +1,28 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; import java.util.Arrays; import java.util.Vector; +import eva2.gui.BeanInspector; +import eva2.gui.GenericObjectEditor; +import eva2.gui.TopoPlot; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.AbstractEAIndividualComparator; +import eva2.server.go.individuals.InterfaceDataTypeDouble; +import eva2.server.go.individuals.InterfaceESIndividual; +import eva2.server.go.operators.distancemetric.PhenotypeMetric; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.F1Problem; +import eva2.server.go.problems.Interface2DBorderProblem; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; +import eva2.tools.SelectedTag; + import wsi.ra.chart2d.DPoint; import wsi.ra.chart2d.DPointSet; import wsi.ra.math.Jama.Matrix; -import javaeva.gui.BeanInspector; -import javaeva.gui.GenericObjectEditor; -import javaeva.gui.TopoPlot; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.AbstractEAIndividualComparator; -import javaeva.server.go.individuals.InterfaceDataTypeDouble; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.operators.distancemetric.PhenotypeMetric; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.F1Problem; -import javaeva.server.go.problems.Interface2DBorderProblem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; -import javaeva.tools.SelectedTag; -//import javax.vecmath.GVector; -//import javax.vecmath.GMatrix; /** * This implements particle swarm optimization by Kennedy and Eberhardt. @@ -100,7 +99,7 @@ public class ParticleSwarmOptimization implements InterfaceOptimizer, java.io.Se // for debugging only transient private static boolean TRACE = false; transient protected boolean m_Show = false; - transient protected javaeva.gui.Plot m_Plot; + transient protected eva2.gui.Plot m_Plot; public ParticleSwarmOptimization() { @@ -1439,7 +1438,7 @@ public class ParticleSwarmOptimization implements InterfaceOptimizer, java.io.Se double[] tmpD = new double[2]; tmpD[0] = 0; tmpD[1] = 0; - this.m_Plot = new javaeva.gui.Plot("PSO "+ m_Population.getGeneration(), "x1", "x2", range[0], range[1]); + this.m_Plot = new eva2.gui.Plot("PSO "+ m_Population.getGeneration(), "x1", "x2", range[0], range[1]); // this.m_Plot.setUnconnectedPoint(range[0][0], range[1][0], 0); // this.m_Plot.setUnconnectedPoint(range[0][1], range[1][1], 0); } diff --git a/src/javaeva/server/go/strategies/PopulationBasedIncrementalLearning.java b/src/eva2/server/go/strategies/PopulationBasedIncrementalLearning.java similarity index 94% rename from src/javaeva/server/go/strategies/PopulationBasedIncrementalLearning.java rename to src/eva2/server/go/strategies/PopulationBasedIncrementalLearning.java index 4afb66de..4a780ee3 100644 --- a/src/javaeva/server/go/strategies/PopulationBasedIncrementalLearning.java +++ b/src/eva2/server/go/strategies/PopulationBasedIncrementalLearning.java @@ -1,15 +1,15 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceGAIndividual; -import javaeva.server.go.operators.selection.InterfaceSelection; -import javaeva.server.go.operators.selection.SelectBestIndividuals; -import javaeva.server.go.populations.PBILPopulation; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.AbstractOptimizationProblem; -import javaeva.server.go.problems.B1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; +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.PBILPopulation; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.AbstractOptimizationProblem; +import eva2.server.go.problems.B1Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; /** Population based increamental learning in the PSM by Mommarche * version with also allows to simulate ant systems due to the flexible diff --git a/src/javaeva/server/go/strategies/SimulatedAnnealing.java b/src/eva2/server/go/strategies/SimulatedAnnealing.java similarity index 95% rename from src/javaeva/server/go/strategies/SimulatedAnnealing.java rename to src/eva2/server/go/strategies/SimulatedAnnealing.java index 061b3b80..d6129540 100644 --- a/src/javaeva/server/go/strategies/SimulatedAnnealing.java +++ b/src/eva2/server/go/strategies/SimulatedAnnealing.java @@ -1,12 +1,12 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.GAIndividualBinaryData; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.B1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.GAIndividualBinaryData; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.B1Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; /** Simulated Annealing by Nelder and Mead, a simple yet efficient local search * method. But to become less prone to premature convergence the cooling rate diff --git a/src/javaeva/server/go/strategies/SteadyStateGA.java b/src/eva2/server/go/strategies/SteadyStateGA.java similarity index 93% rename from src/javaeva/server/go/strategies/SteadyStateGA.java rename to src/eva2/server/go/strategies/SteadyStateGA.java index 4879382b..3a1964cc 100644 --- a/src/javaeva/server/go/strategies/SteadyStateGA.java +++ b/src/eva2/server/go/strategies/SteadyStateGA.java @@ -1,15 +1,15 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.GAIndividualBinaryData; -import javaeva.server.go.operators.selection.InterfaceSelection; -import javaeva.server.go.operators.selection.SelectTournament; -import javaeva.server.go.operators.selection.replacement.InterfaceReplacement; -import javaeva.server.go.operators.selection.replacement.ReplaceWorst; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.B1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; +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.Population; +import eva2.server.go.problems.B1Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; /** A simple implementation of the steady-state GA with variable * replacement schemes. To reduce the logging effort population.size() diff --git a/src/javaeva/server/go/strategies/ThresholdAlgorithm.java b/src/eva2/server/go/strategies/ThresholdAlgorithm.java similarity index 95% rename from src/javaeva/server/go/strategies/ThresholdAlgorithm.java rename to src/eva2/server/go/strategies/ThresholdAlgorithm.java index d9df78ef..e69e1df5 100644 --- a/src/javaeva/server/go/strategies/ThresholdAlgorithm.java +++ b/src/eva2/server/go/strategies/ThresholdAlgorithm.java @@ -1,12 +1,12 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.GAIndividualBinaryData; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.B1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.GAIndividualBinaryData; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.B1Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.tools.RandomNumberGenerator; /** Threshold accepting algorithm simliar strategy as the flood * algorithm, similar problems. diff --git a/src/javaeva/server/go/strategies/Tribes.java b/src/eva2/server/go/strategies/Tribes.java similarity index 96% rename from src/javaeva/server/go/strategies/Tribes.java rename to src/eva2/server/go/strategies/Tribes.java index 700b6953..eb74f898 100644 --- a/src/javaeva/server/go/strategies/Tribes.java +++ b/src/eva2/server/go/strategies/Tribes.java @@ -1,21 +1,22 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; import java.util.Iterator; import java.util.List; -import javaeva.gui.GenericObjectEditor; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceDataTypeDouble; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.AbstractOptimizationProblem; -import javaeva.server.go.problems.InterfaceHasInitRange; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.strategies.tribes.TribesExplorer; -import javaeva.server.go.strategies.tribes.TribesParam; -import javaeva.server.go.strategies.tribes.TribesPosition; -import javaeva.server.go.strategies.tribes.TribesSwarm; +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.individuals.InterfaceESIndividual; +import eva2.server.go.populations.Population; +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; + /** * This is the TRIBES algorithm, an adaptive, parameter-less PSO implementation. @@ -170,7 +171,7 @@ public class Tribes implements InterfaceOptimizer, java.io.Serializable { protected int rangeInitType=1; private boolean m_Show = false; - transient protected javaeva.gui.Plot m_Plot = null; + transient protected eva2.gui.Plot m_Plot = null; // private int useAnchors = 0; // use anchors to detect environment changes? public Object clone() { @@ -355,7 +356,7 @@ public class Tribes implements InterfaceOptimizer, java.io.Serializable { // double[] tmpD = new double[2]; // tmpD[0] = 0; // tmpD[1] = 0; - this.m_Plot = new javaeva.gui.Plot("TRIBES "+ population.getGeneration(), "x1", "x2", range[0], range[1]); + this.m_Plot = new eva2.gui.Plot("TRIBES "+ population.getGeneration(), "x1", "x2", range[0], range[1]); // this.m_Plot.setUnconnectedPoint(range[0][0], range[1][0], 0); // this.m_Plot.setUnconnectedPoint(range[0][1], range[1][1], 0); } diff --git a/src/javaeva/server/go/strategies/WingedMultiObjectiveEA.java b/src/eva2/server/go/strategies/WingedMultiObjectiveEA.java similarity index 93% rename from src/javaeva/server/go/strategies/WingedMultiObjectiveEA.java rename to src/eva2/server/go/strategies/WingedMultiObjectiveEA.java index abdf37e7..0518f077 100644 --- a/src/javaeva/server/go/strategies/WingedMultiObjectiveEA.java +++ b/src/eva2/server/go/strategies/WingedMultiObjectiveEA.java @@ -1,18 +1,18 @@ -package javaeva.server.go.strategies; +package eva2.server.go.strategies; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.operators.archiving.ArchivingNSGAII; -import javaeva.server.go.operators.archiving.InformationRetrievalInserting; -import javaeva.server.go.operators.archiving.InterfaceArchiving; -import javaeva.server.go.operators.archiving.InterfaceInformationRetrieval; -import javaeva.server.go.operators.moso.MOSOWeightedFitness; -import javaeva.server.go.operators.selection.SelectMONonDominated; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.AbstractMultiObjectiveOptimizationProblem; -import javaeva.server.go.problems.FM0Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.gui.PropertyDoubleArray; +import eva2.gui.PropertyDoubleArray; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.individuals.AbstractEAIndividual; +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.moso.MOSOWeightedFitness; +import eva2.server.go.operators.selection.SelectMONonDominated; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.AbstractMultiObjectiveOptimizationProblem; +import eva2.server.go.problems.FM0Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; /** The winged MOEA was a nice idea, which didn't really work out. * Here a standard MOEA is assisted by n additional local searchers, each diff --git a/src/javaeva/server/go/strategies/tribes/Tribe.java b/src/eva2/server/go/strategies/tribes/Tribe.java similarity index 97% rename from src/javaeva/server/go/strategies/tribes/Tribe.java rename to src/eva2/server/go/strategies/tribes/Tribe.java index ef3ec908..891fe65d 100644 --- a/src/javaeva/server/go/strategies/tribes/Tribe.java +++ b/src/eva2/server/go/strategies/tribes/Tribe.java @@ -1,8 +1,8 @@ -package javaeva.server.go.strategies.tribes; +package eva2.server.go.strategies.tribes; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.strategies.Tribes; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.strategies.Tribes; +import eva2.server.go.tools.RandomNumberGenerator; public class Tribe implements java.io.Serializable { diff --git a/src/javaeva/server/go/strategies/tribes/TribesExplorer.java b/src/eva2/server/go/strategies/tribes/TribesExplorer.java similarity index 98% rename from src/javaeva/server/go/strategies/tribes/TribesExplorer.java rename to src/eva2/server/go/strategies/tribes/TribesExplorer.java index 2a105aee..82d1c35b 100644 --- a/src/javaeva/server/go/strategies/tribes/TribesExplorer.java +++ b/src/eva2/server/go/strategies/tribes/TribesExplorer.java @@ -1,12 +1,12 @@ -package javaeva.server.go.strategies.tribes; +package eva2.server.go.strategies.tribes; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.InterfaceDataTypeDouble; -import javaeva.server.go.individuals.InterfaceESIndividual; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.strategies.Tribes; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.individuals.InterfaceDataTypeDouble; +import eva2.server.go.individuals.InterfaceESIndividual; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.strategies.Tribes; +import eva2.server.go.tools.RandomNumberGenerator; public class TribesExplorer extends AbstractEAIndividual implements InterfaceESIndividual, InterfaceDataTypeDouble { /** diff --git a/src/javaeva/server/go/strategies/tribes/TribesMemory.java b/src/eva2/server/go/strategies/tribes/TribesMemory.java similarity index 98% rename from src/javaeva/server/go/strategies/tribes/TribesMemory.java rename to src/eva2/server/go/strategies/tribes/TribesMemory.java index a950c1b1..e6693085 100644 --- a/src/javaeva/server/go/strategies/tribes/TribesMemory.java +++ b/src/eva2/server/go/strategies/tribes/TribesMemory.java @@ -1,4 +1,4 @@ -package javaeva.server.go.strategies.tribes; +package eva2.server.go.strategies.tribes; public class TribesMemory implements java.io.Serializable { /** diff --git a/src/javaeva/server/go/strategies/tribes/TribesParam.java b/src/eva2/server/go/strategies/tribes/TribesParam.java similarity index 95% rename from src/javaeva/server/go/strategies/tribes/TribesParam.java rename to src/eva2/server/go/strategies/tribes/TribesParam.java index fc0f7964..ae37d38c 100644 --- a/src/javaeva/server/go/strategies/tribes/TribesParam.java +++ b/src/eva2/server/go/strategies/tribes/TribesParam.java @@ -1,4 +1,4 @@ -package javaeva.server.go.strategies.tribes; +package eva2.server.go.strategies.tribes; /** * This class for now is used only for keeping the door open to the original diff --git a/src/javaeva/server/go/strategies/tribes/TribesPosition.java b/src/eva2/server/go/strategies/tribes/TribesPosition.java similarity index 99% rename from src/javaeva/server/go/strategies/tribes/TribesPosition.java rename to src/eva2/server/go/strategies/tribes/TribesPosition.java index 131e9679..f9e7d291 100644 --- a/src/javaeva/server/go/strategies/tribes/TribesPosition.java +++ b/src/eva2/server/go/strategies/tribes/TribesPosition.java @@ -1,9 +1,10 @@ -package javaeva.server.go.strategies.tribes; +package eva2.server.go.strategies.tribes; import java.util.Arrays; -import javaeva.server.go.strategies.Tribes; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.strategies.Tribes; +import eva2.server.go.tools.RandomNumberGenerator; + public class TribesPosition implements java.io.Serializable { /** diff --git a/src/javaeva/server/go/strategies/tribes/TribesSwarm.java b/src/eva2/server/go/strategies/tribes/TribesSwarm.java similarity index 99% rename from src/javaeva/server/go/strategies/tribes/TribesSwarm.java rename to src/eva2/server/go/strategies/tribes/TribesSwarm.java index a53939a5..8d76758a 100644 --- a/src/javaeva/server/go/strategies/tribes/TribesSwarm.java +++ b/src/eva2/server/go/strategies/tribes/TribesSwarm.java @@ -1,12 +1,13 @@ -package javaeva.server.go.strategies.tribes; +package eva2.server.go.strategies.tribes; import java.util.ArrayList; import java.util.List; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.strategies.Tribes; -import javaeva.server.go.tools.RandomNumberGenerator; +import eva2.server.go.populations.Population; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.strategies.Tribes; +import eva2.server.go.tools.RandomNumberGenerator; + public class TribesSwarm implements java.io.Serializable{ /** diff --git a/src/javaeva/server/go/tools/AbstractObjectEditor.java b/src/eva2/server/go/tools/AbstractObjectEditor.java similarity index 99% rename from src/javaeva/server/go/tools/AbstractObjectEditor.java rename to src/eva2/server/go/tools/AbstractObjectEditor.java index b536b060..95015014 100644 --- a/src/javaeva/server/go/tools/AbstractObjectEditor.java +++ b/src/eva2/server/go/tools/AbstractObjectEditor.java @@ -1,10 +1,12 @@ -package javaeva.server.go.tools; +package eva2.server.go.tools; -import javaeva.client.EvAClient; -import javaeva.gui.*; -import javaeva.tools.EVAHELP; import javax.swing.*; + +import eva2.client.EvAClient; +import eva2.gui.*; +import eva2.tools.EVAHELP; + import java.beans.*; import java.io.File; import java.lang.reflect.Method; diff --git a/src/javaeva/server/go/tools/DeNovofilter.java b/src/eva2/server/go/tools/DeNovofilter.java similarity index 87% rename from src/javaeva/server/go/tools/DeNovofilter.java rename to src/eva2/server/go/tools/DeNovofilter.java index 5909da18..c4874573 100644 --- a/src/javaeva/server/go/tools/DeNovofilter.java +++ b/src/eva2/server/go/tools/DeNovofilter.java @@ -1,14 +1,15 @@ -package javaeva.server.go.tools; +package eva2.server.go.tools; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.ESIndividualDoubleData; -import javaeva.server.go.operators.archiving.ArchivingAllDominating; -import javaeva.server.go.populations.Population; import java.io.BufferedReader; import java.io.FileReader; import java.util.ArrayList; +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; + /** * Created by IntelliJ IDEA. * User: streiche @@ -43,7 +44,7 @@ public class DeNovofilter { } private void loadData() { pop = new Population(); - ESIndividualDoubleData indy; + AbstractEAIndividual indy; BufferedReader reader= null; try { reader = new BufferedReader(new FileReader("TEST.txt")); diff --git a/src/javaeva/server/go/tools/FileLoader.java b/src/eva2/server/go/tools/FileLoader.java similarity index 98% rename from src/javaeva/server/go/tools/FileLoader.java rename to src/eva2/server/go/tools/FileLoader.java index ebcb70dc..c271521d 100644 --- a/src/javaeva/server/go/tools/FileLoader.java +++ b/src/eva2/server/go/tools/FileLoader.java @@ -1,4 +1,4 @@ -package javaeva.server.go.tools; +package eva2.server.go.tools; import wsi.ra.tool.BasicResourceLoader; diff --git a/src/javaeva/server/go/tools/GONamingBox.java b/src/eva2/server/go/tools/GONamingBox.java similarity index 98% rename from src/javaeva/server/go/tools/GONamingBox.java rename to src/eva2/server/go/tools/GONamingBox.java index 5db6ef4c..368fba7f 100644 --- a/src/javaeva/server/go/tools/GONamingBox.java +++ b/src/eva2/server/go/tools/GONamingBox.java @@ -1,4 +1,4 @@ -package javaeva.server.go.tools; +package eva2.server.go.tools; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/tools/GeneralGEOFaker.java b/src/eva2/server/go/tools/GeneralGEOFaker.java similarity index 99% rename from src/javaeva/server/go/tools/GeneralGEOFaker.java rename to src/eva2/server/go/tools/GeneralGEOFaker.java index 8bb38029..d9fad101 100644 --- a/src/javaeva/server/go/tools/GeneralGEOFaker.java +++ b/src/eva2/server/go/tools/GeneralGEOFaker.java @@ -1,4 +1,4 @@ -package javaeva.server.go.tools; +package eva2.server.go.tools; import javax.swing.*; import java.awt.*; diff --git a/src/javaeva/server/go/tools/GeneralGOEProperty.java b/src/eva2/server/go/tools/GeneralGOEProperty.java similarity index 95% rename from src/javaeva/server/go/tools/GeneralGOEProperty.java rename to src/eva2/server/go/tools/GeneralGOEProperty.java index 232e9d74..d66fc922 100644 --- a/src/javaeva/server/go/tools/GeneralGOEProperty.java +++ b/src/eva2/server/go/tools/GeneralGOEProperty.java @@ -1,4 +1,4 @@ -package javaeva.server.go.tools; +package eva2.server.go.tools; import javax.swing.*; import java.lang.reflect.Method; diff --git a/src/javaeva/server/go/tools/GeneralGenericObjectEditorPanel.java b/src/eva2/server/go/tools/GeneralGenericObjectEditorPanel.java similarity index 98% rename from src/javaeva/server/go/tools/GeneralGenericObjectEditorPanel.java rename to src/eva2/server/go/tools/GeneralGenericObjectEditorPanel.java index c80fd3b3..ab41c7f6 100644 --- a/src/javaeva/server/go/tools/GeneralGenericObjectEditorPanel.java +++ b/src/eva2/server/go/tools/GeneralGenericObjectEditorPanel.java @@ -1,10 +1,12 @@ -package javaeva.server.go.tools; +package eva2.server.go.tools; -import javaeva.gui.GenericObjectEditor; -import javaeva.gui.PropertyDialog; -import javaeva.tools.EVAHELP; import javax.swing.*; + +import eva2.gui.GenericObjectEditor; +import eva2.gui.PropertyDialog; +import eva2.tools.EVAHELP; + import java.awt.event.ItemListener; import java.awt.event.ActionListener; import java.awt.event.ActionEvent; diff --git a/src/javaeva/server/go/tools/ImpactOfDimensionOnMOEAs.java b/src/eva2/server/go/tools/ImpactOfDimensionOnMOEAs.java similarity index 87% rename from src/javaeva/server/go/tools/ImpactOfDimensionOnMOEAs.java rename to src/eva2/server/go/tools/ImpactOfDimensionOnMOEAs.java index b40178eb..9e9d0d06 100644 --- a/src/javaeva/server/go/tools/ImpactOfDimensionOnMOEAs.java +++ b/src/eva2/server/go/tools/ImpactOfDimensionOnMOEAs.java @@ -1,16 +1,17 @@ -package javaeva.server.go.tools; +package eva2.server.go.tools; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.individuals.ESIndividualDoubleData; -import javaeva.server.go.individuals.InterfaceDataTypeDouble; -import javaeva.server.go.operators.archiving.ArchivingAllDominating; -import javaeva.server.go.populations.Population; -import javaeva.gui.Plot; -import javaeva.gui.GraphPointSet; import wsi.ra.chart2d.DPoint; import java.io.*; +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; + /** * Created by IntelliJ IDEA. * User: streiche @@ -36,7 +37,7 @@ public class ImpactOfDimensionOnMOEAs { double[] tmpD = new double[2]; tmpD[0] = 1; tmpD[1] = 1; - mPlot = new javaeva.gui.Plot("ImpactOfDimensionOnMOEAs", "ProblemDimensin", "No. of Pareto-opt solutions", true); + mPlot = new eva2.gui.Plot("ImpactOfDimensionOnMOEAs", "ProblemDimensin", "No. of Pareto-opt solutions", true); for (int l = 0; l < 5; l++) { popSize = 100 + (l*100); mySet = new GraphPointSet(l, mPlot.getFunctionArea()); @@ -95,12 +96,12 @@ public class ImpactOfDimensionOnMOEAs { } public void initPopulation(Population pop, int popSize, int numberOfVariables) { - ESIndividualDoubleData tmpIndy, template; + AbstractEAIndividual tmpIndy, template; pop.clear(); template = new ESIndividualDoubleData(); ((InterfaceDataTypeDouble)template).setDoubleDataLength(numberOfVariables); for (int i = 0; i < popSize; i++) { - tmpIndy = (ESIndividualDoubleData)template.clone(); + tmpIndy = (AbstractEAIndividual)template.clone(); tmpIndy.init(null); pop.add(tmpIndy); } diff --git a/src/javaeva/server/go/tools/InterfaceTest.java b/src/eva2/server/go/tools/InterfaceTest.java similarity index 84% rename from src/javaeva/server/go/tools/InterfaceTest.java rename to src/eva2/server/go/tools/InterfaceTest.java index 3d5806a9..0714bacf 100644 --- a/src/javaeva/server/go/tools/InterfaceTest.java +++ b/src/eva2/server/go/tools/InterfaceTest.java @@ -1,4 +1,4 @@ -package javaeva.server.go.tools; +package eva2.server.go.tools; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/tools/ModuloTest.java b/src/eva2/server/go/tools/ModuloTest.java similarity index 94% rename from src/javaeva/server/go/tools/ModuloTest.java rename to src/eva2/server/go/tools/ModuloTest.java index a6a51f1c..87d2ea76 100644 --- a/src/javaeva/server/go/tools/ModuloTest.java +++ b/src/eva2/server/go/tools/ModuloTest.java @@ -1,4 +1,4 @@ -package javaeva.server.go.tools; +package eva2.server.go.tools; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/tools/ParetoFrontLocalTester.java b/src/eva2/server/go/tools/ParetoFrontLocalTester.java similarity index 95% rename from src/javaeva/server/go/tools/ParetoFrontLocalTester.java rename to src/eva2/server/go/tools/ParetoFrontLocalTester.java index 39f70fe7..db53b9e3 100644 --- a/src/javaeva/server/go/tools/ParetoFrontLocalTester.java +++ b/src/eva2/server/go/tools/ParetoFrontLocalTester.java @@ -1,10 +1,11 @@ -package javaeva.server.go.tools; +package eva2.server.go.tools; -import javaeva.gui.GraphPointSet; import java.util.ArrayList; import java.io.*; +import eva2.gui.GraphPointSet; + /** * Created by IntelliJ IDEA. * User: streiche @@ -14,7 +15,7 @@ import java.io.*; */ public class ParetoFrontLocalTester { - private javaeva.gui.Plot m_Plot; + private eva2.gui.Plot m_Plot; private int index = 0; private BufferedWriter m_OutputFile = null; @@ -148,7 +149,7 @@ public class ParetoFrontLocalTester { double[] tmpD = new double[2]; tmpD[0] = 0; tmpD[1] = 0; - this.m_Plot = new javaeva.gui.Plot("Multiobjective Optimization", "Y1", "Y2", tmpD, tmpD); + this.m_Plot = new eva2.gui.Plot("Multiobjective Optimization", "Y1", "Y2", tmpD, tmpD); } diff --git a/src/javaeva/server/go/tools/PortfolioFrontTester.java b/src/eva2/server/go/tools/PortfolioFrontTester.java similarity index 98% rename from src/javaeva/server/go/tools/PortfolioFrontTester.java rename to src/eva2/server/go/tools/PortfolioFrontTester.java index bb3c3fb4..54875177 100644 --- a/src/javaeva/server/go/tools/PortfolioFrontTester.java +++ b/src/eva2/server/go/tools/PortfolioFrontTester.java @@ -1,10 +1,11 @@ -package javaeva.server.go.tools; +package eva2.server.go.tools; -import javaeva.gui.GraphPointSet; import java.io.*; import java.util.ArrayList; +import eva2.gui.GraphPointSet; + /** * Created by IntelliJ IDEA. * User: streiche @@ -14,7 +15,7 @@ import java.util.ArrayList; */ public class PortfolioFrontTester { - private javaeva.gui.Plot m_Plot; + private eva2.gui.Plot m_Plot; private int index = 0; private BufferedWriter m_OutputFile = null; private double[] loss; @@ -316,7 +317,7 @@ public class PortfolioFrontTester { double[] tmpD = new double[2]; tmpD[0] = 0; tmpD[1] = 0; - this.m_Plot = new javaeva.gui.Plot("Multiobjective Optimization", "Y1", "Y2", tmpD, tmpD); + this.m_Plot = new eva2.gui.Plot("Multiobjective Optimization", "Y1", "Y2", tmpD, tmpD); } diff --git a/src/javaeva/server/go/tools/RandomNumberGenerator.java b/src/eva2/server/go/tools/RandomNumberGenerator.java similarity index 99% rename from src/javaeva/server/go/tools/RandomNumberGenerator.java rename to src/eva2/server/go/tools/RandomNumberGenerator.java index 291381ba..4c9b1bc4 100644 --- a/src/javaeva/server/go/tools/RandomNumberGenerator.java +++ b/src/eva2/server/go/tools/RandomNumberGenerator.java @@ -1,4 +1,4 @@ -package javaeva.server.go.tools; +package eva2.server.go.tools; import java.util.Random; import java.util.ArrayList; diff --git a/src/javaeva/server/go/tools/Test1.java b/src/eva2/server/go/tools/Test1.java similarity index 96% rename from src/javaeva/server/go/tools/Test1.java rename to src/eva2/server/go/tools/Test1.java index 3154eb8a..52ce7690 100644 --- a/src/javaeva/server/go/tools/Test1.java +++ b/src/eva2/server/go/tools/Test1.java @@ -1,4 +1,4 @@ -package javaeva.server.go.tools; +package eva2.server.go.tools; import java.io.Serializable; diff --git a/src/javaeva/server/go/tools/Test2.java b/src/eva2/server/go/tools/Test2.java similarity index 97% rename from src/javaeva/server/go/tools/Test2.java rename to src/eva2/server/go/tools/Test2.java index f8771898..0024f593 100644 --- a/src/javaeva/server/go/tools/Test2.java +++ b/src/eva2/server/go/tools/Test2.java @@ -1,4 +1,4 @@ -package javaeva.server.go.tools; +package eva2.server.go.tools; import java.io.Serializable; diff --git a/src/javaeva/server/go/tools/Test3.java b/src/eva2/server/go/tools/Test3.java similarity index 87% rename from src/javaeva/server/go/tools/Test3.java rename to src/eva2/server/go/tools/Test3.java index daef7c89..1648fd07 100644 --- a/src/javaeva/server/go/tools/Test3.java +++ b/src/eva2/server/go/tools/Test3.java @@ -1,16 +1,17 @@ -package javaeva.server.go.tools; +package eva2.server.go.tools; -import javaeva.server.go.individuals.GAIndividualBinaryData; -import javaeva.server.go.operators.crossover.CrossoverGANPoint; -import javaeva.server.go.operators.crossover.CrossoverGAUniform; -import javaeva.server.go.operators.mutation.MutateGADefault; -import javaeva.server.go.operators.mutation.MutateGAStandard; -import javaeva.server.go.problems.F1Problem; import java.io.*; import java.beans.XMLEncoder; import java.beans.XMLDecoder; +import eva2.server.go.individuals.GAIndividualBinaryData; +import eva2.server.go.operators.crossover.CrossoverGANPoint; +import eva2.server.go.operators.crossover.CrossoverGAUniform; +import eva2.server.go.operators.mutation.MutateGADefault; +import eva2.server.go.operators.mutation.MutateGAStandard; +import eva2.server.go.problems.F1Problem; + public class Test3 { public static void main(String[] args) { diff --git a/src/javaeva/server/go/tools/Test4.java b/src/eva2/server/go/tools/Test4.java similarity index 95% rename from src/javaeva/server/go/tools/Test4.java rename to src/eva2/server/go/tools/Test4.java index 82988f8b..f0a70ae1 100644 --- a/src/javaeva/server/go/tools/Test4.java +++ b/src/eva2/server/go/tools/Test4.java @@ -1,4 +1,4 @@ -package javaeva.server.go.tools; +package eva2.server.go.tools; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/tools/Test5.java b/src/eva2/server/go/tools/Test5.java similarity index 98% rename from src/javaeva/server/go/tools/Test5.java rename to src/eva2/server/go/tools/Test5.java index 1d04a205..8a892482 100644 --- a/src/javaeva/server/go/tools/Test5.java +++ b/src/eva2/server/go/tools/Test5.java @@ -1,4 +1,4 @@ -package javaeva.server.go.tools; +package eva2.server.go.tools; import java.io.*; diff --git a/src/javaeva/server/go/tools/TestingDArea.java b/src/eva2/server/go/tools/TestingDArea.java similarity index 97% rename from src/javaeva/server/go/tools/TestingDArea.java rename to src/eva2/server/go/tools/TestingDArea.java index 513f2688..26d6cbf7 100644 --- a/src/javaeva/server/go/tools/TestingDArea.java +++ b/src/eva2/server/go/tools/TestingDArea.java @@ -1,4 +1,4 @@ -package javaeva.server.go.tools; +package eva2.server.go.tools; import wsi.ra.chart2d.*; diff --git a/src/javaeva/server/go/tools/entity.java b/src/eva2/server/go/tools/entity.java similarity index 96% rename from src/javaeva/server/go/tools/entity.java rename to src/eva2/server/go/tools/entity.java index db9fa9d2..17909c72 100644 --- a/src/javaeva/server/go/tools/entity.java +++ b/src/eva2/server/go/tools/entity.java @@ -1,4 +1,4 @@ -package javaeva.server.go.tools; +package eva2.server.go.tools; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/go/tools/point.java b/src/eva2/server/go/tools/point.java similarity index 96% rename from src/javaeva/server/go/tools/point.java rename to src/eva2/server/go/tools/point.java index c2bbe68a..dea0d81c 100644 --- a/src/javaeva/server/go/tools/point.java +++ b/src/eva2/server/go/tools/point.java @@ -1,4 +1,4 @@ -package javaeva.server.go.tools; +package eva2.server.go.tools; /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/modules/AbstractGOParameters.java b/src/eva2/server/modules/AbstractGOParameters.java similarity index 92% rename from src/javaeva/server/modules/AbstractGOParameters.java rename to src/eva2/server/modules/AbstractGOParameters.java index 4238b77a..af25a6bb 100644 --- a/src/javaeva/server/modules/AbstractGOParameters.java +++ b/src/eva2/server/modules/AbstractGOParameters.java @@ -1,15 +1,16 @@ -package javaeva.server.modules; +package eva2.server.modules; import java.io.Serializable; -import javaeva.gui.BeanInspector; -import javaeva.server.go.InterfaceGOParameters; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.InterfaceTerminator; -import javaeva.server.go.operators.postprocess.InterfacePostProcessParams; -import javaeva.server.go.operators.postprocess.PostProcessParams; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.strategies.InterfaceOptimizer; +import eva2.gui.BeanInspector; +import eva2.server.go.InterfaceGOParameters; +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.InterfaceOptimizationProblem; +import eva2.server.go.strategies.InterfaceOptimizer; + public abstract class AbstractGOParameters implements InterfaceGOParameters, Serializable { public static boolean TRACE = false; diff --git a/src/javaeva/server/modules/AbstractModuleAdapter.java b/src/eva2/server/modules/AbstractModuleAdapter.java similarity index 97% rename from src/javaeva/server/modules/AbstractModuleAdapter.java rename to src/eva2/server/modules/AbstractModuleAdapter.java index e02fe802..63a4b92d 100644 --- a/src/javaeva/server/modules/AbstractModuleAdapter.java +++ b/src/eva2/server/modules/AbstractModuleAdapter.java @@ -1,4 +1,4 @@ -package javaeva.server.modules; +package eva2.server.modules; /* * Title: JavaEvA * Description: @@ -16,9 +16,10 @@ import java.io.Serializable; import java.net.InetAddress; import java.util.Vector; -import javaeva.gui.JTabbedModuleFrame; -import javaeva.gui.LogPanel; -import javaeva.server.go.InterfaceProcessor; +import eva2.gui.JTabbedModuleFrame; +import eva2.gui.LogPanel; +import eva2.server.go.InterfaceProcessor; + import wsi.ra.jproxy.MainAdapterClient; import wsi.ra.jproxy.RemoteStateListener; /*==========================================================================* diff --git a/src/javaeva/server/modules/DEModuleAdapter.java b/src/eva2/server/modules/DEModuleAdapter.java similarity index 91% rename from src/javaeva/server/modules/DEModuleAdapter.java rename to src/eva2/server/modules/DEModuleAdapter.java index 5241e510..75323064 100644 --- a/src/javaeva/server/modules/DEModuleAdapter.java +++ b/src/eva2/server/modules/DEModuleAdapter.java @@ -1,6 +1,6 @@ -package javaeva.server.modules; +package eva2.server.modules; -import javaeva.gui.GenericObjectEditor; +import eva2.gui.GenericObjectEditor; import wsi.ra.jproxy.MainAdapterClient; diff --git a/src/javaeva/server/modules/DEParameters.java b/src/eva2/server/modules/DEParameters.java similarity index 84% rename from src/javaeva/server/modules/DEParameters.java rename to src/eva2/server/modules/DEParameters.java index 47a0c62c..60dda4b3 100644 --- a/src/javaeva/server/modules/DEParameters.java +++ b/src/eva2/server/modules/DEParameters.java @@ -1,21 +1,22 @@ -package javaeva.server.modules; +package eva2.server.modules; -import javaeva.server.go.InterfaceGOParameters; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.InterfaceTerminator; -import javaeva.server.go.operators.selection.InterfaceSelection; -import javaeva.server.go.operators.terminators.EvaluationTerminator; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.F1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.strategies.DifferentialEvolution; -import javaeva.server.go.strategies.GeneticAlgorithm; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.tools.Serializer; -import javaeva.tools.SelectedTag; import java.io.Serializable; +import eva2.server.go.InterfaceGOParameters; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.InterfaceTerminator; +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.problems.InterfaceOptimizationProblem; +import eva2.server.go.strategies.DifferentialEvolution; +import eva2.server.go.strategies.GeneticAlgorithm; +import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.tools.SelectedTag; +import eva2.tools.Serializer; + /** The class gives access to all DE parameters for the JavaEvA * top level GUI. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/modules/EPModuleAdapter.java b/src/eva2/server/modules/EPModuleAdapter.java similarity index 96% rename from src/javaeva/server/modules/EPModuleAdapter.java rename to src/eva2/server/modules/EPModuleAdapter.java index 563f9acb..1171c9a9 100644 --- a/src/javaeva/server/modules/EPModuleAdapter.java +++ b/src/eva2/server/modules/EPModuleAdapter.java @@ -1,4 +1,4 @@ -package javaeva.server.modules; +package eva2.server.modules; import wsi.ra.jproxy.MainAdapterClient; diff --git a/src/javaeva/server/modules/EPParameters.java b/src/eva2/server/modules/EPParameters.java similarity index 82% rename from src/javaeva/server/modules/EPParameters.java rename to src/eva2/server/modules/EPParameters.java index 4be1a1a7..cfe45b9c 100644 --- a/src/javaeva/server/modules/EPParameters.java +++ b/src/eva2/server/modules/EPParameters.java @@ -1,19 +1,20 @@ -package javaeva.server.modules; +package eva2.server.modules; -import javaeva.server.go.InterfaceGOParameters; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.InterfaceTerminator; -import javaeva.server.go.operators.selection.InterfaceSelection; -import javaeva.server.go.operators.terminators.EvaluationTerminator; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.F1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.strategies.EvolutionaryProgramming; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.tools.Serializer; import java.io.Serializable; +import eva2.server.go.InterfaceGOParameters; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.InterfaceTerminator; +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.problems.InterfaceOptimizationProblem; +import eva2.server.go.strategies.EvolutionaryProgramming; +import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.tools.Serializer; + /** The class gives access to all EP parameters for the JavaEvA * top level GUI. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/modules/GAModuleAdapter.java b/src/eva2/server/modules/GAModuleAdapter.java similarity index 96% rename from src/javaeva/server/modules/GAModuleAdapter.java rename to src/eva2/server/modules/GAModuleAdapter.java index d7978c9a..65a4d531 100644 --- a/src/javaeva/server/modules/GAModuleAdapter.java +++ b/src/eva2/server/modules/GAModuleAdapter.java @@ -1,4 +1,4 @@ -package javaeva.server.modules; +package eva2.server.modules; import wsi.ra.jproxy.MainAdapterClient; diff --git a/src/javaeva/server/modules/GAParameters.java b/src/eva2/server/modules/GAParameters.java similarity index 87% rename from src/javaeva/server/modules/GAParameters.java rename to src/eva2/server/modules/GAParameters.java index 8c690bd8..3c033360 100644 --- a/src/javaeva/server/modules/GAParameters.java +++ b/src/eva2/server/modules/GAParameters.java @@ -1,20 +1,21 @@ -package javaeva.server.modules; +package eva2.server.modules; -import javaeva.server.go.InterfaceGOParameters; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.InterfaceTerminator; -import javaeva.server.go.operators.selection.InterfaceSelection; -import javaeva.server.go.operators.terminators.EvaluationTerminator; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.B1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.strategies.GeneticAlgorithm; -import javaeva.server.go.strategies.HillClimbing; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.tools.Serializer; import java.io.Serializable; +import eva2.server.go.InterfaceGOParameters; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.InterfaceTerminator; +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.problems.InterfaceOptimizationProblem; +import eva2.server.go.strategies.GeneticAlgorithm; +import eva2.server.go.strategies.HillClimbing; +import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.tools.Serializer; + /** The class gives access to all GA parameters for the JavaEvA * top level GUI. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/modules/GOModuleAdapter.java b/src/eva2/server/modules/GOModuleAdapter.java similarity index 96% rename from src/javaeva/server/modules/GOModuleAdapter.java rename to src/eva2/server/modules/GOModuleAdapter.java index 50636acf..8c1d13df 100644 --- a/src/javaeva/server/modules/GOModuleAdapter.java +++ b/src/eva2/server/modules/GOModuleAdapter.java @@ -1,4 +1,4 @@ -package javaeva.server.modules; +package eva2.server.modules; import java.io.Serializable; diff --git a/src/javaeva/server/modules/GOParameters.java b/src/eva2/server/modules/GOParameters.java similarity index 81% rename from src/javaeva/server/modules/GOParameters.java rename to src/eva2/server/modules/GOParameters.java index eef55398..1e38b0eb 100644 --- a/src/javaeva/server/modules/GOParameters.java +++ b/src/eva2/server/modules/GOParameters.java @@ -1,14 +1,15 @@ -package javaeva.server.modules; +package eva2.server.modules; import java.io.Serializable; -import javaeva.gui.BeanInspector; -import javaeva.server.go.InterfaceGOParameters; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.operators.terminators.EvaluationTerminator; -import javaeva.server.go.problems.B1Problem; -import javaeva.server.go.strategies.GeneticAlgorithm; -import javaeva.tools.Serializer; +import eva2.gui.BeanInspector; +import eva2.server.go.InterfaceGOParameters; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.operators.terminators.EvaluationTerminator; +import eva2.server.go.problems.B1Problem; +import eva2.server.go.strategies.GeneticAlgorithm; +import eva2.tools.Serializer; + /** * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/modules/GenericModuleAdapter.java b/src/eva2/server/modules/GenericModuleAdapter.java similarity index 89% rename from src/javaeva/server/modules/GenericModuleAdapter.java rename to src/eva2/server/modules/GenericModuleAdapter.java index a83ed152..cd81e88a 100644 --- a/src/javaeva/server/modules/GenericModuleAdapter.java +++ b/src/eva2/server/modules/GenericModuleAdapter.java @@ -1,18 +1,19 @@ -package javaeva.server.modules; +package eva2.server.modules; -import javaeva.server.go.InterfaceGOParameters; -import javaeva.server.stat.StatisticsWithGUI; -import javaeva.server.stat.InterfaceStatisticsParameter; -import javaeva.server.EvAServer; -import javaeva.gui.GenericObjectEditor; -import javaeva.gui.JTabbedModuleFrame; -import javaeva.gui.JModuleGeneralPanel; -import javaeva.gui.JParaPanel; import java.io.Serializable; import java.lang.reflect.Proxy; import java.util.ArrayList; +import eva2.gui.GenericObjectEditor; +import eva2.gui.JModuleGeneralPanel; +import eva2.gui.JParaPanel; +import eva2.gui.JTabbedModuleFrame; +import eva2.server.EvAServer; +import eva2.server.go.InterfaceGOParameters; +import eva2.server.stat.InterfaceStatisticsParameter; +import eva2.server.stat.StatisticsWithGUI; + import wsi.ra.jproxy.MainAdapterClient; import wsi.ra.jproxy.RMIProxyLocal; diff --git a/src/javaeva/server/modules/HCModuleAdapter.java b/src/eva2/server/modules/HCModuleAdapter.java similarity index 96% rename from src/javaeva/server/modules/HCModuleAdapter.java rename to src/eva2/server/modules/HCModuleAdapter.java index 50d07a21..5150a3cd 100644 --- a/src/javaeva/server/modules/HCModuleAdapter.java +++ b/src/eva2/server/modules/HCModuleAdapter.java @@ -1,4 +1,4 @@ -package javaeva.server.modules; +package eva2.server.modules; import wsi.ra.jproxy.MainAdapterClient; diff --git a/src/javaeva/server/modules/HCParameters.java b/src/eva2/server/modules/HCParameters.java similarity index 79% rename from src/javaeva/server/modules/HCParameters.java rename to src/eva2/server/modules/HCParameters.java index 093752a2..12ca2109 100644 --- a/src/javaeva/server/modules/HCParameters.java +++ b/src/eva2/server/modules/HCParameters.java @@ -1,17 +1,18 @@ -package javaeva.server.modules; +package eva2.server.modules; import java.io.Serializable; -import javaeva.server.go.InterfaceGOParameters; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.InterfaceTerminator; -import javaeva.server.go.operators.terminators.EvaluationTerminator; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.B1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.strategies.HillClimbing; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.tools.Serializer; +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.HillClimbing; +import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.tools.Serializer; + /** The class gives access to all HC parameters for the JavaEvA * top level GUI. diff --git a/src/javaeva/server/modules/MCModuleAdapter.java b/src/eva2/server/modules/MCModuleAdapter.java similarity index 96% rename from src/javaeva/server/modules/MCModuleAdapter.java rename to src/eva2/server/modules/MCModuleAdapter.java index dbf6c3f9..64bcefe5 100644 --- a/src/javaeva/server/modules/MCModuleAdapter.java +++ b/src/eva2/server/modules/MCModuleAdapter.java @@ -1,4 +1,4 @@ -package javaeva.server.modules; +package eva2.server.modules; import wsi.ra.jproxy.MainAdapterClient; diff --git a/src/javaeva/server/modules/MCParameters.java b/src/eva2/server/modules/MCParameters.java similarity index 77% rename from src/javaeva/server/modules/MCParameters.java rename to src/eva2/server/modules/MCParameters.java index bb464773..0f6be120 100644 --- a/src/javaeva/server/modules/MCParameters.java +++ b/src/eva2/server/modules/MCParameters.java @@ -1,19 +1,20 @@ -package javaeva.server.modules; +package eva2.server.modules; -import javaeva.server.go.InterfaceGOParameters; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.InterfaceTerminator; -import javaeva.server.go.operators.terminators.EvaluationTerminator; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.B1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.strategies.GeneticAlgorithm; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.server.go.strategies.MonteCarloSearch; -import javaeva.tools.Serializer; import java.io.Serializable; +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.GeneticAlgorithm; +import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.server.go.strategies.MonteCarloSearch; +import eva2.tools.Serializer; + /** The class gives access to all HC parameters for the JavaEvA * top level GUI. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/modules/MOEAModuleAdapter.java b/src/eva2/server/modules/MOEAModuleAdapter.java similarity index 76% rename from src/javaeva/server/modules/MOEAModuleAdapter.java rename to src/eva2/server/modules/MOEAModuleAdapter.java index e8dc7fbf..a64013d0 100644 --- a/src/javaeva/server/modules/MOEAModuleAdapter.java +++ b/src/eva2/server/modules/MOEAModuleAdapter.java @@ -1,16 +1,17 @@ -package javaeva.server.modules; +package eva2.server.modules; -import javaeva.server.go.InterfaceGOParameters; -import javaeva.server.stat.StatisticsWithGUI; -import javaeva.server.stat.InterfaceStatisticsParameter; -import javaeva.server.EvAServer; -import javaeva.gui.JTabbedModuleFrame; -import javaeva.gui.JModuleGeneralPanel; -import javaeva.gui.JParaPanel; import java.io.Serializable; import java.util.ArrayList; +import eva2.gui.JModuleGeneralPanel; +import eva2.gui.JParaPanel; +import eva2.gui.JTabbedModuleFrame; +import eva2.server.EvAServer; +import eva2.server.go.InterfaceGOParameters; +import eva2.server.stat.InterfaceStatisticsParameter; +import eva2.server.stat.StatisticsWithGUI; + import wsi.ra.jproxy.MainAdapterClient; import wsi.ra.jproxy.RMIProxyLocal; diff --git a/src/javaeva/server/modules/MOEAParameters.java b/src/eva2/server/modules/MOEAParameters.java similarity index 84% rename from src/javaeva/server/modules/MOEAParameters.java rename to src/eva2/server/modules/MOEAParameters.java index 8d349e06..b114babd 100644 --- a/src/javaeva/server/modules/MOEAParameters.java +++ b/src/eva2/server/modules/MOEAParameters.java @@ -1,23 +1,24 @@ -package javaeva.server.modules; +package eva2.server.modules; -import javaeva.server.go.InterfaceGOParameters; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.InterfaceTerminator; -import javaeva.server.go.operators.archiving.InterfaceArchiving; -import javaeva.server.go.operators.archiving.InterfaceInformationRetrieval; -import javaeva.server.go.operators.terminators.EvaluationTerminator; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.F1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.problems.TF1Problem; -import javaeva.server.go.strategies.DifferentialEvolution; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.server.go.strategies.MultiObjectiveEA; -import javaeva.tools.Serializer; -import javaeva.tools.SelectedTag; import java.io.Serializable; +import eva2.server.go.InterfaceGOParameters; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.InterfaceTerminator; +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.F1Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.problems.TF1Problem; +import eva2.server.go.strategies.DifferentialEvolution; +import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.server.go.strategies.MultiObjectiveEA; +import eva2.tools.SelectedTag; +import eva2.tools.Serializer; + /** The class gives access to all MOEA parameters for the JavaEvA * top level GUI. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/modules/ModuleAdapter.java b/src/eva2/server/modules/ModuleAdapter.java similarity index 88% rename from src/javaeva/server/modules/ModuleAdapter.java rename to src/eva2/server/modules/ModuleAdapter.java index db34626c..8fa2709c 100644 --- a/src/javaeva/server/modules/ModuleAdapter.java +++ b/src/eva2/server/modules/ModuleAdapter.java @@ -1,4 +1,4 @@ -package javaeva.server.modules; +package eva2.server.modules; /* * Title: JavaEvA * Description: @@ -12,10 +12,10 @@ package javaeva.server.modules; /*==========================================================================* * IMPORTS *==========================================================================*/ -import javaeva.gui.JTabbedModuleFrame; -import javaeva.gui.LogPanel; -import javaeva.server.go.operators.postprocess.PostProcessParams; -import javaeva.server.stat.InterfaceTextListener; +import eva2.gui.JTabbedModuleFrame; +import eva2.gui.LogPanel; +import eva2.server.go.operators.postprocess.PostProcessParams; +import eva2.server.stat.InterfaceTextListener; import wsi.ra.jproxy.RemoteStateListener; /*==========================================================================* * INTERFACE DECLARATION diff --git a/src/javaeva/server/modules/PBILModuleAdapter.java b/src/eva2/server/modules/PBILModuleAdapter.java similarity index 96% rename from src/javaeva/server/modules/PBILModuleAdapter.java rename to src/eva2/server/modules/PBILModuleAdapter.java index 84a7acdf..56637d80 100644 --- a/src/javaeva/server/modules/PBILModuleAdapter.java +++ b/src/eva2/server/modules/PBILModuleAdapter.java @@ -1,4 +1,4 @@ -package javaeva.server.modules; +package eva2.server.modules; import wsi.ra.jproxy.MainAdapterClient; diff --git a/src/javaeva/server/modules/PBILParameters.java b/src/eva2/server/modules/PBILParameters.java similarity index 90% rename from src/javaeva/server/modules/PBILParameters.java rename to src/eva2/server/modules/PBILParameters.java index e04a6795..a4ef1fe9 100644 --- a/src/javaeva/server/modules/PBILParameters.java +++ b/src/eva2/server/modules/PBILParameters.java @@ -1,16 +1,17 @@ -package javaeva.server.modules; +package eva2.server.modules; import java.io.Serializable; -import javaeva.server.go.InterfaceGOParameters; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.operators.selection.InterfaceSelection; -import javaeva.server.go.operators.terminators.EvaluationTerminator; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.B1Problem; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.server.go.strategies.PopulationBasedIncrementalLearning; -import javaeva.tools.Serializer; +import eva2.server.go.InterfaceGOParameters; +import eva2.server.go.InterfacePopulationChangedEventListener; +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.tools.Serializer; + /** The class gives access to all PBIL parameters for the JavaEvA * top level GUI. diff --git a/src/javaeva/server/modules/PSOModuleAdapter.java b/src/eva2/server/modules/PSOModuleAdapter.java similarity index 96% rename from src/javaeva/server/modules/PSOModuleAdapter.java rename to src/eva2/server/modules/PSOModuleAdapter.java index d61bd13c..69fc446a 100644 --- a/src/javaeva/server/modules/PSOModuleAdapter.java +++ b/src/eva2/server/modules/PSOModuleAdapter.java @@ -1,4 +1,4 @@ -package javaeva.server.modules; +package eva2.server.modules; import wsi.ra.jproxy.MainAdapterClient; diff --git a/src/javaeva/server/modules/PSOParameters.java b/src/eva2/server/modules/PSOParameters.java similarity index 91% rename from src/javaeva/server/modules/PSOParameters.java rename to src/eva2/server/modules/PSOParameters.java index c022d2e4..16b4332e 100644 --- a/src/javaeva/server/modules/PSOParameters.java +++ b/src/eva2/server/modules/PSOParameters.java @@ -1,23 +1,24 @@ -package javaeva.server.modules; +package eva2.server.modules; -import javaeva.gui.GenericObjectEditor; -import javaeva.server.go.InterfaceGOParameters; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.InterfaceTerminator; -import javaeva.server.go.operators.selection.InterfaceSelection; -import javaeva.server.go.operators.terminators.EvaluationTerminator; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.B1Problem; -import javaeva.server.go.problems.F1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.server.go.strategies.ParticleSwarmOptimization; -import javaeva.server.go.strategies.PopulationBasedIncrementalLearning; -import javaeva.tools.Serializer; -import javaeva.tools.SelectedTag; import java.io.Serializable; +import eva2.gui.GenericObjectEditor; +import eva2.server.go.InterfaceGOParameters; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.InterfaceTerminator; +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.problems.F1Problem; +import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.server.go.strategies.ParticleSwarmOptimization; +import eva2.server.go.strategies.PopulationBasedIncrementalLearning; +import eva2.tools.SelectedTag; +import eva2.tools.Serializer; + /** The class gives access to all PSO parameters for the JavaEvA * top level GUI. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/modules/Processor.java b/src/eva2/server/modules/Processor.java similarity index 92% rename from src/javaeva/server/modules/Processor.java rename to src/eva2/server/modules/Processor.java index c820e1f8..31db9b8c 100644 --- a/src/javaeva/server/modules/Processor.java +++ b/src/eva2/server/modules/Processor.java @@ -1,20 +1,21 @@ -package javaeva.server.modules; +package eva2.server.modules; -import javaeva.gui.BeanInspector; -import javaeva.server.go.InterfaceGOParameters; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.InterfaceProcessor; -import javaeva.server.go.PopulationInterface; -import javaeva.server.go.operators.postprocess.PostProcess; -import javaeva.server.go.operators.postprocess.PostProcessParams; -import javaeva.server.go.operators.terminators.EvaluationTerminator; -import javaeva.server.go.operators.terminators.GenerationTerminator; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.AbstractOptimizationProblem; -import javaeva.server.go.tools.RandomNumberGenerator; -import javaeva.server.stat.InterfaceStatistics; -import javaeva.server.stat.InterfaceTextListener; -import javaeva.server.stat.StatisticsWithGUI; +import eva2.gui.BeanInspector; +import eva2.server.go.InterfaceGOParameters; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.InterfaceProcessor; +import eva2.server.go.PopulationInterface; +import eva2.server.go.operators.postprocess.PostProcess; +import eva2.server.go.operators.postprocess.PostProcessParams; +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.tools.RandomNumberGenerator; +import eva2.server.stat.InterfaceStatistics; +import eva2.server.stat.InterfaceTextListener; +import eva2.server.stat.StatisticsWithGUI; +import eva2.tools.EVAERROR; import wsi.ra.jproxy.RemoteStateListener; /** @@ -134,6 +135,7 @@ public class Processor extends Thread implements InterfaceProcessor, InterfacePo public Population runOptOnce() { try { + EVAERROR.clearMsgCache(); while (isOptRunning()) { setPriority(3); if (saveParams) goParams.saveInstance(); @@ -193,6 +195,7 @@ public class Processor extends Thread implements InterfaceProcessor, InterfacePo this.goParams.getOptimizer().optimize(); // registerPopulationStateChanged *SHOULD* be fired by the optimizer or resp. the population // as we are event listener +// System.out.println(this.goParams.getOptimizer().getPopulation().getIndyList()); } while (isOptRunning() && !this.goParams.getTerminator().isTerminated(this.goParams.getOptimizer().getPopulation())); runCounter++; diff --git a/src/javaeva/server/modules/SAModuleAdapter.java b/src/eva2/server/modules/SAModuleAdapter.java similarity index 96% rename from src/javaeva/server/modules/SAModuleAdapter.java rename to src/eva2/server/modules/SAModuleAdapter.java index 7804077c..4a299568 100644 --- a/src/javaeva/server/modules/SAModuleAdapter.java +++ b/src/eva2/server/modules/SAModuleAdapter.java @@ -1,4 +1,4 @@ -package javaeva.server.modules; +package eva2.server.modules; import wsi.ra.jproxy.MainAdapterClient; diff --git a/src/javaeva/server/modules/SAParameters.java b/src/eva2/server/modules/SAParameters.java similarity index 84% rename from src/javaeva/server/modules/SAParameters.java rename to src/eva2/server/modules/SAParameters.java index a966037f..20f21088 100644 --- a/src/javaeva/server/modules/SAParameters.java +++ b/src/eva2/server/modules/SAParameters.java @@ -1,20 +1,21 @@ -package javaeva.server.modules; +package eva2.server.modules; -import javaeva.server.go.InterfaceGOParameters; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.InterfaceTerminator; -import javaeva.server.go.operators.terminators.EvaluationTerminator; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.B1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.strategies.GeneticAlgorithm; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.server.go.strategies.MonteCarloSearch; -import javaeva.server.go.strategies.SimulatedAnnealing; -import javaeva.tools.Serializer; import java.io.Serializable; +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.GeneticAlgorithm; +import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.server.go.strategies.MonteCarloSearch; +import eva2.server.go.strategies.SimulatedAnnealing; +import eva2.tools.Serializer; + /** The class gives access to all SA parameters for the JavaEvA * top level GUI. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/modules/SSGAModuleAdapter.java b/src/eva2/server/modules/SSGAModuleAdapter.java similarity index 96% rename from src/javaeva/server/modules/SSGAModuleAdapter.java rename to src/eva2/server/modules/SSGAModuleAdapter.java index 7ec92a73..06188efd 100644 --- a/src/javaeva/server/modules/SSGAModuleAdapter.java +++ b/src/eva2/server/modules/SSGAModuleAdapter.java @@ -1,4 +1,4 @@ -package javaeva.server.modules; +package eva2.server.modules; import wsi.ra.jproxy.MainAdapterClient; diff --git a/src/javaeva/server/modules/SSGAParameters.java b/src/eva2/server/modules/SSGAParameters.java similarity index 86% rename from src/javaeva/server/modules/SSGAParameters.java rename to src/eva2/server/modules/SSGAParameters.java index b2e509d9..04839aa1 100644 --- a/src/javaeva/server/modules/SSGAParameters.java +++ b/src/eva2/server/modules/SSGAParameters.java @@ -1,20 +1,21 @@ -package javaeva.server.modules; +package eva2.server.modules; -import javaeva.server.go.InterfaceGOParameters; -import javaeva.server.go.InterfacePopulationChangedEventListener; -import javaeva.server.go.InterfaceTerminator; -import javaeva.server.go.operators.selection.InterfaceSelection; -import javaeva.server.go.operators.selection.replacement.InterfaceReplacement; -import javaeva.server.go.operators.terminators.EvaluationTerminator; -import javaeva.server.go.populations.Population; -import javaeva.server.go.problems.B1Problem; -import javaeva.server.go.problems.InterfaceOptimizationProblem; -import javaeva.server.go.strategies.InterfaceOptimizer; -import javaeva.server.go.strategies.SteadyStateGA; -import javaeva.tools.Serializer; import java.io.Serializable; +import eva2.server.go.InterfaceGOParameters; +import eva2.server.go.InterfacePopulationChangedEventListener; +import eva2.server.go.InterfaceTerminator; +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.problems.InterfaceOptimizationProblem; +import eva2.server.go.strategies.InterfaceOptimizer; +import eva2.server.go.strategies.SteadyStateGA; +import eva2.tools.Serializer; + /** The class gives access to all SSGA parameters for the JavaEvA * top level GUI. * Created by IntelliJ IDEA. diff --git a/src/javaeva/server/stat/AbstractStatistics.java b/src/eva2/server/stat/AbstractStatistics.java similarity index 98% rename from src/javaeva/server/stat/AbstractStatistics.java rename to src/eva2/server/stat/AbstractStatistics.java index 7e969ad5..e40dd8b1 100644 --- a/src/javaeva/server/stat/AbstractStatistics.java +++ b/src/eva2/server/stat/AbstractStatistics.java @@ -1,4 +1,4 @@ -package javaeva.server.stat; +package eva2.server.stat; import java.io.FileOutputStream; import java.io.PrintWriter; @@ -7,11 +7,12 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import javaeva.gui.BeanInspector; -import javaeva.server.go.IndividualInterface; -import javaeva.server.go.PopulationInterface; -import javaeva.server.go.individuals.AbstractEAIndividual; -import javaeva.server.go.problems.InterfaceAdditionalPopulationInformer; +import eva2.gui.BeanInspector; +import eva2.server.go.IndividualInterface; +import eva2.server.go.PopulationInterface; +import eva2.server.go.individuals.AbstractEAIndividual; +import eva2.server.go.problems.InterfaceAdditionalPopulationInformer; + import wsi.ra.tool.StatisticUtils; public abstract class AbstractStatistics implements InterfaceTextListener, InterfaceStatistics { diff --git a/src/javaeva/server/stat/GenericStatistics.java b/src/eva2/server/stat/GenericStatistics.java similarity index 97% rename from src/javaeva/server/stat/GenericStatistics.java rename to src/eva2/server/stat/GenericStatistics.java index 82c21235..2a850a85 100644 --- a/src/javaeva/server/stat/GenericStatistics.java +++ b/src/eva2/server/stat/GenericStatistics.java @@ -1,4 +1,4 @@ -package javaeva.server.stat; +package eva2.server.stat; /* * Title: JavaEvA * Description: @@ -14,9 +14,10 @@ package javaeva.server.stat; *==========================================================================*/ import java.io.Serializable; import java.lang.reflect.Field; -import javaeva.gui.DataViewer; -import javaeva.gui.DataViewerInterface; -import javaeva.gui.Graph; + +import eva2.gui.DataViewer; +import eva2.gui.DataViewerInterface; +import eva2.gui.Graph; import wsi.ra.jproxy.MainAdapterClient; /** diff --git a/src/javaeva/server/stat/InterfaceStatistics.java b/src/eva2/server/stat/InterfaceStatistics.java similarity index 87% rename from src/javaeva/server/stat/InterfaceStatistics.java rename to src/eva2/server/stat/InterfaceStatistics.java index 7260f654..f4ec1d68 100644 --- a/src/javaeva/server/stat/InterfaceStatistics.java +++ b/src/eva2/server/stat/InterfaceStatistics.java @@ -1,4 +1,4 @@ -package javaeva.server.stat; +package eva2.server.stat; /* * Title: JavaEvA * Description: @@ -12,10 +12,10 @@ package javaeva.server.stat; /*==========================================================================* * IMPORTS *==========================================================================*/ -import javaeva.server.go.IndividualInterface; -import javaeva.server.go.InterfaceGOParameters; -import javaeva.server.go.PopulationInterface; -import javaeva.server.go.problems.InterfaceAdditionalPopulationInformer; +import eva2.server.go.IndividualInterface; +import eva2.server.go.InterfaceGOParameters; +import eva2.server.go.PopulationInterface; +import eva2.server.go.problems.InterfaceAdditionalPopulationInformer; /*==========================================================================* * INTERFACE DECLARATION *==========================================================================*/ diff --git a/src/javaeva/server/stat/InterfaceStatisticsParameter.java b/src/eva2/server/stat/InterfaceStatisticsParameter.java similarity index 97% rename from src/javaeva/server/stat/InterfaceStatisticsParameter.java rename to src/eva2/server/stat/InterfaceStatisticsParameter.java index a59596fb..c04802b1 100644 --- a/src/javaeva/server/stat/InterfaceStatisticsParameter.java +++ b/src/eva2/server/stat/InterfaceStatisticsParameter.java @@ -1,4 +1,4 @@ -package javaeva.server.stat; +package eva2.server.stat; /* * Title: JavaEvA * Description: @@ -14,7 +14,8 @@ package javaeva.server.stat; *==========================================================================*/ import java.util.List; -import javaeva.tools.SelectedTag; +import eva2.tools.SelectedTag; + /*==========================================================================* * INTERFACE DECLARATION *==========================================================================*/ diff --git a/src/javaeva/server/stat/InterfaceTextListener.java b/src/eva2/server/stat/InterfaceTextListener.java similarity index 79% rename from src/javaeva/server/stat/InterfaceTextListener.java rename to src/eva2/server/stat/InterfaceTextListener.java index 8c1c298c..a717e5cd 100644 --- a/src/javaeva/server/stat/InterfaceTextListener.java +++ b/src/eva2/server/stat/InterfaceTextListener.java @@ -1,4 +1,4 @@ -package javaeva.server.stat; +package eva2.server.stat; public interface InterfaceTextListener { public void print(String str); diff --git a/src/javaeva/server/stat/MovingAverage.java b/src/eva2/server/stat/MovingAverage.java similarity index 98% rename from src/javaeva/server/stat/MovingAverage.java rename to src/eva2/server/stat/MovingAverage.java index 87a2374b..6554d454 100644 --- a/src/javaeva/server/stat/MovingAverage.java +++ b/src/eva2/server/stat/MovingAverage.java @@ -1,4 +1,4 @@ -package javaeva.server.stat; +package eva2.server.stat; /* * Title: JavaEvA * Description: diff --git a/src/javaeva/server/stat/StatisticsStandalone.java b/src/eva2/server/stat/StatisticsStandalone.java similarity index 97% rename from src/javaeva/server/stat/StatisticsStandalone.java rename to src/eva2/server/stat/StatisticsStandalone.java index b33d49fc..93e46bc4 100644 --- a/src/javaeva/server/stat/StatisticsStandalone.java +++ b/src/eva2/server/stat/StatisticsStandalone.java @@ -1,4 +1,4 @@ -package javaeva.server.stat; +package eva2.server.stat; /* * Title: JavaEvA @@ -22,9 +22,10 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javaeva.server.go.InterfaceGOParameters; -import javaeva.server.go.PopulationInterface; -import javaeva.server.go.problems.InterfaceAdditionalPopulationInformer; +import eva2.server.go.InterfaceGOParameters; +import eva2.server.go.PopulationInterface; +import eva2.server.go.problems.InterfaceAdditionalPopulationInformer; + /* * ==========================================================================* diff --git a/src/javaeva/server/stat/StatisticsWithGUI.java b/src/eva2/server/stat/StatisticsWithGUI.java similarity index 96% rename from src/javaeva/server/stat/StatisticsWithGUI.java rename to src/eva2/server/stat/StatisticsWithGUI.java index dbee1b12..63566e64 100644 --- a/src/javaeva/server/stat/StatisticsWithGUI.java +++ b/src/eva2/server/stat/StatisticsWithGUI.java @@ -1,4 +1,4 @@ -package javaeva.server.stat; +package eva2.server.stat; /* * Title: JavaEvA @@ -18,15 +18,16 @@ import java.net.InetAddress; import java.util.ArrayList; import java.util.List; -import javaeva.gui.BeanInspector; -import javaeva.gui.Graph; -import javaeva.gui.GraphWindow; -import javaeva.gui.JTextoutputFrame; -import javaeva.gui.JTextoutputFrameInterface; -import javaeva.server.EvAServer; -import javaeva.server.go.PopulationInterface; -import javaeva.server.go.problems.InterfaceAdditionalPopulationInformer; -import javaeva.tools.EVAERROR; +import eva2.gui.BeanInspector; +import eva2.gui.Graph; +import eva2.gui.GraphWindow; +import eva2.gui.JTextoutputFrame; +import eva2.gui.JTextoutputFrameInterface; +import eva2.server.EvAServer; +import eva2.server.go.PopulationInterface; +import eva2.server.go.problems.InterfaceAdditionalPopulationInformer; +import eva2.tools.EVAERROR; + import wsi.ra.jproxy.MainAdapterClient; import wsi.ra.jproxy.RMIProxyLocal; import wsi.ra.jproxy.RMIProxyRemote; diff --git a/src/javaeva/server/stat/StatsParameter.java b/src/eva2/server/stat/StatsParameter.java similarity index 98% rename from src/javaeva/server/stat/StatsParameter.java rename to src/eva2/server/stat/StatsParameter.java index 3b429fc6..0503bac7 100644 --- a/src/javaeva/server/stat/StatsParameter.java +++ b/src/eva2/server/stat/StatsParameter.java @@ -1,4 +1,4 @@ -package javaeva.server.stat; +package eva2.server.stat; /* * Title: JavaEvA @@ -16,10 +16,11 @@ package javaeva.server.stat; import java.io.Serializable; import java.util.ArrayList; -import javaeva.gui.GenericObjectEditor; -import javaeva.tools.Serializer; -import javaeva.tools.Tag; -import javaeva.tools.SelectedTag; +import eva2.gui.GenericObjectEditor; +import eva2.tools.SelectedTag; +import eva2.tools.Serializer; +import eva2.tools.Tag; + /*==========================================================================* * CLASS DECLARATION diff --git a/src/javaeva/tools/Cluster.java b/src/eva2/tools/Cluster.java similarity index 98% rename from src/javaeva/tools/Cluster.java rename to src/eva2/tools/Cluster.java index 74a0338b..ab4b0ed9 100644 --- a/src/javaeva/tools/Cluster.java +++ b/src/eva2/tools/Cluster.java @@ -1,4 +1,4 @@ -package javaeva.tools; +package eva2.tools; /** * Title: JavaEvA * Description: diff --git a/src/javaeva/tools/CubicSpline.java b/src/eva2/tools/CubicSpline.java similarity index 99% rename from src/javaeva/tools/CubicSpline.java rename to src/eva2/tools/CubicSpline.java index e65baec3..939a43e2 100644 --- a/src/javaeva/tools/CubicSpline.java +++ b/src/eva2/tools/CubicSpline.java @@ -1,4 +1,4 @@ -package javaeva.tools; +package eva2.tools; /********************************************************** * diff --git a/src/javaeva/tools/EVAERROR.java b/src/eva2/tools/EVAERROR.java similarity index 71% rename from src/javaeva/tools/EVAERROR.java rename to src/eva2/tools/EVAERROR.java index e1fb40bc..0e3dcbbb 100644 --- a/src/javaeva/tools/EVAERROR.java +++ b/src/eva2/tools/EVAERROR.java @@ -1,4 +1,6 @@ -package javaeva.tools; +package eva2.tools; + +import java.util.HashMap; /** * Title: JavaEvA * Description: @@ -21,6 +23,7 @@ package javaeva.tools; public class EVAERROR { static boolean MAIL_ON_ERROR = false; static boolean MAIL_ON_WARNING = false; + transient static HashMap errMap = null; /** * */ @@ -56,4 +59,27 @@ public class EVAERROR { System.out.flush(); System.err.flush(); } + + /** + * Send a message only once to System.err. Once means that the msg is + * stored for the lifetime of the VM or until clearMsgCache() is called. + * + * @param msg + */ + static public void errorMsgOnce(String msg) { + if (errMap == null) errMap = new HashMap(); + + if (!errMap.containsKey(msg)) { + System.err.println(msg); + errMap.put(msg, new Boolean(true)); + } + } + + /** + * Clear the error message cache, so that any error messages are + * displayed at least once. + */ + static public void clearMsgCache() { + if (errMap != null) errMap.clear(); + } } diff --git a/src/javaeva/tools/EVAHELP.java b/src/eva2/tools/EVAHELP.java similarity index 98% rename from src/javaeva/tools/EVAHELP.java rename to src/eva2/tools/EVAHELP.java index 660fe94c..f50d4cac 100644 --- a/src/javaeva/tools/EVAHELP.java +++ b/src/eva2/tools/EVAHELP.java @@ -1,4 +1,4 @@ -package javaeva.tools; +package eva2.tools; /** * Title: JavaEvA * Description: @@ -21,7 +21,8 @@ import java.net.InetAddress; import java.util.Enumeration; import java.util.Properties; -import javaeva.client.EvAClient; +import eva2.client.EvAClient; + import wsi.ra.tool.BasicResourceLoader; diff --git a/src/javaeva/tools/EVAThread.java b/src/eva2/tools/EVAThread.java similarity index 99% rename from src/javaeva/tools/EVAThread.java rename to src/eva2/tools/EVAThread.java index da43ea79..8b8acb46 100644 --- a/src/javaeva/tools/EVAThread.java +++ b/src/eva2/tools/EVAThread.java @@ -1,4 +1,4 @@ -package javaeva.tools; +package eva2.tools; /** * Title: JavaEvA diff --git a/src/javaeva/tools/JPasswordDialog.java b/src/eva2/tools/JPasswordDialog.java similarity index 99% rename from src/javaeva/tools/JPasswordDialog.java rename to src/eva2/tools/JPasswordDialog.java index 90542a5b..a4713a09 100644 --- a/src/javaeva/tools/JPasswordDialog.java +++ b/src/eva2/tools/JPasswordDialog.java @@ -1,4 +1,4 @@ -package javaeva.tools; +package eva2.tools; import javax.swing.JDialog; import java.awt.HeadlessException; diff --git a/src/javaeva/tools/JarResources.java b/src/eva2/tools/JarResources.java similarity index 99% rename from src/javaeva/tools/JarResources.java rename to src/eva2/tools/JarResources.java index bfbf28f9..a0afe98a 100644 --- a/src/javaeva/tools/JarResources.java +++ b/src/eva2/tools/JarResources.java @@ -1,4 +1,4 @@ -package javaeva.tools; +package eva2.tools; /** * Title: JavaEvA * Description: diff --git a/src/javaeva/tools/KMEANSJAVA.java b/src/eva2/tools/KMEANSJAVA.java similarity index 99% rename from src/javaeva/tools/KMEANSJAVA.java rename to src/eva2/tools/KMEANSJAVA.java index ace87717..3df10ade 100644 --- a/src/javaeva/tools/KMEANSJAVA.java +++ b/src/eva2/tools/KMEANSJAVA.java @@ -1,4 +1,4 @@ -package javaeva.tools; +package eva2.tools; /** * Title: JavaEvA * Description: diff --git a/src/javaeva/tools/LogProxy.java b/src/eva2/tools/LogProxy.java similarity index 99% rename from src/javaeva/tools/LogProxy.java rename to src/eva2/tools/LogProxy.java index ac69fc99..52686a72 100644 --- a/src/javaeva/tools/LogProxy.java +++ b/src/eva2/tools/LogProxy.java @@ -1,4 +1,4 @@ -package javaeva.tools; +package eva2.tools; import java.io.Serializable; diff --git a/src/javaeva/tools/Mathematics.java b/src/eva2/tools/Mathematics.java similarity index 99% rename from src/javaeva/tools/Mathematics.java rename to src/eva2/tools/Mathematics.java index b0bcca05..513f9f98 100644 --- a/src/javaeva/tools/Mathematics.java +++ b/src/eva2/tools/Mathematics.java @@ -1,4 +1,4 @@ -package javaeva.tools; +package eva2.tools; import java.util.Arrays; import wsi.ra.math.interpolation.BasicDataSet; diff --git a/src/javaeva/tools/MultirunRefiner.java b/src/eva2/tools/MultirunRefiner.java similarity index 99% rename from src/javaeva/tools/MultirunRefiner.java rename to src/eva2/tools/MultirunRefiner.java index dc6e20f4..cadcdadb 100644 --- a/src/javaeva/tools/MultirunRefiner.java +++ b/src/eva2/tools/MultirunRefiner.java @@ -4,7 +4,7 @@ * Created on 8. Oktober 2002, 09:47 */ -package javaeva.tools; +package eva2.tools; import java.awt.*; import java.awt.event.*; diff --git a/src/javaeva/tools/Pair.java b/src/eva2/tools/Pair.java similarity index 94% rename from src/javaeva/tools/Pair.java rename to src/eva2/tools/Pair.java index 042747b9..2dd5aba4 100644 --- a/src/javaeva/tools/Pair.java +++ b/src/eva2/tools/Pair.java @@ -1,4 +1,4 @@ -package javaeva.tools; +package eva2.tools; /** * Simple pair structure of two types, Scheme style, but typed. diff --git a/src/javaeva/tools/ReflectPackage.java b/src/eva2/tools/ReflectPackage.java similarity index 98% rename from src/javaeva/tools/ReflectPackage.java rename to src/eva2/tools/ReflectPackage.java index cd59bfa4..139a68e3 100644 --- a/src/javaeva/tools/ReflectPackage.java +++ b/src/eva2/tools/ReflectPackage.java @@ -1,4 +1,4 @@ -package javaeva.tools; +package eva2.tools; import java.io.File; import java.io.FileInputStream; @@ -321,8 +321,8 @@ public class ReflectPackage { public static void main(String[] args) { ClassLoader cld = Thread.currentThread().getContextClassLoader(); - System.out.println("1: " + cld.getResource("/javaeva/server")); - System.out.println("2: " + cld.getResource("javaeva/server")); + System.out.println("1: " + cld.getResource("/eva2/server")); + System.out.println("2: " + cld.getResource("eva2/server")); // BasicResourceLoader rld = BasicResourceLoader.instance(); // byte[] b = rld.getBytesFromResourceLocation("resources/images/Sub24.gif"); // System.out.println((b == null) ? "null" : b.toString()); diff --git a/src/javaeva/tools/SelectedTag.java b/src/eva2/tools/SelectedTag.java similarity index 99% rename from src/javaeva/tools/SelectedTag.java rename to src/eva2/tools/SelectedTag.java index 9384c2cc..43cd1a75 100644 --- a/src/javaeva/tools/SelectedTag.java +++ b/src/eva2/tools/SelectedTag.java @@ -1,4 +1,4 @@ -package javaeva.tools; +package eva2.tools; /** * This serves as activation state of one item in an array of Tags diff --git a/src/javaeva/tools/Serializer.java b/src/eva2/tools/Serializer.java similarity index 99% rename from src/javaeva/tools/Serializer.java rename to src/eva2/tools/Serializer.java index 16d37240..91298df9 100644 --- a/src/javaeva/tools/Serializer.java +++ b/src/eva2/tools/Serializer.java @@ -1,4 +1,4 @@ -package javaeva.tools; +package eva2.tools; /** * Title: JavaEvA * Description: diff --git a/src/javaeva/tools/ServerPingThread.java b/src/eva2/tools/ServerPingThread.java similarity index 93% rename from src/javaeva/tools/ServerPingThread.java rename to src/eva2/tools/ServerPingThread.java index 2637ee98..b88d376c 100644 --- a/src/javaeva/tools/ServerPingThread.java +++ b/src/eva2/tools/ServerPingThread.java @@ -1,11 +1,12 @@ -package javaeva.tools; +package eva2.tools; -import javaeva.server.EvAMainAdapter; import java.util.StringTokenizer; import wsi.ra.jproxy.RMIInvocationHandler; -import javaeva.server.EvAMainAdapterImpl; import java.rmi.Naming; +import eva2.server.EvAMainAdapter; +import eva2.server.EvAMainAdapterImpl; + /** *

Title: The JavaEvA

*

Description:

diff --git a/src/javaeva/tools/StringTools.java b/src/eva2/tools/StringTools.java similarity index 98% rename from src/javaeva/tools/StringTools.java rename to src/eva2/tools/StringTools.java index e9e09e11..0c50301c 100644 --- a/src/javaeva/tools/StringTools.java +++ b/src/eva2/tools/StringTools.java @@ -1,4 +1,4 @@ -package javaeva.tools; +package eva2.tools; import java.util.StringTokenizer; diff --git a/src/javaeva/tools/TXTFileFilter.java b/src/eva2/tools/TXTFileFilter.java similarity index 97% rename from src/javaeva/tools/TXTFileFilter.java rename to src/eva2/tools/TXTFileFilter.java index 34aad2fc..9292e7da 100644 --- a/src/javaeva/tools/TXTFileFilter.java +++ b/src/eva2/tools/TXTFileFilter.java @@ -4,7 +4,7 @@ * Created on 8. Oktober 2002, 14:20 */ -package javaeva.tools; +package eva2.tools; import javax.swing.filechooser.FileFilter; diff --git a/src/javaeva/tools/Tag.java b/src/eva2/tools/Tag.java similarity index 97% rename from src/javaeva/tools/Tag.java rename to src/eva2/tools/Tag.java index 72a5fbde..e5c323fb 100644 --- a/src/javaeva/tools/Tag.java +++ b/src/eva2/tools/Tag.java @@ -1,4 +1,4 @@ -package javaeva.tools; +package eva2.tools; /** * Title: JavaEvA * Description: diff --git a/src/javaeva/tools/TokenHolder.java b/src/eva2/tools/TokenHolder.java similarity index 99% rename from src/javaeva/tools/TokenHolder.java rename to src/eva2/tools/TokenHolder.java index 03394682..5e81c3a7 100644 --- a/src/javaeva/tools/TokenHolder.java +++ b/src/eva2/tools/TokenHolder.java @@ -1,4 +1,4 @@ -package javaeva.tools; +package eva2.tools; /** * Title: JavaEvA diff --git a/src/javaeva/tools/URLGetter.java b/src/eva2/tools/URLGetter.java similarity index 98% rename from src/javaeva/tools/URLGetter.java rename to src/eva2/tools/URLGetter.java index 0f191ad8..3d3a57ae 100644 --- a/src/javaeva/tools/URLGetter.java +++ b/src/eva2/tools/URLGetter.java @@ -1,4 +1,4 @@ -package javaeva.tools; +package eva2.tools; import java.net.*; import java.io.BufferedReader; import java.io.InputStreamReader; diff --git a/src/wsi/ra/jproxy/ComAdapter.java b/src/wsi/ra/jproxy/ComAdapter.java index adaab4ba..31a60f67 100644 --- a/src/wsi/ra/jproxy/ComAdapter.java +++ b/src/wsi/ra/jproxy/ComAdapter.java @@ -21,7 +21,8 @@ import java.util.ArrayList; import java.util.Properties; import java.util.StringTokenizer; -import javaeva.tools.Serializer; +import eva2.tools.Serializer; + /** * diff --git a/src/wsi/ra/jproxy/MainAdapterImpl.java b/src/wsi/ra/jproxy/MainAdapterImpl.java index 815bf113..67a4e4b7 100644 --- a/src/wsi/ra/jproxy/MainAdapterImpl.java +++ b/src/wsi/ra/jproxy/MainAdapterImpl.java @@ -46,10 +46,9 @@ public class MainAdapterImpl implements MainAdapter { public void restartServer() { System.out.println("Received message to restartServer !!!!"); try { - String Out =""; - String command = "java -cp .:../lib/jdom.jar:../lib/log4j.jar javaeva.server.EvAServer &"; + String command = "java -cp . eva2.server.EvAServer &"; - System.out.println("Calling the command:"+"java javaeva.server.EvAServer"); + System.out.println("Calling the command:"+"java eva2.server.EvAServer"); Process pro = Runtime.getRuntime().exec(command); BufferedReader in = new BufferedReader ( new InputStreamReader (pro.getInputStream())); // String line = null;