From e40041615da7b4c6821f66299cd64f75e19ff470 Mon Sep 17 00:00:00 2001 From: Fabian Becker Date: Tue, 7 Oct 2014 15:42:55 +0200 Subject: [PATCH] Random fixes across the board --- src/eva2/optimization/ModuleServer.java | 2 +- .../AbstractSynchronousOptimizationProblem.java | 6 ------ src/eva2/optimization/problems/DynJumpProblem.java | 10 ---------- src/eva2/optimization/problems/F15Problem.java | 2 +- .../optimization/strategies/DifferentialEvolution.java | 10 +++------- 5 files changed, 5 insertions(+), 25 deletions(-) diff --git a/src/eva2/optimization/ModuleServer.java b/src/eva2/optimization/ModuleServer.java index 1ec7a65a..75d1ca17 100644 --- a/src/eva2/optimization/ModuleServer.java +++ b/src/eva2/optimization/ModuleServer.java @@ -42,7 +42,7 @@ public class ModuleServer { /* Fetch the the super class for all modules */ filterBy = Class.forName(EvAProps.getProperty("ModuleFilterClass")); } catch (Exception ex) { - System.err.println("Creating ModuleServer failed: couldnt load modules:" + ex.getMessage()); + System.err.println("Creating ModuleServer failed: couldn't load modules:" + ex.getMessage()); System.err.println("module path was " + modulePckg + ", is it valid?"); System.err.println("filter class path was " + ((filterBy == null) ? "null" : filterBy.getName())); } diff --git a/src/eva2/optimization/problems/AbstractSynchronousOptimizationProblem.java b/src/eva2/optimization/problems/AbstractSynchronousOptimizationProblem.java index 2e40132e..dd12a89c 100644 --- a/src/eva2/optimization/problems/AbstractSynchronousOptimizationProblem.java +++ b/src/eva2/optimization/problems/AbstractSynchronousOptimizationProblem.java @@ -57,9 +57,6 @@ public abstract class AbstractSynchronousOptimizationProblem extends @Override protected void changeProblemAt(double problemTime) { incProblemTime(shiftPerChange); - if (TRACE) { - System.out.println("problem shiftet at " + problemTime + " per " + shiftPerChange); - } evalsSinceChange = 0.; } @@ -79,9 +76,6 @@ public abstract class AbstractSynchronousOptimizationProblem extends */ protected void setConstantProblemEvals(double constEvals) { constantProblemEvals = constEvals; - if (TRACE) { - System.out.println("setConstantProblemEvals: " + constEvals); - } } /* (non-Javadoc) diff --git a/src/eva2/optimization/problems/DynJumpProblem.java b/src/eva2/optimization/problems/DynJumpProblem.java index 9b6f97f1..27963c72 100644 --- a/src/eva2/optimization/problems/DynJumpProblem.java +++ b/src/eva2/optimization/problems/DynJumpProblem.java @@ -54,9 +54,6 @@ public class DynJumpProblem extends AbstractDynTransProblem { super.changeProblemAt(problemTime); makeTranslation(); /* prooving results */ - if (TRACE) { - writeFile(); - } ++changeCounter; } @@ -110,13 +107,6 @@ public class DynJumpProblem extends AbstractDynTransProblem { /* Update previousMovement */ previousMovement[i] = shift[i]; } - if (TRACE) { - System.out.print("Jumped to "); - for (int i = 0; i < getProblemDimension(); i++) { - System.out.print(" " + translation[i]); - } - System.out.println(); - } } @Override diff --git a/src/eva2/optimization/problems/F15Problem.java b/src/eva2/optimization/problems/F15Problem.java index ff909ce9..7b42452e 100644 --- a/src/eva2/optimization/problems/F15Problem.java +++ b/src/eva2/optimization/problems/F15Problem.java @@ -74,6 +74,6 @@ public class F15Problem extends AbstractProblemDouble implements Serializable, I @Override public String getName() { - return "F15-Problem"; + return "F15Problem"; } } diff --git a/src/eva2/optimization/strategies/DifferentialEvolution.java b/src/eva2/optimization/strategies/DifferentialEvolution.java index 5524455e..c31b4722 100644 --- a/src/eva2/optimization/strategies/DifferentialEvolution.java +++ b/src/eva2/optimization/strategies/DifferentialEvolution.java @@ -47,7 +47,7 @@ public class DifferentialEvolution implements InterfaceOptimizer, java.io.Serial private double differentialWeight = 0.8; @Parameter(name = "CR", description = "Crossover Rate") - private double crossoverRate = 0.6; // AKA CR + private double crossoverRate = 0.6; @Parameter(name = "Lambda", description = "Enhance greediness through amplification of the differential vector to the best individual for DE2.") private double lambda = 0.6; @@ -74,11 +74,11 @@ public class DifferentialEvolution implements InterfaceOptimizer, java.io.Serial DEType = DETypeEnum.DE2_CurrentToBest; } - public DifferentialEvolution(int popSize, DETypeEnum type, double f, double k, double lambda, double mt) { + public DifferentialEvolution(int popSize, DETypeEnum type, double f, double cr, double lambda, double mt) { population = new Population(popSize); DEType = type; differentialWeight = f; - crossoverRate = k; + crossoverRate = cr; this.lambda = lambda; this.mt = mt; } @@ -136,8 +136,6 @@ public class DifferentialEvolution implements InterfaceOptimizer, java.io.Serial this.evaluatePopulation(this.population); this.firePropertyChangedEvent(Population.NEXT_GENERATION_PERFORMED); } -// if (reset) this.population.init(); -// else children = new Population(population.size()); } /** @@ -570,7 +568,6 @@ public class DifferentialEvolution implements InterfaceOptimizer, java.io.Serial ReplacementCrowding repl = new ReplacementCrowding(); repl.insertIndividual(indy, population, null); } else { -// index = RNG.randomInt(0, this.population.size()-1); if (!compareToParent) { parentIndex = RNG.randomInt(0, this.population.size() - 1); } @@ -984,7 +981,6 @@ public class DifferentialEvolution implements InterfaceOptimizer, java.io.Serial } /** - * @param maximumAge the maximumAge to set */ public void setReEvaluate(boolean reEvaluate) { this.reEvaluate = reEvaluate;