From 247bfe653867879e5bcbf4be2aed70fa069117bb Mon Sep 17 00:00:00 2001 From: Fabian Becker Date: Mon, 14 Dec 2015 16:10:10 +0100 Subject: [PATCH] Rename Chart2D classes and remove Chart2D prefix --- src/main/java/eva2/gui/plot/FunctionArea.java | 16 ++++----- .../mocco/paretofrontviewer/MOCCOViewer.java | 4 +-- .../paretofrontviewer/ParetoFrontView2D.java | 12 +++---- .../ParetoFrontViewScatterPlot.java | 6 ++-- .../operator/archiving/AbstractArchiving.java | 4 +-- .../operator/archiving/ArchivingMaxiMin.java | 4 +-- .../operator/archiving/ArchivingNSGAII.java | 4 +-- .../operator/archiving/ArchivingSPEAII.java | 10 +++--- .../ClassificationSelfOrganizingMaps.java | 2 +- .../operator/cluster/ClusteringKMeans.java | 26 +++++++------- .../operator/cluster/ClusteringXMeans.java | 14 ++++---- .../migration/MOClusteringSeparation.java | 20 +++++------ .../operator/migration/MOConeSeparation.java | 16 ++++----- .../migration/MOXMeansSeparation.java | 20 +++++------ .../operator/selection/SelectMOSPEAII.java | 10 +++--- .../strategies/ClusterBasedNichingEA.java | 8 ++--- .../optimization/strategies/NichePSO.java | 36 +++++++++---------- ...ractMultiObjectiveOptimizationProblem.java | 14 ++++---- ...able.java => DPointContentSelectable.java} | 2 +- ...tIconCircle.java => DPointIconCircle.java} | 2 +- ...conContent.java => DPointIconContent.java} | 2 +- ...intIconCross.java => DPointIconCross.java} | 2 +- ...intIconPoint.java => DPointIconPoint.java} | 2 +- ...PointIconText.java => DPointIconText.java} | 6 ++-- 24 files changed, 121 insertions(+), 121 deletions(-) rename src/main/java/eva2/tools/chart2d/{Chart2DDPointContentSelectable.java => DPointContentSelectable.java} (96%) rename src/main/java/eva2/tools/chart2d/{Chart2DDPointIconCircle.java => DPointIconCircle.java} (95%) rename src/main/java/eva2/tools/chart2d/{Chart2DDPointIconContent.java => DPointIconContent.java} (96%) rename src/main/java/eva2/tools/chart2d/{Chart2DDPointIconCross.java => DPointIconCross.java} (92%) rename src/main/java/eva2/tools/chart2d/{Chart2DDPointIconPoint.java => DPointIconPoint.java} (95%) rename src/main/java/eva2/tools/chart2d/{Chart2DDPointIconText.java => DPointIconText.java} (85%) diff --git a/src/main/java/eva2/gui/plot/FunctionArea.java b/src/main/java/eva2/gui/plot/FunctionArea.java index 3fd3a815..39f1ba94 100644 --- a/src/main/java/eva2/gui/plot/FunctionArea.java +++ b/src/main/java/eva2/gui/plot/FunctionArea.java @@ -491,7 +491,7 @@ public class FunctionArea extends DArea implements Serializable { * @param graphID */ public void drawCircle(String label, double[] position, int graphID) { - drawIcon(new Chart2DDPointIconCircle(), label, position, graphID); + drawIcon(new DPointIconCircle(), label, position, graphID); } /** @@ -508,9 +508,9 @@ public class FunctionArea extends DArea implements Serializable { DPointSet popRep; popRep = new DPointSet(); popRep.addDPoint(new DPoint(position[0], position[1])); - DPointIcon icon = new Chart2DDPointIconText(label); - ((Chart2DDPointIconText) icon).setIcon(theIcon); - ((Chart2DDPointIconText) icon).setColor(getGraphPointSet(graphID).getColor()); + DPointIcon icon = new DPointIconText(label); + ((DPointIconText) icon).setIcon(theIcon); + ((DPointIconText) icon).setColor(getGraphPointSet(graphID).getColor()); popRep.setIcon(icon); addDElement(popRep); } @@ -529,14 +529,14 @@ public class FunctionArea extends DArea implements Serializable { DPointIcon theIcon; switch (iconType) { case 0: - theIcon = new Chart2DDPointIconCircle(); + theIcon = new DPointIconCircle(); break; case 1: - theIcon = new Chart2DDPointIconCross(); + theIcon = new DPointIconCross(); break; default: case 2: - theIcon = new Chart2DDPointIconPoint(); + theIcon = new DPointIconPoint(); break; } drawIcon(theIcon, label, position, graphID); @@ -745,7 +745,7 @@ public class FunctionArea extends DArea implements Serializable { ret = point2; } if ((dist == distmin) - && !(ret.getIcon() instanceof Chart2DDPointIconContent) + && !(ret.getIcon() instanceof DPointIconContent) && !(ret.getIcon() instanceof InterfaceSelectablePointIcon)) { distmin = dist; ret = point2; diff --git a/src/main/java/eva2/optimization/mocco/paretofrontviewer/MOCCOViewer.java b/src/main/java/eva2/optimization/mocco/paretofrontviewer/MOCCOViewer.java index 21995d62..361846e7 100644 --- a/src/main/java/eva2/optimization/mocco/paretofrontviewer/MOCCOViewer.java +++ b/src/main/java/eva2/optimization/mocco/paretofrontviewer/MOCCOViewer.java @@ -9,7 +9,7 @@ import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.population.Population; import eva2.problems.InterfaceMultiObjectiveDeNovoProblem; import eva2.problems.InterfaceOptimizationObjective; -import eva2.tools.chart2d.Chart2DDPointContentSelectable; +import eva2.tools.chart2d.DPointContentSelectable; import eva2.tools.chart2d.DPoint; import eva2.tools.chart2d.DPointIcon; import eva2.tools.chart2d.ScaledBorder; @@ -369,7 +369,7 @@ public class MOCCOViewer extends JPanel implements InterfaceRefSolutionListener, for (int i = 0; i < pops.length; i++) { fitness = pops[i].getBestEAIndividual().getFitness()[0]; myPoint = new DPoint(i + 1, fitness); - icon = new Chart2DDPointContentSelectable(); + icon = new DPointContentSelectable(); ((InterfaceDPointWithContent) icon).setProblem(this.moccoStandalone.state.currentProblem); ((InterfaceDPointWithContent) icon).setEAIndividual(pops[i].getBestEAIndividual()); myPoint.setIcon(icon); diff --git a/src/main/java/eva2/optimization/mocco/paretofrontviewer/ParetoFrontView2D.java b/src/main/java/eva2/optimization/mocco/paretofrontviewer/ParetoFrontView2D.java index dbef801a..3bcbad32 100644 --- a/src/main/java/eva2/optimization/mocco/paretofrontviewer/ParetoFrontView2D.java +++ b/src/main/java/eva2/optimization/mocco/paretofrontviewer/ParetoFrontView2D.java @@ -200,9 +200,9 @@ public class ParetoFrontView2D extends JPanel implements InterfaceParetoFrontVie fitness = (double[]) ((ArrayList) this.moccoViewer.moccoStandalone.state.fitnessCache.get(i)).get(j); myPoint = new DPoint(fitness[indexX], fitness[indexY]); if ((Double) ((ArrayList) this.moccoViewer.moccoStandalone.state.constraintCache.get(i)).get(j) == 0) { - myPoint.setIcon(new Chart2DDPointIconCross()); + myPoint.setIcon(new DPointIconCross()); } else { - myPoint.setIcon(new Chart2DDPointIconPoint()); + myPoint.setIcon(new DPointIconPoint()); } mySet.addDPoint(myPoint); if (fitness[indexX] < xmin) { @@ -223,9 +223,9 @@ public class ParetoFrontView2D extends JPanel implements InterfaceParetoFrontVie fitness = (double[]) ((ArrayList) this.moccoViewer.moccoStandalone.state.objectiveCache.get(i)).get(j); myPoint = new DPoint(fitness[indexX], fitness[indexY]); if ((Double) ((ArrayList) this.moccoViewer.moccoStandalone.state.constraintCache.get(i)).get(j) == 0) { - myPoint.setIcon(new Chart2DDPointIconCross()); + myPoint.setIcon(new DPointIconCross()); } else { - myPoint.setIcon(new Chart2DDPointIconPoint()); + myPoint.setIcon(new DPointIconPoint()); } mySet.addDPoint(myPoint); if (fitness[indexX] < xmin) { @@ -264,9 +264,9 @@ public class ParetoFrontView2D extends JPanel implements InterfaceParetoFrontVie } } point = new DPoint(fitness[indexX], fitness[indexY]); - icon = new Chart2DDPointContentSelectable(); + icon = new DPointContentSelectable(); if (this.moccoViewer.refSolutionSelectable) { - ((Chart2DDPointContentSelectable) icon).addSelectionListener(this.moccoViewer); + ((DPointContentSelectable) icon).addSelectionListener(this.moccoViewer); } ((InterfaceDPointWithContent) icon).setProblem(this.moccoViewer.moccoStandalone.state.currentProblem); ((InterfaceDPointWithContent) icon).setEAIndividual(pf.get(i)); diff --git a/src/main/java/eva2/optimization/mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java b/src/main/java/eva2/optimization/mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java index 101d65ae..3bf40f53 100644 --- a/src/main/java/eva2/optimization/mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java +++ b/src/main/java/eva2/optimization/mocco/paretofrontviewer/ParetoFrontViewScatterPlot.java @@ -8,7 +8,7 @@ import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.population.Population; import eva2.problems.InterfaceMultiObjectiveDeNovoProblem; import eva2.problems.InterfaceOptimizationObjective; -import eva2.tools.chart2d.Chart2DDPointContentSelectable; +import eva2.tools.chart2d.DPointContentSelectable; import eva2.tools.chart2d.DPoint; import eva2.tools.chart2d.DPointIcon; import eva2.tools.chart2d.ScaledBorder; @@ -125,9 +125,9 @@ class SimpleView extends JComponent implements InterfaceRefPointListener { for (int i = 0; i < pf.size(); i++) { plotValue = this.fetchPlotValueFor(pf.get(i)); point = new DPoint(plotValue[0], plotValue[1]); - icon = new Chart2DDPointContentSelectable(); + icon = new DPointContentSelectable(); if (this.paretoFrontViewScatterPlot.moccoViewer.refSolutionSelectable) { - ((Chart2DDPointContentSelectable) icon).addSelectionListener(this.paretoFrontViewScatterPlot.moccoViewer); + ((DPointContentSelectable) icon).addSelectionListener(this.paretoFrontViewScatterPlot.moccoViewer); } ((InterfaceDPointWithContent) icon).setProblem(this.paretoFrontViewScatterPlot.moccoViewer.moccoStandalone.state.currentProblem); ((InterfaceDPointWithContent) icon).setEAIndividual(pf.get(i)); diff --git a/src/main/java/eva2/optimization/operator/archiving/AbstractArchiving.java b/src/main/java/eva2/optimization/operator/archiving/AbstractArchiving.java index 2ba03fce..09e0c3ff 100644 --- a/src/main/java/eva2/optimization/operator/archiving/AbstractArchiving.java +++ b/src/main/java/eva2/optimization/operator/archiving/AbstractArchiving.java @@ -4,7 +4,7 @@ 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; +import eva2.tools.chart2d.DPointIconCross; import eva2.tools.chart2d.DPoint; import eva2.tools.chart2d.DPointIcon; @@ -91,7 +91,7 @@ public abstract class AbstractArchiving implements InterfaceArchiving, java.io.S public void plotParetoFront(Population pop, Plot plot) { DPointIcon[] icons = new DPointIcon[pop.size()]; for (int i = 0; i < icons.length; i++) { - icons[i] = new Chart2DDPointIconCross(); + icons[i] = new DPointIconCross(); } this.plotParetoFront(pop, icons, plot); } diff --git a/src/main/java/eva2/optimization/operator/archiving/ArchivingMaxiMin.java b/src/main/java/eva2/optimization/operator/archiving/ArchivingMaxiMin.java index 06fbe75b..cfc72356 100644 --- a/src/main/java/eva2/optimization/operator/archiving/ArchivingMaxiMin.java +++ b/src/main/java/eva2/optimization/operator/archiving/ArchivingMaxiMin.java @@ -4,7 +4,7 @@ import eva2.optimization.operator.moso.MOSOMaxiMin; import eva2.optimization.operator.selection.InterfaceSelection; import eva2.optimization.operator.selection.SelectBestIndividuals; import eva2.optimization.population.Population; -import eva2.tools.chart2d.Chart2DDPointIconCross; +import eva2.tools.chart2d.DPointIconCross; import eva2.tools.chart2d.DPointIcon; import eva2.util.annotation.Description; @@ -78,7 +78,7 @@ public class ArchivingMaxiMin implements InterfaceArchiving, java.io.Serializabl * @param index The identifier for the individual */ public DPointIcon getIconFor(int index, Population pop) { - return new Chart2DDPointIconCross(); + return new DPointIconCross(); } /** diff --git a/src/main/java/eva2/optimization/operator/archiving/ArchivingNSGAII.java b/src/main/java/eva2/optimization/operator/archiving/ArchivingNSGAII.java index 922c1d85..179dbabd 100644 --- a/src/main/java/eva2/optimization/operator/archiving/ArchivingNSGAII.java +++ b/src/main/java/eva2/optimization/operator/archiving/ArchivingNSGAII.java @@ -1,7 +1,7 @@ package eva2.optimization.operator.archiving; import eva2.optimization.population.Population; -import eva2.tools.chart2d.Chart2DDPointIconCross; +import eva2.tools.chart2d.DPointIconCross; import eva2.tools.chart2d.DPointIcon; import eva2.util.annotation.Description; @@ -169,7 +169,7 @@ public class ArchivingNSGAII extends ArchivingNSGA implements java.io.Serializab * @param index The identifier for the individual */ public DPointIcon getIconFor(int index, Population pop) { - return new Chart2DDPointIconCross(); + return new DPointIconCross(); } /** diff --git a/src/main/java/eva2/optimization/operator/archiving/ArchivingSPEAII.java b/src/main/java/eva2/optimization/operator/archiving/ArchivingSPEAII.java index 335d1fdf..da4e7968 100644 --- a/src/main/java/eva2/optimization/operator/archiving/ArchivingSPEAII.java +++ b/src/main/java/eva2/optimization/operator/archiving/ArchivingSPEAII.java @@ -7,8 +7,8 @@ import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.operator.distancemetric.InterfaceDistanceMetric; import eva2.optimization.operator.distancemetric.ObjectiveSpaceMetric; import eva2.optimization.population.Population; -import eva2.tools.chart2d.Chart2DDPointIconCircle; -import eva2.tools.chart2d.Chart2DDPointIconText; +import eva2.tools.chart2d.DPointIconCircle; +import eva2.tools.chart2d.DPointIconText; import eva2.tools.chart2d.DPoint; import eva2.util.annotation.Description; @@ -209,13 +209,13 @@ public class ArchivingSPEAII extends AbstractArchiving implements java.io.Serial System.out.println("Fitness: (" + trueFitness[i][0] + "/" + trueFitness[i][1] + ")"); } DPoint myPoint; - Chart2DDPointIconText tmp; + DPointIconText tmp; mySet.setConnectedMode(false); for (int i = 0; i < trueFitness.length; i++) { myPoint = new DPoint(trueFitness[i][0], trueFitness[i][1]); - tmp = new Chart2DDPointIconText("" + SPEAStrength[i] + "/" + result[i]); - tmp.setIcon(new Chart2DDPointIconCircle()); + tmp = new DPointIconText("" + SPEAStrength[i] + "/" + result[i]); + tmp.setIcon(new DPointIconCircle()); myPoint.setIcon(tmp); mySet.addDPoint(myPoint); } diff --git a/src/main/java/eva2/optimization/operator/classification/ClassificationSelfOrganizingMaps.java b/src/main/java/eva2/optimization/operator/classification/ClassificationSelfOrganizingMaps.java index dbc7de1b..22781a8d 100644 --- a/src/main/java/eva2/optimization/operator/classification/ClassificationSelfOrganizingMaps.java +++ b/src/main/java/eva2/optimization/operator/classification/ClassificationSelfOrganizingMaps.java @@ -378,7 +378,7 @@ public class ClassificationSelfOrganizingMaps implements java.io.Serializable, I DPoint tmpP; for (int i = 0; i < data.length; i++) { tmpP = new DPoint((data[i][0] - this.range[0][2]) / (1 + this.range[0][3]), (data[i][1] - this.range[1][2]) / (1 + this.range[1][3])); - tmpP.setIcon(new Chart2DDPointIconCross()); + tmpP.setIcon(new DPointIconCross()); tmpP.setColor(this.getColorFor(types[i])); area.addDElement(tmpP); } diff --git a/src/main/java/eva2/optimization/operator/cluster/ClusteringKMeans.java b/src/main/java/eva2/optimization/operator/cluster/ClusteringKMeans.java index 7a4cf3fa..8b777e85 100644 --- a/src/main/java/eva2/optimization/operator/cluster/ClusteringKMeans.java +++ b/src/main/java/eva2/optimization/operator/cluster/ClusteringKMeans.java @@ -9,8 +9,8 @@ import eva2.optimization.operator.distancemetric.EuclideanMetric; import eva2.optimization.operator.distancemetric.InterfaceDistanceMetric; import eva2.optimization.population.Population; import eva2.problems.F1Problem; -import eva2.tools.chart2d.Chart2DDPointIconCircle; -import eva2.tools.chart2d.Chart2DDPointIconText; +import eva2.tools.chart2d.DPointIconCircle; +import eva2.tools.chart2d.DPointIconText; import eva2.tools.chart2d.DPoint; import eva2.util.annotation.Description; @@ -160,18 +160,18 @@ public class ClusteringKMeans implements InterfaceClustering, java.io.Serializab // now add the c GraphPointSet mySet; DPoint myPoint; - Chart2DDPointIconText tmp; + DPointIconText tmp; for (int i = 0; i < this.c.length; i++) { mySet = new GraphPointSet(10 + i, plot.getFunctionArea()); mySet.setConnectedMode(true); myPoint = new DPoint(this.c[i][0], this.c[i][1]); - tmp = new Chart2DDPointIconText("Old: " + i); - tmp.setIcon(new Chart2DDPointIconCircle()); + tmp = new DPointIconText("Old: " + i); + tmp.setIcon(new DPointIconCircle()); myPoint.setIcon(tmp); mySet.addDPoint(myPoint); myPoint = new DPoint(newC[i][0], newC[i][1]); - tmp = new Chart2DDPointIconText("New: " + i); - tmp.setIcon(new Chart2DDPointIconCircle()); + tmp = new DPointIconText("New: " + i); + tmp.setIcon(new DPointIconCircle()); myPoint.setIcon(tmp); mySet.addDPoint(myPoint); } @@ -185,15 +185,15 @@ public class ClusteringKMeans implements InterfaceClustering, java.io.Serializab plot = new Plot("Debugging Cluster", "Y1", "Y2", tmpD, tmpD); GraphPointSet mySet; DPoint myPoint; - Chart2DDPointIconText tmp; + DPointIconText tmp; for (int i = 0; i < pop.size(); i++) { mySet = new GraphPointSet(10 + 1, plot.getFunctionArea()); mySet.setConnectedMode(false); double[] x = pop.getEAIndividual(i).getDoublePosition(); myPoint = new DPoint(x[0], x[1]); - tmp = new Chart2DDPointIconText("" + assignment[i]); + tmp = new DPointIconText("" + assignment[i]); if (assignment[i] % 2 == 0) { - tmp.setIcon(new Chart2DDPointIconCircle()); + tmp.setIcon(new DPointIconCircle()); } myPoint.setIcon(tmp); mySet.addDPoint(myPoint); @@ -223,16 +223,16 @@ public class ClusteringKMeans implements InterfaceClustering, java.io.Serializab plot = new Plot("Debugging Clustering Separation", "Y1", "Y2", tmpD, tmpD); GraphPointSet mySet; DPoint myPoint; - Chart2DDPointIconText tmp; + DPointIconText tmp; for (int i = 0; i < result.length; i++) { mySet = new GraphPointSet(10 + 1, plot.getFunctionArea()); mySet.setConnectedMode(false); for (int j = 0; j < result[i].size(); j++) { double[] x = ((InterfaceDataTypeDouble) result[i].get(j)).getDoubleData(); myPoint = new DPoint(x[0], x[1]); - tmp = new Chart2DDPointIconText("" + i); + tmp = new DPointIconText("" + i); if (i % 2 == 0) { - tmp.setIcon(new Chart2DDPointIconCircle()); + tmp.setIcon(new DPointIconCircle()); } myPoint.setIcon(tmp); mySet.addDPoint(myPoint); diff --git a/src/main/java/eva2/optimization/operator/cluster/ClusteringXMeans.java b/src/main/java/eva2/optimization/operator/cluster/ClusteringXMeans.java index a7458260..5c1f5108 100644 --- a/src/main/java/eva2/optimization/operator/cluster/ClusteringXMeans.java +++ b/src/main/java/eva2/optimization/operator/cluster/ClusteringXMeans.java @@ -6,8 +6,8 @@ import eva2.optimization.individuals.ESIndividualDoubleData; import eva2.optimization.individuals.InterfaceDataTypeDouble; import eva2.optimization.population.Population; import eva2.problems.F1Problem; -import eva2.tools.chart2d.Chart2DDPointIconCircle; -import eva2.tools.chart2d.Chart2DDPointIconText; +import eva2.tools.chart2d.DPointIconCircle; +import eva2.tools.chart2d.DPointIconText; import eva2.tools.chart2d.DPoint; import eva2.tools.math.RNG; import eva2.util.annotation.Description; @@ -90,7 +90,7 @@ public class ClusteringXMeans implements InterfaceClustering, java.io.Serializab plot = new Plot("K=" + (i + 1) + " reaches BIC = " + tmpBIC, "Y1", "Y2", tmpD, tmpD); GraphPointSet mySet; DPoint myPoint; - Chart2DDPointIconText tmp; + DPointIconText tmp; for (int k = 0; k < tmpResults[i].length; k++) { mySet = new GraphPointSet(10 + k, plot.getFunctionArea()); mySet.setConnectedMode(false); @@ -98,9 +98,9 @@ public class ClusteringXMeans implements InterfaceClustering, java.io.Serializab for (int l = 0; l < tmpResults[i][k].size(); l++) { x = ((InterfaceDataTypeDouble) tmpResults[i][k].get(l)).getDoubleData(); myPoint = new DPoint(x[0], x[1]); - tmp = new Chart2DDPointIconText("" + k); + tmp = new DPointIconText("" + k); if (k % 2 == 0) { - tmp.setIcon(new Chart2DDPointIconCircle()); + tmp.setIcon(new DPointIconCircle()); } myPoint.setIcon(tmp); mySet.addDPoint(myPoint); @@ -110,9 +110,9 @@ public class ClusteringXMeans implements InterfaceClustering, java.io.Serializab mySet.setConnectedMode(false); for (int k = 0; k < tmpC[i].length; k++) { myPoint = new DPoint(tmpC[i][k][0], tmpC[i][k][1]); - tmp = new Chart2DDPointIconText("C/" + k); + tmp = new DPointIconText("C/" + k); if (k % 2 == 0) { - tmp.setIcon(new Chart2DDPointIconCircle()); + tmp.setIcon(new DPointIconCircle()); } myPoint.setIcon(tmp); mySet.addDPoint(myPoint); diff --git a/src/main/java/eva2/optimization/operator/migration/MOClusteringSeparation.java b/src/main/java/eva2/optimization/operator/migration/MOClusteringSeparation.java index f375798d..db0024a1 100644 --- a/src/main/java/eva2/optimization/operator/migration/MOClusteringSeparation.java +++ b/src/main/java/eva2/optimization/operator/migration/MOClusteringSeparation.java @@ -12,8 +12,8 @@ import eva2.optimization.population.Population; import eva2.optimization.strategies.InterfaceOptimizer; import eva2.problems.AbstractMultiObjectiveOptimizationProblem; import eva2.problems.InterfaceOptimizationProblem; -import eva2.tools.chart2d.Chart2DDPointIconCircle; -import eva2.tools.chart2d.Chart2DDPointIconText; +import eva2.tools.chart2d.DPointIconCircle; +import eva2.tools.chart2d.DPointIconText; import eva2.tools.chart2d.DPoint; import eva2.util.annotation.Description; @@ -112,15 +112,15 @@ public class MOClusteringSeparation implements InterfaceMigration, java.io.Seria // plot = new eva2.gui.plot.Plot("Debugging Clustering Separation", "Y1", "Y2", tmpD, tmpD); // GraphPointSet mySet; // DPoint myPoint; -// Chart2DDPointIconText tmp; +// DPointIconText tmp; // for (int i = 0; i < oldIPOP.length; i++) { // mySet = new GraphPointSet(10+1, plot.getFunctionArea()); // mySet.setConnectedMode(false); // for (int j = 0; j < oldIPOP[i].size(); j++) { // indy = (AbstractEAIndividual)oldIPOP[i].get(j); // myPoint = new DPoint(indy.getFitness()[0], indy.getFitness()[1]); -// tmp = new Chart2DDPointIconText(""+i); -// if (i % 2 == 0) tmp.setIcon(new Chart2DDPointIconCircle()); +// tmp = new DPointIconText(""+i); +// if (i % 2 == 0) tmp.setIcon(new DPointIconCircle()); // myPoint.setIcon(tmp); // mySet.addDPoint(myPoint); // } @@ -151,15 +151,15 @@ public class MOClusteringSeparation implements InterfaceMigration, java.io.Seria plot = new Plot("Debugging Clustering Separation", "Y1", "Y2", tmpD, tmpD); GraphPointSet mySet; DPoint myPoint; - Chart2DDPointIconText tmp; + DPointIconText tmp; for (int i = 0; i < newIPOP.length; i++) { mySet = new GraphPointSet(10 + 1, plot.getFunctionArea()); mySet.setConnectedMode(false); for (int j = 0; j < newIPOP[i].size(); j++) { indy = newIPOP[i].get(j); myPoint = new DPoint(indy.getFitness()[0], indy.getFitness()[1]); - tmp = new Chart2DDPointIconText("" + i); - //if (i % 2 == 0) tmp.setIcon(new Chart2DDPointIconCircle()); + tmp = new DPointIconText("" + i); + //if (i % 2 == 0) tmp.setIcon(new DPointIconCircle()); myPoint.setIcon(tmp); mySet.addDPoint(myPoint); } @@ -168,8 +168,8 @@ public class MOClusteringSeparation implements InterfaceMigration, java.io.Seria mySet.setConnectedMode(false); for (int i = 0; i < c.length; i++) { myPoint = new DPoint(c[i][0], c[i][1]); - tmp = new Chart2DDPointIconText("" + i); - tmp.setIcon(new Chart2DDPointIconCircle()); + tmp = new DPointIconText("" + i); + tmp.setIcon(new DPointIconCircle()); myPoint.setIcon(tmp); mySet.addDPoint(myPoint); } diff --git a/src/main/java/eva2/optimization/operator/migration/MOConeSeparation.java b/src/main/java/eva2/optimization/operator/migration/MOConeSeparation.java index 667a4b7f..e08cb5c3 100644 --- a/src/main/java/eva2/optimization/operator/migration/MOConeSeparation.java +++ b/src/main/java/eva2/optimization/operator/migration/MOConeSeparation.java @@ -15,8 +15,8 @@ import eva2.optimization.population.Population; import eva2.optimization.strategies.InterfaceOptimizer; import eva2.problems.AbstractMultiObjectiveOptimizationProblem; import eva2.problems.InterfaceOptimizationProblem; -import eva2.tools.chart2d.Chart2DDPointIconCircle; -import eva2.tools.chart2d.Chart2DDPointIconText; +import eva2.tools.chart2d.DPointIconCircle; +import eva2.tools.chart2d.DPointIconText; import eva2.tools.chart2d.DPoint; import eva2.util.annotation.Description; @@ -145,15 +145,15 @@ public class MOConeSeparation implements InterfaceMigration, java.io.Serializabl // plot = new eva2.gui.plot.Plot("Debugging Cone Separation", "Y1", "Y2", tmpD, tmpD); // GraphPointSet mySet; // DPoint myPoint; -// Chart2DDPointIconText tmp; +// DPointIconText tmp; // for (int i = 0; i < oldIPOP.length; i++) { // mySet = new GraphPointSet(10+1, plot.getFunctionArea()); // mySet.setConnectedMode(false); // for (int j = 0; j < oldIPOP[i].size(); j++) { // indy = (AbstractEAIndividual)oldIPOP[i].get(j); // myPoint = new DPoint(indy.getFitness()[0], indy.getFitness()[1]); -// tmp = new Chart2DDPointIconText(""+i); -// if (indy.areaConst4ParallelViolated) tmp.setIcon(new Chart2DDPointIconCircle()); +// tmp = new DPointIconText(""+i); +// if (indy.areaConst4ParallelViolated) tmp.setIcon(new DPointIconCircle()); // myPoint.setIcon(tmp); // mySet.addDPoint(myPoint); // } @@ -217,7 +217,7 @@ public class MOConeSeparation implements InterfaceMigration, java.io.Serializabl plot = new Plot("Debugging Cone Separation", "Y1", "Y2", tmpD, tmpD); GraphPointSet mySet; DPoint myPoint; - Chart2DDPointIconText tmp; + DPointIconText tmp; mySet = new GraphPointSet(9, plot.getFunctionArea()); mySet.setConnectedMode(false); // now plot the region boundaries @@ -231,9 +231,9 @@ public class MOConeSeparation implements InterfaceMigration, java.io.Serializabl for (int j = 0; j < newIPOP[i].size(); j++) { indy = newIPOP[i].get(j); myPoint = new DPoint(indy.getFitness()[0], indy.getFitness()[1]); - tmp = new Chart2DDPointIconText("" + i); + tmp = new DPointIconText("" + i); if (i % 2 == 0) { - tmp.setIcon(new Chart2DDPointIconCircle()); + tmp.setIcon(new DPointIconCircle()); } myPoint.setIcon(tmp); mySet.addDPoint(myPoint); diff --git a/src/main/java/eva2/optimization/operator/migration/MOXMeansSeparation.java b/src/main/java/eva2/optimization/operator/migration/MOXMeansSeparation.java index 1b0ffd91..909b96d0 100644 --- a/src/main/java/eva2/optimization/operator/migration/MOXMeansSeparation.java +++ b/src/main/java/eva2/optimization/operator/migration/MOXMeansSeparation.java @@ -13,8 +13,8 @@ import eva2.optimization.population.Population; import eva2.optimization.strategies.InterfaceOptimizer; import eva2.problems.AbstractMultiObjectiveOptimizationProblem; import eva2.problems.InterfaceOptimizationProblem; -import eva2.tools.chart2d.Chart2DDPointIconCircle; -import eva2.tools.chart2d.Chart2DDPointIconText; +import eva2.tools.chart2d.DPointIconCircle; +import eva2.tools.chart2d.DPointIconText; import eva2.tools.chart2d.DPoint; import eva2.util.annotation.Description; @@ -109,15 +109,15 @@ public class MOXMeansSeparation implements InterfaceMigration, java.io.Serializa // plot = new eva2.gui.plot.Plot("Debugging Clustering Separation", "Y1", "Y2", tmpD, tmpD); // GraphPointSet mySet; // DPoint myPoint; -// Chart2DDPointIconText tmp; +// DPointIconText tmp; // for (int i = 0; i < oldIPOP.length; i++) { // mySet = new GraphPointSet(10+1, plot.getFunctionArea()); // mySet.setConnectedMode(false); // for (int j = 0; j < oldIPOP[i].size(); j++) { // indy = (AbstractEAIndividual)oldIPOP[i].get(j); // myPoint = new DPoint(indy.getFitness()[0], indy.getFitness()[1]); -// tmp = new Chart2DDPointIconText(""+i); -// if (i % 2 == 0) tmp.setIcon(new Chart2DDPointIconCircle()); +// tmp = new DPointIconText(""+i); +// if (i % 2 == 0) tmp.setIcon(new DPointIconCircle()); // myPoint.setIcon(tmp); // mySet.addDPoint(myPoint); // } @@ -152,15 +152,15 @@ public class MOXMeansSeparation implements InterfaceMigration, java.io.Serializa plot = new Plot("Debugging Clustering Separation", "Y1", "Y2", tmpD, tmpD); GraphPointSet mySet; DPoint myPoint; - Chart2DDPointIconText tmp; + DPointIconText tmp; for (int i = 0; i < newIPOP.length; i++) { mySet = new GraphPointSet(10 + 1, plot.getFunctionArea()); mySet.setConnectedMode(false); for (int j = 0; j < newIPOP[i].size(); j++) { indy = newIPOP[i].get(j); myPoint = new DPoint(indy.getFitness()[0], indy.getFitness()[1]); - tmp = new Chart2DDPointIconText("" + i); - //if (i % 2 == 0) tmp.setIcon(new Chart2DDPointIconCircle()); + tmp = new DPointIconText("" + i); + //if (i % 2 == 0) tmp.setIcon(new DPointIconCircle()); myPoint.setIcon(tmp); mySet.addDPoint(myPoint); } @@ -169,8 +169,8 @@ public class MOXMeansSeparation implements InterfaceMigration, java.io.Serializa mySet.setConnectedMode(false); for (int i = 0; i < c.length; i++) { myPoint = new DPoint(c[i][0], c[i][1]); - tmp = new Chart2DDPointIconText("" + i); - tmp.setIcon(new Chart2DDPointIconCircle()); + tmp = new DPointIconText("" + i); + tmp.setIcon(new DPointIconCircle()); myPoint.setIcon(tmp); mySet.addDPoint(myPoint); } diff --git a/src/main/java/eva2/optimization/operator/selection/SelectMOSPEAII.java b/src/main/java/eva2/optimization/operator/selection/SelectMOSPEAII.java index 3fd79b9d..72b3a6c7 100644 --- a/src/main/java/eva2/optimization/operator/selection/SelectMOSPEAII.java +++ b/src/main/java/eva2/optimization/operator/selection/SelectMOSPEAII.java @@ -5,8 +5,8 @@ import eva2.gui.plot.Plot; import eva2.optimization.individuals.AbstractEAIndividual; import eva2.optimization.operator.archiving.ArchivingSPEAII; import eva2.optimization.population.Population; -import eva2.tools.chart2d.Chart2DDPointIconCircle; -import eva2.tools.chart2d.Chart2DDPointIconText; +import eva2.tools.chart2d.DPointIconCircle; +import eva2.tools.chart2d.DPointIconText; import eva2.tools.chart2d.DPoint; import eva2.util.annotation.Description; @@ -89,14 +89,14 @@ public class SelectMOSPEAII implements InterfaceSelection, java.io.Serializable GraphPointSet mySet = new GraphPointSet(10, plot.getFunctionArea()); DPoint myPoint; double tmp1, tmp2; - Chart2DDPointIconText tmp; + DPointIconText tmp; mySet.setConnectedMode(false); for (int i = 0; i < orgFit.length; i++) { myPoint = new DPoint(orgFit[i][0], orgFit[i][1]); tmp1 = Math.round(SPEAFitness[i] * 100) / (double) 100; - tmp = new Chart2DDPointIconText("" + tmp1); - tmp.setIcon(new Chart2DDPointIconCircle()); + tmp = new DPointIconText("" + tmp1); + tmp.setIcon(new DPointIconCircle()); myPoint.setIcon(tmp); mySet.addDPoint(myPoint); } diff --git a/src/main/java/eva2/optimization/strategies/ClusterBasedNichingEA.java b/src/main/java/eva2/optimization/strategies/ClusterBasedNichingEA.java index 593e79a7..a065b4b4 100644 --- a/src/main/java/eva2/optimization/strategies/ClusterBasedNichingEA.java +++ b/src/main/java/eva2/optimization/strategies/ClusterBasedNichingEA.java @@ -250,7 +250,7 @@ public class ClusterBasedNichingEA extends AbstractOptimizer implements Interfac AbstractEAIndividual indy = this.undifferentiatedPopulation.get(i); double[] d = indy.getFitness(); point = new DPoint(d[0], d[1]); - point.setIcon(new Chart2DDPointIconCircle()); + point.setIcon(new DPointIconCircle()); mySet.addDPoint(point); } for (int i = 0; i < this.species.size(); i++) { @@ -263,7 +263,7 @@ public class ClusterBasedNichingEA extends AbstractOptimizer implements Interfac AbstractEAIndividual indy = pop.get(j); double[] d = indy.getFitness(); point = new DPoint(d[0], d[1]); - point.setIcon(new Chart2DDPointIconText("P" + j)); + point.setIcon(new DPointIconText("P" + j)); mySet.addDPoint(point); } @@ -345,8 +345,8 @@ public class ClusterBasedNichingEA extends AbstractOptimizer implements Interfac popRep = new DPointSet(); popRep.addDPoint(new DPoint(position[0], position[1])); double d = Math.round(100 * fitness) / (double) 100; - DPointIcon icon = new Chart2DDPointIconText(c + "" + d); - ((Chart2DDPointIconText) icon).setIcon(new Chart2DDPointIconCircle()); + DPointIcon icon = new DPointIconText(c + "" + d); + ((DPointIconText) icon).setIcon(new DPointIconCircle()); popRep.setIcon(icon); p.getFunctionArea().addDElement(popRep); } diff --git a/src/main/java/eva2/optimization/strategies/NichePSO.java b/src/main/java/eva2/optimization/strategies/NichePSO.java index 8991a3d2..dc3218ae 100644 --- a/src/main/java/eva2/optimization/strategies/NichePSO.java +++ b/src/main/java/eva2/optimization/strategies/NichePSO.java @@ -1561,8 +1561,8 @@ public class NichePSO extends AbstractOptimizer implements InterfaceAdditionalPo Double da = (Double) (((AbstractEAIndividual) tmpIndy1).getData(NichePSO.stdDevKey)); double d = da; String ds = String.format("%6.2f", d); - DPointIcon icon = new Chart2DDPointIconText(id + ds); - ((Chart2DDPointIconText) icon).setIcon(new Chart2DDPointIconCircle()); + DPointIcon icon = new DPointIconText(id + ds); + ((DPointIconText) icon).setIcon(new DPointIconCircle()); point.setIcon(icon); this.topoPlot.getFunctionArea().addDElement(point); } @@ -1580,8 +1580,8 @@ public class NichePSO extends AbstractOptimizer implements InterfaceAdditionalPo double min = da; DPoint point = new DPoint(tmpIndy1.getDoubleData()[0], tmpIndy1.getDoubleData()[1]); String ds = String.format("%6.2f", min); - DPointIcon icon = new Chart2DDPointIconText(ds); - ((Chart2DDPointIconText) icon).setIcon(new Chart2DDPointIconCircle()); + DPointIcon icon = new DPointIconText(ds); + ((DPointIconText) icon).setIcon(new DPointIconCircle()); point.setIcon(icon); this.topoPlot.getFunctionArea().addDElement(point); } @@ -1604,8 +1604,8 @@ public class NichePSO extends AbstractOptimizer implements InterfaceAdditionalPo Double da = (Double) (((AbstractEAIndividual) tmpIndy1).getData(NichePSO.stdDevKey)); double d = da; String ds = String.format("%6.2f", d); - DPointIcon icon = new Chart2DDPointIconText(id + ds); - ((Chart2DDPointIconText) icon).setIcon(new Chart2DDPointIconCircle()); + DPointIcon icon = new DPointIconText(id + ds); + ((DPointIconText) icon).setIcon(new DPointIconCircle()); point.setIcon(icon); if (d < boundary) { this.topoPlot.getFunctionArea().addDElement(point); @@ -1622,8 +1622,8 @@ public class NichePSO extends AbstractOptimizer implements InterfaceAdditionalPo AbstractEAIndividual indy = getIndyByParticleIndex(index); InterfaceDataTypeDouble tmpIndy1 = (InterfaceDataTypeDouble) indy; DPoint point = new DPoint(tmpIndy1.getDoubleData()[0], tmpIndy1.getDoubleData()[1]); - DPointIcon icon = new Chart2DDPointIconText(text); - ((Chart2DDPointIconText) icon).setIcon(new Chart2DDPointIconCircle()); + DPointIcon icon = new DPointIconText(text); + ((DPointIconText) icon).setIcon(new DPointIconCircle()); point.setIcon(icon); this.topoPlot.getFunctionArea().addDElement(point); } @@ -1636,8 +1636,8 @@ public class NichePSO extends AbstractOptimizer implements InterfaceAdditionalPo protected void plotCircleForIndy(AbstractEAIndividual indy, String text) { InterfaceDataTypeDouble tmpIndy1 = (InterfaceDataTypeDouble) indy; DPoint point = new DPoint(tmpIndy1.getDoubleData()[0], tmpIndy1.getDoubleData()[1]); - DPointIcon icon = new Chart2DDPointIconText(text); - ((Chart2DDPointIconText) icon).setIcon(new Chart2DDPointIconCircle()); + DPointIcon icon = new DPointIconText(text); + ((DPointIconText) icon).setIcon(new DPointIconCircle()); point.setIcon(icon); this.topoPlot.getFunctionArea().addDElement(point); } @@ -1897,8 +1897,8 @@ public class NichePSO extends AbstractOptimizer implements InterfaceAdditionalPo //plot newPos InterfaceDataTypeDouble tmpIndy1 = (InterfaceDataTypeDouble) indy; DPoint point = new DPoint(tmpIndy1.getDoubleData()[0], tmpIndy1.getDoubleData()[1]); - DPointIcon icon = new Chart2DDPointIconText(""); - ((Chart2DDPointIconText) icon).setIcon(new Chart2DDPointIconPoint()); + DPointIcon icon = new DPointIconText(""); + ((DPointIconText) icon).setIcon(new DPointIconPoint()); point.setIcon(icon); this.topoPlot.getFunctionArea().addDElement(point); @@ -1906,8 +1906,8 @@ public class NichePSO extends AbstractOptimizer implements InterfaceAdditionalPo if (!(indy.getData("oldPosition") == null)) { double[] oldpos = (double[]) indy.getData("oldPosition"); point = new DPoint(oldpos[0], oldpos[1]); - icon = new Chart2DDPointIconText(""); - ((Chart2DDPointIconText) icon).setIcon(new Chart2DDPointIconCross()); + icon = new DPointIconText(""); + ((DPointIconText) icon).setIcon(new DPointIconCross()); point.setIcon(icon); this.topoPlot.getFunctionArea().addDElement(point); } @@ -1915,16 +1915,16 @@ public class NichePSO extends AbstractOptimizer implements InterfaceAdditionalPo //plot personalBestPos double[] pbestpos = (double[]) indy.getData("BestPosition"); point = new DPoint(pbestpos[0], pbestpos[1]); - icon = new Chart2DDPointIconText(""); - ((Chart2DDPointIconText) icon).setIcon(new Chart2DDPointIconCircle()); + icon = new DPointIconText(""); + ((DPointIconText) icon).setIcon(new DPointIconCircle()); point.setIcon(icon); this.topoPlot.getFunctionArea().addDElement(point); //plot neighbourBestPos double[] neighbourBestPos = (double[]) indy.getData("neighbourBestPos"); point = new DPoint(neighbourBestPos[0], neighbourBestPos[1]); - icon = new Chart2DDPointIconText(""); - ((Chart2DDPointIconText) icon).setIcon(new Chart2DDPointIconContent()); + icon = new DPointIconText(""); + ((DPointIconText) icon).setIcon(new DPointIconContent()); point.setIcon(icon); this.topoPlot.getFunctionArea().addDElement(point); } diff --git a/src/main/java/eva2/problems/AbstractMultiObjectiveOptimizationProblem.java b/src/main/java/eva2/problems/AbstractMultiObjectiveOptimizationProblem.java index aa01b1f2..85b31454 100644 --- a/src/main/java/eva2/problems/AbstractMultiObjectiveOptimizationProblem.java +++ b/src/main/java/eva2/problems/AbstractMultiObjectiveOptimizationProblem.java @@ -14,8 +14,8 @@ import eva2.optimization.population.Population; import eva2.optimization.population.PopulationInterface; import eva2.optimization.strategies.InterfaceOptimizer; import eva2.tools.ToolBox; -import eva2.tools.chart2d.Chart2DDPointIconCircle; -import eva2.tools.chart2d.Chart2DDPointIconText; +import eva2.tools.chart2d.DPointIconCircle; +import eva2.tools.chart2d.DPointIconText; import eva2.tools.chart2d.DPoint; import javax.swing.*; @@ -326,11 +326,11 @@ public abstract class AbstractMultiObjectiveOptimizationProblem extends Abstract if (archive != null) { GraphPointSet mySet = new GraphPointSet(10, plot.getFunctionArea()); DPoint myPoint; - Chart2DDPointIconCircle icon; + DPointIconCircle icon; double[] tmpD; mySet.setConnectedMode(false); for (int i = 0; i < archive.size(); i++) { - icon = new Chart2DDPointIconCircle(); + icon = new DPointIconCircle(); tmpD = archive.get(i).getFitness(); if (tmpD.length < 2) { throw new RuntimeException("Error, problem seems not to be multi-objective, pareto front plot not possible!"); @@ -478,9 +478,9 @@ public abstract class AbstractMultiObjectiveOptimizationProblem extends Abstract private static void addPoint(double[] constraint, GraphPointSet mySet, DPoint myPoint, int i, String text) { - Chart2DDPointIconCircle icon; - Chart2DDPointIconText tmp = new Chart2DDPointIconText(text); - icon = new Chart2DDPointIconCircle(); + DPointIconCircle icon; + DPointIconText tmp = new DPointIconText(text); + icon = new DPointIconCircle(); if (constraint[i] > 0) { icon.setBorderColor(Color.RED); icon.setFillColor(Color.RED); diff --git a/src/main/java/eva2/tools/chart2d/Chart2DDPointContentSelectable.java b/src/main/java/eva2/tools/chart2d/DPointContentSelectable.java similarity index 96% rename from src/main/java/eva2/tools/chart2d/Chart2DDPointContentSelectable.java rename to src/main/java/eva2/tools/chart2d/DPointContentSelectable.java index db8fc754..70e49cec 100644 --- a/src/main/java/eva2/tools/chart2d/Chart2DDPointContentSelectable.java +++ b/src/main/java/eva2/tools/chart2d/DPointContentSelectable.java @@ -15,7 +15,7 @@ import java.awt.event.WindowEvent; /** * */ -public class Chart2DDPointContentSelectable implements InterfaceDPointWithContent, InterfaceSelectablePointIcon, DPointIcon { +public class DPointContentSelectable implements InterfaceDPointWithContent, InterfaceSelectablePointIcon, DPointIcon { AbstractEAIndividual individual; InterfaceOptimizationProblem optimizationProblem; diff --git a/src/main/java/eva2/tools/chart2d/Chart2DDPointIconCircle.java b/src/main/java/eva2/tools/chart2d/DPointIconCircle.java similarity index 95% rename from src/main/java/eva2/tools/chart2d/Chart2DDPointIconCircle.java rename to src/main/java/eva2/tools/chart2d/DPointIconCircle.java index 6b9efc0a..52600c3b 100644 --- a/src/main/java/eva2/tools/chart2d/Chart2DDPointIconCircle.java +++ b/src/main/java/eva2/tools/chart2d/DPointIconCircle.java @@ -5,7 +5,7 @@ import java.awt.*; /** * */ -public class Chart2DDPointIconCircle implements DPointIcon { +public class DPointIconCircle implements DPointIcon { private Color borderColor = Color.BLACK; private Color fillColor = null; diff --git a/src/main/java/eva2/tools/chart2d/Chart2DDPointIconContent.java b/src/main/java/eva2/tools/chart2d/DPointIconContent.java similarity index 96% rename from src/main/java/eva2/tools/chart2d/Chart2DDPointIconContent.java rename to src/main/java/eva2/tools/chart2d/DPointIconContent.java index 824817d6..7f4bf5b5 100644 --- a/src/main/java/eva2/tools/chart2d/Chart2DDPointIconContent.java +++ b/src/main/java/eva2/tools/chart2d/DPointIconContent.java @@ -9,7 +9,7 @@ import java.awt.*; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -public class Chart2DDPointIconContent implements InterfaceDPointWithContent, DPointIcon { +public class DPointIconContent implements InterfaceDPointWithContent, DPointIcon { AbstractEAIndividual individual; InterfaceOptimizationProblem optimizationProblem; diff --git a/src/main/java/eva2/tools/chart2d/Chart2DDPointIconCross.java b/src/main/java/eva2/tools/chart2d/DPointIconCross.java similarity index 92% rename from src/main/java/eva2/tools/chart2d/Chart2DDPointIconCross.java rename to src/main/java/eva2/tools/chart2d/DPointIconCross.java index 34f64976..0a47a77e 100644 --- a/src/main/java/eva2/tools/chart2d/Chart2DDPointIconCross.java +++ b/src/main/java/eva2/tools/chart2d/DPointIconCross.java @@ -5,7 +5,7 @@ import java.awt.*; /** * */ -public class Chart2DDPointIconCross implements DPointIcon { +public class DPointIconCross implements DPointIcon { private Color color; diff --git a/src/main/java/eva2/tools/chart2d/Chart2DDPointIconPoint.java b/src/main/java/eva2/tools/chart2d/DPointIconPoint.java similarity index 95% rename from src/main/java/eva2/tools/chart2d/Chart2DDPointIconPoint.java rename to src/main/java/eva2/tools/chart2d/DPointIconPoint.java index a4326b9c..3f7074d5 100644 --- a/src/main/java/eva2/tools/chart2d/Chart2DDPointIconPoint.java +++ b/src/main/java/eva2/tools/chart2d/DPointIconPoint.java @@ -7,7 +7,7 @@ import java.awt.*; /** * */ -public class Chart2DDPointIconPoint implements DPointIcon { +public class DPointIconPoint implements DPointIcon { private Color borderColor = Color.BLACK; private Color fillColor = Color.BLACK; diff --git a/src/main/java/eva2/tools/chart2d/Chart2DDPointIconText.java b/src/main/java/eva2/tools/chart2d/DPointIconText.java similarity index 85% rename from src/main/java/eva2/tools/chart2d/Chart2DDPointIconText.java rename to src/main/java/eva2/tools/chart2d/DPointIconText.java index 17923cfc..91ef5f8c 100644 --- a/src/main/java/eva2/tools/chart2d/Chart2DDPointIconText.java +++ b/src/main/java/eva2/tools/chart2d/DPointIconText.java @@ -5,13 +5,13 @@ import java.awt.*; /** * */ -public class Chart2DDPointIconText implements DPointIcon { +public class DPointIconText implements DPointIcon { - private DPointIcon icon = new Chart2DDPointIconCross(); + private DPointIcon icon = new DPointIconCross(); private String text = " "; private Color color; - public Chart2DDPointIconText(String s) { + public DPointIconText(String s) { text = s; }