Random fixes across the board
This commit is contained in:
parent
5c77484a11
commit
e40041615d
@ -42,7 +42,7 @@ public class ModuleServer {
|
|||||||
/* Fetch the the super class for all modules */
|
/* Fetch the the super class for all modules */
|
||||||
filterBy = Class.forName(EvAProps.getProperty("ModuleFilterClass"));
|
filterBy = Class.forName(EvAProps.getProperty("ModuleFilterClass"));
|
||||||
} catch (Exception ex) {
|
} 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("module path was " + modulePckg + ", is it valid?");
|
||||||
System.err.println("filter class path was " + ((filterBy == null) ? "null" : filterBy.getName()));
|
System.err.println("filter class path was " + ((filterBy == null) ? "null" : filterBy.getName()));
|
||||||
}
|
}
|
||||||
|
@ -57,9 +57,6 @@ public abstract class AbstractSynchronousOptimizationProblem extends
|
|||||||
@Override
|
@Override
|
||||||
protected void changeProblemAt(double problemTime) {
|
protected void changeProblemAt(double problemTime) {
|
||||||
incProblemTime(shiftPerChange);
|
incProblemTime(shiftPerChange);
|
||||||
if (TRACE) {
|
|
||||||
System.out.println("problem shiftet at " + problemTime + " per " + shiftPerChange);
|
|
||||||
}
|
|
||||||
evalsSinceChange = 0.;
|
evalsSinceChange = 0.;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -79,9 +76,6 @@ public abstract class AbstractSynchronousOptimizationProblem extends
|
|||||||
*/
|
*/
|
||||||
protected void setConstantProblemEvals(double constEvals) {
|
protected void setConstantProblemEvals(double constEvals) {
|
||||||
constantProblemEvals = constEvals;
|
constantProblemEvals = constEvals;
|
||||||
if (TRACE) {
|
|
||||||
System.out.println("setConstantProblemEvals: " + constEvals);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* (non-Javadoc)
|
/* (non-Javadoc)
|
||||||
|
@ -54,9 +54,6 @@ public class DynJumpProblem extends AbstractDynTransProblem {
|
|||||||
super.changeProblemAt(problemTime);
|
super.changeProblemAt(problemTime);
|
||||||
makeTranslation();
|
makeTranslation();
|
||||||
/* prooving results */
|
/* prooving results */
|
||||||
if (TRACE) {
|
|
||||||
writeFile();
|
|
||||||
}
|
|
||||||
++changeCounter;
|
++changeCounter;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -110,13 +107,6 @@ public class DynJumpProblem extends AbstractDynTransProblem {
|
|||||||
/* Update previousMovement */
|
/* Update previousMovement */
|
||||||
previousMovement[i] = shift[i];
|
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
|
@Override
|
||||||
|
@ -74,6 +74,6 @@ public class F15Problem extends AbstractProblemDouble implements Serializable, I
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getName() {
|
public String getName() {
|
||||||
return "F15-Problem";
|
return "F15Problem";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -47,7 +47,7 @@ public class DifferentialEvolution implements InterfaceOptimizer, java.io.Serial
|
|||||||
private double differentialWeight = 0.8;
|
private double differentialWeight = 0.8;
|
||||||
|
|
||||||
@Parameter(name = "CR", description = "Crossover Rate")
|
@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.")
|
@Parameter(name = "Lambda", description = "Enhance greediness through amplification of the differential vector to the best individual for DE2.")
|
||||||
private double lambda = 0.6;
|
private double lambda = 0.6;
|
||||||
@ -74,11 +74,11 @@ public class DifferentialEvolution implements InterfaceOptimizer, java.io.Serial
|
|||||||
DEType = DETypeEnum.DE2_CurrentToBest;
|
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);
|
population = new Population(popSize);
|
||||||
DEType = type;
|
DEType = type;
|
||||||
differentialWeight = f;
|
differentialWeight = f;
|
||||||
crossoverRate = k;
|
crossoverRate = cr;
|
||||||
this.lambda = lambda;
|
this.lambda = lambda;
|
||||||
this.mt = mt;
|
this.mt = mt;
|
||||||
}
|
}
|
||||||
@ -136,8 +136,6 @@ public class DifferentialEvolution implements InterfaceOptimizer, java.io.Serial
|
|||||||
this.evaluatePopulation(this.population);
|
this.evaluatePopulation(this.population);
|
||||||
this.firePropertyChangedEvent(Population.NEXT_GENERATION_PERFORMED);
|
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();
|
ReplacementCrowding repl = new ReplacementCrowding();
|
||||||
repl.insertIndividual(indy, population, null);
|
repl.insertIndividual(indy, population, null);
|
||||||
} else {
|
} else {
|
||||||
// index = RNG.randomInt(0, this.population.size()-1);
|
|
||||||
if (!compareToParent) {
|
if (!compareToParent) {
|
||||||
parentIndex = RNG.randomInt(0, this.population.size() - 1);
|
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) {
|
public void setReEvaluate(boolean reEvaluate) {
|
||||||
this.reEvaluate = reEvaluate;
|
this.reEvaluate = reEvaluate;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user