From 00ddb505accbb1bfdd6b86002aa05a60df047029 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Dr=C3=A4ger?= Date: Thu, 7 Jan 2010 14:49:58 +0000 Subject: [PATCH] Restructured eva2 package. --- src/eva2/gui/Exp.java | 52 ++++++++++++++----- src/eva2/gui/FunctionArea.java | 5 ++ .../mocco/paretofrontviewer/MOCCOViewer.java | 2 +- .../paretofrontviewer/ParetoFrontView2D.java | 3 ++ .../ParetoFrontViewScatterPlot.java | 1 + .../archiving/AbstractArchiving.java | 1 + .../operators/archiving/ArchivingMaxiMin.java | 2 +- .../operators/archiving/ArchivingNSGAII.java | 1 + .../operators/archiving/ArchivingPESAII.java | 2 + .../operators/archiving/ArchivingSPEAII.java | 2 + .../ClassificationSelfOrganizingMaps.java | 1 - .../operators/cluster/ClusteringKMeans.java | 4 +- .../operators/cluster/ClusteringXMeans.java | 4 +- .../migration/MOClusteringSeparation.java | 4 +- .../operators/migration/MOConeSeparation.java | 4 +- .../migration/MOXMeansSeparation.java | 4 +- .../server/go/operators/moso/MOSOMaxiMin.java | 4 +- .../operators/selection/SelectMOSPEAII.java | 4 +- ...ractMultiObjectiveOptimizationProblem.java | 4 +- src/eva2/server/go/problems/TF1Problem.java | 4 +- .../go/strategies/ClusterBasedNichingEA.java | 4 +- .../Chart2DDPointContentSelectable.java | 6 +-- .../chart2d}/Chart2DDPointIconCircle.java | 4 +- .../chart2d}/Chart2DDPointIconContent.java | 5 +- .../chart2d}/Chart2DDPointIconCross.java | 4 +- .../chart2d}/Chart2DDPointIconPoint.java | 4 +- .../chart2d}/Chart2DDPointIconText.java | 4 +- 27 files changed, 85 insertions(+), 54 deletions(-) rename src/eva2/{gui => tools/chart2d}/Chart2DDPointContentSelectable.java (97%) rename src/eva2/{gui => tools/chart2d}/Chart2DDPointIconCircle.java (93%) rename src/eva2/{gui => tools/chart2d}/Chart2DDPointIconContent.java (96%) rename src/eva2/{gui => tools/chart2d}/Chart2DDPointIconCross.java (90%) rename src/eva2/{gui => tools/chart2d}/Chart2DDPointIconPoint.java (93%) rename src/eva2/{gui => tools/chart2d}/Chart2DDPointIconText.java (93%) diff --git a/src/eva2/gui/Exp.java b/src/eva2/gui/Exp.java index 08f05830..f7cfbea3 100644 --- a/src/eva2/gui/Exp.java +++ b/src/eva2/gui/Exp.java @@ -1,4 +1,5 @@ package eva2.gui; + /* * Title: EvA2 * Description: @@ -17,17 +18,42 @@ import eva2.tools.chart2d.DFunction; /** * */ -public class Exp extends DFunction{ - public boolean isDefinedAt( double source ){ return true; } - public boolean isInvertibleAt( double image ){ return image > 0; } - public double getImageOf( double source ){ return Math.exp( source ); } - public double getSourceOf( double target ){ - if( target <= 0 ) { throw - new IllegalArgumentException( - "Can not calculate log on values smaller than or equal 0 --> target = "+target - ); - } - return Math.log( target ); - } -} +public class Exp extends DFunction { + + /* + * (non-Javadoc) + * @see eva2.tools.chart2d.DFunction#isDefinedAt(double) + */ + public boolean isDefinedAt(double source) { + return true; + } + /* + * (non-Javadoc) + * @see eva2.tools.chart2d.DFunction#isInvertibleAt(double) + */ + public boolean isInvertibleAt(double image) { + return image > 0; + } + + /* + * (non-Javadoc) + * @see eva2.tools.chart2d.DFunction#getImageOf(double) + */ + public double getImageOf(double source) { + return Math.exp(source); + } + + /* + * (non-Javadoc) + * @see eva2.tools.chart2d.DFunction#getSourceOf(double) + */ + public double getSourceOf(double target) { + if (target <= 0) { + throw new IllegalArgumentException( + "Can not calculate log on values smaller than or equal 0 --> target = " + + target); + } + return Math.log(target); + } +} diff --git a/src/eva2/gui/FunctionArea.java b/src/eva2/gui/FunctionArea.java index 54da252a..9a232ada 100644 --- a/src/eva2/gui/FunctionArea.java +++ b/src/eva2/gui/FunctionArea.java @@ -37,6 +37,11 @@ import javax.swing.JPopupMenu; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.mocco.paretofrontviewer.InterfaceRefPointListener; +import eva2.tools.chart2d.Chart2DDPointIconCircle; +import eva2.tools.chart2d.Chart2DDPointIconContent; +import eva2.tools.chart2d.Chart2DDPointIconCross; +import eva2.tools.chart2d.Chart2DDPointIconPoint; +import eva2.tools.chart2d.Chart2DDPointIconText; import eva2.tools.chart2d.DArea; import eva2.tools.chart2d.DBorder; import eva2.tools.chart2d.DPoint; diff --git a/src/eva2/server/go/mocco/paretofrontviewer/MOCCOViewer.java b/src/eva2/server/go/mocco/paretofrontviewer/MOCCOViewer.java index 9dae04e5..d97ff637 100644 --- a/src/eva2/server/go/mocco/paretofrontviewer/MOCCOViewer.java +++ b/src/eva2/server/go/mocco/paretofrontviewer/MOCCOViewer.java @@ -3,7 +3,6 @@ package eva2.server.go.mocco.paretofrontviewer; import javax.swing.*; -import eva2.gui.Chart2DDPointContentSelectable; import eva2.gui.FunctionArea; import eva2.gui.GraphPointSet; import eva2.gui.InterfaceDPointWithContent; @@ -12,6 +11,7 @@ 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.Chart2DDPointContentSelectable; import eva2.tools.chart2d.DPoint; import eva2.tools.chart2d.DPointIcon; import eva2.tools.chart2d.ScaledBorder; diff --git a/src/eva2/server/go/mocco/paretofrontviewer/ParetoFrontView2D.java b/src/eva2/server/go/mocco/paretofrontviewer/ParetoFrontView2D.java index 93be7acb..42c503fc 100644 --- a/src/eva2/server/go/mocco/paretofrontviewer/ParetoFrontView2D.java +++ b/src/eva2/server/go/mocco/paretofrontviewer/ParetoFrontView2D.java @@ -8,6 +8,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.Chart2DDPointContentSelectable; +import eva2.tools.chart2d.Chart2DDPointIconCross; +import eva2.tools.chart2d.Chart2DDPointIconPoint; import eva2.tools.chart2d.DPoint; import eva2.tools.chart2d.DPointIcon; import eva2.tools.chart2d.ScaledBorder; diff --git a/src/eva2/server/go/mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java b/src/eva2/server/go/mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java index 8ea80d08..f154f608 100644 --- a/src/eva2/server/go/mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java +++ b/src/eva2/server/go/mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java @@ -8,6 +8,7 @@ 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.Chart2DDPointContentSelectable; import eva2.tools.chart2d.DPoint; import eva2.tools.chart2d.DPointIcon; import eva2.tools.chart2d.ScaledBorder; diff --git a/src/eva2/server/go/operators/archiving/AbstractArchiving.java b/src/eva2/server/go/operators/archiving/AbstractArchiving.java index 5c41428f..f6241428 100644 --- a/src/eva2/server/go/operators/archiving/AbstractArchiving.java +++ b/src/eva2/server/go/operators/archiving/AbstractArchiving.java @@ -4,6 +4,7 @@ import eva2.gui.*; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.individuals.ESIndividualDoubleData; import eva2.server.go.populations.Population; +import eva2.tools.chart2d.Chart2DDPointIconCross; import eva2.tools.chart2d.DPoint; import eva2.tools.chart2d.DPointIcon; diff --git a/src/eva2/server/go/operators/archiving/ArchivingMaxiMin.java b/src/eva2/server/go/operators/archiving/ArchivingMaxiMin.java index 00d88f81..dce713bc 100644 --- a/src/eva2/server/go/operators/archiving/ArchivingMaxiMin.java +++ b/src/eva2/server/go/operators/archiving/ArchivingMaxiMin.java @@ -3,12 +3,12 @@ package eva2.server.go.operators.archiving; import java.util.ArrayList; -import eva2.gui.Chart2DDPointIconCross; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.operators.moso.MOSOMaxiMin; import eva2.server.go.operators.selection.InterfaceSelection; import eva2.server.go.operators.selection.SelectBestIndividuals; import eva2.server.go.populations.Population; +import eva2.tools.chart2d.Chart2DDPointIconCross; import eva2.tools.chart2d.DPointIcon; diff --git a/src/eva2/server/go/operators/archiving/ArchivingNSGAII.java b/src/eva2/server/go/operators/archiving/ArchivingNSGAII.java index 0edd122c..edd254ec 100644 --- a/src/eva2/server/go/operators/archiving/ArchivingNSGAII.java +++ b/src/eva2/server/go/operators/archiving/ArchivingNSGAII.java @@ -8,6 +8,7 @@ import eva2.server.go.IndividualInterface; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.individuals.ESIndividualDoubleData; import eva2.server.go.populations.Population; +import eva2.tools.chart2d.Chart2DDPointIconCross; import eva2.tools.chart2d.DPoint; import eva2.tools.chart2d.DPointIcon; import eva2.tools.math.RNG; diff --git a/src/eva2/server/go/operators/archiving/ArchivingPESAII.java b/src/eva2/server/go/operators/archiving/ArchivingPESAII.java index db6e275e..f12040df 100644 --- a/src/eva2/server/go/operators/archiving/ArchivingPESAII.java +++ b/src/eva2/server/go/operators/archiving/ArchivingPESAII.java @@ -8,6 +8,8 @@ import eva2.gui.*; import eva2.server.go.IndividualInterface; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.populations.Population; +import eva2.tools.chart2d.Chart2DDPointIconCircle; +import eva2.tools.chart2d.Chart2DDPointIconText; import eva2.tools.chart2d.DLine; import eva2.tools.chart2d.DPoint; import eva2.tools.chart2d.DPointIcon; diff --git a/src/eva2/server/go/operators/archiving/ArchivingSPEAII.java b/src/eva2/server/go/operators/archiving/ArchivingSPEAII.java index e0af5cc3..46d385e4 100644 --- a/src/eva2/server/go/operators/archiving/ArchivingSPEAII.java +++ b/src/eva2/server/go/operators/archiving/ArchivingSPEAII.java @@ -11,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.Chart2DDPointIconCircle; +import eva2.tools.chart2d.Chart2DDPointIconText; import eva2.tools.chart2d.DPoint; import eva2.tools.chart2d.DPointIcon; diff --git a/src/eva2/server/go/operators/classification/ClassificationSelfOrganizingMaps.java b/src/eva2/server/go/operators/classification/ClassificationSelfOrganizingMaps.java index a12fba45..d2ef43c5 100644 --- a/src/eva2/server/go/operators/classification/ClassificationSelfOrganizingMaps.java +++ b/src/eva2/server/go/operators/classification/ClassificationSelfOrganizingMaps.java @@ -2,7 +2,6 @@ package eva2.server.go.operators.classification; import javax.swing.*; -import eva2.gui.Chart2DDPointIconCross; import eva2.tools.chart2d.*; import eva2.tools.math.RNG; diff --git a/src/eva2/server/go/operators/cluster/ClusteringKMeans.java b/src/eva2/server/go/operators/cluster/ClusteringKMeans.java index 71238a8b..6bf23445 100644 --- a/src/eva2/server/go/operators/cluster/ClusteringKMeans.java +++ b/src/eva2/server/go/operators/cluster/ClusteringKMeans.java @@ -2,8 +2,6 @@ package eva2.server.go.operators.cluster; import java.util.Arrays; -import eva2.gui.Chart2DDPointIconCircle; -import eva2.gui.Chart2DDPointIconText; import eva2.gui.GraphPointSet; import eva2.gui.Plot; import eva2.server.go.individuals.AbstractEAIndividual; @@ -11,6 +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 eva2.tools.chart2d.Chart2DDPointIconCircle; +import eva2.tools.chart2d.Chart2DDPointIconText; import eva2.tools.chart2d.DPoint; import eva2.tools.math.RNG; diff --git a/src/eva2/server/go/operators/cluster/ClusteringXMeans.java b/src/eva2/server/go/operators/cluster/ClusteringXMeans.java index 7e6954f9..8d6844b3 100644 --- a/src/eva2/server/go/operators/cluster/ClusteringXMeans.java +++ b/src/eva2/server/go/operators/cluster/ClusteringXMeans.java @@ -2,8 +2,6 @@ package eva2.server.go.operators.cluster; import java.util.Arrays; -import eva2.gui.Chart2DDPointIconCircle; -import eva2.gui.Chart2DDPointIconText; import eva2.gui.GraphPointSet; import eva2.gui.Plot; import eva2.server.go.individuals.AbstractEAIndividual; @@ -11,6 +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 eva2.tools.chart2d.Chart2DDPointIconCircle; +import eva2.tools.chart2d.Chart2DDPointIconText; import eva2.tools.chart2d.DPoint; import eva2.tools.math.RNG; diff --git a/src/eva2/server/go/operators/migration/MOClusteringSeparation.java b/src/eva2/server/go/operators/migration/MOClusteringSeparation.java index 68b3b662..4b85a8ed 100644 --- a/src/eva2/server/go/operators/migration/MOClusteringSeparation.java +++ b/src/eva2/server/go/operators/migration/MOClusteringSeparation.java @@ -3,8 +3,6 @@ package eva2.server.go.operators.migration; import java.io.*; -import eva2.gui.Chart2DDPointIconCircle; -import eva2.gui.Chart2DDPointIconText; import eva2.gui.GraphPointSet; import eva2.gui.Plot; import eva2.server.go.individuals.AbstractEAIndividual; @@ -22,6 +20,8 @@ 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.Chart2DDPointIconCircle; +import eva2.tools.chart2d.Chart2DDPointIconText; import eva2.tools.chart2d.DPoint; /** This method implements the clustering based subdivision diff --git a/src/eva2/server/go/operators/migration/MOConeSeparation.java b/src/eva2/server/go/operators/migration/MOConeSeparation.java index 659a2346..75355900 100644 --- a/src/eva2/server/go/operators/migration/MOConeSeparation.java +++ b/src/eva2/server/go/operators/migration/MOConeSeparation.java @@ -4,8 +4,6 @@ package eva2.server.go.operators.migration; import java.io.*; import java.util.ArrayList; -import eva2.gui.Chart2DDPointIconCircle; -import eva2.gui.Chart2DDPointIconText; import eva2.gui.GraphPointSet; import eva2.gui.Plot; import eva2.server.go.individuals.AbstractEAIndividual; @@ -25,6 +23,8 @@ 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.Chart2DDPointIconCircle; +import eva2.tools.chart2d.Chart2DDPointIconText; import eva2.tools.chart2d.DPoint; /** This method implements the cone separation subdivision diff --git a/src/eva2/server/go/operators/migration/MOXMeansSeparation.java b/src/eva2/server/go/operators/migration/MOXMeansSeparation.java index 7303cb92..d0d593c7 100644 --- a/src/eva2/server/go/operators/migration/MOXMeansSeparation.java +++ b/src/eva2/server/go/operators/migration/MOXMeansSeparation.java @@ -3,8 +3,6 @@ package eva2.server.go.operators.migration; import java.io.*; -import eva2.gui.Chart2DDPointIconCircle; -import eva2.gui.Chart2DDPointIconText; import eva2.gui.GraphPointSet; import eva2.gui.Plot; import eva2.server.go.individuals.AbstractEAIndividual; @@ -19,6 +17,8 @@ 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.Chart2DDPointIconCircle; +import eva2.tools.chart2d.Chart2DDPointIconText; import eva2.tools.chart2d.DPoint; /** This method implements the clustering based subdivision diff --git a/src/eva2/server/go/operators/moso/MOSOMaxiMin.java b/src/eva2/server/go/operators/moso/MOSOMaxiMin.java index 2ba21342..d939a555 100644 --- a/src/eva2/server/go/operators/moso/MOSOMaxiMin.java +++ b/src/eva2/server/go/operators/moso/MOSOMaxiMin.java @@ -1,10 +1,10 @@ package eva2.server.go.operators.moso; -import eva2.gui.Chart2DDPointIconCircle; -import eva2.gui.Chart2DDPointIconText; import eva2.gui.GraphPointSet; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.populations.Population; +import eva2.tools.chart2d.Chart2DDPointIconCircle; +import eva2.tools.chart2d.Chart2DDPointIconText; import eva2.tools.chart2d.DPoint; import eva2.tools.math.RNG; diff --git a/src/eva2/server/go/operators/selection/SelectMOSPEAII.java b/src/eva2/server/go/operators/selection/SelectMOSPEAII.java index d835ff36..e21092f3 100644 --- a/src/eva2/server/go/operators/selection/SelectMOSPEAII.java +++ b/src/eva2/server/go/operators/selection/SelectMOSPEAII.java @@ -1,13 +1,13 @@ package eva2.server.go.operators.selection; -import eva2.gui.Chart2DDPointIconCircle; -import eva2.gui.Chart2DDPointIconText; import eva2.gui.GraphPointSet; import eva2.gui.Plot; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.operators.archiving.ArchivingNSGAII; import eva2.server.go.operators.archiving.ArchivingSPEAII; import eva2.server.go.populations.Population; +import eva2.tools.chart2d.Chart2DDPointIconCircle; +import eva2.tools.chart2d.Chart2DDPointIconText; import eva2.tools.chart2d.DPoint; import eva2.tools.math.RNG; diff --git a/src/eva2/server/go/problems/AbstractMultiObjectiveOptimizationProblem.java b/src/eva2/server/go/problems/AbstractMultiObjectiveOptimizationProblem.java index caf4d7ff..8626d475 100644 --- a/src/eva2/server/go/problems/AbstractMultiObjectiveOptimizationProblem.java +++ b/src/eva2/server/go/problems/AbstractMultiObjectiveOptimizationProblem.java @@ -9,8 +9,6 @@ import java.util.concurrent.Semaphore; import javax.swing.JFrame; -import eva2.gui.Chart2DDPointIconCircle; -import eva2.gui.Chart2DDPointIconText; import eva2.gui.GraphPointSet; import eva2.gui.Plot; import eva2.server.go.individuals.AbstractEAIndividual; @@ -23,6 +21,8 @@ import eva2.server.go.operators.paretofrontmetrics.InterfaceParetoFrontMetric; import eva2.server.go.operators.paretofrontmetrics.MetricS; import eva2.server.go.populations.Population; import eva2.server.go.problems.AbstractOptimizationProblem.EvalThread; +import eva2.tools.chart2d.Chart2DDPointIconCircle; +import eva2.tools.chart2d.Chart2DDPointIconText; import eva2.tools.chart2d.DPoint; /** diff --git a/src/eva2/server/go/problems/TF1Problem.java b/src/eva2/server/go/problems/TF1Problem.java index 6e80c3b5..ca4d6acc 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 eva2.gui.Chart2DDPointIconCircle; -import eva2.gui.Chart2DDPointIconText; import eva2.gui.GraphPointSet; import eva2.gui.Plot; import eva2.gui.PropertyFilePath; @@ -17,6 +15,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.Chart2DDPointIconCircle; +import eva2.tools.chart2d.Chart2DDPointIconText; import eva2.tools.chart2d.DPoint; import eva2.tools.math.RNG; diff --git a/src/eva2/server/go/strategies/ClusterBasedNichingEA.java b/src/eva2/server/go/strategies/ClusterBasedNichingEA.java index 2fdc2bee..60510db0 100644 --- a/src/eva2/server/go/strategies/ClusterBasedNichingEA.java +++ b/src/eva2/server/go/strategies/ClusterBasedNichingEA.java @@ -5,8 +5,6 @@ import java.util.Collections; import java.util.PriorityQueue; import eva2.gui.BeanInspector; -import eva2.gui.Chart2DDPointIconCircle; -import eva2.gui.Chart2DDPointIconText; import eva2.gui.GenericObjectEditor; import eva2.gui.GraphPointSet; import eva2.gui.Plot; @@ -27,6 +25,8 @@ import eva2.server.go.problems.Interface2DBorderProblem; import eva2.server.go.problems.InterfaceAdditionalPopulationInformer; import eva2.server.go.problems.InterfaceOptimizationProblem; import eva2.server.go.problems.TF1Problem; +import eva2.tools.chart2d.Chart2DDPointIconCircle; +import eva2.tools.chart2d.Chart2DDPointIconText; import eva2.tools.chart2d.DPoint; import eva2.tools.chart2d.DPointIcon; import eva2.tools.chart2d.DPointSet; diff --git a/src/eva2/gui/Chart2DDPointContentSelectable.java b/src/eva2/tools/chart2d/Chart2DDPointContentSelectable.java similarity index 97% rename from src/eva2/gui/Chart2DDPointContentSelectable.java rename to src/eva2/tools/chart2d/Chart2DDPointContentSelectable.java index dbb5ea55..8a6dd8e5 100644 --- a/src/eva2/gui/Chart2DDPointContentSelectable.java +++ b/src/eva2/tools/chart2d/Chart2DDPointContentSelectable.java @@ -1,13 +1,13 @@ -package eva2.gui; +package eva2.tools.chart2d; import javax.swing.*; +import eva2.gui.InterfaceDPointWithContent; +import eva2.gui.InterfaceSelectablePointIcon; import eva2.server.go.individuals.AbstractEAIndividual; import eva2.server.go.mocco.paretofrontviewer.InterfaceRefSolutionListener; import eva2.server.go.problems.InterfaceOptimizationProblem; -import eva2.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/tools/chart2d/Chart2DDPointIconCircle.java similarity index 93% rename from src/eva2/gui/Chart2DDPointIconCircle.java rename to src/eva2/tools/chart2d/Chart2DDPointIconCircle.java index a4607108..babd2b99 100644 --- a/src/eva2/gui/Chart2DDPointIconCircle.java +++ b/src/eva2/tools/chart2d/Chart2DDPointIconCircle.java @@ -1,9 +1,7 @@ -package eva2.gui; +package eva2.tools.chart2d; import java.awt.*; -import eva2.tools.chart2d.DBorder; -import eva2.tools.chart2d.DPointIcon; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/gui/Chart2DDPointIconContent.java b/src/eva2/tools/chart2d/Chart2DDPointIconContent.java similarity index 96% rename from src/eva2/gui/Chart2DDPointIconContent.java rename to src/eva2/tools/chart2d/Chart2DDPointIconContent.java index 8e952d52..06e2cc47 100644 --- a/src/eva2/gui/Chart2DDPointIconContent.java +++ b/src/eva2/tools/chart2d/Chart2DDPointIconContent.java @@ -1,4 +1,4 @@ -package eva2.gui; +package eva2.tools.chart2d; import java.awt.*; @@ -8,10 +8,9 @@ import java.awt.event.WindowEvent; import javax.swing.*; +import eva2.gui.InterfaceDPointWithContent; 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/tools/chart2d/Chart2DDPointIconCross.java similarity index 90% rename from src/eva2/gui/Chart2DDPointIconCross.java rename to src/eva2/tools/chart2d/Chart2DDPointIconCross.java index 2b746208..6bb22401 100644 --- a/src/eva2/gui/Chart2DDPointIconCross.java +++ b/src/eva2/tools/chart2d/Chart2DDPointIconCross.java @@ -1,10 +1,8 @@ -package eva2.gui; +package eva2.tools.chart2d; import java.awt.*; -import eva2.tools.chart2d.DBorder; -import eva2.tools.chart2d.DPointIcon; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/gui/Chart2DDPointIconPoint.java b/src/eva2/tools/chart2d/Chart2DDPointIconPoint.java similarity index 93% rename from src/eva2/gui/Chart2DDPointIconPoint.java rename to src/eva2/tools/chart2d/Chart2DDPointIconPoint.java index 2c504a37..7e3dde9f 100644 --- a/src/eva2/gui/Chart2DDPointIconPoint.java +++ b/src/eva2/tools/chart2d/Chart2DDPointIconPoint.java @@ -1,10 +1,8 @@ -package eva2.gui; +package eva2.tools.chart2d; import java.awt.*; -import eva2.tools.chart2d.DBorder; -import eva2.tools.chart2d.DPointIcon; /** * Created by IntelliJ IDEA. diff --git a/src/eva2/gui/Chart2DDPointIconText.java b/src/eva2/tools/chart2d/Chart2DDPointIconText.java similarity index 93% rename from src/eva2/gui/Chart2DDPointIconText.java rename to src/eva2/tools/chart2d/Chart2DDPointIconText.java index 28170543..48082f39 100644 --- a/src/eva2/gui/Chart2DDPointIconText.java +++ b/src/eva2/tools/chart2d/Chart2DDPointIconText.java @@ -1,10 +1,8 @@ -package eva2.gui; +package eva2.tools.chart2d; import java.awt.*; -import eva2.tools.chart2d.DBorder; -import eva2.tools.chart2d.DPointIcon; /** * Created by IntelliJ IDEA.