From 69a78d57579246901271329d9f45505472a05b65 Mon Sep 17 00:00:00 2001 From: Fabian Becker Date: Thu, 16 Oct 2014 11:23:35 +0200 Subject: [PATCH] More code cleanup. --- src/eva2/optimization/stat/AbstractStatistics.java | 1 - src/eva2/problems/FLensProblem.java | 12 ------------ src/eva2/problems/SimpleProblemWrapper.java | 4 ++-- src/eva2/problems/simple/InterfaceSimpleProblem.java | 2 +- src/eva2/problems/simple/SimpleB1.java | 2 +- src/eva2/problems/simple/SimpleF1.java | 2 +- 6 files changed, 5 insertions(+), 18 deletions(-) diff --git a/src/eva2/optimization/stat/AbstractStatistics.java b/src/eva2/optimization/stat/AbstractStatistics.java index d3a5ea2e..6c14c986 100644 --- a/src/eva2/optimization/stat/AbstractStatistics.java +++ b/src/eva2/optimization/stat/AbstractStatistics.java @@ -1002,7 +1002,6 @@ public abstract class AbstractStatistics implements InterfaceTextListener, Inter if (firstPlot) { initPlots(null, null); -// if (doTextOutput()) printToTextListener(getOutputHeader(null, null)+'\n'); firstPlot = false; } if ((iterationCounter == 0) && printHeaderByVerbosity()) { diff --git a/src/eva2/problems/FLensProblem.java b/src/eva2/problems/FLensProblem.java index a5497c11..64f8df18 100644 --- a/src/eva2/problems/FLensProblem.java +++ b/src/eva2/problems/FLensProblem.java @@ -53,8 +53,6 @@ class MyLensViewer extends JPanel implements InterfaceSolutionViewer { int mag = 10; int centerLens, centerScreen, segment; -// lineStroke = ds; -// pointStroke = new BasicStroke(ds.getLineWidth(), ds.getEndCap(), ds.getLineJoin(), ds.getMiterLimit() , new float[] {1, 4}, 0); dashStroke = new BasicStroke(ds.getLineWidth(), ds.getEndCap(), ds.getLineJoin(), ds.getMiterLimit(), new float[]{8, 8}, 0); super.paint(g); @@ -85,7 +83,6 @@ class MyLensViewer extends JPanel implements InterfaceSolutionViewer { g2D.drawLine(centerLens, this.theHeight / 2 + (int) this.lensProblem.radius * 10, centerLens, this.theHeight / 2 - (int) this.lensProblem.radius * 10); g2D.drawLine(centerScreen, this.theHeight / 2 + (int) this.lensProblem.radius * 10 + 10, centerScreen, this.theHeight / 2 - (int) this.lensProblem.radius * 10 - 10); g2D.setStroke(ds); -// System.out.println("indies to paint: " + indiesToPaint.size()); paintLens(lensProblem.problemDimension, theHeight, lensProblem.radius, mag, centerLens, centerScreen, segment, g2D); // Now put everything on the screen g.drawImage(bufferedImage, 0, 0, this); @@ -127,12 +124,6 @@ class MyLensViewer extends JPanel implements InterfaceSolutionViewer { g2D.drawLine(centerLens, currentXPos + segment / 2, centerScreen, height / 2 + (int) (dots[i - 1] * mag)); currentXPos += segment; -// tmpShape = new Rectangle(currentPos-width/2, this.theHeight/2, width, (int)(variables[i]*10)); -// g2D.setPaint(Color.red); -// g2D.fill(tmpShape); -// g2D.setPaint(Color.black); -// g2D.draw(tmpShape); -// g2D.drawLine(currentPos, this.theHeight/2+5, currentPos, this.theHeight/2-5); } } @@ -144,7 +135,6 @@ class MyLensViewer extends JPanel implements InterfaceSolutionViewer { @Override public void updateView(Population pop, boolean showAllIfPossible) { if (showAllIfPossible) { -// indiesToPaint=population; for (int i = 0; i < pop.size(); i++) { MyLensViewer newView = new MyLensViewer(lensProblem); @@ -157,7 +147,6 @@ class MyLensViewer extends JPanel implements InterfaceSolutionViewer { newFrame.pack(); newFrame.setVisible(true); } -// this.paint(this.getGraphics()); } else { InterfaceDataTypeDouble best = (InterfaceDataTypeDouble) pop.getBestIndividual(); if (indiesToPaint.size() == 0 || ((AbstractEAIndividual) best).isDominant(indiesToPaint.getBestIndividual())) { @@ -190,7 +179,6 @@ public class FLensProblem extends AbstractOptimizationProblem protected double xOffset = 0.0; protected double yOffset = 0.0; transient protected boolean show = false; - //protected int sleepTime = 0; transient private JFrame problemFrame; transient private MyLensViewer lensViewerPanel; diff --git a/src/eva2/problems/SimpleProblemWrapper.java b/src/eva2/problems/SimpleProblemWrapper.java index 90936aa6..0b5226c5 100644 --- a/src/eva2/problems/SimpleProblemWrapper.java +++ b/src/eva2/problems/SimpleProblemWrapper.java @@ -54,7 +54,7 @@ public class SimpleProblemWrapper extends AbstractOptimizationProblem { x = new double[((InterfaceDataTypeDouble) individual).getDoubleData().length]; System.arraycopy(((InterfaceDataTypeDouble) individual).getDoubleData(), 0, x, 0, x.length); // evaluate the vector - fitness = ((SimpleProblemDouble) simProb).eval(x); + fitness = ((SimpleProblemDouble) simProb).evaluate(x); // if indicated, add Gaussian noise if (noise != 0) { RNG.addNoise(fitness, noise); @@ -67,7 +67,7 @@ public class SimpleProblemWrapper extends AbstractOptimizationProblem { tmpBitSet = ((InterfaceDataTypeBinary) individual).getBinaryData(); // evaluate the fitness - result = ((SimpleProblemBinary) simProb).eval(tmpBitSet); + result = ((SimpleProblemBinary) simProb).evaluate(tmpBitSet); // set the fitness individual.setFitness(result); } else { diff --git a/src/eva2/problems/simple/InterfaceSimpleProblem.java b/src/eva2/problems/simple/InterfaceSimpleProblem.java index f901396c..db2a2de7 100644 --- a/src/eva2/problems/simple/InterfaceSimpleProblem.java +++ b/src/eva2/problems/simple/InterfaceSimpleProblem.java @@ -14,7 +14,7 @@ public interface InterfaceSimpleProblem { * @param x a double vector to be evaluated * @return the fitness vector assigned to x as to the target function */ - public double[] eval(T x); + public double[] evaluate(T x); /** * Return the problem dimension. diff --git a/src/eva2/problems/simple/SimpleB1.java b/src/eva2/problems/simple/SimpleB1.java index 4f8f6fb4..a598f92d 100644 --- a/src/eva2/problems/simple/SimpleB1.java +++ b/src/eva2/problems/simple/SimpleB1.java @@ -8,7 +8,7 @@ public class SimpleB1 extends SimpleProblemBinary { } @Override - public double[] eval(BitSet b) { + public double[] evaluate(BitSet b) { double[] result = new double[1]; int fitness = 0; diff --git a/src/eva2/problems/simple/SimpleF1.java b/src/eva2/problems/simple/SimpleF1.java index f0dd555d..54d15d32 100644 --- a/src/eva2/problems/simple/SimpleF1.java +++ b/src/eva2/problems/simple/SimpleF1.java @@ -7,7 +7,7 @@ public class SimpleF1 extends SimpleProblemDouble { } @Override - public double[] eval(double[] x) { + public double[] evaluate(double[] x) { double res[] = new double[1]; // this defines the dimension of the fitness vector, which should be always the same