Restructured eva2 package.

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);
+	}
+}

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;

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;

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;

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;

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;
 

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;
 
 

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;

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;

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;
 

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;
 

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;
 

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;
 

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

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

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

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;
 

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;
 

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;
 
 /**

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;
 

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;

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;

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.

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.

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.

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.

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.