- moved everything in wsi.* to eva2.tools.*

- fixed bug in thread-parallel AbstractOptimization problem (ArrayList -> Vector)

src/eva2/OptimizerRunnable.java

@@ -4,7 +4,6 @@ import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.BitSet;
 
-import wsi.ra.jproxy.RemoteStateListener;
 
 import eva2.server.go.IndividualInterface;
 import eva2.server.go.InterfaceGOParameters;
@@ -23,6 +22,7 @@ import eva2.server.stat.StatisticsDummy;
 import eva2.server.stat.InterfaceTextListener;
 import eva2.server.stat.StatisticsStandalone;
 import eva2.server.stat.StatsParameter;
+import eva2.tools.jproxy.RemoteStateListener;
 
 
 /**

src/eva2/client/EvAClient.java

@@ -51,8 +51,6 @@ import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.event.MenuEvent;
 import javax.swing.event.MenuListener;
 
-import wsi.ra.jproxy.RemoteStateListener;
-import wsi.ra.tool.BasicResourceLoader;
 import eva2.EvAInfo;
 import eva2.gui.BeanInspector;
 import eva2.gui.ExtAction;
@@ -72,6 +70,8 @@ import eva2.tools.EVAHELP;
 import eva2.tools.ReflectPackage;
 import eva2.tools.Serializer;
 import eva2.tools.StringTools;
+import eva2.tools.jproxy.RemoteStateListener;
+import eva2.tools.tool.BasicResourceLoader;
 
 /**
  *

src/eva2/client/EvAComAdapter.java

@@ -23,14 +23,14 @@ import eva2.server.EvAMainAdapter;
 import eva2.server.EvAMainAdapterImpl;
 import eva2.server.RMIServerEvA;
 import eva2.server.modules.ModuleAdapter;
+import eva2.tools.jproxy.ComAdapter;
+import eva2.tools.jproxy.MainAdapter;
+import eva2.tools.jproxy.MainAdapterClient;
+import eva2.tools.jproxy.MainAdapterClientImpl;
+import eva2.tools.jproxy.RMIConnection;
+import eva2.tools.jproxy.RMIInvocationHandler;
+import eva2.tools.jproxy.RMIProxyLocal;
 
-import wsi.ra.jproxy.ComAdapter;
-import wsi.ra.jproxy.MainAdapter;
-import wsi.ra.jproxy.MainAdapterClient;
-import wsi.ra.jproxy.MainAdapterClientImpl;
-import wsi.ra.jproxy.RMIConnection;
-import wsi.ra.jproxy.RMIInvocationHandler;
-import wsi.ra.jproxy.RMIProxyLocal;
 /*==========================================================================*
  * CLASS DECLARATION
  *==========================================================================*/

src/eva2/client/RMIConnectionEvA.java

@@ -5,10 +5,10 @@ import java.net.UnknownHostException;
 
 import eva2.server.EvAMainAdapter;
 import eva2.server.modules.ModuleAdapter;
+import eva2.tools.jproxy.MainAdapter;
+import eva2.tools.jproxy.MainAdapterClient;
+import eva2.tools.jproxy.RMIConnection;
 
-import wsi.ra.jproxy.MainAdapter;
-import wsi.ra.jproxy.MainAdapterClient;
-import wsi.ra.jproxy.RMIConnection;
 
 /**
  *

src/eva2/gui/Chart2DDPointContentSelectable.java

@@ -1,13 +1,13 @@
 package eva2.gui;
 
-import wsi.ra.chart2d.DPointIcon;
-import wsi.ra.chart2d.DBorder;
 
 import javax.swing.*;
 
 import eva2.server.go.individuals.AbstractEAIndividual;
 import eva2.server.go.mocco.paretofrontviewer.InterfaceRefSolutionListener;
 import eva2.server.go.problems.InterfaceOptimizationProblem;
+import eva2.tools.chart2d.DBorder;
+import eva2.tools.chart2d.DPointIcon;
 
 import java.awt.*;
 import java.awt.event.WindowAdapter;

src/eva2/gui/Chart2DDPointIconCircle.java

@@ -1,9 +1,10 @@
 package eva2.gui;
 
-import wsi.ra.chart2d.DPointIcon;
-import wsi.ra.chart2d.DBorder;
 import java.awt.*;
 
+import eva2.tools.chart2d.DBorder;
+import eva2.tools.chart2d.DPointIcon;
+
 /**
  * Created by IntelliJ IDEA.
  * User: streiche

src/eva2/gui/Chart2DDPointIconContent.java

@@ -1,7 +1,5 @@
 package eva2.gui;
 
-import wsi.ra.chart2d.DBorder;
-import wsi.ra.chart2d.DPointIcon;
 
 import java.awt.*;
 import java.awt.event.WindowAdapter;
@@ -12,6 +10,8 @@ import javax.swing.*;
 
 import eva2.server.go.individuals.AbstractEAIndividual;
 import eva2.server.go.problems.InterfaceOptimizationProblem;
+import eva2.tools.chart2d.DBorder;
+import eva2.tools.chart2d.DPointIcon;
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/gui/Chart2DDPointIconCross.java

@@ -1,10 +1,11 @@
 package eva2.gui;
 
-import wsi.ra.chart2d.DBorder;
-import wsi.ra.chart2d.DPointIcon;
 
 import java.awt.*;
 
+import eva2.tools.chart2d.DBorder;
+import eva2.tools.chart2d.DPointIcon;
+
 /**
  * Created by IntelliJ IDEA.
  * User: streiche

src/eva2/gui/Chart2DDPointIconPoint.java

@@ -1,10 +1,11 @@
 package eva2.gui;
 
-import wsi.ra.chart2d.DPointIcon;
-import wsi.ra.chart2d.DBorder;
 
 import java.awt.*;
 
+import eva2.tools.chart2d.DBorder;
+import eva2.tools.chart2d.DPointIcon;
+
 /**
  * Created by IntelliJ IDEA.
  * User: streiche

src/eva2/gui/Chart2DDPointIconText.java

@@ -1,10 +1,11 @@
 package eva2.gui;
 
-import wsi.ra.chart2d.DPointIcon;
-import wsi.ra.chart2d.DBorder;
 
 import java.awt.*;
 
+import eva2.tools.chart2d.DBorder;
+import eva2.tools.chart2d.DPointIcon;
+
 /**
  * Created by IntelliJ IDEA.
  * User: streiche

src/eva2/gui/DPointSetMultiIcon.java

@@ -1,13 +1,14 @@
 package eva2.gui;
 
-import wsi.ra.chart2d.*;
 
-import wsi.ra.tool.IntegerArrayList;
 
 import java.awt.*;
 
 import java.util.ArrayList;
 
+import eva2.tools.chart2d.*;
+import eva2.tools.tool.IntegerArrayList;
+
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/gui/DataViewer.java

@@ -15,8 +15,9 @@ package eva2.gui;
 import java.net.InetAddress;
 import java.util.ArrayList;
 
-import wsi.ra.jproxy.MainAdapterClient;
+import eva2.tools.jproxy.MainAdapterClient;
-import wsi.ra.jproxy.RMIProxyRemote;
+import eva2.tools.jproxy.RMIProxyRemote;
+
 /*==========================================================================*
  * CLASS DECLARATION
  *==========================================================================*/

src/eva2/gui/EvAModuleButtonPanelMaker.java

@@ -24,8 +24,6 @@ import javax.swing.JFrame;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 
-import wsi.ra.jproxy.RMIProxyLocal;
-import wsi.ra.jproxy.RemoteStateListener;
 import eva2.server.go.InterfaceGOParameters;
 import eva2.server.go.individuals.AbstractEAIndividual;
 import eva2.server.go.populations.Population;
@@ -33,6 +31,8 @@ import eva2.server.go.problems.InterfaceOptimizationProblem;
 import eva2.server.go.strategies.InterfaceOptimizer;
 import eva2.server.modules.AbstractModuleAdapter;
 import eva2.server.modules.ModuleAdapter;
+import eva2.tools.jproxy.RMIProxyLocal;
+import eva2.tools.jproxy.RemoteStateListener;
 
 /**
  * Contains the GUI elements of start and stop buttons and optionally a help button.

src/eva2/gui/Exp.java

@@ -12,10 +12,7 @@ package eva2.gui;
 /*==========================================================================*
  * IMPORTS
  *==========================================================================*/
-import wsi.ra.chart2d.DFunction;
+import eva2.tools.chart2d.DFunction;
-/*==========================================================================*
- * CLASS DECLARATION
- *==========================================================================*/
 
 /**
  *

src/eva2/gui/FunctionArea.java

@@ -37,13 +37,13 @@ import javax.swing.JPopupMenu;
 
 import eva2.server.go.individuals.AbstractEAIndividual;
 import eva2.server.go.mocco.paretofrontviewer.InterfaceRefPointListener;
+import eva2.tools.chart2d.DArea;
+import eva2.tools.chart2d.DBorder;
+import eva2.tools.chart2d.DPoint;
+import eva2.tools.chart2d.DPointIcon;
+import eva2.tools.chart2d.DPointSet;
+import eva2.tools.chart2d.ScaledBorder;
 
-import wsi.ra.chart2d.DArea;
-import wsi.ra.chart2d.DBorder;
-import wsi.ra.chart2d.DPoint;
-import wsi.ra.chart2d.DPointIcon;
-import wsi.ra.chart2d.DPointSet;
-import wsi.ra.chart2d.ScaledBorder;
 
 /*==========================================================================*
  * CLASS DECLARATION

src/eva2/gui/GOEPanel.java

@@ -29,9 +29,9 @@ import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 
-import wsi.ra.jproxy.RMIProxyLocal;
 import eva2.server.go.tools.FileTools;
 import eva2.tools.EVAHELP;
+import eva2.tools.jproxy.RMIProxyLocal;
 /**
 *
 */

src/eva2/gui/GenericObjectEditor.java

@@ -58,8 +58,8 @@ import eva2.EvAInfo;
 import eva2.client.EvAClient;
 import eva2.tools.EVAHELP;
 import eva2.tools.ReflectPackage;
+import eva2.tools.jproxy.RMIProxyLocal;
 
-import wsi.ra.jproxy.RMIProxyLocal;
 
 
 /*==========================================================================*

src/eva2/gui/GenericOptimizationObjectivesEditor.java

@@ -6,12 +6,12 @@ import javax.swing.*;
 import eva2.server.go.problems.InterfaceOptimizationObjective;
 import eva2.server.go.problems.InterfaceOptimizationTarget;
 import eva2.server.go.tools.GeneralGOEProperty;
+import eva2.tools.tool.BasicResourceLoader;
 
 import java.beans.*;
 import java.awt.*;
 import java.awt.event.*;
 
-import wsi.ra.tool.BasicResourceLoader;
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/gui/GenericOptimizationObjectivesWithParamEditor.java

@@ -5,6 +5,7 @@ import javax.swing.*;
 
 import eva2.server.go.problems.InterfaceOptimizationObjective;
 import eva2.server.go.tools.GeneralGOEProperty;
+import eva2.tools.tool.BasicResourceLoader;
 
 import java.beans.*;
 import java.awt.*;
@@ -13,7 +14,6 @@ import java.awt.event.ActionEvent;
 import java.awt.event.KeyListener;
 import java.awt.event.KeyEvent;
 
-import wsi.ra.tool.BasicResourceLoader;
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/gui/GenericRemoteServersEditor.java

@@ -1,10 +1,10 @@
 package eva2.gui;
 
-import wsi.ra.tool.BasicResourceLoader;
 
 import javax.swing.*;
 
 import eva2.server.go.SwingWorker;
+import eva2.tools.tool.BasicResourceLoader;
 
 import java.beans.PropertyEditor;
 import java.beans.PropertyChangeSupport;

src/eva2/gui/GraphPointSet.java

@@ -12,7 +12,6 @@ package eva2.gui;
 /*==========================================================================*
  * IMPORTS
  *==========================================================================*/
-import wsi.ra.chart2d.*;
 
 import java.awt.Color;
 import java.awt.Graphics;
@@ -22,6 +21,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 
 import eva2.tools.Mathematics;
+import eva2.tools.chart2d.*;
  /*==========================================================================*
  * CLASS DECLARATION
  *==========================================================================*/

src/eva2/gui/GraphPointSetLegend.java

@@ -13,8 +13,8 @@ import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 
-import wsi.ra.chart2d.SlimRect;
 import eva2.tools.Pair;
+import eva2.tools.chart2d.SlimRect;
 
 /**
  * A class representing the legend of a plot. It is created from a list of GraphPointSets as

src/eva2/gui/GraphWindow.java

@@ -15,8 +15,9 @@ package eva2.gui;
 import java.net.InetAddress;
 import java.util.ArrayList;
 
-import wsi.ra.jproxy.MainAdapterClient;
+import eva2.tools.jproxy.MainAdapterClient;
-import wsi.ra.jproxy.RMIProxyRemote;
+import eva2.tools.jproxy.RMIProxyRemote;
+
 /*==========================================================================*
  * CLASS DECLARATION
  *==========================================================================*/

src/eva2/gui/HtmlDemo.java

@@ -28,9 +28,9 @@ import javax.swing.event.HyperlinkListener;
 import javax.swing.text.html.HTMLDocument;
 import javax.swing.text.html.HTMLFrameHyperlinkEvent;
 
-import wsi.ra.tool.BasicResourceLoader;
 import eva2.EvAInfo;
 import eva2.client.EvAClient;
+import eva2.tools.tool.BasicResourceLoader;
 /**
  *
  */

src/eva2/gui/JTextoutputFrame.java

@@ -36,9 +36,9 @@ import javax.swing.JViewport;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
-import wsi.ra.tool.BasicResourceLoader;
 import eva2.EvAInfo;
 import eva2.server.go.tools.FileTools;
+import eva2.tools.tool.BasicResourceLoader;
 /*==========================================================================*
  * CLASS DECLARATION
  *==========================================================================*/

src/eva2/gui/LogPanel.java

@@ -29,8 +29,8 @@ import javax.swing.JViewport;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
-import wsi.ra.tool.BasicResourceLoader;
 import eva2.EvAInfo;
+import eva2.tools.tool.BasicResourceLoader;
 /*==========================================================================*
  * CLASS DECLARATION
  *==========================================================================*/

src/eva2/gui/Plot.java

@@ -39,13 +39,13 @@ import javax.swing.JFrame;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 
-import wsi.ra.chart2d.DPointSet;
-import wsi.ra.tool.BasicResourceLoader;
 
 import com.sun.image.codec.jpeg.JPEGCodec;
 import com.sun.image.codec.jpeg.JPEGImageEncoder;
 
 import eva2.EvAInfo;
+import eva2.tools.chart2d.DPointSet;
+import eva2.tools.tool.BasicResourceLoader;
 /*==========================================================================*
  * CLASS DECLARATION
  *==========================================================================*/

src/eva2/gui/PropertyDialog.java

@@ -19,9 +19,9 @@ import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.beans.PropertyEditor;
 
-import wsi.ra.tool.BasicResourceLoader;
 import eva2.EvAInfo;
 import eva2.tools.EVAHELP;
+import eva2.tools.tool.BasicResourceLoader;
 /*==========================================================================*
 * CLASS DECLARATION
 *==========================================================================*/

src/eva2/gui/PropertyRemoteServers.java

@@ -3,7 +3,8 @@ package eva2.gui;
 import java.rmi.Naming;
 import java.util.ArrayList;
 
-import wsi.ra.jproxy.RMIInvocationHandler;
+import eva2.tools.jproxy.RMIInvocationHandler;
+
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/gui/TagEditor.java

@@ -22,10 +22,10 @@ import java.beans.PropertyEditorSupport;
 
 import javax.swing.JFrame;
 
-import wsi.ra.tool.BasicResourceLoader;
 import eva2.EvAInfo;
 import eva2.tools.SelectedTag;
 import eva2.tools.Tag;
+import eva2.tools.tool.BasicResourceLoader;
 /*==========================================================================*
 * CLASS DECLARATION
 *==========================================================================*/

src/eva2/gui/TopoPlot.java

@@ -12,13 +12,13 @@ package eva2.gui;
 /*==========================================================================*
  * IMPORTS
  *==========================================================================*/
-import wsi.ra.chart2d.*;
 import java.awt.*;
 
 import eva2.server.go.problems.Interface2DBorderProblem;
 import eva2.tools.Mathematics;
+import eva2.tools.chart2d.*;
+import eva2.tools.diagram.ColorBarCalculator;
 
-import wsi.ra.diagram.ColorBarCalculator;
 
 /*==========================================================================*
  * CLASS DECLARATION

src/eva2/server/EvAMainAdapter.java

@@ -13,8 +13,8 @@ package eva2.server;
  *==========================================================================*/
 
 import eva2.server.modules.ModuleAdapter;
-import wsi.ra.jproxy.MainAdapter;
+import eva2.tools.jproxy.MainAdapter;
-import wsi.ra.jproxy.MainAdapterClient;
+import eva2.tools.jproxy.MainAdapterClient;
 /*==========================================================================*
 * INTERFACE DECLARATION
 *==========================================================================*/

src/eva2/server/EvAMainAdapterImpl.java

@@ -14,8 +14,8 @@ package eva2.server;
  *==========================================================================*/
 import eva2.client.EvAClient;
 import eva2.server.modules.ModuleAdapter;
-import wsi.ra.jproxy.MainAdapterClient;
+import eva2.tools.jproxy.MainAdapterClient;
-import wsi.ra.jproxy.MainAdapterImpl;
+import eva2.tools.jproxy.MainAdapterImpl;
 /*==========================================================================*
 * CLASS DECLARATION
 *==========================================================================*/

src/eva2/server/ModuleServer.java

@@ -18,12 +18,12 @@ import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Properties;
 
-import wsi.ra.jproxy.MainAdapterClient;
-import wsi.ra.jproxy.RMIProxyLocal;
 import eva2.server.modules.GOModuleAdapter;
 import eva2.server.modules.ModuleAdapter;
 import eva2.tools.EVAERROR;
 import eva2.tools.ReflectPackage;
+import eva2.tools.jproxy.MainAdapterClient;
+import eva2.tools.jproxy.RMIProxyLocal;
 
 /*==========================================================================*
  * CLASS DECLARATION

src/eva2/server/RMIServerEvA.java

@@ -11,8 +11,8 @@ package eva2.server;
 /*==========================================================================*
  * IMPORTS
  *==========================================================================*/
-import wsi.ra.jproxy.RMIProxyLocal;
+import eva2.tools.jproxy.RMIProxyLocal;
-import wsi.ra.jproxy.RMIServer;
+import eva2.tools.jproxy.RMIServer;
 
 /**
  *

src/eva2/server/go/GOStandaloneVersion.java

@@ -25,8 +25,6 @@ import javax.swing.JProgressBar;
 import javax.swing.JTabbedPane;
 import javax.swing.SwingUtilities;
 
-import wsi.ra.jproxy.ThreadProxy;
-import wsi.ra.math.RNG;
 import eva2.client.EvAClient;
 import eva2.gui.JParaPanel;
 import eva2.server.go.individuals.AbstractEAIndividual;
@@ -46,6 +44,8 @@ import eva2.server.go.strategies.GeneticAlgorithm;
 import eva2.server.go.strategies.InterfaceOptimizer;
 import eva2.server.modules.GOParameters;
 import eva2.tools.TokenHolder;
+import eva2.tools.jproxy.ThreadProxy;
+import eva2.tools.math.RNG;
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/server/go/InterfaceProcessor.java

@@ -1,6 +1,6 @@
 package eva2.server.go;
 
-import wsi.ra.jproxy.RemoteStateListener;
+import eva2.tools.jproxy.RemoteStateListener;
 
 /*
  * Title:        EvA2

src/eva2/server/go/MOCCOStandalone.java

@@ -32,13 +32,13 @@ 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 eva2.tools.jproxy.ThreadProxy;
 
 import java.io.*;
 import java.awt.*;
 import java.awt.event.*;
 import java.util.ArrayList;
 
-import wsi.ra.jproxy.ThreadProxy;
 
 /*import wsi.ra.jproxy.test.Something;
 import wsi.ra.jproxy.test.SomethingInterface;*/

src/eva2/server/go/individuals/AbstractEAIndividual.java

@@ -6,7 +6,6 @@ import java.util.BitSet;
 import java.util.HashMap;
 import java.util.List;
 
-import wsi.ra.math.RNG;
 import eva2.gui.BeanInspector;
 import eva2.server.go.IndividualInterface;
 import eva2.server.go.individuals.codings.gp.InterfaceProgram;
@@ -18,6 +17,7 @@ import eva2.server.go.operators.mutation.NoMutation;
 import eva2.server.go.populations.Population;
 import eva2.server.go.problems.InterfaceOptimizationProblem;
 import eva2.tools.EVAERROR;
+import eva2.tools.math.RNG;
 
 /** This is the abstract EA individual implementing the most important methods giving
  * access to mutation and crossover rates and operators, fitness values and selection

src/eva2/server/go/individuals/ESIndividualBinaryData.java

@@ -2,11 +2,11 @@ package eva2.server.go.individuals;
 
 import java.util.BitSet;
 
-import wsi.ra.math.RNG;
 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.tools.math.RNG;
 
 
 /** This individual uses a real-valued genotype to code for binary values, either

src/eva2/server/go/individuals/ESIndividualDoubleData.java

@@ -1,13 +1,13 @@
 package eva2.server.go.individuals;
 
 
-import wsi.ra.math.RNG;
 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.tools.EVAERROR;
 import eva2.tools.Mathematics;
+import eva2.tools.math.RNG;
 
 /** This individual uses a real-valued genotype to code for double values.
  * Created by IntelliJ IDEA.

src/eva2/server/go/individuals/ESIndividualIntegerData.java

@@ -8,7 +8,7 @@ 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 wsi.ra.math.RNG;
+import eva2.tools.math.RNG;
 
 /** This individual uses a real-valued genotype to code for integer values.
  * Created by IntelliJ IDEA.

src/eva2/server/go/individuals/ESIndividualPermutationData.java

@@ -5,7 +5,7 @@ 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 wsi.ra.math.RNG;
+import eva2.tools.math.RNG;
 
 /** 
  * This individual uses a real-valued genotype to code for a permutations,

src/eva2/server/go/individuals/GAESIndividualBinaryDoubleData.java

@@ -6,7 +6,7 @@ import java.util.BitSet;
 import eva2.server.go.operators.mutation.InterfaceMutation;
 import eva2.server.go.populations.Population;
 import eva2.server.go.problems.InterfaceOptimizationProblem;
-import wsi.ra.math.RNG;
+import eva2.tools.math.RNG;
 
 /** This individual combines a binary and a real-valued phenotype.
  * Created by IntelliJ IDEA.

src/eva2/server/go/individuals/GAIndividualBinaryData.java

@@ -3,11 +3,11 @@ package eva2.server.go.individuals;
 
 import java.util.BitSet;
 
-import wsi.ra.math.RNG;
 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.tools.math.RNG;
 
 /** This individual uses a binary genotype to code for binary values.
  * Created by IntelliJ IDEA.

src/eva2/server/go/individuals/GAIndividualDoubleData.java

@@ -3,13 +3,13 @@ package eva2.server.go.individuals;
 
 import java.util.BitSet;
 
-import wsi.ra.math.RNG;
 import eva2.server.go.individuals.codings.ga.GAStandardCodingDouble;
 import eva2.server.go.individuals.codings.ga.InterfaceGADoubleCoding;
 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.tools.math.RNG;
 
 /** This individual uses a binary genotype to code for double values
  * using two alternative encodings.

src/eva2/server/go/individuals/GAIndividualIntegerData.java

@@ -11,7 +11,7 @@ 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 wsi.ra.math.RNG;
+import eva2.tools.math.RNG;
 
 /** This individual uses a binary genotype to code for binary values using
  * two alternative encodings.

src/eva2/server/go/individuals/GAPIndividualProgramData.java

@@ -1,11 +1,11 @@
 package eva2.server.go.individuals;
 
 
-import wsi.ra.math.RNG;
 import eva2.server.go.individuals.codings.gp.InterfaceProgram;
 import eva2.server.go.operators.mutation.InterfaceMutation;
 import eva2.server.go.populations.Population;
 import eva2.server.go.problems.InterfaceOptimizationProblem;
+import eva2.tools.math.RNG;
 
 /** This individual combines a real-valued phenotype with a tree-based phenotype.
  * Created by IntelliJ IDEA.

src/eva2/server/go/individuals/GEIndividualProgramData.java

@@ -4,7 +4,6 @@ package eva2.server.go.individuals;
 import java.util.ArrayList;
 import java.util.BitSet;
 
-import wsi.ra.math.RNG;
 import eva2.server.go.individuals.codings.gp.AbstractGPNode;
 import eva2.server.go.individuals.codings.gp.GPArea;
 import eva2.server.go.individuals.codings.gp.InterfaceProgram;
@@ -12,6 +11,7 @@ import eva2.server.go.operators.crossover.CrossoverGADefault;
 import eva2.server.go.operators.mutation.InterfaceMutation;
 import eva2.server.go.operators.mutation.MutateDefault;
 import eva2.server.go.problems.InterfaceOptimizationProblem;
+import eva2.tools.math.RNG;
 
 /** This individual uses a binary genotype to code for a tree-based representation
  * using a BNF grammar, see also Grammatical Evolution.

src/eva2/server/go/individuals/GIIndividualIntegerData.java

@@ -1,10 +1,10 @@
 package eva2.server.go.individuals;
 
-import wsi.ra.math.RNG;
 import eva2.server.go.operators.crossover.CrossoverGIDefault;
 import eva2.server.go.operators.mutation.InterfaceMutation;
 import eva2.server.go.operators.mutation.MutateDefault;
 import eva2.server.go.problems.InterfaceOptimizationProblem;
+import eva2.tools.math.RNG;
 
 /** This individual uses a integer genotype to code for integer values.
  * Created by IntelliJ IDEA.

src/eva2/server/go/individuals/GIOBGAIndividualIntegerPermutationData.java

@@ -6,7 +6,7 @@ import java.util.BitSet;
 import eva2.server.go.operators.mutation.InterfaceMutation;
 import eva2.server.go.populations.Population;
 import eva2.server.go.problems.InterfaceOptimizationProblem;
-import wsi.ra.math.RNG;
+import eva2.tools.math.RNG;
 
 /** This individual combines a binary and a real-valued phenotype.
  * Created by IntelliJ IDEA.

src/eva2/server/go/individuals/GPIndividualProgramData.java

@@ -3,7 +3,6 @@ package eva2.server.go.individuals;
 
 import java.util.ArrayList;
 
-import wsi.ra.math.RNG;
 import eva2.server.go.individuals.codings.gp.AbstractGPNode;
 import eva2.server.go.individuals.codings.gp.GPArea;
 import eva2.server.go.individuals.codings.gp.InterfaceProgram;
@@ -12,6 +11,7 @@ import eva2.server.go.operators.mutation.InterfaceMutation;
 import eva2.server.go.operators.mutation.MutateDefault;
 import eva2.server.go.problems.InterfaceOptimizationProblem;
 import eva2.tools.EVAERROR;
+import eva2.tools.math.RNG;
 
 /** This individual uses a tree-based genotype to code for program trees.
  * Created by IntelliJ IDEA.

src/eva2/server/go/individuals/OBGAIndividualPermutationData.java

@@ -7,7 +7,7 @@ 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 wsi.ra.math.RNG;
+import eva2.tools.math.RNG;
 
 /** This individual uses a permutation based genotype to code for
  * permutations.

src/eva2/server/go/individuals/codings/ga/GAGrayCodingDouble.java

@@ -3,7 +3,8 @@ package eva2.server.go.individuals.codings.ga;
 
 import java.util.BitSet;
 
-import wsi.ra.math.RNG;
+import eva2.tools.math.RNG;
+
 
 /** 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.

src/eva2/server/go/individuals/codings/ga/GAStandardCodingInteger.java

@@ -3,7 +3,8 @@ package eva2.server.go.individuals.codings.ga;
 
 import java.util.BitSet;
 
-import wsi.ra.math.RNG;
+import eva2.tools.math.RNG;
+
 
 /** The traditional binary coding for integer number, no variable number of bits here, sorry.
  * Created by IntelliJ IDEA.

src/eva2/server/go/individuals/codings/gp/GPArea.java

@@ -5,7 +5,8 @@ import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
 import java.util.ArrayList;
 
-import wsi.ra.math.RNG;
+import eva2.tools.math.RNG;
+
 
 /**  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.

src/eva2/server/go/mocco/MOCCOChooseMOStrategy.java

@@ -4,12 +4,12 @@ package eva2.server.go.mocco;
 import javax.swing.*;
 
 import eva2.server.go.MOCCOStandalone;
+import eva2.tools.tool.BasicResourceLoader;
 
 import java.awt.*;
 import java.awt.event.ActionListener;
 import java.awt.event.ActionEvent;
 
-import wsi.ra.tool.BasicResourceLoader;
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/server/go/mocco/MOCCOParameterizeRefPoint.java

@@ -13,7 +13,7 @@ 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 wsi.ra.math.RNG;
+import eva2.tools.math.RNG;
 
 import java.awt.*;
 import java.awt.event.ActionListener;

src/eva2/server/go/mocco/MOCCOParameterizeTchebycheff.java

@@ -13,7 +13,7 @@ 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 wsi.ra.math.RNG;
+import eva2.tools.math.RNG;
 
 import java.awt.*;
 import java.awt.event.ActionListener;

src/eva2/server/go/mocco/paretofrontviewer/MOCCOViewer.java

@@ -12,6 +12,9 @@ import eva2.server.go.individuals.AbstractEAIndividual;
 import eva2.server.go.populations.Population;
 import eva2.server.go.problems.InterfaceMultiObjectiveDeNovoProblem;
 import eva2.server.go.problems.InterfaceOptimizationObjective;
+import eva2.tools.chart2d.DPoint;
+import eva2.tools.chart2d.DPointIcon;
+import eva2.tools.chart2d.ScaledBorder;
 
 import java.awt.*;
 import java.awt.event.ActionListener;
@@ -23,9 +26,6 @@ import java.io.FileNotFoundException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import wsi.ra.chart2d.DPoint;
-import wsi.ra.chart2d.DPointIcon;
-import wsi.ra.chart2d.ScaledBorder;
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/server/go/mocco/paretofrontviewer/ParetoFrontView2D.java

@@ -8,15 +8,15 @@ import eva2.server.go.individuals.AbstractEAIndividual;
 import eva2.server.go.populations.Population;
 import eva2.server.go.problems.InterfaceMultiObjectiveDeNovoProblem;
 import eva2.server.go.problems.InterfaceOptimizationObjective;
+import eva2.tools.chart2d.DPoint;
+import eva2.tools.chart2d.DPointIcon;
+import eva2.tools.chart2d.ScaledBorder;
 
 import java.awt.*;
 import java.awt.event.ActionListener;
 import java.awt.event.ActionEvent;
 import java.util.ArrayList;
 
-import wsi.ra.chart2d.ScaledBorder;
-import wsi.ra.chart2d.DPoint;
-import wsi.ra.chart2d.DPointIcon;
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/server/go/mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java

@@ -8,10 +8,10 @@ import eva2.server.go.individuals.AbstractEAIndividual;
 import eva2.server.go.populations.Population;
 import eva2.server.go.problems.InterfaceMultiObjectiveDeNovoProblem;
 import eva2.server.go.problems.InterfaceOptimizationObjective;
+import eva2.tools.chart2d.DPoint;
+import eva2.tools.chart2d.DPointIcon;
+import eva2.tools.chart2d.ScaledBorder;
 
-import wsi.ra.chart2d.ScaledBorder;
-import wsi.ra.chart2d.DPoint;
-import wsi.ra.chart2d.DPointIcon;
 
 import java.awt.*;
 import java.awt.event.ActionListener;

src/eva2/server/go/operators/archiving/AbstractArchiving.java

@@ -4,8 +4,8 @@ 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 eva2.tools.chart2d.DPoint;
-import wsi.ra.chart2d.DPointIcon;
+import eva2.tools.chart2d.DPointIcon;
 
 /** This is an abstract archiving strategy giving default implementation of determining
  * dominance, inserting individuals in exsisting Pareto front (removing now dominated solutions)

src/eva2/server/go/operators/archiving/ArchivingMaxiMin.java

@@ -9,8 +9,8 @@ import eva2.server.go.operators.moso.MOSOMaxiMin;
 import eva2.server.go.operators.selection.InterfaceSelection;
 import eva2.server.go.operators.selection.SelectBestIndividuals;
 import eva2.server.go.populations.Population;
+import eva2.tools.chart2d.DPointIcon;
 
-import wsi.ra.chart2d.DPointIcon;
 
 /** Another simple archiving strategy not based on dominance but on the MaxiMin
  * criterion. Doesn't work well on non-convex Pareto fronts.

src/eva2/server/go/operators/archiving/ArchivingNSGAII.java

@@ -8,10 +8,10 @@ import eva2.server.go.IndividualInterface;
 import eva2.server.go.individuals.AbstractEAIndividual;
 import eva2.server.go.individuals.ESIndividualDoubleData;
 import eva2.server.go.populations.Population;
-import wsi.ra.math.RNG;
+import eva2.tools.chart2d.DPoint;
+import eva2.tools.chart2d.DPointIcon;
+import eva2.tools.math.RNG;
 
-import wsi.ra.chart2d.DPoint;
-import wsi.ra.chart2d.DPointIcon;
 
 /** The secon verison of the non dominace sorting GA.
  * Created by IntelliJ IDEA.

src/eva2/server/go/operators/archiving/ArchivingPESAII.java

@@ -1,8 +1,5 @@
 package eva2.server.go.operators.archiving;
 
-import wsi.ra.chart2d.DPointIcon;
-import wsi.ra.chart2d.DPoint;
-import wsi.ra.chart2d.DLine;
 
 import java.util.ArrayList;
 import java.awt.*;
@@ -11,7 +8,10 @@ import eva2.gui.*;
 import eva2.server.go.IndividualInterface;
 import eva2.server.go.individuals.AbstractEAIndividual;
 import eva2.server.go.populations.Population;
-import wsi.ra.math.RNG;
+import eva2.tools.chart2d.DLine;
+import eva2.tools.chart2d.DPoint;
+import eva2.tools.chart2d.DPointIcon;
+import eva2.tools.math.RNG;
 
 /** The Pareto envelope sorting algorithm using a hybergrid and
  * the so called squezze factor.

src/eva2/server/go/operators/archiving/ArchivingSPEAII.java

@@ -1,7 +1,5 @@
 package eva2.server.go.operators.archiving;
 
-import wsi.ra.chart2d.DPoint;
-import wsi.ra.chart2d.DPointIcon;
 
 import java.awt.*;
 
@@ -13,6 +11,8 @@ 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;
+import eva2.tools.chart2d.DPoint;
+import eva2.tools.chart2d.DPointIcon;
 
 /** The strength Pareto EA in it's second version, which is based on
  * dominance counts.

src/eva2/server/go/operators/archiving/InformationRetrievalReplacing.java

@@ -1,7 +1,7 @@
 package eva2.server.go.operators.archiving;
 
 import eva2.server.go.populations.Population;
-import wsi.ra.math.RNG;
+import eva2.tools.math.RNG;
 
 /** This information retrieval method simply add the retrieved solutions
  * to the current population.

src/eva2/server/go/operators/archiving/RemoveSurplusIndividualsDynamicHyperCube.java

@@ -2,7 +2,7 @@ package eva2.server.go.operators.archiving;
 
 import eva2.server.go.individuals.AbstractEAIndividual;
 import eva2.server.go.populations.Population;
-import wsi.ra.math.RNG;
+import eva2.tools.math.RNG;
 
 /** This class removes surplus individuals based on bounding
  * hybercube, which can be calculated in objective or decision

src/eva2/server/go/operators/archiving/RemoveSurplusIndividualsStaticHyperCube.java

@@ -2,7 +2,7 @@ package eva2.server.go.operators.archiving;
 
 import eva2.server.go.individuals.AbstractEAIndividual;
 import eva2.server.go.populations.Population;
-import wsi.ra.math.RNG;
+import eva2.tools.math.RNG;
 
 /** This class removes surplus individuals based on bounding
  * hybercube, which can be calculated in objective or decision

src/eva2/server/go/operators/classification/ClassificationSelfOrganizingMaps.java

@@ -3,8 +3,9 @@ package eva2.server.go.operators.classification;
 import javax.swing.*;
 
 import eva2.gui.Chart2DDPointIconCross;
-import wsi.ra.math.RNG;
+import eva2.tools.chart2d.*;
-import wsi.ra.chart2d.*;
+import eva2.tools.math.RNG;
+
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.awt.*;

src/eva2/server/go/operators/cluster/ClusteringKMeans.java

@@ -9,8 +9,8 @@ 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 wsi.ra.math.RNG;
+import eva2.tools.chart2d.DPoint;
-import wsi.ra.chart2d.DPoint;
+import eva2.tools.math.RNG;
 
 /** The k-mean clustering algorithms. I guess it is not a hierachical
  * clustering method.

src/eva2/server/go/operators/cluster/ClusteringXMeans.java

@@ -9,8 +9,8 @@ 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 wsi.ra.math.RNG;
+import eva2.tools.chart2d.DPoint;
-import wsi.ra.chart2d.DPoint;
+import eva2.tools.math.RNG;
 
 /** The x-means clustering method should be able to determine a
  * suiteable value for k automatically, simply by evaluating all

src/eva2/server/go/operators/crossover/CrossoverEAMixer.java

@@ -6,7 +6,7 @@ import eva2.gui.GenericObjectEditor;
 import eva2.server.go.individuals.AbstractEAIndividual;
 import eva2.server.go.populations.Population;
 import eva2.server.go.problems.InterfaceOptimizationProblem;
-import wsi.ra.math.RNG;
+import eva2.tools.math.RNG;
 
 
 /**

src/eva2/server/go/operators/crossover/CrossoverESArithmetical.java

@@ -4,7 +4,7 @@ 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 wsi.ra.math.RNG;
+import eva2.tools.math.RNG;
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/server/go/operators/crossover/CrossoverESBLXAlpha.java

@@ -4,7 +4,7 @@ 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 wsi.ra.math.RNG;
+import eva2.tools.math.RNG;
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/server/go/operators/crossover/CrossoverESDefault.java

@@ -4,7 +4,7 @@ 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 wsi.ra.math.RNG;
+import eva2.tools.math.RNG;
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/server/go/operators/crossover/CrossoverESFlat.java

@@ -8,7 +8,7 @@ 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 wsi.ra.math.RNG;
+import eva2.tools.math.RNG;
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/server/go/operators/crossover/CrossoverESNPointDiscrete.java

@@ -1,10 +1,10 @@
 package eva2.server.go.operators.crossover;
 
-import wsi.ra.math.RNG;
 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.tools.math.RNG;
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/server/go/operators/crossover/CrossoverESNPointDiscreteDislocation.java

@@ -4,7 +4,7 @@ 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 wsi.ra.math.RNG;
+import eva2.tools.math.RNG;
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/server/go/operators/crossover/CrossoverESPCX.java

@@ -3,7 +3,6 @@ package eva2.server.go.operators.crossover;
 
 import java.util.ArrayList;
 
-import wsi.ra.math.RNG;
 import eva2.gui.Plot;
 import eva2.server.go.individuals.AbstractEAIndividual;
 import eva2.server.go.individuals.ESIndividualDoubleData;
@@ -12,6 +11,7 @@ import eva2.server.go.populations.Population;
 import eva2.server.go.problems.F1Problem;
 import eva2.server.go.problems.InterfaceOptimizationProblem;
 import eva2.tools.Mathematics;
+import eva2.tools.math.RNG;
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/server/go/operators/crossover/CrossoverESSBX.java

@@ -7,7 +7,7 @@ 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 wsi.ra.math.RNG;
+import eva2.tools.math.RNG;
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/server/go/operators/crossover/CrossoverESSPX.java

@@ -11,7 +11,7 @@ import eva2.server.go.populations.Population;
 import eva2.server.go.problems.F1Problem;
 import eva2.server.go.problems.InterfaceOptimizationProblem;
 import eva2.tools.Mathematics;
-import wsi.ra.math.RNG;
+import eva2.tools.math.RNG;
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/server/go/operators/crossover/CrossoverESUNDX.java

@@ -11,7 +11,7 @@ import eva2.server.go.populations.Population;
 import eva2.server.go.problems.F1Problem;
 import eva2.server.go.problems.InterfaceOptimizationProblem;
 import eva2.tools.Mathematics;
-import wsi.ra.math.RNG;
+import eva2.tools.math.RNG;
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/server/go/operators/crossover/CrossoverESUniformDiscrete.java

@@ -4,7 +4,7 @@ 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 wsi.ra.math.RNG;
+import eva2.tools.math.RNG;
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/server/go/operators/crossover/CrossoverGABitSimulated.java

@@ -7,7 +7,7 @@ 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 wsi.ra.math.RNG;
+import eva2.tools.math.RNG;
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/server/go/operators/crossover/CrossoverGADefault.java

@@ -7,7 +7,7 @@ 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 wsi.ra.math.RNG;
+import eva2.tools.math.RNG;
 
 /**
  * This operator performs one-point crossover.

src/eva2/server/go/operators/crossover/CrossoverGANPoint.java

@@ -7,7 +7,7 @@ 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 wsi.ra.math.RNG;
+import eva2.tools.math.RNG;
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/server/go/operators/crossover/CrossoverGAUniform.java

@@ -7,7 +7,7 @@ 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 wsi.ra.math.RNG;
+import eva2.tools.math.RNG;
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/server/go/operators/crossover/CrossoverGIDefault.java

@@ -4,7 +4,7 @@ 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 wsi.ra.math.RNG;
+import eva2.tools.math.RNG;
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/server/go/operators/crossover/CrossoverGINPoint.java

@@ -4,7 +4,7 @@ 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 wsi.ra.math.RNG;
+import eva2.tools.math.RNG;
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/server/go/operators/crossover/CrossoverGINPointVL.java

@@ -8,7 +8,7 @@ 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 wsi.ra.math.RNG;
+import eva2.tools.math.RNG;
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/server/go/operators/crossover/CrossoverGIUniform.java

@@ -7,7 +7,7 @@ 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 wsi.ra.math.RNG;
+import eva2.tools.math.RNG;
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/server/go/operators/crossover/CrossoverGPDefault.java

@@ -8,7 +8,7 @@ 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 wsi.ra.math.RNG;
+import eva2.tools.math.RNG;
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/server/go/operators/crossover/CrossoverOBGAPMX.java

@@ -6,7 +6,7 @@ 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 wsi.ra.math.RNG;
+import eva2.tools.math.RNG;
 
 /**
  * <p>Title: EvA2</p>

src/eva2/server/go/operators/crossover/CrossoverOBGAPMXUniform.java

@@ -5,7 +5,7 @@ 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 wsi.ra.math.RNG;
+import eva2.tools.math.RNG;
 
 /**
  * <p>Title: EvA2</p>

src/eva2/server/go/operators/crossover/PropertyCrossoverMixerEditor.java

@@ -6,6 +6,7 @@ import javax.swing.*;
 import eva2.gui.*;
 import eva2.server.go.tools.GeneralGEOFaker;
 import eva2.server.go.tools.GeneralGOEProperty;
+import eva2.tools.tool.BasicResourceLoader;
 
 import java.beans.*;
 import java.awt.*;
@@ -14,7 +15,6 @@ import java.awt.event.ActionEvent;
 import java.awt.event.KeyListener;
 import java.awt.event.KeyEvent;
 
-import wsi.ra.tool.BasicResourceLoader;
 
 /**
  * Created by IntelliJ IDEA.

src/eva2/server/go/operators/migration/MOClusteringSeparation.java

@@ -1,6 +1,5 @@
 package eva2.server.go.operators.migration;
 
-import wsi.ra.chart2d.DPoint;
 
 import java.io.*;
 
@@ -23,6 +22,7 @@ import eva2.server.go.problems.AbstractMultiObjectiveOptimizationProblem;
 import eva2.server.go.problems.InterfaceOptimizationProblem;
 import eva2.server.go.strategies.InterfaceOptimizer;
 import eva2.server.go.strategies.MultiObjectiveEA;
+import eva2.tools.chart2d.DPoint;
 
 /** This method implements the clustering based subdivision
  * scheme, this method rearanges the populations and may

src/eva2/server/go/operators/migration/MOConeSeparation.java

@@ -1,6 +1,5 @@
 package eva2.server.go.operators.migration;
 
-import wsi.ra.chart2d.DPoint;
 
 import java.io.*;
 import java.util.ArrayList;
@@ -26,6 +25,7 @@ import eva2.server.go.problems.AbstractMultiObjectiveOptimizationProblem;
 import eva2.server.go.problems.InterfaceOptimizationProblem;
 import eva2.server.go.strategies.InterfaceOptimizer;
 import eva2.server.go.strategies.MultiObjectiveEA;
+import eva2.tools.chart2d.DPoint;
 
 /** This method implements the cone separation subdivision
  * scheme, this method rearanges the populations and may

src/eva2/server/go/operators/migration/MOXMeansSeparation.java

@@ -1,6 +1,5 @@
 package eva2.server.go.operators.migration;
 
-import wsi.ra.chart2d.DPoint;
 
 import java.io.*;
 
@@ -20,6 +19,7 @@ import eva2.server.go.problems.AbstractMultiObjectiveOptimizationProblem;
 import eva2.server.go.problems.InterfaceOptimizationProblem;
 import eva2.server.go.strategies.InterfaceOptimizer;
 import eva2.server.go.strategies.MultiObjectiveEA;
+import eva2.tools.chart2d.DPoint;
 
 /** This method implements the clustering based subdivision
  * scheme suited to identify uni- and multi-modal search spaces