diff --git a/src/eva2/OptimizerRunnable.java b/src/eva2/OptimizerRunnable.java index de4ed785..7afc8382 100644 --- a/src/eva2/OptimizerRunnable.java +++ b/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; /** diff --git a/src/eva2/client/EvAClient.java b/src/eva2/client/EvAClient.java index 85c9ae5c..82bc1620 100644 --- a/src/eva2/client/EvAClient.java +++ b/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; /** * diff --git a/src/eva2/client/EvAComAdapter.java b/src/eva2/client/EvAComAdapter.java index dc42a92a..188239ef 100644 --- a/src/eva2/client/EvAComAdapter.java +++ b/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 *==========================================================================*/ diff --git a/src/eva2/client/RMIConnectionEvA.java b/src/eva2/client/RMIConnectionEvA.java index 0b295a0a..88dde381 100644 --- a/src/eva2/client/RMIConnectionEvA.java +++ b/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; /** * diff --git a/src/eva2/gui/Chart2DDPointContentSelectable.java b/src/eva2/gui/Chart2DDPointContentSelectable.java index 751bf4a3..dbb5ea55 100644 --- a/src/eva2/gui/Chart2DDPointContentSelectable.java +++ b/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; diff --git a/src/eva2/gui/Chart2DDPointIconCircle.java b/src/eva2/gui/Chart2DDPointIconCircle.java index 879ab561..a4607108 100644 --- a/src/eva2/gui/Chart2DDPointIconCircle.java +++ b/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 diff --git a/src/eva2/gui/Chart2DDPointIconContent.java b/src/eva2/gui/Chart2DDPointIconContent.java index dc4b330e..8e952d52 100644 --- a/src/eva2/gui/Chart2DDPointIconContent.java +++ b/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. diff --git a/src/eva2/gui/Chart2DDPointIconCross.java b/src/eva2/gui/Chart2DDPointIconCross.java index 97b85ef6..2b746208 100644 --- a/src/eva2/gui/Chart2DDPointIconCross.java +++ b/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 diff --git a/src/eva2/gui/Chart2DDPointIconPoint.java b/src/eva2/gui/Chart2DDPointIconPoint.java index eb461f10..2c504a37 100644 --- a/src/eva2/gui/Chart2DDPointIconPoint.java +++ b/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 diff --git a/src/eva2/gui/Chart2DDPointIconText.java b/src/eva2/gui/Chart2DDPointIconText.java index b3a38e69..28170543 100644 --- a/src/eva2/gui/Chart2DDPointIconText.java +++ b/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 diff --git a/src/eva2/gui/DPointSetMultiIcon.java b/src/eva2/gui/DPointSetMultiIcon.java index 3f2f72c2..6cb2a7b7 100644 --- a/src/eva2/gui/DPointSetMultiIcon.java +++ b/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. diff --git a/src/eva2/gui/DataViewer.java b/src/eva2/gui/DataViewer.java index 8a6903df..ce77b194 100644 --- a/src/eva2/gui/DataViewer.java +++ b/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 wsi.ra.jproxy.RMIProxyRemote; +import eva2.tools.jproxy.MainAdapterClient; +import eva2.tools.jproxy.RMIProxyRemote; + /*==========================================================================* * CLASS DECLARATION *==========================================================================*/ diff --git a/src/eva2/gui/EvAModuleButtonPanelMaker.java b/src/eva2/gui/EvAModuleButtonPanelMaker.java index 4d8ac319..fe8a5325 100644 --- a/src/eva2/gui/EvAModuleButtonPanelMaker.java +++ b/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. diff --git a/src/eva2/gui/Exp.java b/src/eva2/gui/Exp.java index fdafee08..08f05830 100644 --- a/src/eva2/gui/Exp.java +++ b/src/eva2/gui/Exp.java @@ -12,10 +12,7 @@ package eva2.gui; /*==========================================================================* * IMPORTS *==========================================================================*/ -import wsi.ra.chart2d.DFunction; -/*==========================================================================* - * CLASS DECLARATION - *==========================================================================*/ +import eva2.tools.chart2d.DFunction; /** * diff --git a/src/eva2/gui/FunctionArea.java b/src/eva2/gui/FunctionArea.java index ec29e9b1..000d032b 100644 --- a/src/eva2/gui/FunctionArea.java +++ b/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 diff --git a/src/eva2/gui/GOEPanel.java b/src/eva2/gui/GOEPanel.java index 72ad52a2..19c02ddb 100644 --- a/src/eva2/gui/GOEPanel.java +++ b/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; /** * */ diff --git a/src/eva2/gui/GenericObjectEditor.java b/src/eva2/gui/GenericObjectEditor.java index 437dd3d0..33b574d2 100644 --- a/src/eva2/gui/GenericObjectEditor.java +++ b/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; /*==========================================================================* diff --git a/src/eva2/gui/GenericOptimizationObjectivesEditor.java b/src/eva2/gui/GenericOptimizationObjectivesEditor.java index 76a5c39d..3f6d66e0 100644 --- a/src/eva2/gui/GenericOptimizationObjectivesEditor.java +++ b/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. diff --git a/src/eva2/gui/GenericOptimizationObjectivesWithParamEditor.java b/src/eva2/gui/GenericOptimizationObjectivesWithParamEditor.java index 233b4132..fea8a855 100644 --- a/src/eva2/gui/GenericOptimizationObjectivesWithParamEditor.java +++ b/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. diff --git a/src/eva2/gui/GenericRemoteServersEditor.java b/src/eva2/gui/GenericRemoteServersEditor.java index a11e9e17..0a6fc994 100644 --- a/src/eva2/gui/GenericRemoteServersEditor.java +++ b/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; diff --git a/src/eva2/gui/GraphPointSet.java b/src/eva2/gui/GraphPointSet.java index 9842a416..74c7925a 100644 --- a/src/eva2/gui/GraphPointSet.java +++ b/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 *==========================================================================*/ diff --git a/src/eva2/gui/GraphPointSetLegend.java b/src/eva2/gui/GraphPointSetLegend.java index ab1b3b45..50bcc4aa 100644 --- a/src/eva2/gui/GraphPointSetLegend.java +++ b/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 diff --git a/src/eva2/gui/GraphWindow.java b/src/eva2/gui/GraphWindow.java index 0ef18475..43acf89c 100644 --- a/src/eva2/gui/GraphWindow.java +++ b/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 wsi.ra.jproxy.RMIProxyRemote; +import eva2.tools.jproxy.MainAdapterClient; +import eva2.tools.jproxy.RMIProxyRemote; + /*==========================================================================* * CLASS DECLARATION *==========================================================================*/ diff --git a/src/eva2/gui/HtmlDemo.java b/src/eva2/gui/HtmlDemo.java index 711f5af9..f78d2f8b 100644 --- a/src/eva2/gui/HtmlDemo.java +++ b/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; /** * */ diff --git a/src/eva2/gui/JTextoutputFrame.java b/src/eva2/gui/JTextoutputFrame.java index 8ae312e5..bef0addc 100644 --- a/src/eva2/gui/JTextoutputFrame.java +++ b/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 *==========================================================================*/ diff --git a/src/eva2/gui/LogPanel.java b/src/eva2/gui/LogPanel.java index 53351db1..9a9f1478 100644 --- a/src/eva2/gui/LogPanel.java +++ b/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 *==========================================================================*/ diff --git a/src/eva2/gui/Plot.java b/src/eva2/gui/Plot.java index f655589f..bf9d6e25 100644 --- a/src/eva2/gui/Plot.java +++ b/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 *==========================================================================*/ diff --git a/src/eva2/gui/PropertyDialog.java b/src/eva2/gui/PropertyDialog.java index e8265590..ec465a04 100644 --- a/src/eva2/gui/PropertyDialog.java +++ b/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 *==========================================================================*/ diff --git a/src/eva2/gui/PropertyRemoteServers.java b/src/eva2/gui/PropertyRemoteServers.java index 8ad5ee01..ccd48aad 100644 --- a/src/eva2/gui/PropertyRemoteServers.java +++ b/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. diff --git a/src/eva2/gui/TagEditor.java b/src/eva2/gui/TagEditor.java index da48a34b..35e45a60 100644 --- a/src/eva2/gui/TagEditor.java +++ b/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 *==========================================================================*/ diff --git a/src/eva2/gui/TopoPlot.java b/src/eva2/gui/TopoPlot.java index 6ea3f63a..c8938f53 100644 --- a/src/eva2/gui/TopoPlot.java +++ b/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 diff --git a/src/eva2/server/EvAMainAdapter.java b/src/eva2/server/EvAMainAdapter.java index 48e3a069..ae08493b 100644 --- a/src/eva2/server/EvAMainAdapter.java +++ b/src/eva2/server/EvAMainAdapter.java @@ -13,8 +13,8 @@ package eva2.server; *==========================================================================*/ import eva2.server.modules.ModuleAdapter; -import wsi.ra.jproxy.MainAdapter; -import wsi.ra.jproxy.MainAdapterClient; +import eva2.tools.jproxy.MainAdapter; +import eva2.tools.jproxy.MainAdapterClient; /*==========================================================================* * INTERFACE DECLARATION *==========================================================================*/ diff --git a/src/eva2/server/EvAMainAdapterImpl.java b/src/eva2/server/EvAMainAdapterImpl.java index f763c3d7..87aeeb83 100644 --- a/src/eva2/server/EvAMainAdapterImpl.java +++ b/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 wsi.ra.jproxy.MainAdapterImpl; +import eva2.tools.jproxy.MainAdapterClient; +import eva2.tools.jproxy.MainAdapterImpl; /*==========================================================================* * CLASS DECLARATION *==========================================================================*/ diff --git a/src/eva2/server/ModuleServer.java b/src/eva2/server/ModuleServer.java index 16572e52..321ef5b6 100644 --- a/src/eva2/server/ModuleServer.java +++ b/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 diff --git a/src/eva2/server/RMIServerEvA.java b/src/eva2/server/RMIServerEvA.java index 8239c563..3b85da54 100644 --- a/src/eva2/server/RMIServerEvA.java +++ b/src/eva2/server/RMIServerEvA.java @@ -11,8 +11,8 @@ package eva2.server; /*==========================================================================* * IMPORTS *==========================================================================*/ -import wsi.ra.jproxy.RMIProxyLocal; -import wsi.ra.jproxy.RMIServer; +import eva2.tools.jproxy.RMIProxyLocal; +import eva2.tools.jproxy.RMIServer; /** * diff --git a/src/eva2/server/go/GOStandaloneVersion.java b/src/eva2/server/go/GOStandaloneVersion.java index 8f09b26d..f70960cb 100644 --- a/src/eva2/server/go/GOStandaloneVersion.java +++ b/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. diff --git a/src/eva2/server/go/InterfaceProcessor.java b/src/eva2/server/go/InterfaceProcessor.java index 70743ab7..b1b84c58 100644 --- a/src/eva2/server/go/InterfaceProcessor.java +++ b/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 diff --git a/src/eva2/server/go/MOCCOStandalone.java b/src/eva2/server/go/MOCCOStandalone.java index ca9613d3..bb46a29e 100644 --- a/src/eva2/server/go/MOCCOStandalone.java +++ b/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;*/ diff --git a/src/eva2/server/go/individuals/AbstractEAIndividual.java b/src/eva2/server/go/individuals/AbstractEAIndividual.java index 665aadc0..a3753f51 100644 --- a/src/eva2/server/go/individuals/AbstractEAIndividual.java +++ b/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 diff --git a/src/eva2/server/go/individuals/ESIndividualBinaryData.java b/src/eva2/server/go/individuals/ESIndividualBinaryData.java index 691a5f5c..a3e3b09f 100644 --- a/src/eva2/server/go/individuals/ESIndividualBinaryData.java +++ b/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 diff --git a/src/eva2/server/go/individuals/ESIndividualDoubleData.java b/src/eva2/server/go/individuals/ESIndividualDoubleData.java index 796eed66..18d9bad8 100644 --- a/src/eva2/server/go/individuals/ESIndividualDoubleData.java +++ b/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. diff --git a/src/eva2/server/go/individuals/ESIndividualIntegerData.java b/src/eva2/server/go/individuals/ESIndividualIntegerData.java index c7cb562d..d2679a9c 100644 --- a/src/eva2/server/go/individuals/ESIndividualIntegerData.java +++ b/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. diff --git a/src/eva2/server/go/individuals/ESIndividualPermutationData.java b/src/eva2/server/go/individuals/ESIndividualPermutationData.java index 885e90b9..fd924ee9 100644 --- a/src/eva2/server/go/individuals/ESIndividualPermutationData.java +++ b/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, diff --git a/src/eva2/server/go/individuals/GAESIndividualBinaryDoubleData.java b/src/eva2/server/go/individuals/GAESIndividualBinaryDoubleData.java index 0072995b..ba0e40eb 100644 --- a/src/eva2/server/go/individuals/GAESIndividualBinaryDoubleData.java +++ b/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. diff --git a/src/eva2/server/go/individuals/GAIndividualBinaryData.java b/src/eva2/server/go/individuals/GAIndividualBinaryData.java index 096e3c84..825b7405 100644 --- a/src/eva2/server/go/individuals/GAIndividualBinaryData.java +++ b/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. diff --git a/src/eva2/server/go/individuals/GAIndividualDoubleData.java b/src/eva2/server/go/individuals/GAIndividualDoubleData.java index f133fadb..70f0138b 100644 --- a/src/eva2/server/go/individuals/GAIndividualDoubleData.java +++ b/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. diff --git a/src/eva2/server/go/individuals/GAIndividualIntegerData.java b/src/eva2/server/go/individuals/GAIndividualIntegerData.java index 23ec32f8..b65e1b28 100644 --- a/src/eva2/server/go/individuals/GAIndividualIntegerData.java +++ b/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. diff --git a/src/eva2/server/go/individuals/GAPIndividualProgramData.java b/src/eva2/server/go/individuals/GAPIndividualProgramData.java index da077d2c..e06a42b0 100644 --- a/src/eva2/server/go/individuals/GAPIndividualProgramData.java +++ b/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. diff --git a/src/eva2/server/go/individuals/GEIndividualProgramData.java b/src/eva2/server/go/individuals/GEIndividualProgramData.java index 85620964..5075e6ea 100644 --- a/src/eva2/server/go/individuals/GEIndividualProgramData.java +++ b/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. diff --git a/src/eva2/server/go/individuals/GIIndividualIntegerData.java b/src/eva2/server/go/individuals/GIIndividualIntegerData.java index 5547c662..4ed80f30 100644 --- a/src/eva2/server/go/individuals/GIIndividualIntegerData.java +++ b/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. diff --git a/src/eva2/server/go/individuals/GIOBGAIndividualIntegerPermutationData.java b/src/eva2/server/go/individuals/GIOBGAIndividualIntegerPermutationData.java index 2a5b8df8..90bc26a2 100644 --- a/src/eva2/server/go/individuals/GIOBGAIndividualIntegerPermutationData.java +++ b/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. diff --git a/src/eva2/server/go/individuals/GPIndividualProgramData.java b/src/eva2/server/go/individuals/GPIndividualProgramData.java index 7379c687..a985ed03 100644 --- a/src/eva2/server/go/individuals/GPIndividualProgramData.java +++ b/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. diff --git a/src/eva2/server/go/individuals/OBGAIndividualPermutationData.java b/src/eva2/server/go/individuals/OBGAIndividualPermutationData.java index 4e130731..fd9b272e 100644 --- a/src/eva2/server/go/individuals/OBGAIndividualPermutationData.java +++ b/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. diff --git a/src/eva2/server/go/individuals/codings/ga/GAGrayCodingDouble.java b/src/eva2/server/go/individuals/codings/ga/GAGrayCodingDouble.java index 066be876..289d4151 100644 --- a/src/eva2/server/go/individuals/codings/ga/GAGrayCodingDouble.java +++ b/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. diff --git a/src/eva2/server/go/individuals/codings/ga/GAStandardCodingInteger.java b/src/eva2/server/go/individuals/codings/ga/GAStandardCodingInteger.java index 061c09ad..b75a07ed 100644 --- a/src/eva2/server/go/individuals/codings/ga/GAStandardCodingInteger.java +++ b/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. diff --git a/src/eva2/server/go/individuals/codings/gp/GPArea.java b/src/eva2/server/go/individuals/codings/gp/GPArea.java index 0c8855bf..f79dd16c 100644 --- a/src/eva2/server/go/individuals/codings/gp/GPArea.java +++ b/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. diff --git a/src/eva2/server/go/mocco/MOCCOChooseMOStrategy.java b/src/eva2/server/go/mocco/MOCCOChooseMOStrategy.java index 11d581f1..b544bbb2 100644 --- a/src/eva2/server/go/mocco/MOCCOChooseMOStrategy.java +++ b/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. diff --git a/src/eva2/server/go/mocco/MOCCOParameterizeRefPoint.java b/src/eva2/server/go/mocco/MOCCOParameterizeRefPoint.java index 742a527b..cc8099f7 100644 --- a/src/eva2/server/go/mocco/MOCCOParameterizeRefPoint.java +++ b/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; diff --git a/src/eva2/server/go/mocco/MOCCOParameterizeTchebycheff.java b/src/eva2/server/go/mocco/MOCCOParameterizeTchebycheff.java index 06706f02..ee9c5673 100644 --- a/src/eva2/server/go/mocco/MOCCOParameterizeTchebycheff.java +++ b/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; diff --git a/src/eva2/server/go/mocco/paretofrontviewer/MOCCOViewer.java b/src/eva2/server/go/mocco/paretofrontviewer/MOCCOViewer.java index ea3d2cdf..9dae04e5 100644 --- a/src/eva2/server/go/mocco/paretofrontviewer/MOCCOViewer.java +++ b/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. diff --git a/src/eva2/server/go/mocco/paretofrontviewer/ParetoFrontView2D.java b/src/eva2/server/go/mocco/paretofrontviewer/ParetoFrontView2D.java index f601c4f5..93be7acb 100644 --- a/src/eva2/server/go/mocco/paretofrontviewer/ParetoFrontView2D.java +++ b/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. diff --git a/src/eva2/server/go/mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java b/src/eva2/server/go/mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java index ead04483..8ea80d08 100644 --- a/src/eva2/server/go/mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java +++ b/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; diff --git a/src/eva2/server/go/operators/archiving/AbstractArchiving.java b/src/eva2/server/go/operators/archiving/AbstractArchiving.java index c7eca643..5c41428f 100644 --- a/src/eva2/server/go/operators/archiving/AbstractArchiving.java +++ b/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 wsi.ra.chart2d.DPointIcon; +import eva2.tools.chart2d.DPoint; +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) diff --git a/src/eva2/server/go/operators/archiving/ArchivingMaxiMin.java b/src/eva2/server/go/operators/archiving/ArchivingMaxiMin.java index 4100103d..7a5a7d49 100644 --- a/src/eva2/server/go/operators/archiving/ArchivingMaxiMin.java +++ b/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. diff --git a/src/eva2/server/go/operators/archiving/ArchivingNSGAII.java b/src/eva2/server/go/operators/archiving/ArchivingNSGAII.java index 0a012e88..b448e0fa 100644 --- a/src/eva2/server/go/operators/archiving/ArchivingNSGAII.java +++ b/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. diff --git a/src/eva2/server/go/operators/archiving/ArchivingPESAII.java b/src/eva2/server/go/operators/archiving/ArchivingPESAII.java index ec69cf6d..3fe5ffcb 100644 --- a/src/eva2/server/go/operators/archiving/ArchivingPESAII.java +++ b/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. diff --git a/src/eva2/server/go/operators/archiving/ArchivingSPEAII.java b/src/eva2/server/go/operators/archiving/ArchivingSPEAII.java index 8db85a87..845f9578 100644 --- a/src/eva2/server/go/operators/archiving/ArchivingSPEAII.java +++ b/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. diff --git a/src/eva2/server/go/operators/archiving/InformationRetrievalReplacing.java b/src/eva2/server/go/operators/archiving/InformationRetrievalReplacing.java index b8c8091c..c2254d32 100644 --- a/src/eva2/server/go/operators/archiving/InformationRetrievalReplacing.java +++ b/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. diff --git a/src/eva2/server/go/operators/archiving/RemoveSurplusIndividualsDynamicHyperCube.java b/src/eva2/server/go/operators/archiving/RemoveSurplusIndividualsDynamicHyperCube.java index 13eb104a..5a4f3aac 100644 --- a/src/eva2/server/go/operators/archiving/RemoveSurplusIndividualsDynamicHyperCube.java +++ b/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 diff --git a/src/eva2/server/go/operators/archiving/RemoveSurplusIndividualsStaticHyperCube.java b/src/eva2/server/go/operators/archiving/RemoveSurplusIndividualsStaticHyperCube.java index b93cd9b3..be55b139 100644 --- a/src/eva2/server/go/operators/archiving/RemoveSurplusIndividualsStaticHyperCube.java +++ b/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 diff --git a/src/eva2/server/go/operators/classification/ClassificationSelfOrganizingMaps.java b/src/eva2/server/go/operators/classification/ClassificationSelfOrganizingMaps.java index 91f90d93..a12fba45 100644 --- a/src/eva2/server/go/operators/classification/ClassificationSelfOrganizingMaps.java +++ b/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 wsi.ra.chart2d.*; +import eva2.tools.chart2d.*; +import eva2.tools.math.RNG; + import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.awt.*; diff --git a/src/eva2/server/go/operators/cluster/ClusteringKMeans.java b/src/eva2/server/go/operators/cluster/ClusteringKMeans.java index 17ead62b..5df406dc 100644 --- a/src/eva2/server/go/operators/cluster/ClusteringKMeans.java +++ b/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 wsi.ra.chart2d.DPoint; +import eva2.tools.chart2d.DPoint; +import eva2.tools.math.RNG; /** The k-mean clustering algorithms. I guess it is not a hierachical * clustering method. diff --git a/src/eva2/server/go/operators/cluster/ClusteringXMeans.java b/src/eva2/server/go/operators/cluster/ClusteringXMeans.java index 049ca407..b5c7a924 100644 --- a/src/eva2/server/go/operators/cluster/ClusteringXMeans.java +++ b/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 wsi.ra.chart2d.DPoint; +import eva2.tools.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 diff --git a/src/eva2/server/go/operators/crossover/CrossoverEAMixer.java b/src/eva2/server/go/operators/crossover/CrossoverEAMixer.java index 49de7bb7..d550bc94 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverEAMixer.java +++ b/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; /** diff --git a/src/eva2/server/go/operators/crossover/CrossoverESArithmetical.java b/src/eva2/server/go/operators/crossover/CrossoverESArithmetical.java index 4bdfad3f..46c61049 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverESArithmetical.java +++ b/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. diff --git a/src/eva2/server/go/operators/crossover/CrossoverESBLXAlpha.java b/src/eva2/server/go/operators/crossover/CrossoverESBLXAlpha.java index e56b2eb6..a38f4e8d 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverESBLXAlpha.java +++ b/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. diff --git a/src/eva2/server/go/operators/crossover/CrossoverESDefault.java b/src/eva2/server/go/operators/crossover/CrossoverESDefault.java index 5c414c6d..5776edf9 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverESDefault.java +++ b/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. diff --git a/src/eva2/server/go/operators/crossover/CrossoverESFlat.java b/src/eva2/server/go/operators/crossover/CrossoverESFlat.java index 7706f318..37b4f363 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverESFlat.java +++ b/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. diff --git a/src/eva2/server/go/operators/crossover/CrossoverESNPointDiscrete.java b/src/eva2/server/go/operators/crossover/CrossoverESNPointDiscrete.java index 33644c53..78c4ea36 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverESNPointDiscrete.java +++ b/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. diff --git a/src/eva2/server/go/operators/crossover/CrossoverESNPointDiscreteDislocation.java b/src/eva2/server/go/operators/crossover/CrossoverESNPointDiscreteDislocation.java index 3d20940d..a4b7cb9f 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverESNPointDiscreteDislocation.java +++ b/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. diff --git a/src/eva2/server/go/operators/crossover/CrossoverESPCX.java b/src/eva2/server/go/operators/crossover/CrossoverESPCX.java index 72a45e64..e6708ee5 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverESPCX.java +++ b/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. diff --git a/src/eva2/server/go/operators/crossover/CrossoverESSBX.java b/src/eva2/server/go/operators/crossover/CrossoverESSBX.java index 982c02b7..27692384 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverESSBX.java +++ b/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. diff --git a/src/eva2/server/go/operators/crossover/CrossoverESSPX.java b/src/eva2/server/go/operators/crossover/CrossoverESSPX.java index 8548f047..67d427e6 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverESSPX.java +++ b/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. diff --git a/src/eva2/server/go/operators/crossover/CrossoverESUNDX.java b/src/eva2/server/go/operators/crossover/CrossoverESUNDX.java index 1ae6cd3f..d0a76f97 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverESUNDX.java +++ b/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. diff --git a/src/eva2/server/go/operators/crossover/CrossoverESUniformDiscrete.java b/src/eva2/server/go/operators/crossover/CrossoverESUniformDiscrete.java index 0775e8d1..41dd928b 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverESUniformDiscrete.java +++ b/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. diff --git a/src/eva2/server/go/operators/crossover/CrossoverGABitSimulated.java b/src/eva2/server/go/operators/crossover/CrossoverGABitSimulated.java index 1d1d5e2f..510550d4 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverGABitSimulated.java +++ b/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. diff --git a/src/eva2/server/go/operators/crossover/CrossoverGADefault.java b/src/eva2/server/go/operators/crossover/CrossoverGADefault.java index 8bcf82ac..65ebd093 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverGADefault.java +++ b/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. diff --git a/src/eva2/server/go/operators/crossover/CrossoverGANPoint.java b/src/eva2/server/go/operators/crossover/CrossoverGANPoint.java index 4cddef85..4b8bcea8 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverGANPoint.java +++ b/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. diff --git a/src/eva2/server/go/operators/crossover/CrossoverGAUniform.java b/src/eva2/server/go/operators/crossover/CrossoverGAUniform.java index d677fbc2..5fce14ad 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverGAUniform.java +++ b/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. diff --git a/src/eva2/server/go/operators/crossover/CrossoverGIDefault.java b/src/eva2/server/go/operators/crossover/CrossoverGIDefault.java index 866a4905..04a02b12 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverGIDefault.java +++ b/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. diff --git a/src/eva2/server/go/operators/crossover/CrossoverGINPoint.java b/src/eva2/server/go/operators/crossover/CrossoverGINPoint.java index 571be139..cd45ca2a 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverGINPoint.java +++ b/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. diff --git a/src/eva2/server/go/operators/crossover/CrossoverGINPointVL.java b/src/eva2/server/go/operators/crossover/CrossoverGINPointVL.java index 4179dd9c..a54c4bf0 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverGINPointVL.java +++ b/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. diff --git a/src/eva2/server/go/operators/crossover/CrossoverGIUniform.java b/src/eva2/server/go/operators/crossover/CrossoverGIUniform.java index 3162eb75..31eada1a 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverGIUniform.java +++ b/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. diff --git a/src/eva2/server/go/operators/crossover/CrossoverGPDefault.java b/src/eva2/server/go/operators/crossover/CrossoverGPDefault.java index e2a7ea8d..09a8a965 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverGPDefault.java +++ b/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. diff --git a/src/eva2/server/go/operators/crossover/CrossoverOBGAPMX.java b/src/eva2/server/go/operators/crossover/CrossoverOBGAPMX.java index 324fdf42..c2ba6a37 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverOBGAPMX.java +++ b/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; /** *

Title: EvA2

diff --git a/src/eva2/server/go/operators/crossover/CrossoverOBGAPMXUniform.java b/src/eva2/server/go/operators/crossover/CrossoverOBGAPMXUniform.java index 56ebb64b..c93d366b 100644 --- a/src/eva2/server/go/operators/crossover/CrossoverOBGAPMXUniform.java +++ b/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; /** *

Title: EvA2

diff --git a/src/eva2/server/go/operators/crossover/PropertyCrossoverMixerEditor.java b/src/eva2/server/go/operators/crossover/PropertyCrossoverMixerEditor.java index 5397c76e..4601547a 100644 --- a/src/eva2/server/go/operators/crossover/PropertyCrossoverMixerEditor.java +++ b/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. diff --git a/src/eva2/server/go/operators/migration/MOClusteringSeparation.java b/src/eva2/server/go/operators/migration/MOClusteringSeparation.java index a1279e83..f30145bd 100644 --- a/src/eva2/server/go/operators/migration/MOClusteringSeparation.java +++ b/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 diff --git a/src/eva2/server/go/operators/migration/MOConeSeparation.java b/src/eva2/server/go/operators/migration/MOConeSeparation.java index c4cfded2..bd4a13a6 100644 --- a/src/eva2/server/go/operators/migration/MOConeSeparation.java +++ b/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 diff --git a/src/eva2/server/go/operators/migration/MOXMeansSeparation.java b/src/eva2/server/go/operators/migration/MOXMeansSeparation.java index 37e41d24..f73929b1 100644 --- a/src/eva2/server/go/operators/migration/MOXMeansSeparation.java +++ b/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 diff --git a/src/eva2/server/go/operators/moso/MOSOMaxiMin.java b/src/eva2/server/go/operators/moso/MOSOMaxiMin.java index 6f677f6d..2ba21342 100644 --- a/src/eva2/server/go/operators/moso/MOSOMaxiMin.java +++ b/src/eva2/server/go/operators/moso/MOSOMaxiMin.java @@ -5,8 +5,8 @@ import eva2.gui.Chart2DDPointIconText; import eva2.gui.GraphPointSet; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.populations.Population; -import wsi.ra.math.RNG; -import wsi.ra.chart2d.DPoint; +import eva2.tools.chart2d.DPoint; +import eva2.tools.math.RNG; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/moso/MOSONoConvert.java b/src/eva2/server/go/operators/moso/MOSONoConvert.java index bb035c9e..51bd474b 100644 --- a/src/eva2/server/go/operators/moso/MOSONoConvert.java +++ b/src/eva2/server/go/operators/moso/MOSONoConvert.java @@ -2,7 +2,7 @@ package eva2.server.go.operators.moso; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.populations.Population; -import wsi.ra.math.RNG; +import eva2.tools.math.RNG; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/moso/MOSORandomChoice.java b/src/eva2/server/go/operators/moso/MOSORandomChoice.java index 900e1895..c3daf8b8 100644 --- a/src/eva2/server/go/operators/moso/MOSORandomChoice.java +++ b/src/eva2/server/go/operators/moso/MOSORandomChoice.java @@ -2,7 +2,7 @@ package eva2.server.go.operators.moso; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.populations.Population; -import wsi.ra.math.RNG; +import eva2.tools.math.RNG; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/moso/MOSORandomWeight.java b/src/eva2/server/go/operators/moso/MOSORandomWeight.java index 6b6179a2..2be33e54 100644 --- a/src/eva2/server/go/operators/moso/MOSORandomWeight.java +++ b/src/eva2/server/go/operators/moso/MOSORandomWeight.java @@ -3,7 +3,7 @@ package eva2.server.go.operators.moso; import eva2.gui.PropertyDoubleArray; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.populations.Population; -import wsi.ra.math.RNG; +import eva2.tools.math.RNG; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/moso/MOSORankbased.java b/src/eva2/server/go/operators/moso/MOSORankbased.java index 029bf40d..5c92483e 100644 --- a/src/eva2/server/go/operators/moso/MOSORankbased.java +++ b/src/eva2/server/go/operators/moso/MOSORankbased.java @@ -3,7 +3,7 @@ package eva2.server.go.operators.moso; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.operators.archiving.ArchivingNSGAII; import eva2.server.go.populations.Population; -import wsi.ra.math.RNG; +import eva2.tools.math.RNG; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/mutation/MutateEAMixer.java b/src/eva2/server/go/operators/mutation/MutateEAMixer.java index 5f6a2a0c..9c0a261f 100644 --- a/src/eva2/server/go/operators/mutation/MutateEAMixer.java +++ b/src/eva2/server/go/operators/mutation/MutateEAMixer.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; /** diff --git a/src/eva2/server/go/operators/mutation/MutateESCorrVector.java b/src/eva2/server/go/operators/mutation/MutateESCorrVector.java index 98b274f9..18ae3a3e 100644 --- a/src/eva2/server/go/operators/mutation/MutateESCorrVector.java +++ b/src/eva2/server/go/operators/mutation/MutateESCorrVector.java @@ -7,9 +7,9 @@ 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.Mathematics; import eva2.tools.SelectedTag; +import eva2.tools.math.RNG; /** diff --git a/src/eva2/server/go/operators/mutation/MutateESCorrolated.java b/src/eva2/server/go/operators/mutation/MutateESCorrolated.java index 30ba7b09..9f8e411e 100644 --- a/src/eva2/server/go/operators/mutation/MutateESCorrolated.java +++ b/src/eva2/server/go/operators/mutation/MutateESCorrolated.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. diff --git a/src/eva2/server/go/operators/mutation/MutateESCovarianceMatrixAdaption.java b/src/eva2/server/go/operators/mutation/MutateESCovarianceMatrixAdaption.java index 9b630914..0536d053 100644 --- a/src/eva2/server/go/operators/mutation/MutateESCovarianceMatrixAdaption.java +++ b/src/eva2/server/go/operators/mutation/MutateESCovarianceMatrixAdaption.java @@ -5,9 +5,9 @@ import eva2.server.go.individuals.InterfaceESIndividual; import eva2.server.go.populations.Population; import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.tools.Mathematics; -import wsi.ra.math.RNG; -import wsi.ra.math.Jama.EigenvalueDecomposition; -import wsi.ra.math.Jama.Matrix; +import eva2.tools.math.RNG; +import eva2.tools.math.Jama.EigenvalueDecomposition; +import eva2.tools.math.Jama.Matrix; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/mutation/MutateESFixedStepSize.java b/src/eva2/server/go/operators/mutation/MutateESFixedStepSize.java index c23c5043..8373614e 100644 --- a/src/eva2/server/go/operators/mutation/MutateESFixedStepSize.java +++ b/src/eva2/server/go/operators/mutation/MutateESFixedStepSize.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. diff --git a/src/eva2/server/go/operators/mutation/MutateESGlobal.java b/src/eva2/server/go/operators/mutation/MutateESGlobal.java index f39d408a..d3038e95 100644 --- a/src/eva2/server/go/operators/mutation/MutateESGlobal.java +++ b/src/eva2/server/go/operators/mutation/MutateESGlobal.java @@ -6,8 +6,8 @@ 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.SelectedTag; +import eva2.tools.math.RNG; /** diff --git a/src/eva2/server/go/operators/mutation/MutateESLocal.java b/src/eva2/server/go/operators/mutation/MutateESLocal.java index 1c9029a1..d8b2ea00 100644 --- a/src/eva2/server/go/operators/mutation/MutateESLocal.java +++ b/src/eva2/server/go/operators/mutation/MutateESLocal.java @@ -8,9 +8,9 @@ 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 wsi.ra.math.RNG; import eva2.tools.SelectedTag; import eva2.tools.Tag; +import eva2.tools.math.RNG; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/mutation/MutateESMainVectorAdaption.java b/src/eva2/server/go/operators/mutation/MutateESMainVectorAdaption.java index 9e7f4bd7..b9ea6457 100644 --- a/src/eva2/server/go/operators/mutation/MutateESMainVectorAdaption.java +++ b/src/eva2/server/go/operators/mutation/MutateESMainVectorAdaption.java @@ -5,7 +5,7 @@ import eva2.server.go.individuals.InterfaceESIndividual; import eva2.server.go.populations.Population; import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.tools.Mathematics; -import wsi.ra.math.RNG; +import eva2.tools.math.RNG; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/mutation/MutateESMutativeStepSizeControl.java b/src/eva2/server/go/operators/mutation/MutateESMutativeStepSizeControl.java index b359d2f7..570717e4 100644 --- a/src/eva2/server/go/operators/mutation/MutateESMutativeStepSizeControl.java +++ b/src/eva2/server/go/operators/mutation/MutateESMutativeStepSizeControl.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. diff --git a/src/eva2/server/go/operators/mutation/MutateESPathLengthAdaption.java b/src/eva2/server/go/operators/mutation/MutateESPathLengthAdaption.java index 31f04edc..15012b62 100644 --- a/src/eva2/server/go/operators/mutation/MutateESPathLengthAdaption.java +++ b/src/eva2/server/go/operators/mutation/MutateESPathLengthAdaption.java @@ -1,11 +1,11 @@ package eva2.server.go.operators.mutation; -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.Mathematics; +import eva2.tools.math.RNG; /** * ES mutation with path length control. The step size (single sigma) is diff --git a/src/eva2/server/go/operators/mutation/MutateESRankMuCMA.java b/src/eva2/server/go/operators/mutation/MutateESRankMuCMA.java index 792d5b23..03ae6a6c 100644 --- a/src/eva2/server/go/operators/mutation/MutateESRankMuCMA.java +++ b/src/eva2/server/go/operators/mutation/MutateESRankMuCMA.java @@ -3,9 +3,6 @@ package eva2.server.go.operators.mutation; import java.io.Serializable; import java.util.Arrays; -import wsi.ra.math.RNG; -import wsi.ra.math.Jama.EigenvalueDecomposition; -import wsi.ra.math.Jama.Matrix; import eva2.gui.BeanInspector; import eva2.gui.GenericObjectEditor; import eva2.server.go.InterfacePopulationChangedEventListener; @@ -18,6 +15,9 @@ import eva2.server.go.strategies.EvolutionStrategies; import eva2.tools.EVAERROR; import eva2.tools.Mathematics; import eva2.tools.Pair; +import eva2.tools.math.RNG; +import eva2.tools.math.Jama.EigenvalueDecomposition; +import eva2.tools.math.Jama.Matrix; /** * The collection of all population specific data required for a rank-mu-CMA optimization. diff --git a/src/eva2/server/go/operators/mutation/MutateESSuccessRule.java b/src/eva2/server/go/operators/mutation/MutateESSuccessRule.java index 45cec399..85773140 100644 --- a/src/eva2/server/go/operators/mutation/MutateESSuccessRule.java +++ b/src/eva2/server/go/operators/mutation/MutateESSuccessRule.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; /** * Success rule implementation. diff --git a/src/eva2/server/go/operators/mutation/MutateGAAdaptive.java b/src/eva2/server/go/operators/mutation/MutateGAAdaptive.java index 1d1ee254..bdc774ee 100644 --- a/src/eva2/server/go/operators/mutation/MutateGAAdaptive.java +++ b/src/eva2/server/go/operators/mutation/MutateGAAdaptive.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; /** * The mutation probability is adapted using a parameter tau and stored in the individual. diff --git a/src/eva2/server/go/operators/mutation/MutateGAInvertBits.java b/src/eva2/server/go/operators/mutation/MutateGAInvertBits.java index 916e865e..cec2f20c 100644 --- a/src/eva2/server/go/operators/mutation/MutateGAInvertBits.java +++ b/src/eva2/server/go/operators/mutation/MutateGAInvertBits.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. diff --git a/src/eva2/server/go/operators/mutation/MutateGAStandard.java b/src/eva2/server/go/operators/mutation/MutateGAStandard.java index f5e85a98..53d98242 100644 --- a/src/eva2/server/go/operators/mutation/MutateGAStandard.java +++ b/src/eva2/server/go/operators/mutation/MutateGAStandard.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. diff --git a/src/eva2/server/go/operators/mutation/MutateGASwapBits.java b/src/eva2/server/go/operators/mutation/MutateGASwapBits.java index c001cc31..fd6851e1 100644 --- a/src/eva2/server/go/operators/mutation/MutateGASwapBits.java +++ b/src/eva2/server/go/operators/mutation/MutateGASwapBits.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. diff --git a/src/eva2/server/go/operators/mutation/MutateGIInsertDelete.java b/src/eva2/server/go/operators/mutation/MutateGIInsertDelete.java index 6eac2fe7..2c6de96e 100644 --- a/src/eva2/server/go/operators/mutation/MutateGIInsertDelete.java +++ b/src/eva2/server/go/operators/mutation/MutateGIInsertDelete.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. diff --git a/src/eva2/server/go/operators/mutation/MutateGIInvert.java b/src/eva2/server/go/operators/mutation/MutateGIInvert.java index 8314222c..cbde4ae6 100644 --- a/src/eva2/server/go/operators/mutation/MutateGIInvert.java +++ b/src/eva2/server/go/operators/mutation/MutateGIInvert.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. diff --git a/src/eva2/server/go/operators/mutation/MutateGINominal.java b/src/eva2/server/go/operators/mutation/MutateGINominal.java index 059af2fd..bf819202 100644 --- a/src/eva2/server/go/operators/mutation/MutateGINominal.java +++ b/src/eva2/server/go/operators/mutation/MutateGINominal.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. diff --git a/src/eva2/server/go/operators/mutation/MutateGIOrdinal.java b/src/eva2/server/go/operators/mutation/MutateGIOrdinal.java index cde9662e..9b400f8f 100644 --- a/src/eva2/server/go/operators/mutation/MutateGIOrdinal.java +++ b/src/eva2/server/go/operators/mutation/MutateGIOrdinal.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. diff --git a/src/eva2/server/go/operators/mutation/MutateGITranslocate.java b/src/eva2/server/go/operators/mutation/MutateGITranslocate.java index 03bf1453..82f78bce 100644 --- a/src/eva2/server/go/operators/mutation/MutateGITranslocate.java +++ b/src/eva2/server/go/operators/mutation/MutateGITranslocate.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; /** diff --git a/src/eva2/server/go/operators/mutation/MutateGPAdaptive.java b/src/eva2/server/go/operators/mutation/MutateGPAdaptive.java index c25d5351..ca37a420 100644 --- a/src/eva2/server/go/operators/mutation/MutateGPAdaptive.java +++ b/src/eva2/server/go/operators/mutation/MutateGPAdaptive.java @@ -1,12 +1,12 @@ package eva2.server.go.operators.mutation; -import wsi.ra.math.RNG; import eva2.server.go.IndividualInterface; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.individuals.InterfaceGPIndividual; import eva2.server.go.populations.Population; import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.tools.math.RNG; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/mutation/MutateGPSingleNode.java b/src/eva2/server/go/operators/mutation/MutateGPSingleNode.java index d97d0e71..c76a7f37 100644 --- a/src/eva2/server/go/operators/mutation/MutateGPSingleNode.java +++ b/src/eva2/server/go/operators/mutation/MutateGPSingleNode.java @@ -10,7 +10,7 @@ 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 wsi.ra.math.RNG; +import eva2.tools.math.RNG; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/mutation/MutateOBGAFlip.java b/src/eva2/server/go/operators/mutation/MutateOBGAFlip.java index 83acb7fc..d5a70aed 100644 --- a/src/eva2/server/go/operators/mutation/MutateOBGAFlip.java +++ b/src/eva2/server/go/operators/mutation/MutateOBGAFlip.java @@ -5,7 +5,7 @@ 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 wsi.ra.math.RNG; +import eva2.tools.math.RNG; /** diff --git a/src/eva2/server/go/operators/mutation/MutateOBGAInversion.java b/src/eva2/server/go/operators/mutation/MutateOBGAInversion.java index 39f078cd..3626526e 100644 --- a/src/eva2/server/go/operators/mutation/MutateOBGAInversion.java +++ b/src/eva2/server/go/operators/mutation/MutateOBGAInversion.java @@ -5,7 +5,7 @@ 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 wsi.ra.math.RNG; +import eva2.tools.math.RNG; /** diff --git a/src/eva2/server/go/operators/mutation/PropertyMutationMixerEditor.java b/src/eva2/server/go/operators/mutation/PropertyMutationMixerEditor.java index ecea87c6..81ad99f3 100644 --- a/src/eva2/server/go/operators/mutation/PropertyMutationMixerEditor.java +++ b/src/eva2/server/go/operators/mutation/PropertyMutationMixerEditor.java @@ -5,6 +5,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.*; @@ -12,7 +13,6 @@ import java.awt.event.ActionListener; import java.awt.event.ActionEvent; import java.awt.event.KeyListener; import java.awt.event.KeyEvent; -import wsi.ra.tool.BasicResourceLoader; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/paretofrontmetrics/MetricErrorRatio.java b/src/eva2/server/go/operators/paretofrontmetrics/MetricErrorRatio.java index 349f91c8..bb8ec054 100644 --- a/src/eva2/server/go/operators/paretofrontmetrics/MetricErrorRatio.java +++ b/src/eva2/server/go/operators/paretofrontmetrics/MetricErrorRatio.java @@ -1,6 +1,5 @@ package eva2.server.go.operators.paretofrontmetrics; -import wsi.ra.tool.ResourceLoader; import java.io.ByteArrayInputStream; import java.util.Properties; @@ -12,6 +11,7 @@ import eva2.server.go.operators.archiving.ArchivingAllDominating; import eva2.server.go.populations.Population; import eva2.server.go.problems.AbstractMultiObjectiveOptimizationProblem; import eva2.server.go.tools.FileTools; +import eva2.tools.tool.ResourceLoader; /** The error ratio metric only suited for small discrete diff --git a/src/eva2/server/go/operators/selection/SelectAll.java b/src/eva2/server/go/operators/selection/SelectAll.java index 8d6bf679..f61aae6b 100644 --- a/src/eva2/server/go/operators/selection/SelectAll.java +++ b/src/eva2/server/go/operators/selection/SelectAll.java @@ -2,7 +2,7 @@ package eva2.server.go.operators.selection; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.populations.Population; -import wsi.ra.math.RNG; +import eva2.tools.math.RNG; /** Simple method to selecet all. * In case of multiple fitness values the selection diff --git a/src/eva2/server/go/operators/selection/SelectBestIndividuals.java b/src/eva2/server/go/operators/selection/SelectBestIndividuals.java index e6944be7..25b349df 100644 --- a/src/eva2/server/go/operators/selection/SelectBestIndividuals.java +++ b/src/eva2/server/go/operators/selection/SelectBestIndividuals.java @@ -5,7 +5,7 @@ import java.util.ArrayList; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.populations.Population; -import wsi.ra.math.RNG; +import eva2.tools.math.RNG; /** Select the best individuals. * In case of multiple fitness values the selection diff --git a/src/eva2/server/go/operators/selection/SelectBestSingle.java b/src/eva2/server/go/operators/selection/SelectBestSingle.java index 89528409..cb064327 100644 --- a/src/eva2/server/go/operators/selection/SelectBestSingle.java +++ b/src/eva2/server/go/operators/selection/SelectBestSingle.java @@ -2,7 +2,7 @@ package eva2.server.go.operators.selection; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.populations.Population; -import wsi.ra.math.RNG; +import eva2.tools.math.RNG; /** Select best individual multiple times if necessary. diff --git a/src/eva2/server/go/operators/selection/SelectEPTournaments.java b/src/eva2/server/go/operators/selection/SelectEPTournaments.java index 3582cb63..142de166 100644 --- a/src/eva2/server/go/operators/selection/SelectEPTournaments.java +++ b/src/eva2/server/go/operators/selection/SelectEPTournaments.java @@ -5,7 +5,7 @@ import java.util.ArrayList; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.populations.Population; -import wsi.ra.math.RNG; +import eva2.tools.math.RNG; /** This method implements the multiple tournament scheme * for EP. diff --git a/src/eva2/server/go/operators/selection/SelectHomologousMate.java b/src/eva2/server/go/operators/selection/SelectHomologousMate.java index 8ba71a90..2622ee5e 100644 --- a/src/eva2/server/go/operators/selection/SelectHomologousMate.java +++ b/src/eva2/server/go/operators/selection/SelectHomologousMate.java @@ -6,7 +6,7 @@ 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 wsi.ra.math.RNG; +import eva2.tools.math.RNG; /** An experimential implementation for mating restriction. * Possibly defunct. diff --git a/src/eva2/server/go/operators/selection/SelectMOMaxiMin.java b/src/eva2/server/go/operators/selection/SelectMOMaxiMin.java index f9226e50..6f91f89d 100644 --- a/src/eva2/server/go/operators/selection/SelectMOMaxiMin.java +++ b/src/eva2/server/go/operators/selection/SelectMOMaxiMin.java @@ -3,7 +3,7 @@ package eva2.server.go.operators.selection; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.operators.moso.MOSOMaxiMin; import eva2.server.go.populations.Population; -import wsi.ra.math.RNG; +import eva2.tools.math.RNG; /** A multi-objective selection criterion based on the maximin * method. diff --git a/src/eva2/server/go/operators/selection/SelectMONSGAIICrowedTournament.java b/src/eva2/server/go/operators/selection/SelectMONSGAIICrowedTournament.java index dd374865..6033558f 100644 --- a/src/eva2/server/go/operators/selection/SelectMONSGAIICrowedTournament.java +++ b/src/eva2/server/go/operators/selection/SelectMONSGAIICrowedTournament.java @@ -3,7 +3,7 @@ package eva2.server.go.operators.selection; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.operators.archiving.ArchivingNSGAII; import eva2.server.go.populations.Population; -import wsi.ra.math.RNG; +import eva2.tools.math.RNG; /** The infamous NSGA-II selection scheme for multi-objective * optimization based on Pareto ranks and hybergrids. diff --git a/src/eva2/server/go/operators/selection/SelectMONonDominated.java b/src/eva2/server/go/operators/selection/SelectMONonDominated.java index 73e89c71..bd9ce481 100644 --- a/src/eva2/server/go/operators/selection/SelectMONonDominated.java +++ b/src/eva2/server/go/operators/selection/SelectMONonDominated.java @@ -2,7 +2,7 @@ package eva2.server.go.operators.selection; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.populations.Population; -import wsi.ra.math.RNG; +import eva2.tools.math.RNG; /** This multi-objective selection method preferrs non-dominated * individuals over dominated ones. Actually, this fails in case diff --git a/src/eva2/server/go/operators/selection/SelectMOPESA.java b/src/eva2/server/go/operators/selection/SelectMOPESA.java index 862d58f7..b2794e16 100644 --- a/src/eva2/server/go/operators/selection/SelectMOPESA.java +++ b/src/eva2/server/go/operators/selection/SelectMOPESA.java @@ -4,7 +4,7 @@ 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 wsi.ra.math.RNG; +import eva2.tools.math.RNG; /** The multi-objective PESA selection method. * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/selection/SelectMOPESAII.java b/src/eva2/server/go/operators/selection/SelectMOPESAII.java index 8069469f..7ed205ed 100644 --- a/src/eva2/server/go/operators/selection/SelectMOPESAII.java +++ b/src/eva2/server/go/operators/selection/SelectMOPESAII.java @@ -8,7 +8,7 @@ import java.util.Enumeration; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.operators.archiving.ArchivingPESAII; import eva2.server.go.populations.Population; -import wsi.ra.math.RNG; +import eva2.tools.math.RNG; /** The multi-objective PESA II selection criteria based on an n-dimensional * grid using a squeezing factor. diff --git a/src/eva2/server/go/operators/selection/SelectMOSPEAII.java b/src/eva2/server/go/operators/selection/SelectMOSPEAII.java index 1440ddc2..d835ff36 100644 --- a/src/eva2/server/go/operators/selection/SelectMOSPEAII.java +++ b/src/eva2/server/go/operators/selection/SelectMOSPEAII.java @@ -8,8 +8,8 @@ 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 wsi.ra.math.RNG; -import wsi.ra.chart2d.DPoint; +import eva2.tools.chart2d.DPoint; +import eva2.tools.math.RNG; /** The SPEA II selection criteria using strength and raw fitness to determine * good individuals. diff --git a/src/eva2/server/go/operators/selection/SelectParticleWheel.java b/src/eva2/server/go/operators/selection/SelectParticleWheel.java index 0efc338a..a88a0761 100644 --- a/src/eva2/server/go/operators/selection/SelectParticleWheel.java +++ b/src/eva2/server/go/operators/selection/SelectParticleWheel.java @@ -6,7 +6,7 @@ import eva2.server.go.operators.selection.probability.SelProbBoltzman; import eva2.server.go.operators.selection.probability.SelProbStandard; import eva2.server.go.operators.selection.probability.SelProbStandardScaling; import eva2.server.go.populations.Population; -import wsi.ra.math.RNG; +import eva2.tools.math.RNG; /** This method implements the roulette wheel selection for diff --git a/src/eva2/server/go/operators/selection/SelectRandom.java b/src/eva2/server/go/operators/selection/SelectRandom.java index 531a206b..6510a779 100644 --- a/src/eva2/server/go/operators/selection/SelectRandom.java +++ b/src/eva2/server/go/operators/selection/SelectRandom.java @@ -2,7 +2,7 @@ package eva2.server.go.operators.selection; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.populations.Population; -import wsi.ra.math.RNG; +import eva2.tools.math.RNG; /** Random selection typically used for ES a mating selection. diff --git a/src/eva2/server/go/operators/selection/SelectTournament.java b/src/eva2/server/go/operators/selection/SelectTournament.java index 902a5887..ad0254d4 100644 --- a/src/eva2/server/go/operators/selection/SelectTournament.java +++ b/src/eva2/server/go/operators/selection/SelectTournament.java @@ -2,7 +2,7 @@ package eva2.server.go.operators.selection; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.populations.Population; -import wsi.ra.math.RNG; +import eva2.tools.math.RNG; /** Tournament selection within a given tournament group size, * also scaling invariant. diff --git a/src/eva2/server/go/operators/selection/SelectXProbRouletteWheel.java b/src/eva2/server/go/operators/selection/SelectXProbRouletteWheel.java index ebe71d9e..7cd71f26 100644 --- a/src/eva2/server/go/operators/selection/SelectXProbRouletteWheel.java +++ b/src/eva2/server/go/operators/selection/SelectXProbRouletteWheel.java @@ -4,7 +4,7 @@ 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 wsi.ra.math.RNG; +import eva2.tools.math.RNG; class treeElement implements java.io.Serializable { diff --git a/src/eva2/server/go/operators/selection/replacement/ReplaceRandom.java b/src/eva2/server/go/operators/selection/replacement/ReplaceRandom.java index 41da37ff..5c525579 100644 --- a/src/eva2/server/go/operators/selection/replacement/ReplaceRandom.java +++ b/src/eva2/server/go/operators/selection/replacement/ReplaceRandom.java @@ -2,7 +2,7 @@ package eva2.server.go.operators.selection.replacement; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.populations.Population; -import wsi.ra.math.RNG; +import eva2.tools.math.RNG; /** Random replacement. * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/operators/selection/replacement/ReplaceWorst.java b/src/eva2/server/go/operators/selection/replacement/ReplaceWorst.java index d4edb332..681850d0 100644 --- a/src/eva2/server/go/operators/selection/replacement/ReplaceWorst.java +++ b/src/eva2/server/go/operators/selection/replacement/ReplaceWorst.java @@ -2,7 +2,7 @@ package eva2.server.go.operators.selection.replacement; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.populations.Population; -import wsi.ra.math.RNG; +import eva2.tools.math.RNG; /** This method replaces the worst indvidual in the population. * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/populations/PBILPopulation.java b/src/eva2/server/go/populations/PBILPopulation.java index 6ba9e972..631ececb 100644 --- a/src/eva2/server/go/populations/PBILPopulation.java +++ b/src/eva2/server/go/populations/PBILPopulation.java @@ -5,7 +5,7 @@ import java.util.BitSet; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.individuals.InterfaceGAIndividual; -import wsi.ra.math.RNG; +import eva2.tools.math.RNG; /** This implementation of Population Based Incremental Learning is only * suited for a BitString based genotyp represenation. diff --git a/src/eva2/server/go/populations/Population.java b/src/eva2/server/go/populations/Population.java index 416199c1..97d073fa 100644 --- a/src/eva2/server/go/populations/Population.java +++ b/src/eva2/server/go/populations/Population.java @@ -8,7 +8,6 @@ import java.util.List; import java.util.PriorityQueue; import java.util.Set; -import wsi.ra.math.RNG; import eva2.server.go.IndividualInterface; import eva2.server.go.InterfacePopulationChangedEventListener; import eva2.server.go.PopulationInterface; @@ -21,6 +20,7 @@ import eva2.server.go.operators.selection.probability.AbstractSelProb; import eva2.tools.EVAERROR; import eva2.tools.Mathematics; import eva2.tools.Pair; +import eva2.tools.math.RNG; /** This is a basic implementation for a EA Population. diff --git a/src/eva2/server/go/problems/AbstractMultiObjectiveOptimizationProblem.java b/src/eva2/server/go/problems/AbstractMultiObjectiveOptimizationProblem.java index c2a9302e..b7d28f39 100644 --- a/src/eva2/server/go/problems/AbstractMultiObjectiveOptimizationProblem.java +++ b/src/eva2/server/go/problems/AbstractMultiObjectiveOptimizationProblem.java @@ -5,7 +5,6 @@ import java.util.ArrayList; import javax.swing.JFrame; -import wsi.ra.chart2d.DPoint; import eva2.gui.Chart2DDPointIconCircle; import eva2.gui.Chart2DDPointIconText; import eva2.gui.GraphPointSet; @@ -19,6 +18,7 @@ import eva2.server.go.operators.moso.MOSONoConvert; import eva2.server.go.operators.paretofrontmetrics.InterfaceParetoFrontMetric; import eva2.server.go.operators.paretofrontmetrics.MetricS; import eva2.server.go.populations.Population; +import eva2.tools.chart2d.DPoint; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/problems/AbstractOptimizationProblem.java b/src/eva2/server/go/problems/AbstractOptimizationProblem.java index 15dc28b4..095c04b1 100644 --- a/src/eva2/server/go/problems/AbstractOptimizationProblem.java +++ b/src/eva2/server/go/problems/AbstractOptimizationProblem.java @@ -2,6 +2,7 @@ package eva2.server.go.problems; import java.awt.BorderLayout; import java.util.ArrayList; +import java.util.Vector; import java.io.Serializable; @@ -39,10 +40,10 @@ public abstract class AbstractOptimizationProblem implements InterfaceOptimizati class EvalThread extends Thread { AbstractOptimizationProblem prob; AbstractEAIndividual ind; - ArrayList resultrep; + Vector resultrep; Population pop; - public EvalThread(AbstractOptimizationProblem prob, AbstractEAIndividual ind, ArrayList resultrep, Population pop) { + public EvalThread(AbstractOptimizationProblem prob, AbstractEAIndividual ind, Vector resultrep, Population pop) { this.ind = ind; this.prob = prob; this.resultrep = resultrep; @@ -101,8 +102,8 @@ public abstract class AbstractOptimizationProblem implements InterfaceOptimizati evaluatePopulationStart(population); if (this.parallelthreads > 1) { - ArrayList queue = new ArrayList(); - ArrayList finished = new ArrayList(); + Vector queue = new Vector(); + Vector finished = new Vector(); queue.addAll(population); while (finished.size() < population.size()) { diff --git a/src/eva2/server/go/problems/AbstractParallelOptimizationProblem.java b/src/eva2/server/go/problems/AbstractParallelOptimizationProblem.java index d17ce1c4..26741663 100644 --- a/src/eva2/server/go/problems/AbstractParallelOptimizationProblem.java +++ b/src/eva2/server/go/problems/AbstractParallelOptimizationProblem.java @@ -1,7 +1,7 @@ package eva2.server.go.problems; -import wsi.ra.jproxy.RMIProxyRemoteThread; import eva2.gui.PropertyRemoteServers; +import eva2.tools.jproxy.RMIProxyRemoteThread; /** * This class is under construction. diff --git a/src/eva2/server/go/problems/AbstractProblemDouble.java b/src/eva2/server/go/problems/AbstractProblemDouble.java index af91e0c8..d3fb022f 100644 --- a/src/eva2/server/go/problems/AbstractProblemDouble.java +++ b/src/eva2/server/go/problems/AbstractProblemDouble.java @@ -1,6 +1,5 @@ package eva2.server.go.problems; -import wsi.ra.math.RNG; import eva2.gui.GenericObjectEditor; import eva2.server.go.PopulationInterface; import eva2.server.go.individuals.AbstractEAIndividual; @@ -11,6 +10,7 @@ import eva2.server.go.operators.constraint.GenericConstraint; import eva2.server.go.populations.Population; import eva2.server.go.strategies.InterfaceOptimizer; import eva2.tools.Pair; +import eva2.tools.math.RNG; /** * For a double valued problem, there are two main methods to implement: {@link #getProblemDimension()} diff --git a/src/eva2/server/go/problems/BKnapsackProblem.java b/src/eva2/server/go/problems/BKnapsackProblem.java index d37173f9..334420da 100644 --- a/src/eva2/server/go/problems/BKnapsackProblem.java +++ b/src/eva2/server/go/problems/BKnapsackProblem.java @@ -4,11 +4,11 @@ package eva2.server.go.problems; import java.util.BitSet; -import wsi.ra.math.RNG; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.individuals.InterfaceDataTypeBinary; import eva2.server.go.strategies.InterfaceOptimizer; import eva2.server.go.problems.AbstractProblemBinary; +import eva2.tools.math.RNG; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/problems/F4Problem.java b/src/eva2/server/go/problems/F4Problem.java index e48b7090..cf594b7f 100644 --- a/src/eva2/server/go/problems/F4Problem.java +++ b/src/eva2/server/go/problems/F4Problem.java @@ -4,7 +4,7 @@ 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 wsi.ra.math.RNG; +import eva2.tools.math.RNG; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/problems/F5Problem.java b/src/eva2/server/go/problems/F5Problem.java index ac84e14c..7d6d31a9 100644 --- a/src/eva2/server/go/problems/F5Problem.java +++ b/src/eva2/server/go/problems/F5Problem.java @@ -4,7 +4,7 @@ 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 wsi.ra.math.RNG; +import eva2.tools.math.RNG; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/problems/F6Problem.java b/src/eva2/server/go/problems/F6Problem.java index 9823ed51..f40334a0 100644 --- a/src/eva2/server/go/problems/F6Problem.java +++ b/src/eva2/server/go/problems/F6Problem.java @@ -2,7 +2,7 @@ package eva2.server.go.problems; import eva2.server.go.individuals.ESIndividualDoubleData; import eva2.tools.Mathematics; -import wsi.ra.math.Jama.Matrix; +import eva2.tools.math.Jama.Matrix; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/problems/F7Problem.java b/src/eva2/server/go/problems/F7Problem.java index b7100198..42721d52 100644 --- a/src/eva2/server/go/problems/F7Problem.java +++ b/src/eva2/server/go/problems/F7Problem.java @@ -4,9 +4,9 @@ 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 wsi.ra.math.RNG; import eva2.tools.SelectedTag; import eva2.tools.Tag; +import eva2.tools.math.RNG; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/problems/FLensProblem.java b/src/eva2/server/go/problems/FLensProblem.java index 31477128..b0738562 100644 --- a/src/eva2/server/go/problems/FLensProblem.java +++ b/src/eva2/server/go/problems/FLensProblem.java @@ -18,7 +18,6 @@ import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JTextArea; -import wsi.ra.math.RNG; import eva2.server.go.GOStandaloneVersion; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.individuals.ESIndividualDoubleData; @@ -26,6 +25,7 @@ import eva2.server.go.individuals.InterfaceDataTypeDouble; import eva2.server.go.populations.Population; import eva2.server.go.strategies.InterfaceOptimizer; import eva2.server.modules.GOParameters; +import eva2.tools.math.RNG; class MyLensViewer extends JPanel { diff --git a/src/eva2/server/go/problems/PSymbolicRegression.java b/src/eva2/server/go/problems/PSymbolicRegression.java index aadabacd..1ed09e8e 100644 --- a/src/eva2/server/go/problems/PSymbolicRegression.java +++ b/src/eva2/server/go/problems/PSymbolicRegression.java @@ -23,8 +23,8 @@ 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 wsi.ra.math.RNG; import eva2.tools.EVAERROR; +import eva2.tools.math.RNG; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/problems/SimpleProblemWrapper.java b/src/eva2/server/go/problems/SimpleProblemWrapper.java index b68c8854..59a488b1 100644 --- a/src/eva2/server/go/problems/SimpleProblemWrapper.java +++ b/src/eva2/server/go/problems/SimpleProblemWrapper.java @@ -6,7 +6,6 @@ import simpleprobs.InterfaceSimpleProblem; import simpleprobs.SimpleF1; import simpleprobs.SimpleProblemBinary; import simpleprobs.SimpleProblemDouble; -import wsi.ra.math.RNG; import eva2.gui.BeanInspector; import eva2.gui.GenericObjectEditor; import eva2.gui.Plot; @@ -17,6 +16,7 @@ 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.tools.math.RNG; public class SimpleProblemWrapper extends AbstractOptimizationProblem { InterfaceSimpleProblem simProb = new SimpleF1(); diff --git a/src/eva2/server/go/problems/TF1Problem.java b/src/eva2/server/go/problems/TF1Problem.java index 03fdfcc2..b074824b 100644 --- a/src/eva2/server/go/problems/TF1Problem.java +++ b/src/eva2/server/go/problems/TF1Problem.java @@ -5,8 +5,6 @@ import java.io.BufferedWriter; import java.io.FileWriter; import java.util.ArrayList; -import wsi.ra.chart2d.DPoint; -import wsi.ra.math.RNG; import eva2.gui.Chart2DDPointIconCircle; import eva2.gui.Chart2DDPointIconText; import eva2.gui.GraphPointSet; @@ -19,6 +17,8 @@ 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.tools.chart2d.DPoint; +import eva2.tools.math.RNG; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/strategies/CHCAdaptiveSearchAlgorithm.java b/src/eva2/server/go/strategies/CHCAdaptiveSearchAlgorithm.java index 8b61bed6..3b458e37 100644 --- a/src/eva2/server/go/strategies/CHCAdaptiveSearchAlgorithm.java +++ b/src/eva2/server/go/strategies/CHCAdaptiveSearchAlgorithm.java @@ -3,7 +3,6 @@ package eva2.server.go.strategies; import java.util.BitSet; -import wsi.ra.math.RNG; import eva2.server.go.InterfacePopulationChangedEventListener; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.individuals.InterfaceGAIndividual; @@ -15,6 +14,7 @@ import eva2.server.go.populations.Population; import eva2.server.go.populations.SolutionSet; import eva2.server.go.problems.B1Problem; import eva2.server.go.problems.InterfaceOptimizationProblem; +import eva2.tools.math.RNG; /** 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 diff --git a/src/eva2/server/go/strategies/ClusterBasedNichingEA.java b/src/eva2/server/go/strategies/ClusterBasedNichingEA.java index 467a2f60..85fe33c0 100644 --- a/src/eva2/server/go/strategies/ClusterBasedNichingEA.java +++ b/src/eva2/server/go/strategies/ClusterBasedNichingEA.java @@ -2,10 +2,6 @@ package eva2.server.go.strategies; import java.util.ArrayList; -import wsi.ra.chart2d.DPoint; -import wsi.ra.chart2d.DPointIcon; -import wsi.ra.chart2d.DPointSet; -import wsi.ra.math.RNG; import eva2.gui.BeanInspector; import eva2.gui.Chart2DDPointIconCircle; import eva2.gui.Chart2DDPointIconText; @@ -26,6 +22,10 @@ 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.tools.chart2d.DPoint; +import eva2.tools.chart2d.DPointIcon; +import eva2.tools.chart2d.DPointSet; +import eva2.tools.math.RNG; /** The infamuos clustering based niching EA, still under construction. * It should be able to identify and track multiple global/local optima diff --git a/src/eva2/server/go/strategies/DifferentialEvolution.java b/src/eva2/server/go/strategies/DifferentialEvolution.java index 2626e915..4229c4c7 100644 --- a/src/eva2/server/go/strategies/DifferentialEvolution.java +++ b/src/eva2/server/go/strategies/DifferentialEvolution.java @@ -2,7 +2,6 @@ package eva2.server.go.strategies; import java.util.Vector; -import wsi.ra.math.RNG; import eva2.gui.BeanInspector; import eva2.gui.GenericObjectEditor; import eva2.server.go.InterfacePopulationChangedEventListener; @@ -19,6 +18,7 @@ import eva2.server.go.problems.F1Problem; import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.tools.EVAERROR; import eva2.tools.Mathematics; +import eva2.tools.math.RNG; /** * Differential evolution implementing DE1 and DE2 following the paper of Storm and diff --git a/src/eva2/server/go/strategies/DynamicParticleSwarmOptimization.java b/src/eva2/server/go/strategies/DynamicParticleSwarmOptimization.java index 218f256e..38cf919d 100644 --- a/src/eva2/server/go/strategies/DynamicParticleSwarmOptimization.java +++ b/src/eva2/server/go/strategies/DynamicParticleSwarmOptimization.java @@ -1,6 +1,5 @@ package eva2.server.go.strategies; -import wsi.ra.math.RNG; import eva2.gui.GenericObjectEditor; import eva2.gui.Plot; import eva2.server.go.individuals.AbstractEAIndividual; @@ -11,6 +10,7 @@ import eva2.server.go.problems.AbstractOptimizationProblem; import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.tools.Mathematics; import eva2.tools.SelectedTag; +import eva2.tools.math.RNG; /** * This extends our particle swarm implementation to dynamic optimization problems. diff --git a/src/eva2/server/go/strategies/IslandModelEA.java b/src/eva2/server/go/strategies/IslandModelEA.java index 1618801c..a94cf1db 100644 --- a/src/eva2/server/go/strategies/IslandModelEA.java +++ b/src/eva2/server/go/strategies/IslandModelEA.java @@ -16,9 +16,9 @@ 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; +import eva2.tools.jproxy.RMIProxyLocal; +import eva2.tools.jproxy.RMIProxyRemoteThread; +import eva2.tools.jproxy.RMIServer; /** The one and only island model for parallelization. Since parallelization based * on the RMIProxyRemoteThread is on the one hand much slower than benchmark function diff --git a/src/eva2/server/go/strategies/ParticleSwarmOptimization.java b/src/eva2/server/go/strategies/ParticleSwarmOptimization.java index facd0816..25bdfaed 100644 --- a/src/eva2/server/go/strategies/ParticleSwarmOptimization.java +++ b/src/eva2/server/go/strategies/ParticleSwarmOptimization.java @@ -3,10 +3,6 @@ package eva2.server.go.strategies; import java.util.Arrays; import java.util.Vector; -import wsi.ra.chart2d.DPoint; -import wsi.ra.chart2d.DPointSet; -import wsi.ra.math.RNG; -import wsi.ra.math.Jama.Matrix; import eva2.gui.BeanInspector; import eva2.gui.GenericObjectEditor; import eva2.gui.TopoPlot; @@ -27,6 +23,10 @@ import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.tools.EVAERROR; import eva2.tools.Mathematics; import eva2.tools.SelectedTag; +import eva2.tools.chart2d.DPoint; +import eva2.tools.chart2d.DPointSet; +import eva2.tools.math.RNG; +import eva2.tools.math.Jama.Matrix; /** diff --git a/src/eva2/server/go/strategies/SimulatedAnnealing.java b/src/eva2/server/go/strategies/SimulatedAnnealing.java index 06028c69..fc3ccd2d 100644 --- a/src/eva2/server/go/strategies/SimulatedAnnealing.java +++ b/src/eva2/server/go/strategies/SimulatedAnnealing.java @@ -8,7 +8,7 @@ import eva2.server.go.populations.Population; import eva2.server.go.populations.SolutionSet; import eva2.server.go.problems.B1Problem; import eva2.server.go.problems.InterfaceOptimizationProblem; -import wsi.ra.math.RNG; +import eva2.tools.math.RNG; /** 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/eva2/server/go/strategies/ThresholdAlgorithm.java b/src/eva2/server/go/strategies/ThresholdAlgorithm.java index 19dcc216..392f258d 100644 --- a/src/eva2/server/go/strategies/ThresholdAlgorithm.java +++ b/src/eva2/server/go/strategies/ThresholdAlgorithm.java @@ -8,7 +8,7 @@ import eva2.server.go.populations.Population; import eva2.server.go.populations.SolutionSet; import eva2.server.go.problems.B1Problem; import eva2.server.go.problems.InterfaceOptimizationProblem; -import wsi.ra.math.RNG; +import eva2.tools.math.RNG; /** Threshold accepting algorithm simliar strategy as the flood * algorithm, similar problems. diff --git a/src/eva2/server/go/strategies/tribes/Tribe.java b/src/eva2/server/go/strategies/tribes/Tribe.java index 0f0d91a9..cfe882d6 100644 --- a/src/eva2/server/go/strategies/tribes/Tribe.java +++ b/src/eva2/server/go/strategies/tribes/Tribe.java @@ -2,7 +2,7 @@ package eva2.server.go.strategies.tribes; import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.server.go.strategies.Tribes; -import wsi.ra.math.RNG; +import eva2.tools.math.RNG; public class Tribe implements java.io.Serializable { diff --git a/src/eva2/server/go/strategies/tribes/TribesExplorer.java b/src/eva2/server/go/strategies/tribes/TribesExplorer.java index 2082f9b8..f782fa5f 100644 --- a/src/eva2/server/go/strategies/tribes/TribesExplorer.java +++ b/src/eva2/server/go/strategies/tribes/TribesExplorer.java @@ -6,7 +6,7 @@ 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 wsi.ra.math.RNG; +import eva2.tools.math.RNG; public class TribesExplorer extends AbstractEAIndividual implements InterfaceDataTypeDouble { /** diff --git a/src/eva2/server/go/strategies/tribes/TribesPosition.java b/src/eva2/server/go/strategies/tribes/TribesPosition.java index db5c6460..b488179c 100644 --- a/src/eva2/server/go/strategies/tribes/TribesPosition.java +++ b/src/eva2/server/go/strategies/tribes/TribesPosition.java @@ -3,7 +3,7 @@ package eva2.server.go.strategies.tribes; import java.util.Arrays; import eva2.server.go.strategies.Tribes; -import wsi.ra.math.RNG; +import eva2.tools.math.RNG; public class TribesPosition implements java.io.Serializable { diff --git a/src/eva2/server/go/strategies/tribes/TribesSwarm.java b/src/eva2/server/go/strategies/tribes/TribesSwarm.java index 35e895a8..7ac8fb49 100644 --- a/src/eva2/server/go/strategies/tribes/TribesSwarm.java +++ b/src/eva2/server/go/strategies/tribes/TribesSwarm.java @@ -6,7 +6,7 @@ import java.util.List; import eva2.server.go.populations.Population; import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.server.go.strategies.Tribes; -import wsi.ra.math.RNG; +import eva2.tools.math.RNG; public class TribesSwarm implements java.io.Serializable{ diff --git a/src/eva2/server/go/tools/FileTools.java b/src/eva2/server/go/tools/FileTools.java index 11b9c1ef..95981666 100644 --- a/src/eva2/server/go/tools/FileTools.java +++ b/src/eva2/server/go/tools/FileTools.java @@ -17,7 +17,8 @@ import java.util.ArrayList; import javax.swing.JFileChooser; import javax.swing.JOptionPane; -import wsi.ra.tool.BasicResourceLoader; +import eva2.tools.tool.BasicResourceLoader; + /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/tools/GONamingBox.java b/src/eva2/server/go/tools/GONamingBox.java index 9f7553e9..9db76f54 100644 --- a/src/eva2/server/go/tools/GONamingBox.java +++ b/src/eva2/server/go/tools/GONamingBox.java @@ -1,6 +1,6 @@ package eva2.server.go.tools; -import wsi.ra.math.RNG; +import eva2.tools.math.RNG; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/tools/ImpactOfDimensionOnMOEAs.java b/src/eva2/server/go/tools/ImpactOfDimensionOnMOEAs.java index 9e9d0d06..ca5d82bc 100644 --- a/src/eva2/server/go/tools/ImpactOfDimensionOnMOEAs.java +++ b/src/eva2/server/go/tools/ImpactOfDimensionOnMOEAs.java @@ -1,6 +1,5 @@ package eva2.server.go.tools; -import wsi.ra.chart2d.DPoint; import java.io.*; @@ -11,6 +10,7 @@ import eva2.server.go.individuals.ESIndividualDoubleData; import eva2.server.go.individuals.InterfaceDataTypeDouble; import eva2.server.go.operators.archiving.ArchivingAllDominating; import eva2.server.go.populations.Population; +import eva2.tools.chart2d.DPoint; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/server/go/tools/TestingDArea.java b/src/eva2/server/go/tools/TestingDArea.java index 26d6cbf7..596eccf5 100644 --- a/src/eva2/server/go/tools/TestingDArea.java +++ b/src/eva2/server/go/tools/TestingDArea.java @@ -1,8 +1,10 @@ package eva2.server.go.tools; -import wsi.ra.chart2d.*; import javax.swing.*; + +import eva2.tools.chart2d.*; + import java.awt.*; /** diff --git a/src/eva2/server/modules/AbstractModuleAdapter.java b/src/eva2/server/modules/AbstractModuleAdapter.java index 4bd77f2c..09dceed5 100644 --- a/src/eva2/server/modules/AbstractModuleAdapter.java +++ b/src/eva2/server/modules/AbstractModuleAdapter.java @@ -16,8 +16,6 @@ import java.io.Serializable; import java.net.InetAddress; import java.util.Vector; -import wsi.ra.jproxy.MainAdapterClient; -import wsi.ra.jproxy.RemoteStateListener; import eva2.gui.EvATabbedFrameMaker; import eva2.gui.LogPanel; import eva2.server.go.InterfaceGOParameters; @@ -25,6 +23,8 @@ import eva2.server.go.InterfaceProcessor; /*==========================================================================* * ABSTRACT CLASS DECLARATION *==========================================================================*/ +import eva2.tools.jproxy.MainAdapterClient; +import eva2.tools.jproxy.RemoteStateListener; /** * The module server expects a constructor with two arguments: String adapterName and MainAdapterClient client. diff --git a/src/eva2/server/modules/DEModuleAdapter.java b/src/eva2/server/modules/DEModuleAdapter.java index 028746a6..65c02275 100644 --- a/src/eva2/server/modules/DEModuleAdapter.java +++ b/src/eva2/server/modules/DEModuleAdapter.java @@ -1,8 +1,8 @@ package eva2.server.modules; import eva2.gui.GenericObjectEditor; +import eva2.tools.jproxy.MainAdapterClient; -import wsi.ra.jproxy.MainAdapterClient; /** This the DE module adapter necessary to access this implementation * from the EvA top level. diff --git a/src/eva2/server/modules/EPModuleAdapter.java b/src/eva2/server/modules/EPModuleAdapter.java index 7082c50f..ec553aa8 100644 --- a/src/eva2/server/modules/EPModuleAdapter.java +++ b/src/eva2/server/modules/EPModuleAdapter.java @@ -1,6 +1,6 @@ package eva2.server.modules; -import wsi.ra.jproxy.MainAdapterClient; +import eva2.tools.jproxy.MainAdapterClient; /** This the EP module adapter necessary to access this implementation * from the EvA top level. diff --git a/src/eva2/server/modules/GAModuleAdapter.java b/src/eva2/server/modules/GAModuleAdapter.java index 0ac079cb..78eaf855 100644 --- a/src/eva2/server/modules/GAModuleAdapter.java +++ b/src/eva2/server/modules/GAModuleAdapter.java @@ -1,6 +1,6 @@ package eva2.server.modules; -import wsi.ra.jproxy.MainAdapterClient; +import eva2.tools.jproxy.MainAdapterClient; /** This the GA module adapter necessary to access this implementation * from the EvA top level. diff --git a/src/eva2/server/modules/GOModuleAdapter.java b/src/eva2/server/modules/GOModuleAdapter.java index a562af12..7bd7d10f 100644 --- a/src/eva2/server/modules/GOModuleAdapter.java +++ b/src/eva2/server/modules/GOModuleAdapter.java @@ -2,7 +2,8 @@ package eva2.server.modules; import java.io.Serializable; -import wsi.ra.jproxy.MainAdapterClient; +import eva2.tools.jproxy.MainAdapterClient; + /** * Starts a statistics GUI and the GOProcessor thread. diff --git a/src/eva2/server/modules/GenericModuleAdapter.java b/src/eva2/server/modules/GenericModuleAdapter.java index 295eb429..baa2f065 100644 --- a/src/eva2/server/modules/GenericModuleAdapter.java +++ b/src/eva2/server/modules/GenericModuleAdapter.java @@ -5,8 +5,6 @@ import java.io.Serializable; import java.lang.reflect.Proxy; import java.util.ArrayList; -import wsi.ra.jproxy.MainAdapterClient; -import wsi.ra.jproxy.RMIProxyLocal; import eva2.gui.EvAModuleButtonPanelMaker; import eva2.gui.EvATabbedFrameMaker; import eva2.gui.GenericObjectEditor; @@ -17,6 +15,8 @@ import eva2.server.stat.AbstractStatistics; import eva2.server.stat.InterfaceStatisticsParameter; import eva2.server.stat.StatisticsStandalone; import eva2.server.stat.StatisticsWithGUI; +import eva2.tools.jproxy.MainAdapterClient; +import eva2.tools.jproxy.RMIProxyLocal; public class GenericModuleAdapter extends AbstractModuleAdapter implements Serializable { diff --git a/src/eva2/server/modules/HCModuleAdapter.java b/src/eva2/server/modules/HCModuleAdapter.java index 1c03b30f..023a39a7 100644 --- a/src/eva2/server/modules/HCModuleAdapter.java +++ b/src/eva2/server/modules/HCModuleAdapter.java @@ -1,6 +1,6 @@ package eva2.server.modules; -import wsi.ra.jproxy.MainAdapterClient; +import eva2.tools.jproxy.MainAdapterClient; /** This the HC module adapter necessary to access this implementation * from the EvA top level. diff --git a/src/eva2/server/modules/MCModuleAdapter.java b/src/eva2/server/modules/MCModuleAdapter.java index 786a60f3..2fe0bf17 100644 --- a/src/eva2/server/modules/MCModuleAdapter.java +++ b/src/eva2/server/modules/MCModuleAdapter.java @@ -1,6 +1,6 @@ package eva2.server.modules; -import wsi.ra.jproxy.MainAdapterClient; +import eva2.tools.jproxy.MainAdapterClient; /** This the MC module adapter necessary to access this implementation * from the EvA top level. diff --git a/src/eva2/server/modules/MOEAModuleAdapter.java b/src/eva2/server/modules/MOEAModuleAdapter.java index 6471713d..2c8f1e3b 100644 --- a/src/eva2/server/modules/MOEAModuleAdapter.java +++ b/src/eva2/server/modules/MOEAModuleAdapter.java @@ -9,9 +9,9 @@ import eva2.server.EvAServer; import eva2.server.go.InterfaceGOParameters; import eva2.server.stat.InterfaceStatisticsParameter; import eva2.server.stat.StatisticsWithGUI; +import eva2.tools.jproxy.MainAdapterClient; +import eva2.tools.jproxy.RMIProxyLocal; -import wsi.ra.jproxy.MainAdapterClient; -import wsi.ra.jproxy.RMIProxyLocal; /** This the MOEA module adapter necessary to access this implementation * from the EvA top level. diff --git a/src/eva2/server/modules/ModuleAdapter.java b/src/eva2/server/modules/ModuleAdapter.java index 1caa5d3b..38bf387b 100644 --- a/src/eva2/server/modules/ModuleAdapter.java +++ b/src/eva2/server/modules/ModuleAdapter.java @@ -16,7 +16,7 @@ import eva2.gui.EvATabbedFrameMaker; import eva2.gui.LogPanel; import eva2.server.go.operators.postprocess.PostProcessParams; import eva2.server.stat.InterfaceTextListener; -import wsi.ra.jproxy.RemoteStateListener; +import eva2.tools.jproxy.RemoteStateListener; /*==========================================================================* * INTERFACE DECLARATION *==========================================================================*/ diff --git a/src/eva2/server/modules/PBILModuleAdapter.java b/src/eva2/server/modules/PBILModuleAdapter.java index 23aa0fd3..d2f31b2a 100644 --- a/src/eva2/server/modules/PBILModuleAdapter.java +++ b/src/eva2/server/modules/PBILModuleAdapter.java @@ -1,6 +1,6 @@ package eva2.server.modules; -import wsi.ra.jproxy.MainAdapterClient; +import eva2.tools.jproxy.MainAdapterClient; /** This the PBIL module adapter necessary to access this implementation * from the EvA top level. diff --git a/src/eva2/server/modules/PSOModuleAdapter.java b/src/eva2/server/modules/PSOModuleAdapter.java index 520a4850..af2b7be9 100644 --- a/src/eva2/server/modules/PSOModuleAdapter.java +++ b/src/eva2/server/modules/PSOModuleAdapter.java @@ -1,6 +1,6 @@ package eva2.server.modules; -import wsi.ra.jproxy.MainAdapterClient; +import eva2.tools.jproxy.MainAdapterClient; /** This the PSO module adapter necessary to access this implementation * from the EvA top level. diff --git a/src/eva2/server/modules/Processor.java b/src/eva2/server/modules/Processor.java index c8be7ff6..05f4f58d 100644 --- a/src/eva2/server/modules/Processor.java +++ b/src/eva2/server/modules/Processor.java @@ -2,8 +2,6 @@ package eva2.server.modules; import java.util.Vector; -import wsi.ra.jproxy.RemoteStateListener; -import wsi.ra.math.RNG; import eva2.gui.BeanInspector; import eva2.server.go.InterfaceGOParameters; import eva2.server.go.InterfacePopulationChangedEventListener; @@ -27,6 +25,8 @@ import eva2.server.stat.StatisticsWithGUI; import eva2.tools.EVAERROR; import eva2.tools.EVAHELP; import eva2.tools.Pair; +import eva2.tools.jproxy.RemoteStateListener; +import eva2.tools.math.RNG; /** * The Processor may run as a thread permanently (GenericModuleAdapter) and is then stopped and started diff --git a/src/eva2/server/modules/SAModuleAdapter.java b/src/eva2/server/modules/SAModuleAdapter.java index 127a2677..7a673607 100644 --- a/src/eva2/server/modules/SAModuleAdapter.java +++ b/src/eva2/server/modules/SAModuleAdapter.java @@ -1,6 +1,6 @@ package eva2.server.modules; -import wsi.ra.jproxy.MainAdapterClient; +import eva2.tools.jproxy.MainAdapterClient; /** This the SA module adapter necessary to access this implementation * from the EvA top level. diff --git a/src/eva2/server/modules/SSGAModuleAdapter.java b/src/eva2/server/modules/SSGAModuleAdapter.java index bc657a81..4408bb45 100644 --- a/src/eva2/server/modules/SSGAModuleAdapter.java +++ b/src/eva2/server/modules/SSGAModuleAdapter.java @@ -1,6 +1,6 @@ package eva2.server.modules; -import wsi.ra.jproxy.MainAdapterClient; +import eva2.tools.jproxy.MainAdapterClient; /** This the SSGA module adapter necessary to access this implementation * from the EvA top level. diff --git a/src/eva2/server/stat/GenericStatistics.java b/src/eva2/server/stat/GenericStatistics.java index 879a31c4..c7da52e4 100644 --- a/src/eva2/server/stat/GenericStatistics.java +++ b/src/eva2/server/stat/GenericStatistics.java @@ -18,8 +18,8 @@ import java.lang.reflect.Field; import eva2.gui.DataViewer; import eva2.gui.DataViewerInterface; import eva2.gui.Graph; +import eva2.tools.jproxy.MainAdapterClient; -import wsi.ra.jproxy.MainAdapterClient; /** * */ diff --git a/src/eva2/server/stat/StatisticsWithGUI.java b/src/eva2/server/stat/StatisticsWithGUI.java index e565d288..2f33ccc4 100644 --- a/src/eva2/server/stat/StatisticsWithGUI.java +++ b/src/eva2/server/stat/StatisticsWithGUI.java @@ -18,9 +18,6 @@ import java.net.InetAddress; import java.util.ArrayList; import java.util.List; -import wsi.ra.jproxy.MainAdapterClient; -import wsi.ra.jproxy.RMIProxyLocal; -import wsi.ra.jproxy.RMIProxyRemote; import eva2.gui.BeanInspector; import eva2.gui.Graph; import eva2.gui.GraphWindow; @@ -33,6 +30,9 @@ import eva2.server.go.PopulationInterface; import eva2.server.go.problems.InterfaceAdditionalPopulationInformer; import eva2.tools.EVAERROR; import eva2.tools.StringSelection; +import eva2.tools.jproxy.MainAdapterClient; +import eva2.tools.jproxy.RMIProxyLocal; +import eva2.tools.jproxy.RMIProxyRemote; /*==========================================================================* * CLASS DECLARATION diff --git a/src/eva2/tools/EVAHELP.java b/src/eva2/tools/EVAHELP.java index 57c2b235..bfbdc81d 100644 --- a/src/eva2/tools/EVAHELP.java +++ b/src/eva2/tools/EVAHELP.java @@ -25,8 +25,8 @@ import java.net.InetAddress; import java.util.Enumeration; import java.util.Properties; -import wsi.ra.tool.BasicResourceLoader; import eva2.client.EvAClient; +import eva2.tools.tool.BasicResourceLoader; /** diff --git a/src/eva2/tools/KMEANSJAVA.java b/src/eva2/tools/KMEANSJAVA.java index 6b8743ce..943e14ec 100644 --- a/src/eva2/tools/KMEANSJAVA.java +++ b/src/eva2/tools/KMEANSJAVA.java @@ -13,7 +13,8 @@ package eva2.tools; * IMPORTS *==========================================================================*/ import java.util.Comparator; -import wsi.ra.math.RNG; + +import eva2.tools.math.RNG; /** * */ diff --git a/src/eva2/tools/Mathematics.java b/src/eva2/tools/Mathematics.java index 1e964233..222d217b 100644 --- a/src/eva2/tools/Mathematics.java +++ b/src/eva2/tools/Mathematics.java @@ -3,12 +3,12 @@ package eva2.tools; import java.util.Arrays; import java.util.List; -import wsi.ra.math.RNG; -import wsi.ra.math.Jama.Matrix; -import wsi.ra.math.interpolation.BasicDataSet; -import wsi.ra.math.interpolation.InterpolationException; -import wsi.ra.math.interpolation.SplineInterpolation; import eva2.server.go.tools.DoubleArrayComparator; +import eva2.tools.math.RNG; +import eva2.tools.math.Jama.Matrix; +import eva2.tools.math.interpolation.BasicDataSet; +import eva2.tools.math.interpolation.InterpolationException; +import eva2.tools.math.interpolation.SplineInterpolation; //created at June 27 2006 diff --git a/src/eva2/tools/ReflectPackage.java b/src/eva2/tools/ReflectPackage.java index c626dd9e..db540764 100644 --- a/src/eva2/tools/ReflectPackage.java +++ b/src/eva2/tools/ReflectPackage.java @@ -18,7 +18,8 @@ import java.util.jar.JarInputStream; import javax.management.MBeanServer; import javax.management.ObjectName; -import wsi.ra.tool.BasicResourceLoader; +import eva2.tools.tool.BasicResourceLoader; + //import wsi.ra.tool.BasicResourceLoader; diff --git a/src/eva2/tools/ServerPingThread.java b/src/eva2/tools/ServerPingThread.java index 3141e56f..5c0e5747 100644 --- a/src/eva2/tools/ServerPingThread.java +++ b/src/eva2/tools/ServerPingThread.java @@ -1,11 +1,11 @@ package eva2.tools; import java.util.StringTokenizer; -import wsi.ra.jproxy.RMIInvocationHandler; import java.rmi.Naming; import eva2.server.EvAMainAdapter; import eva2.server.EvAMainAdapterImpl; +import eva2.tools.jproxy.RMIInvocationHandler; /** *

Title: EvA2

diff --git a/src/wsi/ra/chart2d/DArea.java b/src/eva2/tools/chart2d/DArea.java similarity index 96% rename from src/wsi/ra/chart2d/DArea.java rename to src/eva2/tools/chart2d/DArea.java index 70ed7d01..eef22a32 100644 --- a/src/wsi/ra/chart2d/DArea.java +++ b/src/eva2/tools/chart2d/DArea.java @@ -10,7 +10,7 @@ * Copyright (c) Dept. Computer Architecture, University of Tuebingen, Germany */ -package wsi.ra.chart2d; +package eva2.tools.chart2d; import java.awt.Color; import java.awt.Dimension; @@ -23,7 +23,8 @@ import java.awt.print.Printable; import javax.swing.JComponent; import javax.swing.border.Border; -import wsi.ra.print.PagePrinter; +import eva2.tools.print.PagePrinter; + /*==========================================================================* * IMPORTS diff --git a/src/wsi/ra/chart2d/DArray.java b/src/eva2/tools/chart2d/DArray.java similarity index 96% rename from src/wsi/ra/chart2d/DArray.java rename to src/eva2/tools/chart2d/DArray.java index 21622350..5d77b0a1 100644 --- a/src/wsi/ra/chart2d/DArray.java +++ b/src/eva2/tools/chart2d/DArray.java @@ -1,4 +1,4 @@ -package wsi.ra.chart2d; +package eva2.tools.chart2d; /** * Title: diff --git a/src/wsi/ra/chart2d/DBorder.java b/src/eva2/tools/chart2d/DBorder.java similarity index 94% rename from src/wsi/ra/chart2d/DBorder.java rename to src/eva2/tools/chart2d/DBorder.java index 7f6b7ade..e9c56dd2 100644 --- a/src/wsi/ra/chart2d/DBorder.java +++ b/src/eva2/tools/chart2d/DBorder.java @@ -9,7 +9,7 @@ * $Author: ulmerh $ * Copyright (c) Dept. Computer Architecture, University of Tuebingen, Germany */ -package wsi.ra.chart2d; +package eva2.tools.chart2d; import java.awt.Insets; diff --git a/src/wsi/ra/chart2d/DComponent.java b/src/eva2/tools/chart2d/DComponent.java similarity index 95% rename from src/wsi/ra/chart2d/DComponent.java rename to src/eva2/tools/chart2d/DComponent.java index 27496c47..e0481a5a 100644 --- a/src/wsi/ra/chart2d/DComponent.java +++ b/src/eva2/tools/chart2d/DComponent.java @@ -10,7 +10,7 @@ * Copyright (c) Dept. Computer Architecture, University of Tuebingen, Germany */ -package wsi.ra.chart2d; +package eva2.tools.chart2d; /*==========================================================================* * IMPORTS diff --git a/src/wsi/ra/chart2d/DContainer.java b/src/eva2/tools/chart2d/DContainer.java similarity index 96% rename from src/wsi/ra/chart2d/DContainer.java rename to src/eva2/tools/chart2d/DContainer.java index 8b81cc34..92e09394 100644 --- a/src/wsi/ra/chart2d/DContainer.java +++ b/src/eva2/tools/chart2d/DContainer.java @@ -10,7 +10,7 @@ * Copyright (c) Dept. Computer Architecture, University of Tuebingen, Germany */ -package wsi.ra.chart2d; +package eva2.tools.chart2d; /*==========================================================================* * IMPORTS diff --git a/src/wsi/ra/chart2d/DElement.java b/src/eva2/tools/chart2d/DElement.java similarity index 94% rename from src/wsi/ra/chart2d/DElement.java rename to src/eva2/tools/chart2d/DElement.java index 50ee01dd..1502f622 100644 --- a/src/wsi/ra/chart2d/DElement.java +++ b/src/eva2/tools/chart2d/DElement.java @@ -10,7 +10,7 @@ * Copyright (c) Dept. Computer Architecture, University of Tuebingen, Germany */ -package wsi.ra.chart2d; +package eva2.tools.chart2d; /*==========================================================================* * IMPORTS diff --git a/src/wsi/ra/chart2d/DFunction.java b/src/eva2/tools/chart2d/DFunction.java similarity index 95% rename from src/wsi/ra/chart2d/DFunction.java rename to src/eva2/tools/chart2d/DFunction.java index e71c23d9..49c9e471 100644 --- a/src/wsi/ra/chart2d/DFunction.java +++ b/src/eva2/tools/chart2d/DFunction.java @@ -10,7 +10,7 @@ * Copyright (c) Dept. Computer Architecture, University of Tuebingen, Germany */ -package wsi.ra.chart2d; +package eva2.tools.chart2d; /*==========================================================================* * IMPORTS diff --git a/src/wsi/ra/chart2d/DGrid.java b/src/eva2/tools/chart2d/DGrid.java similarity index 96% rename from src/wsi/ra/chart2d/DGrid.java rename to src/eva2/tools/chart2d/DGrid.java index a09ee845..ad1c85bd 100644 --- a/src/wsi/ra/chart2d/DGrid.java +++ b/src/eva2/tools/chart2d/DGrid.java @@ -10,7 +10,7 @@ * Copyright (c) Dept. Computer Architecture, University of Tuebingen, Germany */ -package wsi.ra.chart2d; +package eva2.tools.chart2d; /*==========================================================================* * IMPORTS diff --git a/src/wsi/ra/chart2d/DIntDoubleMap.java b/src/eva2/tools/chart2d/DIntDoubleMap.java similarity index 95% rename from src/wsi/ra/chart2d/DIntDoubleMap.java rename to src/eva2/tools/chart2d/DIntDoubleMap.java index 7108539a..5ef5769a 100644 --- a/src/wsi/ra/chart2d/DIntDoubleMap.java +++ b/src/eva2/tools/chart2d/DIntDoubleMap.java @@ -1,4 +1,4 @@ -package wsi.ra.chart2d; +package eva2.tools.chart2d; /** * Title: diff --git a/src/wsi/ra/chart2d/DLine.java b/src/eva2/tools/chart2d/DLine.java similarity index 95% rename from src/wsi/ra/chart2d/DLine.java rename to src/eva2/tools/chart2d/DLine.java index 0a3fed6d..4c6da163 100644 --- a/src/wsi/ra/chart2d/DLine.java +++ b/src/eva2/tools/chart2d/DLine.java @@ -10,7 +10,7 @@ * Copyright (c) Dept. Computer Architecture, University of Tuebingen, Germany */ -package wsi.ra.chart2d; +package eva2.tools.chart2d; /*==========================================================================* * IMPORTS diff --git a/src/wsi/ra/chart2d/DMeasures.java b/src/eva2/tools/chart2d/DMeasures.java similarity index 96% rename from src/wsi/ra/chart2d/DMeasures.java rename to src/eva2/tools/chart2d/DMeasures.java index 758f5ac0..037f5a96 100644 --- a/src/wsi/ra/chart2d/DMeasures.java +++ b/src/eva2/tools/chart2d/DMeasures.java @@ -1,4 +1,4 @@ -package wsi.ra.chart2d; +package eva2.tools.chart2d; import java.awt.Point ; import java.awt.Graphics ; diff --git a/src/wsi/ra/chart2d/DParent.java b/src/eva2/tools/chart2d/DParent.java similarity index 93% rename from src/wsi/ra/chart2d/DParent.java rename to src/eva2/tools/chart2d/DParent.java index d33cb30f..cfc55d36 100644 --- a/src/wsi/ra/chart2d/DParent.java +++ b/src/eva2/tools/chart2d/DParent.java @@ -10,7 +10,7 @@ * Copyright (c) Dept. Computer Architecture, University of Tuebingen, Germany */ -package wsi.ra.chart2d; +package eva2.tools.chart2d; /*==========================================================================* diff --git a/src/wsi/ra/chart2d/DPoint.java b/src/eva2/tools/chart2d/DPoint.java similarity index 95% rename from src/wsi/ra/chart2d/DPoint.java rename to src/eva2/tools/chart2d/DPoint.java index 74698b0a..d8a1189e 100644 --- a/src/wsi/ra/chart2d/DPoint.java +++ b/src/eva2/tools/chart2d/DPoint.java @@ -10,7 +10,7 @@ * Copyright (c) Dept. Computer Architecture, University of Tuebingen, Germany */ -package wsi.ra.chart2d; +package eva2.tools.chart2d; /*==========================================================================* * IMPORTS diff --git a/src/wsi/ra/chart2d/DPointIcon.java b/src/eva2/tools/chart2d/DPointIcon.java similarity index 93% rename from src/wsi/ra/chart2d/DPointIcon.java rename to src/eva2/tools/chart2d/DPointIcon.java index 9989566c..67f533d0 100644 --- a/src/wsi/ra/chart2d/DPointIcon.java +++ b/src/eva2/tools/chart2d/DPointIcon.java @@ -1,4 +1,4 @@ -package wsi.ra.chart2d; +package eva2.tools.chart2d; /** * Filename: $RCSfile: DPointIcon.java,v $ diff --git a/src/wsi/ra/chart2d/DPointSet.java b/src/eva2/tools/chart2d/DPointSet.java similarity index 95% rename from src/wsi/ra/chart2d/DPointSet.java rename to src/eva2/tools/chart2d/DPointSet.java index 1f457343..3e4c41b5 100644 --- a/src/wsi/ra/chart2d/DPointSet.java +++ b/src/eva2/tools/chart2d/DPointSet.java @@ -10,14 +10,15 @@ * Copyright (c) Dept. Computer Architecture, University of Tuebingen, Germany */ -package wsi.ra.chart2d; +package eva2.tools.chart2d; /*==========================================================================* * IMPORTS *==========================================================================*/ import java.awt.* ; -import wsi.ra.tool.IntegerArrayList; + +import eva2.tools.tool.IntegerArrayList; /*==========================================================================* * CLASS DECLARATION diff --git a/src/wsi/ra/chart2d/DRectangle.java b/src/eva2/tools/chart2d/DRectangle.java similarity index 96% rename from src/wsi/ra/chart2d/DRectangle.java rename to src/eva2/tools/chart2d/DRectangle.java index 83657dd5..217e4918 100644 --- a/src/wsi/ra/chart2d/DRectangle.java +++ b/src/eva2/tools/chart2d/DRectangle.java @@ -10,7 +10,7 @@ * Copyright (c) Dept. Computer Architecture, University of Tuebingen, Germany */ -package wsi.ra.chart2d; +package eva2.tools.chart2d; /*==========================================================================* * IMPORTS diff --git a/src/wsi/ra/chart2d/ScaledBorder.java b/src/eva2/tools/chart2d/ScaledBorder.java similarity index 96% rename from src/wsi/ra/chart2d/ScaledBorder.java rename to src/eva2/tools/chart2d/ScaledBorder.java index 91abba4b..f5b97361 100644 --- a/src/wsi/ra/chart2d/ScaledBorder.java +++ b/src/eva2/tools/chart2d/ScaledBorder.java @@ -1,4 +1,4 @@ -package wsi.ra.chart2d; +package eva2.tools.chart2d; import java.awt.* ; import javax.swing.BorderFactory; diff --git a/src/wsi/ra/chart2d/SlimRect.java b/src/eva2/tools/chart2d/SlimRect.java similarity index 99% rename from src/wsi/ra/chart2d/SlimRect.java rename to src/eva2/tools/chart2d/SlimRect.java index 47ac5269..14385793 100644 --- a/src/wsi/ra/chart2d/SlimRect.java +++ b/src/eva2/tools/chart2d/SlimRect.java @@ -1,4 +1,4 @@ -package wsi.ra.chart2d; +package eva2.tools.chart2d; /** * Encapsulates a slim rectangle structure with x, y, width and height and diff --git a/src/wsi/ra/diagram/ColorBarCalculator.java b/src/eva2/tools/diagram/ColorBarCalculator.java similarity index 95% rename from src/wsi/ra/diagram/ColorBarCalculator.java rename to src/eva2/tools/diagram/ColorBarCalculator.java index 5997509c..0cff649e 100644 --- a/src/wsi/ra/diagram/ColorBarCalculator.java +++ b/src/eva2/tools/diagram/ColorBarCalculator.java @@ -10,7 +10,7 @@ * Copyright (c) Dept. Computer Architecture, University of Tuebingen, Germany */ -package wsi.ra.diagram; +package eva2.tools.diagram; /*============================================================================ * IMPORTS @@ -21,7 +21,8 @@ import java.awt.geom.*; import java.awt.image.*; import javax.swing.*; -import wsi.ra.math.*; +import eva2.tools.math.*; + /*============================================================================ * CLASS DECLARATION diff --git a/src/wsi/ra/jproxy/ComAdapter.java b/src/eva2/tools/jproxy/ComAdapter.java similarity index 96% rename from src/wsi/ra/jproxy/ComAdapter.java rename to src/eva2/tools/jproxy/ComAdapter.java index a219a225..94d47d54 100644 --- a/src/wsi/ra/jproxy/ComAdapter.java +++ b/src/eva2/tools/jproxy/ComAdapter.java @@ -1,4 +1,4 @@ -package wsi.ra.jproxy; +package eva2.tools.jproxy; /** * Title: The JProxy Framework diff --git a/src/wsi/ra/jproxy/JProxyRemoteThread.java b/src/eva2/tools/jproxy/JProxyRemoteThread.java similarity index 95% rename from src/wsi/ra/jproxy/JProxyRemoteThread.java rename to src/eva2/tools/jproxy/JProxyRemoteThread.java index e2bf8ba7..c1070792 100644 --- a/src/wsi/ra/jproxy/JProxyRemoteThread.java +++ b/src/eva2/tools/jproxy/JProxyRemoteThread.java @@ -1,4 +1,4 @@ -package wsi.ra.jproxy; +package eva2.tools.jproxy; /** * Title: The JProxy Framework * Description: API for distributed and parallel computing. diff --git a/src/wsi/ra/jproxy/MainAdapter.java b/src/eva2/tools/jproxy/MainAdapter.java similarity index 94% rename from src/wsi/ra/jproxy/MainAdapter.java rename to src/eva2/tools/jproxy/MainAdapter.java index f6cba3c9..b1d272cd 100644 --- a/src/wsi/ra/jproxy/MainAdapter.java +++ b/src/eva2/tools/jproxy/MainAdapter.java @@ -1,4 +1,4 @@ -package wsi.ra.jproxy; +package eva2.tools.jproxy; /** * Title: The JProxy Framework * Description: API for distributed and parallel computing. diff --git a/src/wsi/ra/jproxy/MainAdapterClient.java b/src/eva2/tools/jproxy/MainAdapterClient.java similarity index 94% rename from src/wsi/ra/jproxy/MainAdapterClient.java rename to src/eva2/tools/jproxy/MainAdapterClient.java index 447c82db..4d1fa083 100644 --- a/src/wsi/ra/jproxy/MainAdapterClient.java +++ b/src/eva2/tools/jproxy/MainAdapterClient.java @@ -1,4 +1,4 @@ -package wsi.ra.jproxy; +package eva2.tools.jproxy; /** * Title: The JProxy Framework * Description: API for distributed and parallel computing. diff --git a/src/wsi/ra/jproxy/MainAdapterClientImpl.java b/src/eva2/tools/jproxy/MainAdapterClientImpl.java similarity index 95% rename from src/wsi/ra/jproxy/MainAdapterClientImpl.java rename to src/eva2/tools/jproxy/MainAdapterClientImpl.java index df3b3afe..96921e66 100644 --- a/src/wsi/ra/jproxy/MainAdapterClientImpl.java +++ b/src/eva2/tools/jproxy/MainAdapterClientImpl.java @@ -1,4 +1,4 @@ -package wsi.ra.jproxy; +package eva2.tools.jproxy; /** * Title: The JProxy Framework * Description: API for distributed and parallel computing. diff --git a/src/wsi/ra/jproxy/MainAdapterImpl.java b/src/eva2/tools/jproxy/MainAdapterImpl.java similarity index 95% rename from src/wsi/ra/jproxy/MainAdapterImpl.java rename to src/eva2/tools/jproxy/MainAdapterImpl.java index 67a4e4b7..4a09f492 100644 --- a/src/wsi/ra/jproxy/MainAdapterImpl.java +++ b/src/eva2/tools/jproxy/MainAdapterImpl.java @@ -1,4 +1,4 @@ -package wsi.ra.jproxy; +package eva2.tools.jproxy; /** * Title: The JProxy Framework * Description: API for distributed and parallel computing. diff --git a/src/wsi/ra/jproxy/NO_RMIServerAvailable.java b/src/eva2/tools/jproxy/NO_RMIServerAvailable.java similarity index 93% rename from src/wsi/ra/jproxy/NO_RMIServerAvailable.java rename to src/eva2/tools/jproxy/NO_RMIServerAvailable.java index be8241f2..d1ba0a6e 100644 --- a/src/wsi/ra/jproxy/NO_RMIServerAvailable.java +++ b/src/eva2/tools/jproxy/NO_RMIServerAvailable.java @@ -1,4 +1,4 @@ -package wsi.ra.jproxy; +package eva2.tools.jproxy; /** * Title: The JProxy Framework * Description: API for distributed and parallel computing. diff --git a/src/wsi/ra/jproxy/RMIConnection.java b/src/eva2/tools/jproxy/RMIConnection.java similarity index 98% rename from src/wsi/ra/jproxy/RMIConnection.java rename to src/eva2/tools/jproxy/RMIConnection.java index edd51099..9d5e24f4 100644 --- a/src/wsi/ra/jproxy/RMIConnection.java +++ b/src/eva2/tools/jproxy/RMIConnection.java @@ -1,4 +1,4 @@ -package wsi.ra.jproxy; +package eva2.tools.jproxy; /** diff --git a/src/wsi/ra/jproxy/RMIInvocationHandler.java b/src/eva2/tools/jproxy/RMIInvocationHandler.java similarity index 94% rename from src/wsi/ra/jproxy/RMIInvocationHandler.java rename to src/eva2/tools/jproxy/RMIInvocationHandler.java index 1072a8dc..26c5503e 100644 --- a/src/wsi/ra/jproxy/RMIInvocationHandler.java +++ b/src/eva2/tools/jproxy/RMIInvocationHandler.java @@ -1,4 +1,4 @@ -package wsi.ra.jproxy; +package eva2.tools.jproxy; /** * Title: The JProxy Framework * Description: API for distributed and parallel computing. diff --git a/src/wsi/ra/jproxy/RMIInvocationHandlerImpl.java b/src/eva2/tools/jproxy/RMIInvocationHandlerImpl.java similarity index 98% rename from src/wsi/ra/jproxy/RMIInvocationHandlerImpl.java rename to src/eva2/tools/jproxy/RMIInvocationHandlerImpl.java index f1451020..67596361 100644 --- a/src/wsi/ra/jproxy/RMIInvocationHandlerImpl.java +++ b/src/eva2/tools/jproxy/RMIInvocationHandlerImpl.java @@ -1,4 +1,4 @@ -package wsi.ra.jproxy; +package eva2.tools.jproxy; /** * Title: The JProxy Framework * Description: API for distributed and parallel computing. @@ -12,12 +12,13 @@ package wsi.ra.jproxy; * IMPORTS *==========================================================================*/ -import wsi.ra.math.RNG; import java.rmi.RemoteException; import java.rmi.Naming; import java.rmi.server.UnicastRemoteObject; import java.lang.reflect.Method; import java.lang.reflect.InvocationTargetException; + +import eva2.tools.math.RNG; /*==========================================================================* * CLASS DECLARATION *==========================================================================*/ diff --git a/src/wsi/ra/jproxy/RMIProxyLocal.java b/src/eva2/tools/jproxy/RMIProxyLocal.java similarity index 95% rename from src/wsi/ra/jproxy/RMIProxyLocal.java rename to src/eva2/tools/jproxy/RMIProxyLocal.java index 2941e4b0..0581e7cc 100644 --- a/src/wsi/ra/jproxy/RMIProxyLocal.java +++ b/src/eva2/tools/jproxy/RMIProxyLocal.java @@ -1,4 +1,4 @@ -package wsi.ra.jproxy; +package eva2.tools.jproxy; /** * Title: The JProxy Framework * Description: API for distributed and parallel computing. diff --git a/src/wsi/ra/jproxy/RMIProxyLocalThread.java b/src/eva2/tools/jproxy/RMIProxyLocalThread.java similarity index 96% rename from src/wsi/ra/jproxy/RMIProxyLocalThread.java rename to src/eva2/tools/jproxy/RMIProxyLocalThread.java index 2292e9a1..2d8bbf84 100644 --- a/src/wsi/ra/jproxy/RMIProxyLocalThread.java +++ b/src/eva2/tools/jproxy/RMIProxyLocalThread.java @@ -1,4 +1,4 @@ -package wsi.ra.jproxy; +package eva2.tools.jproxy; /** * Title: The JProxy Framework * Description: API for distributed and parallel computing. diff --git a/src/wsi/ra/jproxy/RMIProxyRemote.java b/src/eva2/tools/jproxy/RMIProxyRemote.java similarity index 96% rename from src/wsi/ra/jproxy/RMIProxyRemote.java rename to src/eva2/tools/jproxy/RMIProxyRemote.java index 8f12295a..001de5e5 100644 --- a/src/wsi/ra/jproxy/RMIProxyRemote.java +++ b/src/eva2/tools/jproxy/RMIProxyRemote.java @@ -1,4 +1,4 @@ -package wsi.ra.jproxy; +package eva2.tools.jproxy; /** * Title: The JProxy Framework * Description: API for distributed and parallel computing. diff --git a/src/wsi/ra/jproxy/RMIProxyRemoteThread.java b/src/eva2/tools/jproxy/RMIProxyRemoteThread.java similarity index 95% rename from src/wsi/ra/jproxy/RMIProxyRemoteThread.java rename to src/eva2/tools/jproxy/RMIProxyRemoteThread.java index e35201dc..ac534218 100644 --- a/src/wsi/ra/jproxy/RMIProxyRemoteThread.java +++ b/src/eva2/tools/jproxy/RMIProxyRemoteThread.java @@ -1,4 +1,4 @@ -package wsi.ra.jproxy; +package eva2.tools.jproxy; /** * Title: The JProxy Framework * Description: API for distributed and parallel computing. diff --git a/src/wsi/ra/jproxy/RMIServer.java b/src/eva2/tools/jproxy/RMIServer.java similarity index 96% rename from src/wsi/ra/jproxy/RMIServer.java rename to src/eva2/tools/jproxy/RMIServer.java index 60e983f0..987c03ac 100644 --- a/src/wsi/ra/jproxy/RMIServer.java +++ b/src/eva2/tools/jproxy/RMIServer.java @@ -1,4 +1,4 @@ -package wsi.ra.jproxy; +package eva2.tools.jproxy; /** * Title: The JProxy Framework * Description: API for distributed and parallel computing. diff --git a/src/wsi/ra/jproxy/RMIThreadInvocationHandler.java b/src/eva2/tools/jproxy/RMIThreadInvocationHandler.java similarity index 95% rename from src/wsi/ra/jproxy/RMIThreadInvocationHandler.java rename to src/eva2/tools/jproxy/RMIThreadInvocationHandler.java index 028b4a8a..0e3a8854 100644 --- a/src/wsi/ra/jproxy/RMIThreadInvocationHandler.java +++ b/src/eva2/tools/jproxy/RMIThreadInvocationHandler.java @@ -1,4 +1,4 @@ -package wsi.ra.jproxy; +package eva2.tools.jproxy; /** * Title: The JProxy Framework * Description: API for distributed and parallel computing. diff --git a/src/wsi/ra/jproxy/RMIThreadInvocationHandlerImpl.java b/src/eva2/tools/jproxy/RMIThreadInvocationHandlerImpl.java similarity index 96% rename from src/wsi/ra/jproxy/RMIThreadInvocationHandlerImpl.java rename to src/eva2/tools/jproxy/RMIThreadInvocationHandlerImpl.java index 3592807e..3dc66260 100644 --- a/src/wsi/ra/jproxy/RMIThreadInvocationHandlerImpl.java +++ b/src/eva2/tools/jproxy/RMIThreadInvocationHandlerImpl.java @@ -1,4 +1,4 @@ -package wsi.ra.jproxy; +package eva2.tools.jproxy; /** * Title: The JProxy Framework * Description: API for distributed and parallel computing. @@ -18,7 +18,8 @@ import java.rmi.Naming; import java.rmi.RemoteException; import java.rmi.server.UnicastRemoteObject; -import wsi.ra.math.RNG; +import eva2.tools.math.RNG; + /*==========================================================================* * CLASS DECLARATION *==========================================================================*/ diff --git a/src/wsi/ra/jproxy/RemoteStateListener.java b/src/eva2/tools/jproxy/RemoteStateListener.java similarity index 94% rename from src/wsi/ra/jproxy/RemoteStateListener.java rename to src/eva2/tools/jproxy/RemoteStateListener.java index 180a97ac..f2bd231a 100644 --- a/src/wsi/ra/jproxy/RemoteStateListener.java +++ b/src/eva2/tools/jproxy/RemoteStateListener.java @@ -1,4 +1,4 @@ -package wsi.ra.jproxy; +package eva2.tools.jproxy; /** * Title: The JProxy Framework * Description: API for distributed and parallel computing. diff --git a/src/wsi/ra/jproxy/ThreadProxy.java b/src/eva2/tools/jproxy/ThreadProxy.java similarity index 95% rename from src/wsi/ra/jproxy/ThreadProxy.java rename to src/eva2/tools/jproxy/ThreadProxy.java index f444c9f5..7916d3a0 100644 --- a/src/wsi/ra/jproxy/ThreadProxy.java +++ b/src/eva2/tools/jproxy/ThreadProxy.java @@ -1,4 +1,4 @@ -package wsi.ra.jproxy; +package eva2.tools.jproxy; /** * Title: The JProxy Framework * Description: API for distributed and parallel computing. diff --git a/src/wsi/ra/jproxy/ThreadWrapper.java b/src/eva2/tools/jproxy/ThreadWrapper.java similarity index 95% rename from src/wsi/ra/jproxy/ThreadWrapper.java rename to src/eva2/tools/jproxy/ThreadWrapper.java index 1d959f24..234b48e8 100644 --- a/src/wsi/ra/jproxy/ThreadWrapper.java +++ b/src/eva2/tools/jproxy/ThreadWrapper.java @@ -1,4 +1,4 @@ -package wsi.ra.jproxy; +package eva2.tools.jproxy; /** * Title: The JProxy Framework diff --git a/src/wsi/ra/jproxy/XThread.java b/src/eva2/tools/jproxy/XThread.java similarity index 96% rename from src/wsi/ra/jproxy/XThread.java rename to src/eva2/tools/jproxy/XThread.java index f9e8a9fb..75bd937f 100644 --- a/src/wsi/ra/jproxy/XThread.java +++ b/src/eva2/tools/jproxy/XThread.java @@ -1,4 +1,4 @@ -package wsi.ra.jproxy; +package eva2.tools.jproxy; import java.lang.reflect.Method; import java.util.ArrayList; diff --git a/src/wsi/ra/math/Jama/CholeskyDecomposition.java b/src/eva2/tools/math/Jama/CholeskyDecomposition.java similarity index 95% rename from src/wsi/ra/math/Jama/CholeskyDecomposition.java rename to src/eva2/tools/math/Jama/CholeskyDecomposition.java index 1a5ecb47..42c9e424 100644 --- a/src/wsi/ra/math/Jama/CholeskyDecomposition.java +++ b/src/eva2/tools/math/Jama/CholeskyDecomposition.java @@ -1,4 +1,4 @@ -package wsi.ra.math.Jama; +package eva2.tools.math.Jama; /** Cholesky Decomposition.

diff --git a/src/wsi/ra/math/Jama/EigenvalueDecomposition.java b/src/eva2/tools/math/Jama/EigenvalueDecomposition.java similarity index 96% rename from src/wsi/ra/math/Jama/EigenvalueDecomposition.java rename to src/eva2/tools/math/Jama/EigenvalueDecomposition.java index e351c4b1..a117ddb8 100644 --- a/src/wsi/ra/math/Jama/EigenvalueDecomposition.java +++ b/src/eva2/tools/math/Jama/EigenvalueDecomposition.java @@ -1,5 +1,5 @@ -package wsi.ra.math.Jama; -import wsi.ra.math.Jama.util.Maths; +package eva2.tools.math.Jama; +import eva2.tools.math.Jama.util.Maths; /** Eigenvalues and eigenvectors of a real matrix. diff --git a/src/wsi/ra/math/Jama/LUDecomposition.java b/src/eva2/tools/math/Jama/LUDecomposition.java similarity index 96% rename from src/wsi/ra/math/Jama/LUDecomposition.java rename to src/eva2/tools/math/Jama/LUDecomposition.java index 0a013056..44794c99 100644 --- a/src/wsi/ra/math/Jama/LUDecomposition.java +++ b/src/eva2/tools/math/Jama/LUDecomposition.java @@ -1,4 +1,4 @@ -package wsi.ra.math.Jama; +package eva2.tools.math.Jama; /** LU Decomposition. diff --git a/src/wsi/ra/math/Jama/Matrix.java b/src/eva2/tools/math/Jama/Matrix.java similarity index 96% rename from src/wsi/ra/math/Jama/Matrix.java rename to src/eva2/tools/math/Jama/Matrix.java index d557492d..9a881d0d 100644 --- a/src/wsi/ra/math/Jama/Matrix.java +++ b/src/eva2/tools/math/Jama/Matrix.java @@ -1,4 +1,4 @@ -package wsi.ra.math.Jama; +package eva2.tools.math.Jama; import java.io.BufferedReader; @@ -9,10 +9,10 @@ import java.text.DecimalFormatSymbols; import java.text.NumberFormat; import java.util.Locale; -import wsi.ra.math.Jama.util.Maths; import eva2.gui.BeanInspector; import eva2.tools.Mathematics; import eva2.tools.Pair; +import eva2.tools.math.Jama.util.Maths; /** diff --git a/src/wsi/ra/math/Jama/QRDecomposition.java b/src/eva2/tools/math/Jama/QRDecomposition.java similarity index 95% rename from src/wsi/ra/math/Jama/QRDecomposition.java rename to src/eva2/tools/math/Jama/QRDecomposition.java index 76126eba..19000ce8 100644 --- a/src/wsi/ra/math/Jama/QRDecomposition.java +++ b/src/eva2/tools/math/Jama/QRDecomposition.java @@ -1,5 +1,5 @@ -package wsi.ra.math.Jama; -import wsi.ra.math.Jama.util.Maths; +package eva2.tools.math.Jama; +import eva2.tools.math.Jama.util.Maths; /** QR Decomposition.

diff --git a/src/wsi/ra/math/Jama/SingularValueDecomposition.java b/src/eva2/tools/math/Jama/SingularValueDecomposition.java similarity index 96% rename from src/wsi/ra/math/Jama/SingularValueDecomposition.java rename to src/eva2/tools/math/Jama/SingularValueDecomposition.java index 949c65e2..88c1bc18 100644 --- a/src/wsi/ra/math/Jama/SingularValueDecomposition.java +++ b/src/eva2/tools/math/Jama/SingularValueDecomposition.java @@ -1,5 +1,5 @@ -package wsi.ra.math.Jama; -import wsi.ra.math.Jama.util.*; +package eva2.tools.math.Jama; +import eva2.tools.math.Jama.util.*; /** Singular Value Decomposition. diff --git a/src/wsi/ra/math/Jama/util/Maths.java b/src/eva2/tools/math/Jama/util/Maths.java similarity index 88% rename from src/wsi/ra/math/Jama/util/Maths.java rename to src/eva2/tools/math/Jama/util/Maths.java index bb6620df..427dfdd4 100644 --- a/src/wsi/ra/math/Jama/util/Maths.java +++ b/src/eva2/tools/math/Jama/util/Maths.java @@ -1,4 +1,4 @@ -package wsi.ra.math.Jama.util; +package eva2.tools.math.Jama.util; public class Maths { diff --git a/src/wsi/ra/math/RNG.java b/src/eva2/tools/math/RNG.java similarity index 99% rename from src/wsi/ra/math/RNG.java rename to src/eva2/tools/math/RNG.java index 5a9476a7..91f5b7ba 100644 --- a/src/wsi/ra/math/RNG.java +++ b/src/eva2/tools/math/RNG.java @@ -1,4 +1,4 @@ -package wsi.ra.math; +package eva2.tools.math; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/wsi/ra/math/SpecialFunction.java b/src/eva2/tools/math/SpecialFunction.java similarity index 96% rename from src/wsi/ra/math/SpecialFunction.java rename to src/eva2/tools/math/SpecialFunction.java index 219313e2..c4427e8c 100644 --- a/src/wsi/ra/math/SpecialFunction.java +++ b/src/eva2/tools/math/SpecialFunction.java @@ -1,4 +1,4 @@ -package wsi.ra.math; +package eva2.tools.math; import java.lang.Math; import java.lang.ArithmeticException; diff --git a/src/wsi/ra/math/interpolation/AbstractDataModifier.java b/src/eva2/tools/math/interpolation/AbstractDataModifier.java similarity index 94% rename from src/wsi/ra/math/interpolation/AbstractDataModifier.java rename to src/eva2/tools/math/interpolation/AbstractDataModifier.java index d2316efe..126c63c3 100644 --- a/src/wsi/ra/math/interpolation/AbstractDataModifier.java +++ b/src/eva2/tools/math/interpolation/AbstractDataModifier.java @@ -12,7 +12,7 @@ // /////////////////////////////////////////////////////////////////////////////// -package wsi.ra.math.interpolation; +package eva2.tools.math.interpolation; /*==========================================================================* * IMPORTS diff --git a/src/wsi/ra/math/interpolation/AbstractDataSet.java b/src/eva2/tools/math/interpolation/AbstractDataSet.java similarity index 95% rename from src/wsi/ra/math/interpolation/AbstractDataSet.java rename to src/eva2/tools/math/interpolation/AbstractDataSet.java index 633d9d2f..5e4afb54 100644 --- a/src/wsi/ra/math/interpolation/AbstractDataSet.java +++ b/src/eva2/tools/math/interpolation/AbstractDataSet.java @@ -12,7 +12,7 @@ // /////////////////////////////////////////////////////////////////////////////// -package wsi.ra.math.interpolation; +package eva2.tools.math.interpolation; /*==========================================================================* * IMPORTS diff --git a/src/wsi/ra/math/interpolation/BasicDataSet.java b/src/eva2/tools/math/interpolation/BasicDataSet.java similarity index 96% rename from src/wsi/ra/math/interpolation/BasicDataSet.java rename to src/eva2/tools/math/interpolation/BasicDataSet.java index 3e5eed0a..44367080 100644 --- a/src/wsi/ra/math/interpolation/BasicDataSet.java +++ b/src/eva2/tools/math/interpolation/BasicDataSet.java @@ -12,9 +12,9 @@ // /////////////////////////////////////////////////////////////////////////////// -package wsi.ra.math.interpolation; +package eva2.tools.math.interpolation; -import wsi.ra.sort.XYDoubleArray; +import eva2.tools.sort.XYDoubleArray; /*==========================================================================* * IMPORTS diff --git a/src/wsi/ra/math/interpolation/InterpolationException.java b/src/eva2/tools/math/interpolation/InterpolationException.java similarity index 93% rename from src/wsi/ra/math/interpolation/InterpolationException.java rename to src/eva2/tools/math/interpolation/InterpolationException.java index 6f6015ef..6fd68713 100644 --- a/src/wsi/ra/math/interpolation/InterpolationException.java +++ b/src/eva2/tools/math/interpolation/InterpolationException.java @@ -12,7 +12,7 @@ // /////////////////////////////////////////////////////////////////////////////// -package wsi.ra.math.interpolation; +package eva2.tools.math.interpolation; /*==========================================================================* * IMPORTS diff --git a/src/wsi/ra/math/interpolation/LinearInterpolation.java b/src/eva2/tools/math/interpolation/LinearInterpolation.java similarity index 99% rename from src/wsi/ra/math/interpolation/LinearInterpolation.java rename to src/eva2/tools/math/interpolation/LinearInterpolation.java index ab04fadb..6c85be8b 100644 --- a/src/wsi/ra/math/interpolation/LinearInterpolation.java +++ b/src/eva2/tools/math/interpolation/LinearInterpolation.java @@ -13,7 +13,7 @@ // /////////////////////////////////////////////////////////////////////////////// -package wsi.ra.math.interpolation; +package eva2.tools.math.interpolation; /*==========================================================================* * IMPORTS diff --git a/src/wsi/ra/math/interpolation/PolyInterpolation.java b/src/eva2/tools/math/interpolation/PolyInterpolation.java similarity index 99% rename from src/wsi/ra/math/interpolation/PolyInterpolation.java rename to src/eva2/tools/math/interpolation/PolyInterpolation.java index 868d7947..adc635f3 100644 --- a/src/wsi/ra/math/interpolation/PolyInterpolation.java +++ b/src/eva2/tools/math/interpolation/PolyInterpolation.java @@ -12,7 +12,7 @@ // /////////////////////////////////////////////////////////////////////////////// -package wsi.ra.math.interpolation; +package eva2.tools.math.interpolation; /*==========================================================================* * IMPORTS diff --git a/src/wsi/ra/math/interpolation/PolynomialInterpolationResult.java b/src/eva2/tools/math/interpolation/PolynomialInterpolationResult.java similarity index 97% rename from src/wsi/ra/math/interpolation/PolynomialInterpolationResult.java rename to src/eva2/tools/math/interpolation/PolynomialInterpolationResult.java index d63dabb2..19e6ed76 100644 --- a/src/wsi/ra/math/interpolation/PolynomialInterpolationResult.java +++ b/src/eva2/tools/math/interpolation/PolynomialInterpolationResult.java @@ -12,7 +12,7 @@ // /////////////////////////////////////////////////////////////////////////////// -package wsi.ra.math.interpolation; +package eva2.tools.math.interpolation; /*==========================================================================* * IMPORTS diff --git a/src/wsi/ra/math/interpolation/SplineInterpolation.java b/src/eva2/tools/math/interpolation/SplineInterpolation.java similarity index 99% rename from src/wsi/ra/math/interpolation/SplineInterpolation.java rename to src/eva2/tools/math/interpolation/SplineInterpolation.java index 191de54d..279b0de1 100644 --- a/src/wsi/ra/math/interpolation/SplineInterpolation.java +++ b/src/eva2/tools/math/interpolation/SplineInterpolation.java @@ -12,7 +12,7 @@ // /////////////////////////////////////////////////////////////////////////////// -package wsi.ra.math.interpolation; +package eva2.tools.math.interpolation; /*==========================================================================* * IMPORTS diff --git a/src/wsi/ra/print/PagePrinter.java b/src/eva2/tools/print/PagePrinter.java similarity index 96% rename from src/wsi/ra/print/PagePrinter.java rename to src/eva2/tools/print/PagePrinter.java index 9fd7746c..7829a4bf 100644 --- a/src/wsi/ra/print/PagePrinter.java +++ b/src/eva2/tools/print/PagePrinter.java @@ -10,7 +10,7 @@ * Copyright (c) Dept. Computer Architecture, University of Tuebingen, Germany */ -package wsi.ra.print; +package eva2.tools.print; /*==========================================================================* * IMPORTS diff --git a/src/wsi/ra/sort/XYDoubleArray.java b/src/eva2/tools/sort/XYDoubleArray.java similarity index 99% rename from src/wsi/ra/sort/XYDoubleArray.java rename to src/eva2/tools/sort/XYDoubleArray.java index 263ae6af..8ed80e84 100644 --- a/src/wsi/ra/sort/XYDoubleArray.java +++ b/src/eva2/tools/sort/XYDoubleArray.java @@ -14,7 +14,7 @@ * PACKAGE *==========================================================================*/ -package wsi.ra.sort; +package eva2.tools.sort; /*==========================================================================* * IMPORTS diff --git a/src/wsi/ra/tool/BasicResourceLoader.java b/src/eva2/tools/tool/BasicResourceLoader.java similarity index 99% rename from src/wsi/ra/tool/BasicResourceLoader.java rename to src/eva2/tools/tool/BasicResourceLoader.java index 9543d3b4..31db06ed 100644 --- a/src/wsi/ra/tool/BasicResourceLoader.java +++ b/src/eva2/tools/tool/BasicResourceLoader.java @@ -24,7 +24,7 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. /////////////////////////////////////////////////////////////////////////////// -package wsi.ra.tool; +package eva2.tools.tool; import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; diff --git a/src/wsi/ra/tool/DummyCategory.java b/src/eva2/tools/tool/DummyCategory.java similarity index 97% rename from src/wsi/ra/tool/DummyCategory.java rename to src/eva2/tools/tool/DummyCategory.java index 750cec67..16e03ecf 100644 --- a/src/wsi/ra/tool/DummyCategory.java +++ b/src/eva2/tools/tool/DummyCategory.java @@ -1,4 +1,4 @@ -package wsi.ra.tool; +package eva2.tools.tool; /** * Dummy class replacing the log4j Category because log4j couldnt be included in a clean diff --git a/src/wsi/ra/tool/IntegerArrayList.java b/src/eva2/tools/tool/IntegerArrayList.java similarity index 96% rename from src/wsi/ra/tool/IntegerArrayList.java rename to src/eva2/tools/tool/IntegerArrayList.java index f8d78540..8809c88e 100644 --- a/src/wsi/ra/tool/IntegerArrayList.java +++ b/src/eva2/tools/tool/IntegerArrayList.java @@ -11,7 +11,7 @@ * Copyright (c) Dept. Computer Architecture, University of Tuebingen, Germany */ -package wsi.ra.tool; +package eva2.tools.tool; /*==========================================================================* * CLASS DECLARATION diff --git a/src/wsi/ra/tool/ResourceLoader.java b/src/eva2/tools/tool/ResourceLoader.java similarity index 98% rename from src/wsi/ra/tool/ResourceLoader.java rename to src/eva2/tools/tool/ResourceLoader.java index 3e25b91c..ab8f5289 100644 --- a/src/wsi/ra/tool/ResourceLoader.java +++ b/src/eva2/tools/tool/ResourceLoader.java @@ -25,7 +25,7 @@ //MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //GNU General Public License for more details. /////////////////////////////////////////////////////////////////////////////// -package wsi.ra.tool; +package eva2.tools.tool; /** * TODO description. diff --git a/src/wsi/ra/tool/StatisticUtils.java b/src/eva2/tools/tool/StatisticUtils.java similarity index 95% rename from src/wsi/ra/tool/StatisticUtils.java rename to src/eva2/tools/tool/StatisticUtils.java index 0780173c..dd87f149 100644 --- a/src/wsi/ra/tool/StatisticUtils.java +++ b/src/eva2/tools/tool/StatisticUtils.java @@ -12,7 +12,7 @@ // /////////////////////////////////////////////////////////////////////////////// -package wsi.ra.tool; +package eva2.tools.tool; /** diff --git a/src/wsi/ra/tool/matlab/JMatLink.c b/src/eva2/tools/tool/matlab/JMatLink.c similarity index 100% rename from src/wsi/ra/tool/matlab/JMatLink.c rename to src/eva2/tools/tool/matlab/JMatLink.c diff --git a/src/wsi/ra/tool/matlab/JMatLink.h b/src/eva2/tools/tool/matlab/JMatLink.h similarity index 100% rename from src/wsi/ra/tool/matlab/JMatLink.h rename to src/eva2/tools/tool/matlab/JMatLink.h diff --git a/src/wsi/ra/tool/matlab/JMatLink.java b/src/eva2/tools/tool/matlab/JMatLink.java similarity index 94% rename from src/wsi/ra/tool/matlab/JMatLink.java rename to src/eva2/tools/tool/matlab/JMatLink.java index d9d48988..a69c11e7 100644 --- a/src/wsi/ra/tool/matlab/JMatLink.java +++ b/src/eva2/tools/tool/matlab/JMatLink.java @@ -118,7 +118,7 @@ -package wsi.ra.tool.matlab; +package eva2.tools.tool.matlab; @@ -134,7 +134,8 @@ package wsi.ra.tool.matlab; // (especially engEvalString) from ONE single thread. import java.io.*; -import wsi.ra.tool.*; + +import eva2.tools.tool.*; public class JMatLink extends Thread { private static JMatLink m_Instance = null; /** diff --git a/src/wsi/ra/tool/matlab/Makefile b/src/eva2/tools/tool/matlab/Makefile similarity index 100% rename from src/wsi/ra/tool/matlab/Makefile rename to src/eva2/tools/tool/matlab/Makefile