diff --git a/pom.xml b/pom.xml index dd5f5d41..841aa01f 100644 --- a/pom.xml +++ b/pom.xml @@ -42,6 +42,12 @@ commons-cli 1.2 + + com.google.code.gson + gson + 2.2.4 + compile + diff --git a/src/eva2/client/ClassPreloader.java b/src/eva2/client/ClassPreloader.java index 5c480543..bce2fea1 100644 --- a/src/eva2/client/ClassPreloader.java +++ b/src/eva2/client/ClassPreloader.java @@ -1,6 +1,6 @@ package eva2.client; -import eva2.gui.GenericObjectEditor; +import eva2.gui.editor.GenericObjectEditor; /** * This Runnable just requests a number of classes as does the diff --git a/src/eva2/gui/GOEPanel.java b/src/eva2/gui/GOEPanel.java index 2ba71265..ba71a594 100644 --- a/src/eva2/gui/GOEPanel.java +++ b/src/eva2/gui/GOEPanel.java @@ -1,5 +1,6 @@ package eva2.gui; +import eva2.gui.editor.GenericObjectEditor; import eva2.optimization.tools.FileTools; import eva2.tools.BasicResourceLoader; import eva2.tools.EVAHELP; diff --git a/src/eva2/gui/JExtDesktopPane.java b/src/eva2/gui/JExtDesktopPane.java index 931c02bc..763b8342 100644 --- a/src/eva2/gui/JExtDesktopPane.java +++ b/src/eva2/gui/JExtDesktopPane.java @@ -5,6 +5,8 @@ package eva2.gui; * $Date: 2006-01-18 11:02:22 +0100 (Wed, 18 Jan 2006) $ $Author: streiche $ */ +import eva2.gui.editor.ComponentFilter; + import java.awt.Component; import java.awt.Event; import java.awt.event.ActionEvent; diff --git a/src/eva2/gui/JParaPanel.java b/src/eva2/gui/JParaPanel.java index acd1cfa3..38b8e6d1 100644 --- a/src/eva2/gui/JParaPanel.java +++ b/src/eva2/gui/JParaPanel.java @@ -8,6 +8,7 @@ package eva2.gui; * @author Holger Ulmer, Felix Streichert, Hannes Planatscher */ +import eva2.gui.editor.GenericObjectEditor; import eva2.optimization.stat.EvAJobList; import java.beans.PropertyEditor; import java.beans.PropertyEditorManager; diff --git a/src/eva2/gui/PropertyEditorProvider.java b/src/eva2/gui/PropertyEditorProvider.java index 4f321d4f..534c145f 100644 --- a/src/eva2/gui/PropertyEditorProvider.java +++ b/src/eva2/gui/PropertyEditorProvider.java @@ -1,5 +1,6 @@ package eva2.gui; +import eva2.gui.editor.*; import eva2.optimization.go.InterfaceTerminator; import eva2.optimization.individuals.codings.gp.GPArea; import eva2.tools.SelectedTag; @@ -122,7 +123,7 @@ public class PropertyEditorProvider { PropertyEditorManager.registerEditor(PropertyFilePath.class, GenericFilePathEditor.class); PropertyEditorManager.registerEditor(PropertyOptimizationObjectives.class, GenericOptimizationObjectivesEditor.class); PropertyEditorManager.registerEditor(PropertyOptimizationObjectivesWithParam.class, GenericOptimizationObjectivesWithParamEditor.class); - PropertyEditorManager.registerEditor(eva2.gui.MultiLineString.class, eva2.gui.MultiLineStringEditor.class); + PropertyEditorManager.registerEditor(eva2.gui.MultiLineString.class, MultiLineStringEditor.class); PropertyEditorManager.registerEditor(PropertySelectableList.class, GenericArrayEditor.class); } } diff --git a/src/eva2/gui/PropertySheetPanel.java b/src/eva2/gui/PropertySheetPanel.java index aaf589d9..61120e8f 100644 --- a/src/eva2/gui/PropertySheetPanel.java +++ b/src/eva2/gui/PropertySheetPanel.java @@ -9,6 +9,7 @@ package eva2.gui; * $Date: 2007-12-05 11:29:32 +0100 (Wed, 05 Dec 2007) $ * $Author: mkron $ */ +import eva2.gui.editor.GenericObjectEditor; import eva2.tools.EVAHELP; import java.awt.*; import java.awt.event.ActionEvent; @@ -20,7 +21,6 @@ import java.util.EventObject; import java.util.logging.Level; import java.util.logging.Logger; import javax.swing.*; -import javax.swing.event.CellEditorListener; import javax.swing.table.DefaultTableModel; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; diff --git a/src/eva2/gui/AbstractListSelectionEditor.java b/src/eva2/gui/editor/AbstractListSelectionEditor.java similarity index 99% rename from src/eva2/gui/AbstractListSelectionEditor.java rename to src/eva2/gui/editor/AbstractListSelectionEditor.java index 347e7ed7..a0c7ea3e 100644 --- a/src/eva2/gui/AbstractListSelectionEditor.java +++ b/src/eva2/gui/editor/AbstractListSelectionEditor.java @@ -1,4 +1,4 @@ -package eva2.gui; +package eva2.gui.editor; import java.awt.BorderLayout; diff --git a/src/eva2/gui/BigStringEditor.java b/src/eva2/gui/editor/BigStringEditor.java similarity index 99% rename from src/eva2/gui/BigStringEditor.java rename to src/eva2/gui/editor/BigStringEditor.java index 2a004351..dd8c4381 100644 --- a/src/eva2/gui/BigStringEditor.java +++ b/src/eva2/gui/editor/BigStringEditor.java @@ -1,4 +1,4 @@ -package eva2.gui; +package eva2.gui.editor; /* * Title: EvA2 * Description: @@ -12,6 +12,8 @@ package eva2.gui; /*==========================================================================* * IMPORTS *==========================================================================*/ +import eva2.gui.PropertyDialog; + import java.awt.*; import java.awt.event.*; import java.beans.*; diff --git a/src/eva2/gui/ComponentFilter.java b/src/eva2/gui/editor/ComponentFilter.java similarity index 94% rename from src/eva2/gui/ComponentFilter.java rename to src/eva2/gui/editor/ComponentFilter.java index cf939ce9..b90c8b19 100644 --- a/src/eva2/gui/ComponentFilter.java +++ b/src/eva2/gui/editor/ComponentFilter.java @@ -1,4 +1,4 @@ -package eva2.gui; +package eva2.gui.editor; /* * Title: EvA2 * Description: diff --git a/src/eva2/gui/EnumEditor.java b/src/eva2/gui/editor/EnumEditor.java similarity index 97% rename from src/eva2/gui/EnumEditor.java rename to src/eva2/gui/editor/EnumEditor.java index 196eb4b3..996a01a1 100644 --- a/src/eva2/gui/EnumEditor.java +++ b/src/eva2/gui/editor/EnumEditor.java @@ -1,4 +1,6 @@ -package eva2.gui; +package eva2.gui.editor; + +import eva2.gui.PropertyValueSelector; import java.awt.BorderLayout; import java.awt.event.WindowAdapter; diff --git a/src/eva2/gui/GenericAreaEditor.java b/src/eva2/gui/editor/GenericAreaEditor.java similarity index 98% rename from src/eva2/gui/GenericAreaEditor.java rename to src/eva2/gui/editor/GenericAreaEditor.java index 31477a19..f496e661 100644 --- a/src/eva2/gui/GenericAreaEditor.java +++ b/src/eva2/gui/editor/GenericAreaEditor.java @@ -1,4 +1,4 @@ -package eva2.gui; +package eva2.gui.editor; import eva2.optimization.individuals.codings.gp.AbstractGPNode; import eva2.optimization.individuals.codings.gp.GPArea; diff --git a/src/eva2/gui/GenericArrayEditor.java b/src/eva2/gui/editor/GenericArrayEditor.java similarity index 99% rename from src/eva2/gui/GenericArrayEditor.java rename to src/eva2/gui/editor/GenericArrayEditor.java index 13ff8afe..ae597135 100644 --- a/src/eva2/gui/GenericArrayEditor.java +++ b/src/eva2/gui/editor/GenericArrayEditor.java @@ -1,5 +1,6 @@ -package eva2.gui; +package eva2.gui.editor; +import eva2.gui.*; import eva2.tools.EVAHELP; import eva2.tools.SerializedObject; import java.awt.*; diff --git a/src/eva2/gui/GenericDoubleArrayEditor.java b/src/eva2/gui/editor/GenericDoubleArrayEditor.java similarity index 99% rename from src/eva2/gui/GenericDoubleArrayEditor.java rename to src/eva2/gui/editor/GenericDoubleArrayEditor.java index 389ba558..db75222e 100644 --- a/src/eva2/gui/GenericDoubleArrayEditor.java +++ b/src/eva2/gui/editor/GenericDoubleArrayEditor.java @@ -1,4 +1,6 @@ -package eva2.gui; +package eva2.gui.editor; + +import eva2.gui.PropertyDoubleArray; import java.awt.BorderLayout; import java.awt.Component; @@ -64,7 +66,7 @@ public class GenericDoubleArrayEditor extends JPanel implements PropertyEditor { /** The label for when we can't edit that type */ private JLabel m_Label = new JLabel("Can't edit", SwingConstants.CENTER); /** The FilePath that is to be edited*/ - private PropertyDoubleArray m_DoubleArray; + private PropertyDoubleArray m_DoubleArray; /** The gaphix stuff */ private JPanel m_CustomEditor, m_DataPanel, m_ButtonPanel; diff --git a/src/eva2/gui/GenericEpsilonConstraintEditor.java b/src/eva2/gui/editor/GenericEpsilonConstraintEditor.java similarity index 98% rename from src/eva2/gui/GenericEpsilonConstraintEditor.java rename to src/eva2/gui/editor/GenericEpsilonConstraintEditor.java index 279a3de5..ecee29c1 100644 --- a/src/eva2/gui/GenericEpsilonConstraintEditor.java +++ b/src/eva2/gui/editor/GenericEpsilonConstraintEditor.java @@ -1,4 +1,6 @@ -package eva2.gui; +package eva2.gui.editor; + +import eva2.gui.PropertyEpsilonConstraint; import java.awt.*; import java.awt.event.*; @@ -21,7 +23,7 @@ public class GenericEpsilonConstraintEditor extends JPanel implements PropertyEd /** The label for when we can't edit that type */ private JLabel m_Label = new JLabel("Can't edit", SwingConstants.CENTER); /** The FilePath that is to be edited*/ - private PropertyEpsilonConstraint m_EpsilonConstraint; + private PropertyEpsilonConstraint m_EpsilonConstraint; /** The gaphix stuff */ private JPanel m_CustomEditor, m_DataPanel, m_ButtonPanel, m_TargetPanel; diff --git a/src/eva2/gui/GenericEpsilonThresholdEditor.java b/src/eva2/gui/editor/GenericEpsilonThresholdEditor.java similarity index 98% rename from src/eva2/gui/GenericEpsilonThresholdEditor.java rename to src/eva2/gui/editor/GenericEpsilonThresholdEditor.java index fa116d01..3ba91156 100644 --- a/src/eva2/gui/GenericEpsilonThresholdEditor.java +++ b/src/eva2/gui/editor/GenericEpsilonThresholdEditor.java @@ -1,4 +1,6 @@ -package eva2.gui; +package eva2.gui.editor; + +import eva2.gui.PropertyEpsilonThreshold; import java.awt.*; import java.awt.event.*; @@ -21,7 +23,7 @@ public class GenericEpsilonThresholdEditor extends JPanel implements PropertyEdi /** The label for when we can't edit that type */ private JLabel m_Label = new JLabel("Can't edit", SwingConstants.CENTER); /** The FilePath that is to be edited*/ - private PropertyEpsilonThreshold m_EpsilonThreshhold; + private PropertyEpsilonThreshold m_EpsilonThreshhold; /** The gaphix stuff */ private JPanel m_CustomEditor, m_DataPanel, m_ButtonPanel, m_TargetPanel; diff --git a/src/eva2/gui/GenericFilePathEditor.java b/src/eva2/gui/editor/GenericFilePathEditor.java similarity index 98% rename from src/eva2/gui/GenericFilePathEditor.java rename to src/eva2/gui/editor/GenericFilePathEditor.java index 7d649820..b511cfb3 100644 --- a/src/eva2/gui/GenericFilePathEditor.java +++ b/src/eva2/gui/editor/GenericFilePathEditor.java @@ -1,4 +1,6 @@ -package eva2.gui; +package eva2.gui.editor; + +import eva2.gui.PropertyFilePath; import java.awt.*; import java.awt.event.ActionEvent; @@ -26,7 +28,7 @@ public class GenericFilePathEditor extends JPanel implements PropertyEditor { /** The label for when we can't edit that type */ private JLabel m_Label = new JLabel("Can't edit", SwingConstants.CENTER); /** The FilePath that is to be edited*/ - private PropertyFilePath m_FilePath; + private PropertyFilePath m_FilePath; /** The gaphix stuff */ private JFileChooser m_FileChooser; diff --git a/src/eva2/gui/GenericIntArrayEditor.java b/src/eva2/gui/editor/GenericIntArrayEditor.java similarity index 98% rename from src/eva2/gui/GenericIntArrayEditor.java rename to src/eva2/gui/editor/GenericIntArrayEditor.java index 6d66b403..fde2882a 100644 --- a/src/eva2/gui/GenericIntArrayEditor.java +++ b/src/eva2/gui/editor/GenericIntArrayEditor.java @@ -1,4 +1,6 @@ -package eva2.gui; +package eva2.gui.editor; + +import eva2.gui.PropertyIntArray; import java.awt.*; import java.awt.event.ActionEvent; @@ -24,7 +26,7 @@ public class GenericIntArrayEditor extends JPanel implements PropertyEditor { /** The label for when we can't edit that type */ private JLabel m_Label = new JLabel("Can't edit", SwingConstants.CENTER); /** The FilePath that is to be edited*/ - private PropertyIntArray m_IntArray; + private PropertyIntArray m_IntArray; /** The gaphix stuff */ private JPanel m_CustomEditor, m_DataPanel, m_ButtonPanel; diff --git a/src/eva2/gui/GenericObjectEditor.java b/src/eva2/gui/editor/GenericObjectEditor.java similarity index 99% rename from src/eva2/gui/GenericObjectEditor.java rename to src/eva2/gui/editor/GenericObjectEditor.java index 5b4ce939..47c0f422 100644 --- a/src/eva2/gui/GenericObjectEditor.java +++ b/src/eva2/gui/editor/GenericObjectEditor.java @@ -1,4 +1,4 @@ -package eva2.gui; +package eva2.gui.editor; /* * Title: EvA2 Description: Copyright: Copyright (c) 2012 Company: University of Tuebingen, Computer * Architecture @author Holger Ulmer, Felix Streichert, Hannes Planatscher, Fabian Becker @version: @@ -6,6 +6,7 @@ package eva2.gui; */ import eva2.EvAInfo; +import eva2.gui.GOEPanel; import eva2.tools.ReflectPackage; import java.awt.Component; import java.awt.FontMetrics; @@ -21,7 +22,6 @@ import java.beans.PropertyDescriptor; import java.beans.PropertyEditor; import java.lang.reflect.Field; import java.lang.reflect.Modifier; -import java.lang.reflect.Proxy; import java.util.ArrayList; import java.util.StringTokenizer; import java.util.Vector; diff --git a/src/eva2/gui/GenericObjectListSelectionEditor.java b/src/eva2/gui/editor/GenericObjectListSelectionEditor.java similarity index 95% rename from src/eva2/gui/GenericObjectListSelectionEditor.java rename to src/eva2/gui/editor/GenericObjectListSelectionEditor.java index a6f7c9db..c6c85336 100644 --- a/src/eva2/gui/GenericObjectListSelectionEditor.java +++ b/src/eva2/gui/editor/GenericObjectListSelectionEditor.java @@ -1,4 +1,6 @@ -package eva2.gui; +package eva2.gui.editor; + +import eva2.gui.PropertySelectableList; /** * An editor for a selectable List. diff --git a/src/eva2/gui/GenericOptimizationObjectivesEditor.java b/src/eva2/gui/editor/GenericOptimizationObjectivesEditor.java similarity index 99% rename from src/eva2/gui/GenericOptimizationObjectivesEditor.java rename to src/eva2/gui/editor/GenericOptimizationObjectivesEditor.java index 2e445d69..dc30a809 100644 --- a/src/eva2/gui/GenericOptimizationObjectivesEditor.java +++ b/src/eva2/gui/editor/GenericOptimizationObjectivesEditor.java @@ -1,6 +1,8 @@ -package eva2.gui; +package eva2.gui.editor; +import eva2.gui.PropertyEditorProvider; +import eva2.gui.PropertyOptimizationObjectives; import eva2.optimization.problems.InterfaceOptimizationObjective; import eva2.optimization.problems.InterfaceOptimizationTarget; import eva2.optimization.tools.AbstractObjectEditor; diff --git a/src/eva2/gui/GenericOptimizationObjectivesWithParamEditor.java b/src/eva2/gui/editor/GenericOptimizationObjectivesWithParamEditor.java similarity index 99% rename from src/eva2/gui/GenericOptimizationObjectivesWithParamEditor.java rename to src/eva2/gui/editor/GenericOptimizationObjectivesWithParamEditor.java index 37386c08..caa48357 100644 --- a/src/eva2/gui/GenericOptimizationObjectivesWithParamEditor.java +++ b/src/eva2/gui/editor/GenericOptimizationObjectivesWithParamEditor.java @@ -1,6 +1,8 @@ -package eva2.gui; +package eva2.gui.editor; +import eva2.gui.PropertyEditorProvider; +import eva2.gui.PropertyOptimizationObjectivesWithParam; import eva2.optimization.problems.InterfaceOptimizationObjective; import eva2.optimization.tools.AbstractObjectEditor; import eva2.optimization.tools.GeneralGOEProperty; diff --git a/src/eva2/gui/GenericStringListSelectionEditor.java b/src/eva2/gui/editor/GenericStringListSelectionEditor.java similarity index 100% rename from src/eva2/gui/GenericStringListSelectionEditor.java rename to src/eva2/gui/editor/GenericStringListSelectionEditor.java diff --git a/src/eva2/gui/GenericWeigthedLPTchebycheffEditor.java b/src/eva2/gui/editor/GenericWeigthedLPTchebycheffEditor.java similarity index 98% rename from src/eva2/gui/GenericWeigthedLPTchebycheffEditor.java rename to src/eva2/gui/editor/GenericWeigthedLPTchebycheffEditor.java index c129cfe7..f1ea99bc 100644 --- a/src/eva2/gui/GenericWeigthedLPTchebycheffEditor.java +++ b/src/eva2/gui/editor/GenericWeigthedLPTchebycheffEditor.java @@ -1,4 +1,6 @@ -package eva2.gui; +package eva2.gui.editor; + +import eva2.gui.PropertyWeightedLPTchebycheff; import java.awt.*; import java.awt.event.*; @@ -21,7 +23,7 @@ public class GenericWeigthedLPTchebycheffEditor extends JPanel implements Proper /** The label for when we can't edit that type */ private JLabel m_Label = new JLabel("Can't edit", SwingConstants.CENTER); /** The FilePath that is to be edited*/ - private PropertyWeightedLPTchebycheff m_WLPT; + private PropertyWeightedLPTchebycheff m_WLPT; /** The gaphix stuff */ private JPanel m_CustomEditor, m_DataPanel, m_ButtonPanel, m_TargetPanel; diff --git a/src/eva2/gui/MultiLineStringEditor.java b/src/eva2/gui/editor/MultiLineStringEditor.java similarity index 97% rename from src/eva2/gui/MultiLineStringEditor.java rename to src/eva2/gui/editor/MultiLineStringEditor.java index 23299e7b..317ed3a9 100644 --- a/src/eva2/gui/MultiLineStringEditor.java +++ b/src/eva2/gui/editor/MultiLineStringEditor.java @@ -1,4 +1,6 @@ -package eva2.gui; +package eva2.gui.editor; + +import eva2.gui.MultiLineString; import java.awt.*; import java.awt.event.*; diff --git a/src/eva2/gui/StatisticsEditor.java b/src/eva2/gui/editor/StatisticsEditor.java similarity index 98% rename from src/eva2/gui/StatisticsEditor.java rename to src/eva2/gui/editor/StatisticsEditor.java index 5e37b6ed..d49037d9 100644 --- a/src/eva2/gui/StatisticsEditor.java +++ b/src/eva2/gui/editor/StatisticsEditor.java @@ -1,4 +1,4 @@ -package eva2.gui; +package eva2.gui.editor; /* * Title: EvA2 * Description: @@ -9,6 +9,7 @@ package eva2.gui; * $Date: 2007-10-23 13:43:24 +0200 (Tue, 23 Oct 2007) $ * $Author: mkron $ */ +import eva2.gui.PropertySheetPanelStat; import eva2.optimization.stat.GenericStatistics; import java.awt.*; import java.beans.*; diff --git a/src/eva2/gui/StringSelectionEditor.java b/src/eva2/gui/editor/StringSelectionEditor.java similarity index 98% rename from src/eva2/gui/StringSelectionEditor.java rename to src/eva2/gui/editor/StringSelectionEditor.java index 70b535a6..320f9a3b 100644 --- a/src/eva2/gui/StringSelectionEditor.java +++ b/src/eva2/gui/editor/StringSelectionEditor.java @@ -1,4 +1,4 @@ -package eva2.gui; +package eva2.gui.editor; import eva2.tools.StringSelection; diff --git a/src/eva2/gui/TagEditor.java b/src/eva2/gui/editor/TagEditor.java similarity index 98% rename from src/eva2/gui/TagEditor.java rename to src/eva2/gui/editor/TagEditor.java index 48f459b5..65c83f7a 100644 --- a/src/eva2/gui/TagEditor.java +++ b/src/eva2/gui/editor/TagEditor.java @@ -1,4 +1,4 @@ -package eva2.gui; +package eva2.gui.editor; /* * Title: EvA2 * Description: @@ -11,6 +11,7 @@ package eva2.gui; */ import eva2.EvAInfo; +import eva2.gui.PropertyValueSelector; import eva2.tools.BasicResourceLoader; import eva2.tools.SelectedTag; import eva2.tools.Tag; diff --git a/src/eva2/gui/DPointSetMultiIcon.java b/src/eva2/gui/plot/DPointSetMultiIcon.java similarity index 99% rename from src/eva2/gui/DPointSetMultiIcon.java rename to src/eva2/gui/plot/DPointSetMultiIcon.java index a66a0449..219ceb5a 100644 --- a/src/eva2/gui/DPointSetMultiIcon.java +++ b/src/eva2/gui/plot/DPointSetMultiIcon.java @@ -1,4 +1,4 @@ -package eva2.gui; +package eva2.gui.plot; diff --git a/src/eva2/gui/DataViewer.java b/src/eva2/gui/plot/DataViewer.java similarity index 99% rename from src/eva2/gui/DataViewer.java rename to src/eva2/gui/plot/DataViewer.java index 108f2453..425f60d6 100644 --- a/src/eva2/gui/DataViewer.java +++ b/src/eva2/gui/plot/DataViewer.java @@ -1,4 +1,4 @@ -package eva2.gui; +package eva2.gui.plot; /* * Title: EvA2 * Description: diff --git a/src/eva2/gui/DataViewerInterface.java b/src/eva2/gui/plot/DataViewerInterface.java similarity index 92% rename from src/eva2/gui/DataViewerInterface.java rename to src/eva2/gui/plot/DataViewerInterface.java index e5741777..229ad6b2 100644 --- a/src/eva2/gui/DataViewerInterface.java +++ b/src/eva2/gui/plot/DataViewerInterface.java @@ -1,4 +1,7 @@ -package eva2.gui; +package eva2.gui.plot; + +import eva2.gui.plot.Graph; + /* * Title: EvA2 * Description: diff --git a/src/eva2/gui/FunctionArea.java b/src/eva2/gui/plot/FunctionArea.java similarity index 99% rename from src/eva2/gui/FunctionArea.java rename to src/eva2/gui/plot/FunctionArea.java index 0922e884..7b79d01d 100644 --- a/src/eva2/gui/FunctionArea.java +++ b/src/eva2/gui/plot/FunctionArea.java @@ -1,4 +1,4 @@ -package eva2.gui; +package eva2.gui.plot; /* * Title: EvA2 Description: Copyright: Copyright (c) 2003 Company: University of @@ -11,6 +11,7 @@ package eva2.gui; * IMPORTS *========================================================================== */ +import eva2.gui.*; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.mocco.paretofrontviewer.InterfaceRefPointListener; import eva2.tools.ToolBoxGui; diff --git a/src/eva2/gui/Graph.java b/src/eva2/gui/plot/Graph.java similarity index 99% rename from src/eva2/gui/Graph.java rename to src/eva2/gui/plot/Graph.java index b7ee3047..0673b57a 100644 --- a/src/eva2/gui/Graph.java +++ b/src/eva2/gui/plot/Graph.java @@ -1,4 +1,4 @@ -package eva2.gui; +package eva2.gui.plot; import java.io.Serializable; diff --git a/src/eva2/gui/GraphPointSet.java b/src/eva2/gui/plot/GraphPointSet.java similarity index 99% rename from src/eva2/gui/GraphPointSet.java rename to src/eva2/gui/plot/GraphPointSet.java index 2d9d513f..b029abe4 100644 --- a/src/eva2/gui/GraphPointSet.java +++ b/src/eva2/gui/plot/GraphPointSet.java @@ -1,4 +1,4 @@ -package eva2.gui; +package eva2.gui.plot; /* * Title: EvA2 diff --git a/src/eva2/gui/GraphPointSetLegend.java b/src/eva2/gui/plot/GraphPointSetLegend.java similarity index 99% rename from src/eva2/gui/GraphPointSetLegend.java rename to src/eva2/gui/plot/GraphPointSetLegend.java index 9893870a..796ceff0 100644 --- a/src/eva2/gui/GraphPointSetLegend.java +++ b/src/eva2/gui/plot/GraphPointSetLegend.java @@ -1,4 +1,4 @@ -package eva2.gui; +package eva2.gui.plot; import eva2.tools.Pair; import eva2.tools.StringTools; diff --git a/src/eva2/gui/GraphWindow.java b/src/eva2/gui/plot/GraphWindow.java similarity index 99% rename from src/eva2/gui/GraphWindow.java rename to src/eva2/gui/plot/GraphWindow.java index 7023206c..1af6e6cc 100644 --- a/src/eva2/gui/GraphWindow.java +++ b/src/eva2/gui/plot/GraphWindow.java @@ -1,4 +1,4 @@ -package eva2.gui; +package eva2.gui.plot; /* * Title: EvA2 Description: Copyright: Copyright (c) 2003 Company: University of Tuebingen, Computer * Architecture @author Holger Ulmer, Felix Streichert, Hannes Planatscher @version: $Revision: 320 diff --git a/src/eva2/gui/InterfaceDPointWithContent.java b/src/eva2/gui/plot/InterfaceDPointWithContent.java similarity index 97% rename from src/eva2/gui/InterfaceDPointWithContent.java rename to src/eva2/gui/plot/InterfaceDPointWithContent.java index 7c173f1d..0746f0ca 100644 --- a/src/eva2/gui/InterfaceDPointWithContent.java +++ b/src/eva2/gui/plot/InterfaceDPointWithContent.java @@ -1,4 +1,4 @@ -package eva2.gui; +package eva2.gui.plot; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.problems.InterfaceOptimizationProblem; diff --git a/src/eva2/gui/Plot.java b/src/eva2/gui/plot/Plot.java similarity index 99% rename from src/eva2/gui/Plot.java rename to src/eva2/gui/plot/Plot.java index c6fe214f..0bba858e 100644 --- a/src/eva2/gui/Plot.java +++ b/src/eva2/gui/plot/Plot.java @@ -1,4 +1,4 @@ -package eva2.gui; +package eva2.gui.plot; /* * Title: EvA2 Description: Copyright: Copyright (c) 2003 Company: University of @@ -7,6 +7,7 @@ package eva2.gui; * +0100 (Tue, 11 Dec 2007) $ $Author: mkron $ */ import eva2.EvAInfo; +import eva2.gui.JEFrame; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.population.Population; import eva2.tools.BasicResourceLoader; diff --git a/src/eva2/gui/PlotInterface.java b/src/eva2/gui/plot/PlotInterface.java similarity index 98% rename from src/eva2/gui/PlotInterface.java rename to src/eva2/gui/plot/PlotInterface.java index fdaae570..2ba7980e 100644 --- a/src/eva2/gui/PlotInterface.java +++ b/src/eva2/gui/plot/PlotInterface.java @@ -1,4 +1,4 @@ -package eva2.gui; +package eva2.gui.plot; /* * Title: EvA2 * Description: diff --git a/src/eva2/gui/TopoPlot.java b/src/eva2/gui/plot/TopoPlot.java similarity index 99% rename from src/eva2/gui/TopoPlot.java rename to src/eva2/gui/plot/TopoPlot.java index 64806475..fcbf254c 100644 --- a/src/eva2/gui/TopoPlot.java +++ b/src/eva2/gui/plot/TopoPlot.java @@ -1,4 +1,4 @@ -package eva2.gui; +package eva2.gui.plot; /* * Title: EvA2 * Description: diff --git a/src/eva2/optimization/go/GOStandaloneVersion.java b/src/eva2/optimization/go/GOStandaloneVersion.java index 2ff23d08..a7320340 100644 --- a/src/eva2/optimization/go/GOStandaloneVersion.java +++ b/src/eva2/optimization/go/GOStandaloneVersion.java @@ -2,6 +2,7 @@ package eva2.optimization.go; import eva2.gui.BeanInspector; import eva2.gui.JParaPanel; +import eva2.gui.plot.Plot; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.ESIndividualDoubleData; import eva2.optimization.individuals.GAIndividualDoubleData; @@ -72,7 +73,7 @@ public class GOStandaloneVersion implements InterfaceGOStandalone, InterfacePopu transient private Population m_Backup; transient private boolean m_ContinueFlag; // Plot Panel stuff - transient private eva2.gui.Plot m_Plot; + transient private Plot m_Plot; transient private ArrayList m_PerformedRuns = new ArrayList(); transient private ArrayList m_TmpData; transient private BufferedWriter m_OutputFile; @@ -186,7 +187,7 @@ public class GOStandaloneVersion implements InterfaceGOStandalone, InterfacePopu double[] tmpD = new double[2]; tmpD[0] = 1; tmpD[1] = 1; - this.m_Plot = new eva2.gui.Plot("EA Lecture Plot", "Function calls", "Fitness", true); + this.m_Plot = new Plot("EA Lecture Plot", "Function calls", "Fitness", true); // validate and show this.m_Frame.validate(); this.m_Frame.setVisible(true); diff --git a/src/eva2/optimization/individuals/codings/gp/AbstractGPNode.java b/src/eva2/optimization/individuals/codings/gp/AbstractGPNode.java index 617d4754..3b5a0af7 100644 --- a/src/eva2/optimization/individuals/codings/gp/AbstractGPNode.java +++ b/src/eva2/optimization/individuals/codings/gp/AbstractGPNode.java @@ -2,7 +2,7 @@ package eva2.optimization.individuals.codings.gp; import eva2.gui.BeanInspector; -import eva2.gui.GenericObjectEditor; +import eva2.gui.editor.GenericObjectEditor; import eva2.optimization.problems.GPFunctionProblem; import eva2.optimization.problems.InterfaceProgramProblem; import eva2.tools.Pair; diff --git a/src/eva2/optimization/mocco/MOCCOParameterizeGDF.java b/src/eva2/optimization/mocco/MOCCOParameterizeGDF.java index dc0c018a..0e7b4408 100644 --- a/src/eva2/optimization/mocco/MOCCOParameterizeGDF.java +++ b/src/eva2/optimization/mocco/MOCCOParameterizeGDF.java @@ -1,7 +1,7 @@ package eva2.optimization.mocco; -import eva2.gui.GenericObjectEditor; +import eva2.gui.editor.GenericObjectEditor; import eva2.gui.PropertyDoubleArray; import eva2.gui.PropertyEditorProvider; import eva2.optimization.go.InterfaceTerminator; diff --git a/src/eva2/optimization/mocco/MOCCOParameterizeMO.java b/src/eva2/optimization/mocco/MOCCOParameterizeMO.java index fb28999b..9d3856a3 100644 --- a/src/eva2/optimization/mocco/MOCCOParameterizeMO.java +++ b/src/eva2/optimization/mocco/MOCCOParameterizeMO.java @@ -1,7 +1,7 @@ package eva2.optimization.mocco; -import eva2.gui.GenericObjectEditor; +import eva2.gui.editor.GenericObjectEditor; import eva2.gui.PropertyEditorProvider; import eva2.optimization.go.InterfaceTerminator; import eva2.optimization.go.MOCCOStandalone; diff --git a/src/eva2/optimization/mocco/MOCCOParameterizeRefPoint.java b/src/eva2/optimization/mocco/MOCCOParameterizeRefPoint.java index 69ced2fc..d89d49bb 100644 --- a/src/eva2/optimization/mocco/MOCCOParameterizeRefPoint.java +++ b/src/eva2/optimization/mocco/MOCCOParameterizeRefPoint.java @@ -1,7 +1,7 @@ package eva2.optimization.mocco; -import eva2.gui.GenericObjectEditor; +import eva2.gui.editor.GenericObjectEditor; import eva2.gui.PropertyEditorProvider; import eva2.optimization.go.InterfaceTerminator; import eva2.optimization.go.MOCCOStandalone; diff --git a/src/eva2/optimization/mocco/MOCCOParameterizeSO.java b/src/eva2/optimization/mocco/MOCCOParameterizeSO.java index 51bf82dd..f9cc0afd 100644 --- a/src/eva2/optimization/mocco/MOCCOParameterizeSO.java +++ b/src/eva2/optimization/mocco/MOCCOParameterizeSO.java @@ -1,7 +1,7 @@ package eva2.optimization.mocco; -import eva2.gui.GenericObjectEditor; +import eva2.gui.editor.GenericObjectEditor; import eva2.gui.PropertyEditorProvider; import eva2.optimization.go.InterfaceTerminator; import eva2.optimization.go.MOCCOStandalone; diff --git a/src/eva2/optimization/mocco/MOCCOParameterizeSTEP.java b/src/eva2/optimization/mocco/MOCCOParameterizeSTEP.java index cff2cd2c..3b8df6c9 100644 --- a/src/eva2/optimization/mocco/MOCCOParameterizeSTEP.java +++ b/src/eva2/optimization/mocco/MOCCOParameterizeSTEP.java @@ -1,7 +1,7 @@ package eva2.optimization.mocco; -import eva2.gui.GenericObjectEditor; +import eva2.gui.editor.GenericObjectEditor; import eva2.gui.PropertyDoubleArray; import eva2.gui.PropertyEditorProvider; import eva2.optimization.go.InterfaceTerminator; diff --git a/src/eva2/optimization/mocco/MOCCOParameterizeTchebycheff.java b/src/eva2/optimization/mocco/MOCCOParameterizeTchebycheff.java index baaf2b83..a4765663 100644 --- a/src/eva2/optimization/mocco/MOCCOParameterizeTchebycheff.java +++ b/src/eva2/optimization/mocco/MOCCOParameterizeTchebycheff.java @@ -1,7 +1,7 @@ package eva2.optimization.mocco; -import eva2.gui.GenericObjectEditor; +import eva2.gui.editor.GenericObjectEditor; import eva2.gui.PropertyEditorProvider; import eva2.optimization.go.InterfaceTerminator; import eva2.optimization.go.MOCCOStandalone; diff --git a/src/eva2/optimization/mocco/paretofrontviewer/MOCCOViewer.java b/src/eva2/optimization/mocco/paretofrontviewer/MOCCOViewer.java index c0c8463d..e5f91611 100644 --- a/src/eva2/optimization/mocco/paretofrontviewer/MOCCOViewer.java +++ b/src/eva2/optimization/mocco/paretofrontviewer/MOCCOViewer.java @@ -1,9 +1,9 @@ package eva2.optimization.mocco.paretofrontviewer; -import eva2.gui.FunctionArea; -import eva2.gui.GraphPointSet; -import eva2.gui.InterfaceDPointWithContent; +import eva2.gui.plot.FunctionArea; +import eva2.gui.plot.GraphPointSet; +import eva2.gui.plot.InterfaceDPointWithContent; import eva2.optimization.go.MOCCOStandalone; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.population.Population; diff --git a/src/eva2/optimization/mocco/paretofrontviewer/ParetoFrontView2D.java b/src/eva2/optimization/mocco/paretofrontviewer/ParetoFrontView2D.java index 4aa44b52..2455bd02 100644 --- a/src/eva2/optimization/mocco/paretofrontviewer/ParetoFrontView2D.java +++ b/src/eva2/optimization/mocco/paretofrontviewer/ParetoFrontView2D.java @@ -1,7 +1,9 @@ package eva2.optimization.mocco.paretofrontviewer; -import eva2.gui.*; +import eva2.gui.plot.FunctionArea; +import eva2.gui.plot.GraphPointSet; +import eva2.gui.plot.InterfaceDPointWithContent; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.population.Population; import eva2.optimization.problems.InterfaceMultiObjectiveDeNovoProblem; @@ -32,7 +34,7 @@ public class ParetoFrontView2D extends JPanel implements InterfaceParetoFrontVie private JPanel m_JPMain; private JPanel m_JPTop; private JComboBox m_JCObjective1, m_JCObjective2, m_JCFitObj; - private FunctionArea m_Area; + private FunctionArea m_Area; private ScaledBorder m_AreaBorder; private InterfaceRefPointListener m_RefPointListener; diff --git a/src/eva2/optimization/mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java b/src/eva2/optimization/mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java index 67cfb179..865f2f07 100644 --- a/src/eva2/optimization/mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java +++ b/src/eva2/optimization/mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java @@ -1,7 +1,9 @@ package eva2.optimization.mocco.paretofrontviewer; -import eva2.gui.*; +import eva2.gui.plot.FunctionArea; +import eva2.gui.plot.GraphPointSet; +import eva2.gui.plot.InterfaceDPointWithContent; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.population.Population; import eva2.optimization.problems.InterfaceMultiObjectiveDeNovoProblem; @@ -26,7 +28,7 @@ import javax.swing.*; class SimpleView extends JComponent implements InterfaceRefPointListener { private InterfaceRefPointListener m_RefPointListener; - private FunctionArea m_Area = null; + private FunctionArea m_Area = null; private ScaledBorder m_AreaBorder; ParetoFrontViewScatterPlot m_Dad; int m_Obj1, m_Obj2; diff --git a/src/eva2/optimization/modules/GenericModuleAdapter.java b/src/eva2/optimization/modules/GenericModuleAdapter.java index 52956c6f..de18594c 100644 --- a/src/eva2/optimization/modules/GenericModuleAdapter.java +++ b/src/eva2/optimization/modules/GenericModuleAdapter.java @@ -3,7 +3,7 @@ package eva2.optimization.modules; import eva2.gui.EvAModuleButtonPanelMaker; import eva2.gui.EvATabbedFrameMaker; -import eva2.gui.GenericObjectEditor; +import eva2.gui.editor.GenericObjectEditor; import eva2.gui.JParaPanel; import eva2.optimization.go.InterfaceOptimizationParameters; import eva2.optimization.stat.AbstractStatistics; diff --git a/src/eva2/optimization/modules/PSOParameters.java b/src/eva2/optimization/modules/PSOParameters.java index 0863e51d..f318c02f 100644 --- a/src/eva2/optimization/modules/PSOParameters.java +++ b/src/eva2/optimization/modules/PSOParameters.java @@ -1,7 +1,7 @@ package eva2.optimization.modules; -import eva2.gui.GenericObjectEditor; +import eva2.gui.editor.GenericObjectEditor; import eva2.optimization.go.InterfaceOptimizationParameters; import eva2.optimization.enums.PSOTopologyEnum; import eva2.optimization.operator.terminators.EvaluationTerminator; diff --git a/src/eva2/optimization/operator/archiving/AbstractArchiving.java b/src/eva2/optimization/operator/archiving/AbstractArchiving.java index e7b32898..1d33098e 100644 --- a/src/eva2/optimization/operator/archiving/AbstractArchiving.java +++ b/src/eva2/optimization/operator/archiving/AbstractArchiving.java @@ -1,6 +1,7 @@ package eva2.optimization.operator.archiving; -import eva2.gui.*; +import eva2.gui.plot.GraphPointSet; +import eva2.gui.plot.Plot; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.population.Population; import eva2.tools.chart2d.Chart2DDPointIconCross; @@ -17,7 +18,7 @@ import eva2.tools.chart2d.DPointIcon; * To change this template use Options | File Templates. */ public abstract class AbstractArchiving implements InterfaceArchiving, java.io.Serializable { - transient protected eva2.gui.Plot m_Plot = null; + transient protected Plot m_Plot = null; protected int p = 0; public boolean obeyDebsConstViolationPrinciple = true; diff --git a/src/eva2/optimization/operator/archiving/ArchivingPESAII.java b/src/eva2/optimization/operator/archiving/ArchivingPESAII.java index 4eedb070..f7c3693e 100644 --- a/src/eva2/optimization/operator/archiving/ArchivingPESAII.java +++ b/src/eva2/optimization/operator/archiving/ArchivingPESAII.java @@ -1,14 +1,9 @@ package eva2.optimization.operator.archiving; -import eva2.gui.GraphPointSet; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.population.Population; -import eva2.tools.chart2d.Chart2DDPointIconCircle; -import eva2.tools.chart2d.Chart2DDPointIconText; -import eva2.tools.chart2d.DLine; -import eva2.tools.chart2d.DPoint; import eva2.tools.math.RNG; -import java.awt.Color; + import java.util.ArrayList; /** The Pareto envelope sorting algorithm using a hybergrid and diff --git a/src/eva2/optimization/operator/archiving/ArchivingSPEAII.java b/src/eva2/optimization/operator/archiving/ArchivingSPEAII.java index 37397849..d541fbd7 100644 --- a/src/eva2/optimization/operator/archiving/ArchivingSPEAII.java +++ b/src/eva2/optimization/operator/archiving/ArchivingSPEAII.java @@ -1,7 +1,8 @@ package eva2.optimization.operator.archiving; -import eva2.gui.GraphPointSet; +import eva2.gui.plot.GraphPointSet; +import eva2.gui.plot.Plot; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.operator.distancemetric.InterfaceDistanceMetric; import eva2.optimization.operator.distancemetric.ObjectiveSpaceMetric; @@ -9,7 +10,6 @@ import eva2.optimization.population.Population; import eva2.tools.chart2d.Chart2DDPointIconCircle; import eva2.tools.chart2d.Chart2DDPointIconText; import eva2.tools.chart2d.DPoint; -import java.awt.Color; /** The strength Pareto EA in it's second version, which is based on * dominance counts. @@ -196,7 +196,7 @@ public class ArchivingSPEAII extends AbstractArchiving implements java.io.Serial for (int i = 0; i < result.length; i++) { System.out.println("Result "+i+": "+result[i]); } - this.m_Plot = new eva2.gui.Plot("Debug SPEAII", "Y1", "Y2", true); + this.m_Plot = new Plot("Debug SPEAII", "Y1", "Y2", true); this.m_Plot.setUnconnectedPoint(0, 0, 11); this.m_Plot.setUnconnectedPoint(1.2, 2.0, 11); GraphPointSet mySet = new GraphPointSet(10, this.m_Plot.getFunctionArea()); diff --git a/src/eva2/optimization/operator/cluster/ClusteringKMeans.java b/src/eva2/optimization/operator/cluster/ClusteringKMeans.java index eda9b29b..59455223 100644 --- a/src/eva2/optimization/operator/cluster/ClusteringKMeans.java +++ b/src/eva2/optimization/operator/cluster/ClusteringKMeans.java @@ -1,7 +1,7 @@ package eva2.optimization.operator.cluster; -import eva2.gui.GraphPointSet; -import eva2.gui.Plot; +import eva2.gui.plot.GraphPointSet; +import eva2.gui.plot.Plot; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.ESIndividualDoubleData; import eva2.optimization.individuals.InterfaceDataTypeDouble; @@ -152,7 +152,7 @@ public class ClusteringKMeans implements InterfaceClustering, java.io.Serializab double[] tmpD = new double[2]; tmpD[0] = 0; tmpD[1] = 0; - plot = new eva2.gui.Plot("Debugging K-Means Clustering", "Y1", "Y2", tmpD, tmpD); + plot = new Plot("Debugging K-Means Clustering", "Y1", "Y2", tmpD, tmpD); for (int i = 0; i < pop.size(); i++) { double[] x = ((InterfaceDataTypeDouble)pop.get(i)).getDoubleData(); @@ -183,7 +183,7 @@ public class ClusteringKMeans implements InterfaceClustering, java.io.Serializab double[] tmpD = new double[2]; tmpD[0] = 0; tmpD[1] = 0; - plot = new eva2.gui.Plot("Debugging Cluster", "Y1", "Y2", tmpD, tmpD); + plot = new Plot("Debugging Cluster", "Y1", "Y2", tmpD, tmpD); GraphPointSet mySet; DPoint myPoint; Chart2DDPointIconText tmp; @@ -221,7 +221,7 @@ public class ClusteringKMeans implements InterfaceClustering, java.io.Serializab double[] tmpD = new double[2]; tmpD[0] = 0; tmpD[1] = 0; - plot = new eva2.gui.Plot("Debugging Clustering Separation", "Y1", "Y2", tmpD, tmpD); + plot = new Plot("Debugging Clustering Separation", "Y1", "Y2", tmpD, tmpD); GraphPointSet mySet; DPoint myPoint; Chart2DDPointIconText tmp; diff --git a/src/eva2/optimization/operator/cluster/ClusteringNearestBetter.java b/src/eva2/optimization/operator/cluster/ClusteringNearestBetter.java index 602d0743..403a4b32 100644 --- a/src/eva2/optimization/operator/cluster/ClusteringNearestBetter.java +++ b/src/eva2/optimization/operator/cluster/ClusteringNearestBetter.java @@ -1,7 +1,7 @@ package eva2.optimization.operator.cluster; import eva2.gui.BeanInspector; -import eva2.gui.GenericObjectEditor; +import eva2.gui.editor.GenericObjectEditor; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.AbstractEAIndividualComparator; import eva2.optimization.operator.distancemetric.InterfaceDistanceMetric; diff --git a/src/eva2/optimization/operator/cluster/ClusteringXMeans.java b/src/eva2/optimization/operator/cluster/ClusteringXMeans.java index 7b34a441..725a75b0 100644 --- a/src/eva2/optimization/operator/cluster/ClusteringXMeans.java +++ b/src/eva2/optimization/operator/cluster/ClusteringXMeans.java @@ -1,7 +1,7 @@ package eva2.optimization.operator.cluster; -import eva2.gui.GraphPointSet; -import eva2.gui.Plot; +import eva2.gui.plot.GraphPointSet; +import eva2.gui.plot.Plot; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.ESIndividualDoubleData; import eva2.optimization.individuals.InterfaceDataTypeDouble; @@ -85,7 +85,7 @@ public class ClusteringXMeans implements InterfaceClustering, java.io.Serializab double[] tmpD = new double[2], x; tmpD[0] = 0; tmpD[1] = 0; - plot = new eva2.gui.Plot("K="+(i+1)+" reaches BIC = "+tmpBIC, "Y1", "Y2", tmpD, tmpD); + plot = new Plot("K="+(i+1)+" reaches BIC = "+tmpBIC, "Y1", "Y2", tmpD, tmpD); GraphPointSet mySet; DPoint myPoint; Chart2DDPointIconText tmp; diff --git a/src/eva2/optimization/operator/constraint/AbstractConstraint.java b/src/eva2/optimization/operator/constraint/AbstractConstraint.java index 9565671f..bc8af1d6 100644 --- a/src/eva2/optimization/operator/constraint/AbstractConstraint.java +++ b/src/eva2/optimization/operator/constraint/AbstractConstraint.java @@ -5,7 +5,7 @@ import eva2.optimization.operator.paramcontrol.ParamAdaption; import eva2.optimization.operator.paramcontrol.ParameterControlManager; import eva2.optimization.operator.paramcontrol.GenericParamAdaption; import eva2.optimization.operator.paramcontrol.NoParamAdaption; -import eva2.gui.GenericObjectEditor; +import eva2.gui.editor.GenericObjectEditor; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.problems.AbstractProblemDouble; import eva2.tools.EVAERROR; diff --git a/src/eva2/optimization/operator/constraint/DummyConstraint.java b/src/eva2/optimization/operator/constraint/DummyConstraint.java index 41fdb73b..4d0c5fc0 100644 --- a/src/eva2/optimization/operator/constraint/DummyConstraint.java +++ b/src/eva2/optimization/operator/constraint/DummyConstraint.java @@ -1,6 +1,6 @@ package eva2.optimization.operator.constraint; -import eva2.gui.GenericObjectEditor; +import eva2.gui.editor.GenericObjectEditor; /** * This constraint is always satisfied. diff --git a/src/eva2/optimization/operator/constraint/IntervalConstraint.java b/src/eva2/optimization/operator/constraint/IntervalConstraint.java index a8ae7ed5..2da4f8a7 100644 --- a/src/eva2/optimization/operator/constraint/IntervalConstraint.java +++ b/src/eva2/optimization/operator/constraint/IntervalConstraint.java @@ -1,6 +1,6 @@ package eva2.optimization.operator.constraint; -import eva2.gui.GenericObjectEditor; +import eva2.gui.editor.GenericObjectEditor; import eva2.tools.EVAERROR; import eva2.tools.math.Mathematics; import java.io.Serializable; diff --git a/src/eva2/optimization/operator/crossover/CrossoverEAMixer.java b/src/eva2/optimization/operator/crossover/CrossoverEAMixer.java index d663ae66..e505e78b 100644 --- a/src/eva2/optimization/operator/crossover/CrossoverEAMixer.java +++ b/src/eva2/optimization/operator/crossover/CrossoverEAMixer.java @@ -1,6 +1,6 @@ package eva2.optimization.operator.crossover; -import eva2.gui.GenericObjectEditor; +import eva2.gui.editor.GenericObjectEditor; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.population.Population; import eva2.optimization.problems.InterfaceOptimizationProblem; diff --git a/src/eva2/optimization/operator/crossover/CrossoverESPCX.java b/src/eva2/optimization/operator/crossover/CrossoverESPCX.java index 50cf4016..b37d209c 100644 --- a/src/eva2/optimization/operator/crossover/CrossoverESPCX.java +++ b/src/eva2/optimization/operator/crossover/CrossoverESPCX.java @@ -1,7 +1,7 @@ package eva2.optimization.operator.crossover; -import eva2.gui.Plot; +import eva2.gui.plot.Plot; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.ESIndividualDoubleData; import eva2.optimization.individuals.InterfaceESIndividual; @@ -79,7 +79,7 @@ public class CrossoverESPCX implements InterfaceCrossover, java.io.Serializable subSpace = this.getCoordinates(g, i, parents); -// Plot plot = new eva2.gui.Plot("SBX Test", "x", "y", true); +// Plot plot = new eva2.gui.plot.Plot("SBX Test", "x", "y", true); // plot.setUnconnectedPoint(-2, -2, 0); // plot.setUnconnectedPoint(2, 2, 0); // for (int z = 0; z < parents.length; z++) { @@ -262,7 +262,7 @@ public class CrossoverESPCX implements InterfaceCrossover, java.io.Serializable tmpD[0] = 1; tmpD[1] = 1; if (plotFlag) { - plot = new eva2.gui.Plot("SBX Test", "x", "y", true); + plot = new Plot("SBX Test", "x", "y", true); tmpD = indy1.getDoubleData(); plot.setUnconnectedPoint(tmpD[0], tmpD[1], 0); tmpD = indy2.getDoubleData(); diff --git a/src/eva2/optimization/operator/crossover/CrossoverESSBX.java b/src/eva2/optimization/operator/crossover/CrossoverESSBX.java index 61c23131..574f43d3 100644 --- a/src/eva2/optimization/operator/crossover/CrossoverESSBX.java +++ b/src/eva2/optimization/operator/crossover/CrossoverESSBX.java @@ -1,6 +1,6 @@ package eva2.optimization.operator.crossover; -import eva2.gui.Plot; +import eva2.gui.plot.Plot; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.ESIndividualDoubleData; import eva2.optimization.individuals.InterfaceESIndividual; @@ -162,7 +162,7 @@ public class CrossoverESSBX implements InterfaceCrossover, java.io.Serializable pop.add(indy3); tmpD[0] = 1; tmpD[1] = 1; - Plot plot = new eva2.gui.Plot("SBX Test", "x", "y", true); + Plot plot = new Plot("SBX Test", "x", "y", true); tmpD = indy1.getDoubleData(); plot.setUnconnectedPoint(tmpD[0], tmpD[1], 0); tmpD = indy2.getDoubleData(); diff --git a/src/eva2/optimization/operator/crossover/CrossoverESSPX.java b/src/eva2/optimization/operator/crossover/CrossoverESSPX.java index 85590eac..87d4a7bf 100644 --- a/src/eva2/optimization/operator/crossover/CrossoverESSPX.java +++ b/src/eva2/optimization/operator/crossover/CrossoverESSPX.java @@ -1,6 +1,6 @@ package eva2.optimization.operator.crossover; -import eva2.gui.Plot; +import eva2.gui.plot.Plot; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.ESIndividualDoubleData; import eva2.optimization.individuals.InterfaceESIndividual; @@ -181,7 +181,7 @@ public class CrossoverESSPX implements InterfaceCrossover, java.io.Serializable tmpD[0] = 1; tmpD[1] = 1; if (plotFlag) { - plot = new eva2.gui.Plot("SBX Test", "x", "y", true); + plot = new Plot("SBX Test", "x", "y", true); tmpD = indy1.getDoubleData(); plot.setUnconnectedPoint(tmpD[0], tmpD[1], 0); tmpD = indy2.getDoubleData(); diff --git a/src/eva2/optimization/operator/crossover/CrossoverESUNDX.java b/src/eva2/optimization/operator/crossover/CrossoverESUNDX.java index 64df72cc..a77eb221 100644 --- a/src/eva2/optimization/operator/crossover/CrossoverESUNDX.java +++ b/src/eva2/optimization/operator/crossover/CrossoverESUNDX.java @@ -1,7 +1,7 @@ package eva2.optimization.operator.crossover; -import eva2.gui.Plot; +import eva2.gui.plot.Plot; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.ESIndividualDoubleData; import eva2.optimization.individuals.InterfaceESIndividual; @@ -265,7 +265,7 @@ public class CrossoverESUNDX implements InterfaceCrossover, java.io.Serializable tmpD[0] = 1; tmpD[1] = 1; if (plotFlag) { - plot = new eva2.gui.Plot("SBX Test", "x", "y", true); + plot = new Plot("SBX Test", "x", "y", true); tmpD = indy1.getDoubleData(); plot.setUnconnectedPoint(tmpD[0], tmpD[1], 0); tmpD = indy2.getDoubleData(); diff --git a/src/eva2/optimization/operator/crossover/PropertyCrossoverMixerEditor.java b/src/eva2/optimization/operator/crossover/PropertyCrossoverMixerEditor.java index a70c8ddb..b137bd96 100644 --- a/src/eva2/optimization/operator/crossover/PropertyCrossoverMixerEditor.java +++ b/src/eva2/optimization/operator/crossover/PropertyCrossoverMixerEditor.java @@ -1,7 +1,7 @@ package eva2.optimization.operator.crossover; -import eva2.gui.GenericObjectEditor; +import eva2.gui.editor.GenericObjectEditor; import eva2.gui.PropertyEditorProvider; import eva2.optimization.tools.AbstractObjectEditor; import eva2.optimization.tools.GeneralGEOFaker; diff --git a/src/eva2/optimization/operator/crossover/TestESCrossover.java b/src/eva2/optimization/operator/crossover/TestESCrossover.java index 60da07b4..d8d1e18c 100644 --- a/src/eva2/optimization/operator/crossover/TestESCrossover.java +++ b/src/eva2/optimization/operator/crossover/TestESCrossover.java @@ -2,7 +2,7 @@ package eva2.optimization.operator.crossover; import eva2.gui.JParaPanel; -import eva2.gui.Plot; +import eva2.gui.plot.Plot; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.ESIndividualDoubleData; import eva2.optimization.individuals.InterfaceDataTypeDouble; @@ -85,7 +85,7 @@ public class TestESCrossover implements java.io.Serializable { double[] tmpD = new double[2]; tmpD[0] = 0; tmpD[1] = 0; - this.m_Plot = new eva2.gui.Plot("ES Crossover Testert", "x", "y", tmpD, tmpD); + this.m_Plot = new Plot("ES Crossover Testert", "x", "y", tmpD, tmpD); // validate and show this.m_Frame.validate(); this.m_Frame.setVisible(true); diff --git a/src/eva2/optimization/operator/migration/MOClusteringSeparation.java b/src/eva2/optimization/operator/migration/MOClusteringSeparation.java index b196575c..c9050d79 100644 --- a/src/eva2/optimization/operator/migration/MOClusteringSeparation.java +++ b/src/eva2/optimization/operator/migration/MOClusteringSeparation.java @@ -1,7 +1,7 @@ package eva2.optimization.operator.migration; -import eva2.gui.GraphPointSet; -import eva2.gui.Plot; +import eva2.gui.plot.GraphPointSet; +import eva2.gui.plot.Plot; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.operator.archiving.ArchivingNSGAII; import eva2.optimization.operator.cluster.ClusteringKMeans; @@ -107,7 +107,7 @@ public class MOClusteringSeparation implements InterfaceMigration, java.io.Seria // double[] tmpD = new double[2]; // tmpD[0] = 0; // tmpD[1] = 0; -// plot = new eva2.gui.Plot("Debugging Clustering Separation", "Y1", "Y2", tmpD, tmpD); +// plot = new eva2.gui.plot.Plot("Debugging Clustering Separation", "Y1", "Y2", tmpD, tmpD); // GraphPointSet mySet; // DPoint myPoint; // Chart2DDPointIconText tmp; @@ -146,7 +146,7 @@ public class MOClusteringSeparation implements InterfaceMigration, java.io.Seria double[] tmpD = new double[2]; tmpD[0] = 0; tmpD[1] = 0; - plot = new eva2.gui.Plot("Debugging Clustering Separation", "Y1", "Y2", tmpD, tmpD); + plot = new Plot("Debugging Clustering Separation", "Y1", "Y2", tmpD, tmpD); GraphPointSet mySet; DPoint myPoint; Chart2DDPointIconText tmp; diff --git a/src/eva2/optimization/operator/migration/MOConeSeparation.java b/src/eva2/optimization/operator/migration/MOConeSeparation.java index 495ffd14..32b1fc74 100644 --- a/src/eva2/optimization/operator/migration/MOConeSeparation.java +++ b/src/eva2/optimization/operator/migration/MOConeSeparation.java @@ -1,7 +1,7 @@ package eva2.optimization.operator.migration; -import eva2.gui.GraphPointSet; -import eva2.gui.Plot; +import eva2.gui.plot.GraphPointSet; +import eva2.gui.plot.Plot; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.operator.archiving.ArchivingAllDominating; import eva2.optimization.operator.archiving.InterfaceArchiving; @@ -138,7 +138,7 @@ public class MOConeSeparation implements InterfaceMigration, java.io.Serializabl // double[] tmpD = new double[2]; // tmpD[0] = 0; // tmpD[1] = 0; -// plot = new eva2.gui.Plot("Debugging Cone Separation", "Y1", "Y2", tmpD, tmpD); +// plot = new eva2.gui.plot.Plot("Debugging Cone Separation", "Y1", "Y2", tmpD, tmpD); // GraphPointSet mySet; // DPoint myPoint; // Chart2DDPointIconText tmp; @@ -211,7 +211,7 @@ public class MOConeSeparation implements InterfaceMigration, java.io.Serializabl double[] tmpD = new double[2]; tmpD[0] = 0; tmpD[1] = 0; - plot = new eva2.gui.Plot("Debugging Cone Separation", "Y1", "Y2", tmpD, tmpD); + plot = new Plot("Debugging Cone Separation", "Y1", "Y2", tmpD, tmpD); GraphPointSet mySet; DPoint myPoint; Chart2DDPointIconText tmp; diff --git a/src/eva2/optimization/operator/migration/MOXMeansSeparation.java b/src/eva2/optimization/operator/migration/MOXMeansSeparation.java index 7ba6d550..9ca8fde6 100644 --- a/src/eva2/optimization/operator/migration/MOXMeansSeparation.java +++ b/src/eva2/optimization/operator/migration/MOXMeansSeparation.java @@ -1,8 +1,8 @@ package eva2.optimization.operator.migration; -import eva2.gui.GraphPointSet; -import eva2.gui.Plot; +import eva2.gui.plot.GraphPointSet; +import eva2.gui.plot.Plot; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.operator.archiving.ArchivingNSGAII; import eva2.optimization.operator.cluster.ClusteringXMeans; @@ -103,7 +103,7 @@ public class MOXMeansSeparation implements InterfaceMigration, java.io.Serializa // double[] tmpD = new double[2]; // tmpD[0] = 0; // tmpD[1] = 0; -// plot = new eva2.gui.Plot("Debugging Clustering Separation", "Y1", "Y2", tmpD, tmpD); +// plot = new eva2.gui.plot.Plot("Debugging Clustering Separation", "Y1", "Y2", tmpD, tmpD); // GraphPointSet mySet; // DPoint myPoint; // Chart2DDPointIconText tmp; @@ -146,7 +146,7 @@ public class MOXMeansSeparation implements InterfaceMigration, java.io.Serializa double[] tmpD = new double[2]; tmpD[0] = 0; tmpD[1] = 0; - plot = new eva2.gui.Plot("Debugging Clustering Separation", "Y1", "Y2", tmpD, tmpD); + plot = new Plot("Debugging Clustering Separation", "Y1", "Y2", tmpD, tmpD); GraphPointSet mySet; DPoint myPoint; Chart2DDPointIconText tmp; diff --git a/src/eva2/optimization/operator/moso/MOSOMaxiMin.java b/src/eva2/optimization/operator/moso/MOSOMaxiMin.java index 0cda1ed7..1606519d 100644 --- a/src/eva2/optimization/operator/moso/MOSOMaxiMin.java +++ b/src/eva2/optimization/operator/moso/MOSOMaxiMin.java @@ -1,5 +1,6 @@ package eva2.optimization.operator.moso; +import eva2.gui.plot.Plot; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.population.Population; import eva2.tools.math.RNG; @@ -14,7 +15,7 @@ import eva2.tools.math.RNG; public class MOSOMaxiMin implements InterfaceMOSOConverter, java.io.Serializable { private int m_OutputDimension = 2; - transient protected eva2.gui.Plot m_Plot = null; + transient protected Plot m_Plot = null; public MOSOMaxiMin() { } @@ -71,7 +72,7 @@ public class MOSOMaxiMin implements InterfaceMOSOConverter, java.io.Serializable } //////////////////////////////////////////////////////////////////////////////////// // if (false) { -// this.m_Plot = new eva2.gui.Plot("Debug MaxiMin", "Y1", "Y2"); +// this.m_Plot = new eva2.gui.plot.Plot("Debug MaxiMin", "Y1", "Y2"); // this.m_Plot.setUnconnectedPoint(0, 0, 11); // this.m_Plot.setUnconnectedPoint(1.2, 2.0, 11); // double[][] trueFitness, moFitness; diff --git a/src/eva2/optimization/operator/mutation/MutateEAMixer.java b/src/eva2/optimization/operator/mutation/MutateEAMixer.java index 81c4e3f6..27311c90 100644 --- a/src/eva2/optimization/operator/mutation/MutateEAMixer.java +++ b/src/eva2/optimization/operator/mutation/MutateEAMixer.java @@ -1,6 +1,6 @@ package eva2.optimization.operator.mutation; -import eva2.gui.GenericObjectEditor; +import eva2.gui.editor.GenericObjectEditor; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.population.Population; import eva2.optimization.problems.InterfaceOptimizationProblem; diff --git a/src/eva2/optimization/operator/mutation/MutateESRankMuCMA.java b/src/eva2/optimization/operator/mutation/MutateESRankMuCMA.java index 5d08a6a0..5c3e7273 100644 --- a/src/eva2/optimization/operator/mutation/MutateESRankMuCMA.java +++ b/src/eva2/optimization/operator/mutation/MutateESRankMuCMA.java @@ -1,7 +1,7 @@ package eva2.optimization.operator.mutation; import eva2.gui.BeanInspector; -import eva2.gui.GenericObjectEditor; +import eva2.gui.editor.GenericObjectEditor; import eva2.optimization.enums.ESMutationInitialSigma; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.AbstractEAIndividualComparator; diff --git a/src/eva2/optimization/operator/mutation/MutateGAUniform.java b/src/eva2/optimization/operator/mutation/MutateGAUniform.java index 60a71a08..eb424484 100644 --- a/src/eva2/optimization/operator/mutation/MutateGAUniform.java +++ b/src/eva2/optimization/operator/mutation/MutateGAUniform.java @@ -1,6 +1,6 @@ package eva2.optimization.operator.mutation; -import eva2.gui.GenericObjectEditor; +import eva2.gui.editor.GenericObjectEditor; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceGAIndividual; import eva2.optimization.population.Population; diff --git a/src/eva2/optimization/operator/mutation/PropertyMutationMixerEditor.java b/src/eva2/optimization/operator/mutation/PropertyMutationMixerEditor.java index c085f3a8..9bf3c87c 100644 --- a/src/eva2/optimization/operator/mutation/PropertyMutationMixerEditor.java +++ b/src/eva2/optimization/operator/mutation/PropertyMutationMixerEditor.java @@ -1,6 +1,7 @@ package eva2.optimization.operator.mutation; import eva2.gui.*; +import eva2.gui.editor.GenericObjectEditor; import eva2.optimization.tools.AbstractObjectEditor; import eva2.optimization.tools.GeneralGEOFaker; import eva2.optimization.tools.GeneralGOEProperty; diff --git a/src/eva2/optimization/operator/paramcontrol/PSOInertnessAdaption.java b/src/eva2/optimization/operator/paramcontrol/PSOInertnessAdaption.java index db4ea35e..d7926726 100644 --- a/src/eva2/optimization/operator/paramcontrol/PSOInertnessAdaption.java +++ b/src/eva2/optimization/operator/paramcontrol/PSOInertnessAdaption.java @@ -1,6 +1,6 @@ package eva2.optimization.operator.paramcontrol; -import eva2.gui.GenericObjectEditor; +import eva2.gui.editor.GenericObjectEditor; import java.io.Serializable; /** diff --git a/src/eva2/optimization/operator/postprocess/PostProcess.java b/src/eva2/optimization/operator/postprocess/PostProcess.java index 761457dd..c938134d 100644 --- a/src/eva2/optimization/operator/postprocess/PostProcess.java +++ b/src/eva2/optimization/operator/postprocess/PostProcess.java @@ -10,8 +10,8 @@ import eva2.optimization.problems.FM0Problem; import eva2.OptimizerFactory; import eva2.OptimizerRunnable; import eva2.gui.BeanInspector; -import eva2.gui.Plot; -import eva2.gui.TopoPlot; +import eva2.gui.plot.Plot; +import eva2.gui.plot.TopoPlot; import eva2.optimization.go.IndividualInterface; import eva2.optimization.go.InterfaceTerminator; import eva2.optimization.enums.ESMutationInitialSigma; diff --git a/src/eva2/optimization/operator/postprocess/PostProcessParams.java b/src/eva2/optimization/operator/postprocess/PostProcessParams.java index eac4ef07..12a45354 100644 --- a/src/eva2/optimization/operator/postprocess/PostProcessParams.java +++ b/src/eva2/optimization/operator/postprocess/PostProcessParams.java @@ -1,6 +1,6 @@ package eva2.optimization.operator.postprocess; -import eva2.gui.GenericObjectEditor; +import eva2.gui.editor.GenericObjectEditor; import eva2.optimization.enums.PostProcessMethod; import java.io.Serializable; diff --git a/src/eva2/optimization/operator/selection/SelectMOSPEAII.java b/src/eva2/optimization/operator/selection/SelectMOSPEAII.java index 0d730947..ef624cd6 100644 --- a/src/eva2/optimization/operator/selection/SelectMOSPEAII.java +++ b/src/eva2/optimization/operator/selection/SelectMOSPEAII.java @@ -1,7 +1,7 @@ package eva2.optimization.operator.selection; -import eva2.gui.GraphPointSet; -import eva2.gui.Plot; +import eva2.gui.plot.GraphPointSet; +import eva2.gui.plot.Plot; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.operator.archiving.ArchivingSPEAII; import eva2.optimization.population.Population; @@ -81,7 +81,7 @@ public class SelectMOSPEAII implements InterfaceSelection, java.io.Serializable double[] tmpD = new double[2]; tmpD[0] = 0; tmpD[1] = 0; - Plot plot = new eva2.gui.Plot("Debug SPEAIISelect", "Y1", "Y2", tmpD, tmpD); + Plot plot = new Plot("Debug SPEAIISelect", "Y1", "Y2", tmpD, tmpD); plot.setUnconnectedPoint(0, 0, 11); plot.setUnconnectedPoint(1.2, 10, 11); GraphPointSet mySet = new GraphPointSet(10, plot.getFunctionArea()); diff --git a/src/eva2/optimization/population/Population.java b/src/eva2/optimization/population/Population.java index 91a96ec5..a3a465c5 100644 --- a/src/eva2/optimization/population/Population.java +++ b/src/eva2/optimization/population/Population.java @@ -5,7 +5,7 @@ import eva2.optimization.individuals.AbstractEAIndividualComparator; import eva2.optimization.individuals.InterfaceESIndividual; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceGAIndividual; -import eva2.gui.GenericObjectEditor; +import eva2.gui.editor.GenericObjectEditor; import eva2.optimization.go.IndividualInterface; import eva2.optimization.go.InterfacePopulationChangedEventListener; import eva2.optimization.operator.distancemetric.EuclideanMetric; diff --git a/src/eva2/optimization/problems/AbstractDynTransProblem.java b/src/eva2/optimization/problems/AbstractDynTransProblem.java index 32e7302b..15d5148e 100644 --- a/src/eva2/optimization/problems/AbstractDynTransProblem.java +++ b/src/eva2/optimization/problems/AbstractDynTransProblem.java @@ -1,5 +1,6 @@ package eva2.optimization.problems; +import eva2.gui.plot.Plot; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceDataTypeDouble; import eva2.optimization.population.Population; @@ -70,7 +71,7 @@ public abstract class AbstractDynTransProblem extends AbstractSynchronousOptimiz tmpD[0] = 0; tmpD[1] = 0; // im not really certain about what tmpD is required for - this.myplot = new eva2.gui.Plot("population measures", "x1", "x2", tmpD, tmpD); + this.myplot = new Plot("population measures", "x1", "x2", tmpD, tmpD); } myplot.setConnectedPoint(population.getFunctionCalls(), delta, 0); //myplot.setUnconnectedPoint(population.getFunctionCalls(), population.getPopulationMeasures()[2], 2); diff --git a/src/eva2/optimization/problems/AbstractDynamicOptimizationProblem.java b/src/eva2/optimization/problems/AbstractDynamicOptimizationProblem.java index 90931be3..dc5f983b 100644 --- a/src/eva2/optimization/problems/AbstractDynamicOptimizationProblem.java +++ b/src/eva2/optimization/problems/AbstractDynamicOptimizationProblem.java @@ -1,6 +1,6 @@ package eva2.optimization.problems; -import eva2.gui.Plot; +import eva2.gui.plot.Plot; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.population.Population; @@ -344,7 +344,7 @@ public abstract class AbstractDynamicOptimizationProblem extends AbstractOptimiz tmpD[0] = 0; tmpD[1] = 0; // im not really certain about what tmpD is required for - this.myplot = new eva2.gui.Plot("population measures", "x1", "x2", tmpD, tmpD); + this.myplot = new Plot("population measures", "x1", "x2", tmpD, tmpD); } /** This method allows the CommonJavaObjectEditorPanel to read the diff --git a/src/eva2/optimization/problems/AbstractMultiObjectiveOptimizationProblem.java b/src/eva2/optimization/problems/AbstractMultiObjectiveOptimizationProblem.java index 132454c9..809925ab 100644 --- a/src/eva2/optimization/problems/AbstractMultiObjectiveOptimizationProblem.java +++ b/src/eva2/optimization/problems/AbstractMultiObjectiveOptimizationProblem.java @@ -1,7 +1,7 @@ package eva2.optimization.problems; -import eva2.gui.GraphPointSet; -import eva2.gui.Plot; +import eva2.gui.plot.GraphPointSet; +import eva2.gui.plot.Plot; import eva2.optimization.population.PopulationInterface; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.ESIndividualDoubleData; @@ -370,7 +370,7 @@ public abstract class AbstractMultiObjectiveOptimizationProblem extends Abstract Population tmpPop = null; if (p.getGeneration() > 2) { -// m_Plot = new eva2.gui.Plot("Multiobjective Optimization", "Y1", "Y2"); +// m_Plot = new eva2.gui.plot.Plot("Multiobjective Optimization", "Y1", "Y2"); // i want to plot the pareto front for MOEA and other strategies // but i have to differentiate between the case where // there is a true MOEA at work and where the diff --git a/src/eva2/optimization/problems/AbstractProblemDouble.java b/src/eva2/optimization/problems/AbstractProblemDouble.java index 460bc4c7..656d949b 100644 --- a/src/eva2/optimization/problems/AbstractProblemDouble.java +++ b/src/eva2/optimization/problems/AbstractProblemDouble.java @@ -1,7 +1,7 @@ package eva2.optimization.problems; -import eva2.gui.GenericObjectEditor; -import eva2.gui.TopoPlot; +import eva2.gui.editor.GenericObjectEditor; +import eva2.gui.plot.TopoPlot; import eva2.optimization.population.PopulationInterface; import eva2.optimization.enums.PostProcessMethod; import eva2.optimization.individuals.AbstractEAIndividual; diff --git a/src/eva2/optimization/problems/ConstrPressureVessel.java b/src/eva2/optimization/problems/ConstrPressureVessel.java index 6f72eb21..03416698 100644 --- a/src/eva2/optimization/problems/ConstrPressureVessel.java +++ b/src/eva2/optimization/problems/ConstrPressureVessel.java @@ -1,6 +1,6 @@ package eva2.optimization.problems; -import eva2.gui.GenericObjectEditor; +import eva2.gui.editor.GenericObjectEditor; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.operator.constraint.AbstractConstraint; import eva2.optimization.operator.constraint.ConstraintCollection; diff --git a/src/eva2/optimization/problems/F13Problem.java b/src/eva2/optimization/problems/F13Problem.java index d110bb99..9cb4e030 100644 --- a/src/eva2/optimization/problems/F13Problem.java +++ b/src/eva2/optimization/problems/F13Problem.java @@ -1,6 +1,6 @@ package eva2.optimization.problems; -import eva2.gui.GenericObjectEditor; +import eva2.gui.editor.GenericObjectEditor; import eva2.optimization.individuals.ESIndividualDoubleData; import eva2.optimization.operator.postprocess.SolutionHistogram; diff --git a/src/eva2/optimization/problems/PSymbolicRegression.java b/src/eva2/optimization/problems/PSymbolicRegression.java index a2d0a6ac..e11d745c 100644 --- a/src/eva2/optimization/problems/PSymbolicRegression.java +++ b/src/eva2/optimization/problems/PSymbolicRegression.java @@ -1,6 +1,6 @@ package eva2.optimization.problems; -import eva2.gui.Plot; +import eva2.gui.plot.Plot; import eva2.optimization.population.PopulationInterface; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.GAPIndividualProgramData; diff --git a/src/eva2/optimization/problems/SimpleProblemWrapper.java b/src/eva2/optimization/problems/SimpleProblemWrapper.java index 24d23e64..6cf5a0ac 100644 --- a/src/eva2/optimization/problems/SimpleProblemWrapper.java +++ b/src/eva2/optimization/problems/SimpleProblemWrapper.java @@ -1,8 +1,8 @@ package eva2.optimization.problems; import eva2.gui.BeanInspector; -import eva2.gui.GenericObjectEditor; -import eva2.gui.Plot; +import eva2.gui.editor.GenericObjectEditor; +import eva2.gui.plot.Plot; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.ESIndividualDoubleData; import eva2.optimization.individuals.GAIndividualBinaryData; diff --git a/src/eva2/optimization/problems/TF1Problem.java b/src/eva2/optimization/problems/TF1Problem.java index 28ce1cff..edd05690 100644 --- a/src/eva2/optimization/problems/TF1Problem.java +++ b/src/eva2/optimization/problems/TF1Problem.java @@ -1,6 +1,6 @@ package eva2.optimization.problems; -import eva2.gui.Plot; +import eva2.gui.plot.Plot; import eva2.gui.PropertyFilePath; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceDataTypeDouble; diff --git a/src/eva2/optimization/stat/EvAJobList.java b/src/eva2/optimization/stat/EvAJobList.java index b12811ca..3a60708f 100644 --- a/src/eva2/optimization/stat/EvAJobList.java +++ b/src/eva2/optimization/stat/EvAJobList.java @@ -1,6 +1,6 @@ package eva2.optimization.stat; -import eva2.gui.GenericArrayEditor; +import eva2.gui.editor.GenericArrayEditor; import eva2.gui.JParaPanel; import eva2.gui.PropertySelectableList; import eva2.optimization.go.InterfaceOptimizationParameters; diff --git a/src/eva2/optimization/stat/GenericStatistics.java b/src/eva2/optimization/stat/GenericStatistics.java index 86fa79c9..a08b0fed 100644 --- a/src/eva2/optimization/stat/GenericStatistics.java +++ b/src/eva2/optimization/stat/GenericStatistics.java @@ -9,9 +9,9 @@ package eva2.optimization.stat; * $Date: 2007-12-06 16:05:11 +0100 (Thu, 06 Dec 2007) $ * $Author: mkron $ */ -import eva2.gui.DataViewer; -import eva2.gui.DataViewerInterface; -import eva2.gui.Graph; +import eva2.gui.plot.DataViewer; +import eva2.gui.plot.DataViewerInterface; +import eva2.gui.plot.Graph; import java.io.Serializable; import java.lang.reflect.Field; import java.util.logging.Logger; diff --git a/src/eva2/optimization/stat/StatisticsParameter.java b/src/eva2/optimization/stat/StatisticsParameter.java index f1eef46d..ddcff424 100644 --- a/src/eva2/optimization/stat/StatisticsParameter.java +++ b/src/eva2/optimization/stat/StatisticsParameter.java @@ -1,7 +1,7 @@ package eva2.optimization.stat; import eva2.gui.BeanInspector; -import eva2.gui.GenericObjectEditor; +import eva2.gui.editor.GenericObjectEditor; import eva2.optimization.go.InterfaceNotifyOnInformers; import eva2.optimization.problems.InterfaceAdditionalPopulationInformer; import eva2.tools.EVAERROR; diff --git a/src/eva2/optimization/stat/StatisticsWithGUI.java b/src/eva2/optimization/stat/StatisticsWithGUI.java index ca8272d4..eed6cf99 100644 --- a/src/eva2/optimization/stat/StatisticsWithGUI.java +++ b/src/eva2/optimization/stat/StatisticsWithGUI.java @@ -11,12 +11,12 @@ package eva2.optimization.stat; * $Author: mkron $ */ import eva2.gui.BeanInspector; -import eva2.gui.Graph; -import eva2.gui.GraphWindow; +import eva2.gui.plot.Graph; +import eva2.gui.plot.GraphWindow; import eva2.gui.JTextoutputFrame; import eva2.gui.JTextoutputFrameInterface; -import eva2.gui.Plot; -import eva2.gui.PlotInterface; +import eva2.gui.plot.Plot; +import eva2.gui.plot.PlotInterface; import eva2.optimization.population.PopulationInterface; import eva2.optimization.problems.InterfaceAdditionalPopulationInformer; import eva2.tools.EVAERROR; diff --git a/src/eva2/optimization/strategies/ANPSO.java b/src/eva2/optimization/strategies/ANPSO.java index aae93b3a..be97b6a0 100644 --- a/src/eva2/optimization/strategies/ANPSO.java +++ b/src/eva2/optimization/strategies/ANPSO.java @@ -1,7 +1,7 @@ package eva2.optimization.strategies; import eva2.OptimizerFactory; -import eva2.gui.GenericObjectEditor; +import eva2.gui.editor.GenericObjectEditor; import eva2.optimization.go.InterfaceTerminator; import eva2.optimization.population.PopulationInterface; import eva2.optimization.enums.PSOTopologyEnum; diff --git a/src/eva2/optimization/strategies/ClusterBasedNichingEA.java b/src/eva2/optimization/strategies/ClusterBasedNichingEA.java index c3c81b27..58c3ffba 100644 --- a/src/eva2/optimization/strategies/ClusterBasedNichingEA.java +++ b/src/eva2/optimization/strategies/ClusterBasedNichingEA.java @@ -1,10 +1,10 @@ package eva2.optimization.strategies; import eva2.gui.BeanInspector; -import eva2.gui.GenericObjectEditor; -import eva2.gui.GraphPointSet; -import eva2.gui.Plot; -import eva2.gui.TopoPlot; +import eva2.gui.editor.GenericObjectEditor; +import eva2.gui.plot.GraphPointSet; +import eva2.gui.plot.Plot; +import eva2.gui.plot.TopoPlot; import eva2.optimization.go.InterfacePopulationChangedEventListener; import eva2.optimization.go.InterfaceTerminator; import eva2.optimization.population.PopulationInterface; diff --git a/src/eva2/optimization/strategies/ClusteringHillClimbing.java b/src/eva2/optimization/strategies/ClusteringHillClimbing.java index 3535680b..71e51c8b 100644 --- a/src/eva2/optimization/strategies/ClusteringHillClimbing.java +++ b/src/eva2/optimization/strategies/ClusteringHillClimbing.java @@ -1,6 +1,6 @@ package eva2.optimization.strategies; -import eva2.gui.GenericObjectEditor; +import eva2.gui.editor.GenericObjectEditor; import eva2.optimization.go.InterfacePopulationChangedEventListener; import eva2.optimization.population.PopulationInterface; import eva2.optimization.enums.PostProcessMethod; diff --git a/src/eva2/optimization/strategies/DifferentialEvolution.java b/src/eva2/optimization/strategies/DifferentialEvolution.java index 50f1057f..57ac84c2 100644 --- a/src/eva2/optimization/strategies/DifferentialEvolution.java +++ b/src/eva2/optimization/strategies/DifferentialEvolution.java @@ -1,7 +1,7 @@ package eva2.optimization.strategies; import eva2.gui.BeanInspector; -import eva2.gui.GenericObjectEditor; +import eva2.gui.editor.GenericObjectEditor; import eva2.optimization.go.InterfacePopulationChangedEventListener; import eva2.optimization.enums.DETypeEnum; import eva2.optimization.individuals.AbstractEAIndividual; diff --git a/src/eva2/optimization/strategies/DynamicParticleSwarmOptimization.java b/src/eva2/optimization/strategies/DynamicParticleSwarmOptimization.java index e41460d3..d5f79245 100644 --- a/src/eva2/optimization/strategies/DynamicParticleSwarmOptimization.java +++ b/src/eva2/optimization/strategies/DynamicParticleSwarmOptimization.java @@ -1,7 +1,7 @@ package eva2.optimization.strategies; -import eva2.gui.GenericObjectEditor; -import eva2.gui.Plot; +import eva2.gui.editor.GenericObjectEditor; +import eva2.gui.plot.Plot; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceDataTypeDouble; import eva2.optimization.population.Population; diff --git a/src/eva2/optimization/strategies/EsDpiNiching.java b/src/eva2/optimization/strategies/EsDpiNiching.java index 9620a293..14302d3a 100644 --- a/src/eva2/optimization/strategies/EsDpiNiching.java +++ b/src/eva2/optimization/strategies/EsDpiNiching.java @@ -1,7 +1,7 @@ package eva2.optimization.strategies; -import eva2.gui.GenericObjectEditor; -import eva2.gui.TopoPlot; +import eva2.gui.editor.GenericObjectEditor; +import eva2.gui.plot.TopoPlot; import eva2.optimization.go.InterfacePopulationChangedEventListener; import eva2.optimization.population.PopulationInterface; import eva2.optimization.individuals.AbstractEAIndividual; diff --git a/src/eva2/optimization/strategies/EvolutionStrategyIPOP.java b/src/eva2/optimization/strategies/EvolutionStrategyIPOP.java index 100608bd..9b7d3549 100644 --- a/src/eva2/optimization/strategies/EvolutionStrategyIPOP.java +++ b/src/eva2/optimization/strategies/EvolutionStrategyIPOP.java @@ -1,6 +1,6 @@ package eva2.optimization.strategies; -import eva2.gui.GenericObjectEditor; +import eva2.gui.editor.GenericObjectEditor; import eva2.optimization.go.InterfacePopulationChangedEventListener; import eva2.optimization.go.InterfaceTerminator; import eva2.optimization.population.PopulationInterface; diff --git a/src/eva2/optimization/strategies/IslandModelEA.java b/src/eva2/optimization/strategies/IslandModelEA.java index bd764017..fd1ddc0d 100644 --- a/src/eva2/optimization/strategies/IslandModelEA.java +++ b/src/eva2/optimization/strategies/IslandModelEA.java @@ -1,7 +1,7 @@ package eva2.optimization.strategies; import eva2.gui.BeanInspector; -import eva2.gui.Plot; +import eva2.gui.plot.Plot; import eva2.optimization.go.InterfacePopulationChangedEventListener; import eva2.optimization.individuals.ESIndividualDoubleData; import eva2.optimization.operator.migration.InterfaceMigration; @@ -84,7 +84,7 @@ public class IslandModelEA implements InterfacePopulationChangedEventListener, I double[] tmpD = new double[2]; tmpD[0] = 0; tmpD[1] = 0; - this.m_Plot = new eva2.gui.Plot("Island Model EA", "FitnessCalls", "Fitness", tmpD, tmpD); + this.m_Plot = new Plot("Island Model EA", "FitnessCalls", "Fitness", tmpD, tmpD); } } @@ -160,7 +160,7 @@ public class IslandModelEA implements InterfacePopulationChangedEventListener, I double[] tmpD = new double[2]; tmpD[0] = 0; tmpD[1] = 0; - this.m_Plot = new eva2.gui.Plot("Island Model EA", "FitnessCalls", "Fitness", tmpD, tmpD); + this.m_Plot = new Plot("Island Model EA", "FitnessCalls", "Fitness", tmpD, tmpD); } } diff --git a/src/eva2/optimization/strategies/MultiObjectiveCMAES.java b/src/eva2/optimization/strategies/MultiObjectiveCMAES.java index b2b1cacd..cac81f37 100644 --- a/src/eva2/optimization/strategies/MultiObjectiveCMAES.java +++ b/src/eva2/optimization/strategies/MultiObjectiveCMAES.java @@ -1,6 +1,6 @@ package eva2.optimization.strategies; -import eva2.gui.GenericObjectEditor; +import eva2.gui.editor.GenericObjectEditor; import eva2.optimization.go.InterfacePopulationChangedEventListener; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.operator.archiving.ArchivingNSGAII; diff --git a/src/eva2/optimization/strategies/NichePSO.java b/src/eva2/optimization/strategies/NichePSO.java index 083ec771..1f12fcb5 100644 --- a/src/eva2/optimization/strategies/NichePSO.java +++ b/src/eva2/optimization/strategies/NichePSO.java @@ -1,8 +1,8 @@ package eva2.optimization.strategies; import eva2.OptimizerFactory; -import eva2.gui.GenericObjectEditor; -import eva2.gui.TopoPlot; +import eva2.gui.editor.GenericObjectEditor; +import eva2.gui.plot.TopoPlot; import eva2.optimization.go.InterfacePopulationChangedEventListener; import eva2.optimization.go.InterfaceTerminator; import eva2.optimization.population.PopulationInterface; diff --git a/src/eva2/optimization/strategies/PDDifferentialEvolution.java b/src/eva2/optimization/strategies/PDDifferentialEvolution.java index ef85cf9a..dc31563d 100644 --- a/src/eva2/optimization/strategies/PDDifferentialEvolution.java +++ b/src/eva2/optimization/strategies/PDDifferentialEvolution.java @@ -1,7 +1,7 @@ package eva2.optimization.strategies; import eva2.gui.BeanInspector; -import eva2.gui.GenericObjectEditor; +import eva2.gui.editor.GenericObjectEditor; import eva2.optimization.go.InterfacePopulationChangedEventListener; import eva2.optimization.enums.DETypeEnum; import eva2.optimization.individuals.AbstractEAIndividual; diff --git a/src/eva2/optimization/strategies/ParticleFilterOptimization.java b/src/eva2/optimization/strategies/ParticleFilterOptimization.java index 40866e9e..4973264b 100644 --- a/src/eva2/optimization/strategies/ParticleFilterOptimization.java +++ b/src/eva2/optimization/strategies/ParticleFilterOptimization.java @@ -1,8 +1,8 @@ package eva2.optimization.strategies; import eva2.gui.BeanInspector; -import eva2.gui.GenericObjectEditor; -import eva2.gui.Plot; +import eva2.gui.editor.GenericObjectEditor; +import eva2.gui.plot.Plot; import eva2.optimization.go.InterfacePopulationChangedEventListener; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceDataTypeDouble; @@ -453,7 +453,7 @@ public class ParticleFilterOptimization implements InterfaceOptimizer, java.io.S range[0][1] = 0; range[1] = range[0]; // this is evil } - myPlot = new eva2.gui.Plot("PF", "x1", "x2", range[0], range[1]); + myPlot = new Plot("PF", "x1", "x2", range[0], range[1]); } } diff --git a/src/eva2/optimization/strategies/ParticleSwarmOptimization.java b/src/eva2/optimization/strategies/ParticleSwarmOptimization.java index 815b561e..6df0c036 100644 --- a/src/eva2/optimization/strategies/ParticleSwarmOptimization.java +++ b/src/eva2/optimization/strategies/ParticleSwarmOptimization.java @@ -1,13 +1,14 @@ package eva2.optimization.strategies; +import eva2.gui.plot.Plot; import eva2.optimization.problems.F1Problem; import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.optimization.problems.InterfaceProblemDouble; import eva2.optimization.problems.InterfaceAdditionalPopulationInformer; import eva2.optimization.problems.Interface2DBorderProblem; import eva2.gui.BeanInspector; -import eva2.gui.GenericObjectEditor; -import eva2.gui.TopoPlot; +import eva2.gui.editor.GenericObjectEditor; +import eva2.gui.plot.TopoPlot; import eva2.optimization.go.InterfacePopulationChangedEventListener; import eva2.optimization.population.PopulationInterface; import eva2.optimization.enums.PSOTopologyEnum; @@ -106,7 +107,7 @@ public class ParticleSwarmOptimization implements InterfaceOptimizer, java.io.Se // for debugging only transient private static boolean TRACE = false; transient protected boolean m_Show = false; - transient protected eva2.gui.Plot m_Plot; + transient protected Plot m_Plot; private boolean externalInitialPop = false; private static String lastSuccessKey = "successfulUpdate"; // private double lsCandidateRatio=0.25; @@ -1656,7 +1657,7 @@ public class ParticleSwarmOptimization implements InterfaceOptimizer, java.io.Se if (this.m_Plot == null) { InterfaceDataTypeDouble indy = (InterfaceDataTypeDouble) this.m_Population.get(0); double[][] range = indy.getDoubleRange(); - this.m_Plot = new eva2.gui.Plot("PSO " + m_Population.getGeneration(), "x1", "x2", range[0], range[1]); + this.m_Plot = new Plot("PSO " + m_Population.getGeneration(), "x1", "x2", range[0], range[1]); // this.m_Plot.setUnconnectedPoint(range[0][0], range[1][0], 0); // this.m_Plot.setUnconnectedPoint(range[0][1], range[1][1], 0); } diff --git a/src/eva2/optimization/strategies/ScatterSearch.java b/src/eva2/optimization/strategies/ScatterSearch.java index 14e2e29a..da249b13 100644 --- a/src/eva2/optimization/strategies/ScatterSearch.java +++ b/src/eva2/optimization/strategies/ScatterSearch.java @@ -3,7 +3,7 @@ package eva2.optimization.strategies; import eva2.OptimizerFactory; import eva2.OptimizerRunnable; import eva2.gui.BeanInspector; -import eva2.gui.GenericObjectEditor; +import eva2.gui.editor.GenericObjectEditor; import eva2.optimization.go.InterfacePopulationChangedEventListener; import eva2.optimization.go.InterfaceTerminator; import eva2.optimization.individuals.AbstractEAIndividual; diff --git a/src/eva2/optimization/strategies/Tribes.java b/src/eva2/optimization/strategies/Tribes.java index 2dd39f58..beb2f9af 100644 --- a/src/eva2/optimization/strategies/Tribes.java +++ b/src/eva2/optimization/strategies/Tribes.java @@ -1,6 +1,7 @@ package eva2.optimization.strategies; -import eva2.gui.GenericObjectEditor; +import eva2.gui.editor.GenericObjectEditor; +import eva2.gui.plot.Plot; import eva2.optimization.go.InterfacePopulationChangedEventListener; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.InterfaceDataTypeDouble; @@ -163,7 +164,7 @@ public class Tribes implements InterfaceOptimizer, java.io.Serializable { // use full range (0) or subspace (1) for init options 0 and 1 protected int rangeInitType = 1; private boolean m_Show = false; - transient protected eva2.gui.Plot m_Plot = null; + transient protected Plot m_Plot = null; // private int useAnchors = 0; // use anchors to detect environment changes? @Override @@ -365,7 +366,7 @@ public class Tribes implements InterfaceOptimizer, java.io.Serializable { // double[] tmpD = new double[2]; // tmpD[0] = 0; // tmpD[1] = 0; - this.m_Plot = new eva2.gui.Plot("TRIBES " + population.getGeneration(), "x1", "x2", range[0], range[1]); + this.m_Plot = new Plot("TRIBES " + population.getGeneration(), "x1", "x2", range[0], range[1]); // this.m_Plot.setCornerPoints(range, 0); } } diff --git a/src/eva2/optimization/tools/AbstractObjectEditor.java b/src/eva2/optimization/tools/AbstractObjectEditor.java index 020d7814..74da1292 100644 --- a/src/eva2/optimization/tools/AbstractObjectEditor.java +++ b/src/eva2/optimization/tools/AbstractObjectEditor.java @@ -2,6 +2,7 @@ package eva2.optimization.tools; import eva2.gui.*; +import eva2.gui.editor.GenericObjectEditor; import eva2.tools.EVAHELP; import java.awt.*; import java.awt.event.ActionEvent; diff --git a/src/eva2/optimization/tools/GeneralGenericObjectEditorPanel.java b/src/eva2/optimization/tools/GeneralGenericObjectEditorPanel.java index 82c0dcfb..e439f200 100644 --- a/src/eva2/optimization/tools/GeneralGenericObjectEditorPanel.java +++ b/src/eva2/optimization/tools/GeneralGenericObjectEditorPanel.java @@ -1,7 +1,7 @@ package eva2.optimization.tools; -import eva2.gui.GenericObjectEditor; +import eva2.gui.editor.GenericObjectEditor; import eva2.tools.EVAHELP; import java.awt.*; import java.awt.event.ActionEvent; diff --git a/src/eva2/optimization/tools/ImpactOfDimensionOnMOEAs.java b/src/eva2/optimization/tools/ImpactOfDimensionOnMOEAs.java index e3dfffdd..9e13a784 100644 --- a/src/eva2/optimization/tools/ImpactOfDimensionOnMOEAs.java +++ b/src/eva2/optimization/tools/ImpactOfDimensionOnMOEAs.java @@ -1,8 +1,8 @@ package eva2.optimization.tools; -import eva2.gui.GraphPointSet; -import eva2.gui.Plot; +import eva2.gui.plot.GraphPointSet; +import eva2.gui.plot.Plot; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.individuals.ESIndividualDoubleData; import eva2.optimization.individuals.InterfaceDataTypeDouble; @@ -36,7 +36,7 @@ public class ImpactOfDimensionOnMOEAs { double[] tmpD = new double[2]; tmpD[0] = 1; tmpD[1] = 1; - mPlot = new eva2.gui.Plot("ImpactOfDimensionOnMOEAs", "ProblemDimensin", "No. of Pareto-opt solutions", true); + mPlot = new Plot("ImpactOfDimensionOnMOEAs", "ProblemDimensin", "No. of Pareto-opt solutions", true); for (int l = 0; l < 5; l++) { popSize = 100 + (l*100); mySet = new GraphPointSet(l, mPlot.getFunctionArea()); diff --git a/src/eva2/optimization/tools/ParetoFrontLocalTester.java b/src/eva2/optimization/tools/ParetoFrontLocalTester.java index 5da31594..cfbc1a57 100644 --- a/src/eva2/optimization/tools/ParetoFrontLocalTester.java +++ b/src/eva2/optimization/tools/ParetoFrontLocalTester.java @@ -1,7 +1,9 @@ package eva2.optimization.tools; -import eva2.gui.GraphPointSet; +import eva2.gui.plot.GraphPointSet; +import eva2.gui.plot.Plot; + import java.io.*; import java.util.ArrayList; @@ -14,7 +16,7 @@ import java.util.ArrayList; */ public class ParetoFrontLocalTester { - private eva2.gui.Plot m_Plot; + private Plot m_Plot; private int index = 0; private BufferedWriter m_OutputFile = null; @@ -150,7 +152,7 @@ public class ParetoFrontLocalTester { double[] tmpD = new double[2]; tmpD[0] = 0; tmpD[1] = 0; - this.m_Plot = new eva2.gui.Plot("Multiobjective Optimization", "Y1", "Y2", tmpD, tmpD); + this.m_Plot = new Plot("Multiobjective Optimization", "Y1", "Y2", tmpD, tmpD); } diff --git a/src/eva2/optimization/tools/PortfolioFrontTester.java b/src/eva2/optimization/tools/PortfolioFrontTester.java index 9ad63617..28fbb156 100644 --- a/src/eva2/optimization/tools/PortfolioFrontTester.java +++ b/src/eva2/optimization/tools/PortfolioFrontTester.java @@ -1,7 +1,9 @@ package eva2.optimization.tools; -import eva2.gui.GraphPointSet; +import eva2.gui.plot.GraphPointSet; +import eva2.gui.plot.Plot; + import java.io.*; import java.util.ArrayList; @@ -14,7 +16,7 @@ import java.util.ArrayList; */ public class PortfolioFrontTester { - private eva2.gui.Plot m_Plot; + private Plot m_Plot; private int index = 0; private BufferedWriter m_OutputFile = null; private double[] loss; @@ -324,7 +326,7 @@ public class PortfolioFrontTester { double[] tmpD = new double[2]; tmpD[0] = 0; tmpD[1] = 0; - this.m_Plot = new eva2.gui.Plot("Multiobjective Optimization", "Y1", "Y2", tmpD, tmpD); + this.m_Plot = new Plot("Multiobjective Optimization", "Y1", "Y2", tmpD, tmpD); } diff --git a/src/eva2/tools/Serializer.java b/src/eva2/tools/Serializer.java index 065ba3dd..0b40f19b 100644 --- a/src/eva2/tools/Serializer.java +++ b/src/eva2/tools/Serializer.java @@ -3,6 +3,7 @@ package eva2.tools; import java.io.*; import java.util.logging.Level; import java.util.logging.Logger; +import com.google.gson.*; /** * This class defines utility routines that use Java serialization. Any @@ -40,17 +41,22 @@ public class Serializer { */ private static void store(Serializable o, OutputStream outStream, boolean serializeInMem) throws IOException { ObjectOutputStream out = new ObjectOutputStream(outStream); + OutputStreamWriter out2 = new OutputStreamWriter(outStream); try { Object objToStore = o; if (serializeInMem) { objToStore = new SerializedObject((Object) o); } - out.writeObject(objToStore); + Gson gson = new Gson(); + //out.writeObject(objToStore); + String json = gson.toJson(o); + + out2.write(json); } catch (java.io.NotSerializableException ex) { LOGGER.log(Level.SEVERE, "Object is not serializable!", ex); } - out.flush(); - out.close(); + out2.flush(); + out2.close(); } /** diff --git a/src/eva2/tools/chart2d/Chart2DDPointContentSelectable.java b/src/eva2/tools/chart2d/Chart2DDPointContentSelectable.java index cfc4ad19..7ad052ae 100644 --- a/src/eva2/tools/chart2d/Chart2DDPointContentSelectable.java +++ b/src/eva2/tools/chart2d/Chart2DDPointContentSelectable.java @@ -1,7 +1,7 @@ package eva2.tools.chart2d; -import eva2.gui.InterfaceDPointWithContent; +import eva2.gui.plot.InterfaceDPointWithContent; import eva2.gui.InterfaceSelectablePointIcon; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.mocco.paretofrontviewer.InterfaceRefSolutionListener; diff --git a/src/eva2/tools/chart2d/Chart2DDPointIconContent.java b/src/eva2/tools/chart2d/Chart2DDPointIconContent.java index b0dada6c..4a760ba2 100644 --- a/src/eva2/tools/chart2d/Chart2DDPointIconContent.java +++ b/src/eva2/tools/chart2d/Chart2DDPointIconContent.java @@ -1,7 +1,7 @@ package eva2.tools.chart2d; -import eva2.gui.InterfaceDPointWithContent; +import eva2.gui.plot.InterfaceDPointWithContent; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.problems.InterfaceOptimizationProblem; import java.awt.*;