halfdan/eva2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed deprecated methods.

Browse Source 
fixes #10
This commit is contained in:
Fabian Becker
2013-10-29 16:21:09 +01:00
parent cc9b29147f
commit dbb6d54e26
25 changed files with 77 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/eva2/OptimizerFactory.java
View File

@@ -428,7 +428,6 @@ public class OptimizerFactory {
pso.setPhi1(phi1); pso.setPhi1(phi1);
pso.setPhi2(phi2); pso.setPhi2(phi2);
pso.setSpeedLimit(speedLim); pso.setSpeedLimit(speedLim);
// pso.getTopology().setSelectedTag(selectedTopology);
pso.setTopology(selectedTopology); pso.setTopology(selectedTopology);
pso.setTopologyRange(topologyRange); pso.setTopologyRange(topologyRange);
pso.addPopulationChangedEventListener(listener); pso.addPopulationChangedEventListener(listener);

2
src/eva2/optimization/go/MOCCOStandalone.java
View File

@@ -471,7 +471,7 @@ public class MOCCOStandalone implements InterfaceStandaloneOptimization, Interfa
System.out.println("" + this.m_State.m_Optimizer.getStringRepresentation()); System.out.println("" + this.m_State.m_Optimizer.getStringRepresentation());
} }
this.m_State.m_CurrentProblem.evaluate(this.m_State.m_Optimizer.getPopulation()); this.m_State.m_CurrentProblem.evaluate(this.m_State.m_Optimizer.getPopulation());
this.m_State.m_Optimizer.getPopulation().SetFunctionCalls(0); this.m_State.m_Optimizer.getPopulation().setFunctionCalls(0);
if (this.m_State.m_Optimizer.getPopulation().size() == 0) { if (this.m_State.m_Optimizer.getPopulation().size() == 0) {
this.m_State.m_Optimizer.init(); this.m_State.m_Optimizer.init();
} }

2
src/eva2/optimization/go/StandaloneOptimization.java
View File

@@ -407,7 +407,7 @@ public class StandaloneOptimization implements InterfaceStandaloneOptimization,
this.optimizationParameters.getOptimizer().getProblem().evaluate(this.optimizationParameters.getOptimizer().getPopulation()); this.optimizationParameters.getOptimizer().getProblem().evaluate(this.optimizationParameters.getOptimizer().getPopulation());
this.optimizationParameters.getOptimizer().getProblem().evaluate(this.optimizationParameters.getOptimizer().getPopulation().getArchive()); this.optimizationParameters.getOptimizer().getProblem().evaluate(this.optimizationParameters.getOptimizer().getPopulation().getArchive());
this.optimizationParameters.getOptimizer().initByPopulation(this.backupPopulation, false); this.optimizationParameters.getOptimizer().initByPopulation(this.backupPopulation, false);
this.optimizationParameters.getOptimizer().getPopulation().SetFunctionCalls(0); this.optimizationParameters.getOptimizer().getPopulation().setFunctionCalls(0);
this.optimizationParameters.addPopulationChangedEventListener(this); this.optimizationParameters.addPopulationChangedEventListener(this);
} else { } else {
this.recentFunctionCalls = 0; this.recentFunctionCalls = 0;

8
src/eva2/optimization/operator/postprocess/PostProcess.java
View File

@@ -375,8 +375,8 @@ public class PostProcess {
* @return the number of evaluations actually performed * @return the number of evaluations actually performed
*/ */
public static int processWithHC(Population pop, AbstractOptimizationProblem problem, int maxSteps, double stepSize, double minStepSize) { public static int processWithHC(Population pop, AbstractOptimizationProblem problem, int maxSteps, double stepSize, double minStepSize) {
// pop.SetFunctionCalls(0); // or else optimization wont restart on an "old" population // pop.setFunctionCalls(0); // or else optimization wont restart on an "old" population
// pop.setGenerationTo(0); // pop.setGeneration(0);
int stepsBef = pop.getFunctionCalls(); int stepsBef = pop.getFunctionCalls();
processWithHC(pop, problem, new EvaluationTerminator(pop.getFunctionCalls() + maxSteps), new MutateESMutativeStepSizeControl(stepSize, minStepSize, stepSize)); processWithHC(pop, problem, new EvaluationTerminator(pop.getFunctionCalls() + maxSteps), new MutateESMutativeStepSizeControl(stepSize, minStepSize, stepSize));
return pop.getFunctionCalls() - stepsBef; return pop.getFunctionCalls() - stepsBef;
@@ -519,7 +519,7 @@ public class PostProcess {
pop.addPopulation(es.getPopulation()); pop.addPopulation(es.getPopulation());
int funCallsDone = es.getPopulation().getFunctionCalls() - baseEvals; int funCallsDone = es.getPopulation().getFunctionCalls() - baseEvals;
pop.SetFunctionCalls(funCallsBefore); pop.setFunctionCalls(funCallsBefore);
return new Pair<Integer, Boolean>(funCallsDone, ppRunnable.wasAborted()); return new Pair<Integer, Boolean>(funCallsDone, ppRunnable.wasAborted());
} }
@@ -632,7 +632,7 @@ public class PostProcess {
int evalsOld = candidates.getFunctionCalls(); int evalsOld = candidates.getFunctionCalls();
processWithHC(candidates, prob, new EvaluationTerminator(evalsOld + steps), mute); processWithHC(candidates, prob, new EvaluationTerminator(evalsOld + steps), mute);
int evalsDone = candidates.getFunctionCalls() - evalsOld; int evalsDone = candidates.getFunctionCalls() - evalsOld;
candidates.SetFunctionCalls(evalsOld); candidates.setFunctionCalls(evalsOld);
return evalsDone; return evalsDone;
} else { } else {
int stepsPerCand = (steps - (candCnt * (dim - 1))) / candCnt; int stepsPerCand = (steps - (candCnt * (dim - 1))) / candCnt;

7
src/eva2/optimization/operator/terminators/CombinedTerminator.java
View File

@@ -5,10 +5,11 @@ import eva2.optimization.population.InterfaceSolutionSet;
import eva2.optimization.population.PopulationInterface; import eva2.optimization.population.PopulationInterface;
import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.optimization.problems.InterfaceOptimizationProblem;
import eva2.tools.SelectedTag; import eva2.tools.SelectedTag;
import eva2.util.annotation.Description;
import java.io.Serializable; import java.io.Serializable;
@Description(text = "Boolean combination of two terminators.")
public class CombinedTerminator implements InterfaceTerminator, Serializable { public class CombinedTerminator implements InterfaceTerminator, Serializable {
/** /**
* *
@@ -37,10 +38,6 @@ public class CombinedTerminator implements InterfaceTerminator, Serializable {
andOrTag.setSelectedTag(bAnd ? "AND" : "OR"); andOrTag.setSelectedTag(bAnd ? "AND" : "OR");
} }
public static String globalInfo() {
return "Boolean combination of two terminators.";
}
@Override @Override
public void init(InterfaceOptimizationProblem prob) { public void init(InterfaceOptimizationProblem prob) {
if (t1 != null) { if (t1 != null) {

47
src/eva2/optimization/operator/terminators/EvaluationTerminator.java
View File

@@ -1,39 +1,27 @@
package eva2.optimization.operator.terminators; package eva2.optimization.operator.terminators;
/*
* Title: EvA2
* Description:
* Copyright: Copyright (c) 2003
* Company: University of Tuebingen, Computer Architecture
* @author Holger Ulmer, Felix Streichert, Hannes Planatscher
* @version: $Revision: 319 $
* $Date: 2007-12-05 11:29:32 +0100 (Wed, 05 Dec 2007) $
* $Author: mkron $
*/
/*==========================================================================*
* IMPORTS
*==========================================================================*/
import eva2.optimization.go.InterfaceTerminator; import eva2.optimization.go.InterfaceTerminator;
import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.InterfaceSolutionSet;
import eva2.optimization.population.PopulationInterface; import eva2.optimization.population.PopulationInterface;
import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.optimization.problems.InterfaceOptimizationProblem;
import eva2.util.annotation.Description;
import java.io.Serializable; import java.io.Serializable;
/*==========================================================================*
* CLASS DECLARATION
*==========================================================================*/
/** /**
* * Evaluation Terminator. Terminates the optimization after a certain
* number of fitness evaluations. Note that this will not terminate after
* the exact number of fitness calls, since terminators are only once per
* generation.
*/ */
@Description(text = "Terminates after the given number of fitness calls.")
public class EvaluationTerminator implements InterfaceTerminator, public class EvaluationTerminator implements InterfaceTerminator,
Serializable { Serializable {
private String msg = "Not terminated."; private String msg = "Not terminated.";
/** /**
* Number of fitness calls on the problem which is optimized. * Number of fitness calls on the problem which is optimized.
*/ */
protected int m_FitnessCalls = 1000; protected int maxFitnessCalls = 1000;
public EvaluationTerminator() { public EvaluationTerminator() {
} }
@@ -43,17 +31,13 @@ public class EvaluationTerminator implements InterfaceTerminator,
msg = "Not terminated."; msg = "Not terminated.";
} }
public static String globalInfo() {
return "Terminates after the given number of fitness calls.";
}
/** /**
* Construct Terminator with a maximum number of fitness calls. * Construct Terminator with a maximum number of fitness calls.
* *
* @param maximum number of fitness calls * @param maximum number of fitness calls
*/ */
public EvaluationTerminator(int x) { public EvaluationTerminator(int x) {
m_FitnessCalls = x; maxFitnessCalls = x;
} }
@Override @Override
@@ -62,12 +46,11 @@ public class EvaluationTerminator implements InterfaceTerminator,
} }
@Override @Override
public boolean isTerminated(PopulationInterface pop) { public boolean isTerminated(PopulationInterface population) {
//System.out.println("m_FitnessCalls="+m_FitnessCalls); if (maxFitnessCalls > population.getFunctionCalls()) {
if (m_FitnessCalls > pop.getFunctionCalls()) {
return false; return false;
} else { } else {
msg = m_FitnessCalls + " fitness calls were reached."; msg = maxFitnessCalls + " fitness calls were reached.";
return true; return true;
} }
} }
@@ -79,18 +62,18 @@ public class EvaluationTerminator implements InterfaceTerminator,
@Override @Override
public String toString() { public String toString() {
String ret = "EvaluationTerminator,calls=" + m_FitnessCalls; String ret = "EvaluationTerminator,calls=" + maxFitnessCalls;
return ret; return ret;
} }
public void setFitnessCalls(int x) { public void setFitnessCalls(int x) {
//System.out.println("setFitnessCalls"+x); //System.out.println("setFitnessCalls"+x);
m_FitnessCalls = x; maxFitnessCalls = x;
} }
public int getFitnessCalls() { public int getFitnessCalls() {
//System.out.println("getFitnessCalls"+m_FitnessCalls); //System.out.println("getFitnessCalls"+maxFitnessCalls);
return m_FitnessCalls; return maxFitnessCalls;
} }
/** /**

30
src/eva2/optimization/operator/terminators/GenerationTerminator.java
View File

@@ -1,31 +1,23 @@
package eva2.optimization.operator.terminators; package eva2.optimization.operator.terminators;
/*
* Title: EvA2
* Description:
* Copyright: Copyright (c) 2003
* Company: University of Tuebingen, Computer Architecture
* @author Holger Ulmer, Felix Streichert, Hannes Planatscher
* @version: $Revision: 319 $
* $Date: 2007-12-05 11:29:32 +0100 (Wed, 05 Dec 2007) $
* $Author: mkron $
*/
import eva2.optimization.go.InterfaceTerminator; import eva2.optimization.go.InterfaceTerminator;
import eva2.optimization.population.InterfaceSolutionSet; import eva2.optimization.population.InterfaceSolutionSet;
import eva2.optimization.population.PopulationInterface; import eva2.optimization.population.PopulationInterface;
import eva2.optimization.problems.InterfaceOptimizationProblem; import eva2.optimization.problems.InterfaceOptimizationProblem;
import eva2.util.annotation.Description;
import java.io.Serializable; import java.io.Serializable;
/** /**
* *
*/ */
@Description(text = "Terminate after the given number of generations")
public class GenerationTerminator implements InterfaceTerminator, Serializable { public class GenerationTerminator implements InterfaceTerminator, Serializable {
/** /**
* Number of fitness calls on the problem which is optimized * Number of fitness calls on the problem which is optimized
*/ */
protected int m_Generations = 100; protected int maxGenerations = 100;
private String msg = ""; private String msg = "";
@Override @Override
@@ -33,15 +25,11 @@ public class GenerationTerminator implements InterfaceTerminator, Serializable {
msg = "Not terminated."; msg = "Not terminated.";
} }
public static String globalInfo() {
return "Terminate after the given number of generations";
}
public GenerationTerminator() { public GenerationTerminator() {
} }
public GenerationTerminator(int gens) { public GenerationTerminator(int gens) {
m_Generations = gens; maxGenerations = gens;
} }
@Override @Override
@@ -51,8 +39,8 @@ public class GenerationTerminator implements InterfaceTerminator, Serializable {
@Override @Override
public boolean isTerminated(PopulationInterface Pop) { public boolean isTerminated(PopulationInterface Pop) {
if (m_Generations < Pop.getGeneration()) { if (maxGenerations < Pop.getGeneration()) {
msg = m_Generations + " generations reached."; msg = maxGenerations + " generations reached.";
return true; return true;
} }
return false; return false;
@@ -65,16 +53,16 @@ public class GenerationTerminator implements InterfaceTerminator, Serializable {
@Override @Override
public String toString() { public String toString() {
String ret = "Generations calls=" + m_Generations; String ret = "Generations calls=" + maxGenerations;
return ret; return ret;
} }
public void setGenerations(int x) { public void setGenerations(int x) {
m_Generations = x; maxGenerations = x;
} }
public int getGenerations() { public int getGenerations() {
return m_Generations; return maxGenerations;
} }
/** /**

24
src/eva2/optimization/population/Population.java
View File

@@ -323,7 +323,7 @@ public class Population extends ArrayList implements PopulationInterface, Clonea
@Override @Override
public Object clone() { public Object clone() {
return (Object) new Population(this); return new Population(this);
} }
/** /**
@@ -675,17 +675,6 @@ public class Population extends ArrayList implements PopulationInterface, Clonea
return this.functionCallCount; return this.functionCallCount;
} }
/**
* This method set the current number of function calls performed. Use with
* care
*
* @param d The new number of functioncalls.
* @deprecated
*/
public void SetFunctionCalls(int d) {
this.functionCallCount = d;
}
/** /**
* This method set the current number of function calls performed. Use with * This method set the current number of function calls performed. Use with
* care * care
@@ -741,17 +730,6 @@ public class Population extends ArrayList implements PopulationInterface, Clonea
return this.generationCount; return this.generationCount;
} }
/**
* This method sets the generation.
*
* @param gen the value to set as new generation index
* @see setGeneration
* @deprecated
*/
public void setGenerationTo(int gen) {
this.generationCount = gen;
}
/** /**
* This method sets the generation. * This method sets the generation.
* *

8
src/eva2/optimization/strategies/ANPSO.java
View File

@@ -507,8 +507,8 @@ public class ANPSO extends NichePSO implements InterfaceOptimizer, InterfaceAddi
int calls = getMainSwarm().getPopulation().getFunctionCalls(); int calls = getMainSwarm().getPopulation().getFunctionCalls();
getMainSwarm().setPopulation(pop); getMainSwarm().setPopulation(pop);
getMainSwarm().populationSizeHasChanged(); getMainSwarm().populationSizeHasChanged();
getMainSwarm().getPopulation().setGenerationTo(generations); getMainSwarm().getPopulation().setGeneration(generations);
getMainSwarm().getPopulation().SetFunctionCalls(calls); getMainSwarm().getPopulation().setFunctionCalls(calls);
} }
/** /**
@@ -768,7 +768,7 @@ public class ANPSO extends NichePSO implements InterfaceOptimizer, InterfaceAddi
// } // }
// set correct number of generations // set correct number of generations
metapop.setGenerationTo(getMainSwarm().getPopulation().getGeneration()); metapop.setGeneration(getMainSwarm().getPopulation().getGeneration());
// set correct number of function calls // set correct number of function calls
int calls = getMainSwarm().getPopulation().getFunctionCalls(); int calls = getMainSwarm().getPopulation().getFunctionCalls();
@@ -780,7 +780,7 @@ public class ANPSO extends NichePSO implements InterfaceOptimizer, InterfaceAddi
} }
// calls from inactivated subswarms were transfered to the mainswarm, see useAsSubSwarms method // calls from inactivated subswarms were transfered to the mainswarm, see useAsSubSwarms method
metapop.SetFunctionCalls(calls); metapop.setFunctionCalls(calls);
return metapop; return metapop;
} }

2
src/eva2/optimization/strategies/BinaryScatterSearch.java
View File

@@ -806,7 +806,7 @@ public class BinaryScatterSearch implements InterfaceOptimizer, java.io.Serializ
// The events of the interim hill climbing population will be caught here // The events of the interim hill climbing population will be caught here
if (name.compareTo(Population.FUN_CALL_INTERVAL_REACHED) == 0) { if (name.compareTo(Population.FUN_CALL_INTERVAL_REACHED) == 0) {
// set funcalls to real value // set funcalls to real value
refSet.SetFunctionCalls(((Population) source).getFunctionCalls()); refSet.setFunctionCalls(((Population) source).getFunctionCalls());
// System.out.println("FunCallIntervalReached at " + (((Population)source).getFunctionCalls())); // System.out.println("FunCallIntervalReached at " + (((Population)source).getFunctionCalls()));

8
src/eva2/optimization/strategies/ClusterBasedNichingEA.java
View File

@@ -572,7 +572,7 @@ public class ClusterBasedNichingEA implements InterfacePopulationChangedEventLis
System.out.println("-Deme " + i + " size: " + ((Population) this.species.get(i)).size()); System.out.println("-Deme " + i + " size: " + ((Population) this.species.get(i)).size());
} }
curSpecies = ((Population) this.species.get(i)); curSpecies = ((Population) this.species.get(i));
curSpecies.SetFunctionCalls(0); curSpecies.setFunctionCalls(0);
curSpecies.synchSize(); curSpecies.synchSize();
// if (isActive(curSpecies)) { // Lets have only active species... // if (isActive(curSpecies)) { // Lets have only active species...
if ((haltingWindow > 0) && (this.testSpeciesForConvergence(curSpecies))) { if ((haltingWindow > 0) && (this.testSpeciesForConvergence(curSpecies))) {
@@ -969,7 +969,7 @@ public class ClusterBasedNichingEA implements InterfacePopulationChangedEventLis
spec1.SetHistory(spec2.getHistory()); spec1.SetHistory(spec2.getHistory());
} }
if (spec2.getGeneration() > spec1.getGeneration()) { if (spec2.getGeneration() > spec1.getGeneration()) {
spec1.setGenerationTo(spec2.getGeneration()); spec1.setGeneration(spec2.getGeneration());
} }
// possibly notify the optimizer of the merging event to merge population based information // possibly notify the optimizer of the merging event to merge population based information
if (optimizer instanceof InterfaceSpeciesAware) { if (optimizer instanceof InterfaceSpeciesAware) {
@@ -989,10 +989,10 @@ public class ClusterBasedNichingEA implements InterfacePopulationChangedEventLis
newSp.setTargetSize(newSp.size()); newSp.setTargetSize(newSp.size());
newSp.setUseHistory(true); newSp.setUseHistory(true);
if (startAtP1Gen) { // start explicitely as a child population of p1 if (startAtP1Gen) { // start explicitely as a child population of p1
newSp.setGenerationTo(parentSp.getGeneration()); newSp.setGeneration(parentSp.getGeneration());
newSp.SetHistory((LinkedList<AbstractEAIndividual>) parentSp.getHistory().clone()); newSp.SetHistory((LinkedList<AbstractEAIndividual>) parentSp.getHistory().clone());
} else { // start anew (from undiff) } else { // start anew (from undiff)
newSp.setGenerationTo(0); newSp.setGeneration(0);
newSp.SetHistory(new LinkedList<AbstractEAIndividual>()); newSp.SetHistory(new LinkedList<AbstractEAIndividual>());
} }

10
src/eva2/optimization/strategies/ClusteringHillClimbing.java
View File

@@ -212,7 +212,7 @@ public class ClusteringHillClimbing implements InterfacePopulationChangedEventLi
System.out.println("num inds after clusterLS: " + m_Population.size()); System.out.println("num inds after clusterLS: " + m_Population.size());
} }
popD.head().setGenerationTo(m_Population.getGeneration() + 1); popD.head().setGeneration(m_Population.getGeneration() + 1);
if (doReinitialization && (improvement < minImprovement)) { if (doReinitialization && (improvement < minImprovement)) {
if (TRACE) { if (TRACE) {
@@ -229,7 +229,7 @@ public class ClusteringHillClimbing implements InterfacePopulationChangedEventLi
} }
// store results // store results
archive.SetFunctionCalls(m_Population.getFunctionCalls()); archive.setFunctionCalls(m_Population.getFunctionCalls());
archive.addPopulation(m_Population); archive.addPopulation(m_Population);
Population tmpPop = new Population(); Population tmpPop = new Population();
@@ -268,7 +268,7 @@ public class ClusteringHillClimbing implements InterfacePopulationChangedEventLi
// System.out.println("bla"); // System.out.println("bla");
// } // }
// set funcalls to real value // set funcalls to real value
m_Population.SetFunctionCalls(((Population) source).getFunctionCalls()); m_Population.setFunctionCalls(((Population) source).getFunctionCalls());
// System.out.println("FunCallIntervalReached at " + (((Population)source).getFunctionCalls())); // System.out.println("FunCallIntervalReached at " + (((Population)source).getFunctionCalls()));
this.firePropertyChangedEvent(Population.NEXT_GENERATION_PERFORMED); this.firePropertyChangedEvent(Population.NEXT_GENERATION_PERFORMED);
} }
@@ -303,8 +303,8 @@ public class ClusteringHillClimbing implements InterfacePopulationChangedEventLi
Population tmp = new Population(); Population tmp = new Population();
tmp.addPopulation(archive); tmp.addPopulation(archive);
tmp.addPopulation(m_Population); tmp.addPopulation(m_Population);
tmp.SetFunctionCalls(m_Population.getFunctionCalls()); tmp.setFunctionCalls(m_Population.getFunctionCalls());
tmp.setGenerationTo(m_Population.getGeneration()); tmp.setGeneration(m_Population.getGeneration());
// tmp = PostProcessInterim.clusterBest(tmp, sigma, 0, PostProcessInterim.KEEP_LONERS, PostProcessInterim.BEST_ONLY); // tmp = PostProcessInterim.clusterBest(tmp, sigma, 0, PostProcessInterim.KEEP_LONERS, PostProcessInterim.BEST_ONLY);
return new SolutionSet(m_Population, tmp); return new SolutionSet(m_Population, tmp);
} }

8
src/eva2/optimization/strategies/DifferentialEvolution.java
View File

@@ -318,7 +318,6 @@ public class DifferentialEvolution implements InterfaceOptimizer, java.io.Serial
esIndy = (InterfaceDataTypeDouble) indy; esIndy = (InterfaceDataTypeDouble) indy;
} catch (java.lang.ClassCastException e) { } catch (java.lang.ClassCastException e) {
throw new RuntimeException("Differential Evolution currently requires InterfaceESIndividual as basic data type!"); throw new RuntimeException("Differential Evolution currently requires InterfaceESIndividual as basic data type!");
// return (AbstractEAIndividual)((AbstractEAIndividual)pop.get(RNG.randomInt(0, pop.size()-1))).getClone();
} }
double[] nX, vX, oX; double[] nX, vX, oX;
oX = esIndy.getDoubleData(); oX = esIndy.getDoubleData();
@@ -368,9 +367,8 @@ public class DifferentialEvolution implements InterfaceOptimizer, java.io.Serial
parents.add(bestIndy); parents.add(bestIndy);
} // Add best instead of preselected } // Add best instead of preselected
double[] delta1 = this.fetchDeltaRandom(pop); double[] delta1 = this.fetchDeltaRandom(pop);
double[] delta2 = this.fetchDeltaRandom(pop);
for (int i = 0; i < oX.length; i++) { for (int i = 0; i < oX.length; i++) {
vX[i] = oX[i] + this.getCurrentF() * (delta1[i] - delta2[i]); vX[i] = oX[i] + this.getCurrentF() * delta1[i];
} }
break; break;
} }
@@ -383,10 +381,8 @@ public class DifferentialEvolution implements InterfaceOptimizer, java.io.Serial
} // Add best instead of preselected } // Add best instead of preselected
double[] delta1 = this.fetchDeltaRandom(pop); double[] delta1 = this.fetchDeltaRandom(pop);
double[] delta2 = this.fetchDeltaRandom(pop); double[] delta2 = this.fetchDeltaRandom(pop);
double[] delta3 = this.fetchDeltaRandom(pop);
double[] delta4 = this.fetchDeltaRandom(pop);
for (int i = 0; i < oX.length; i++) { for (int i = 0; i < oX.length; i++) {
vX[i] = oX[i] + this.getCurrentF() * (delta1[i] - delta2[i]) + this.getCurrentF() * (delta3[i] - delta4[i]); vX[i] = oX[i] + this.getCurrentF() * delta1[i] + this.getCurrentF() * delta2[i];
} }
break; break;
} }

6
src/eva2/optimization/strategies/EsDpiNiching.java
View File

@@ -704,7 +704,7 @@ public class EsDpiNiching implements InterfaceOptimizer, Serializable, Interface
private void setGeneration(int gen, Population[] pops) { private void setGeneration(int gen, Population[] pops) {
for (int i = 0; i < pops.length; i++) { for (int i = 0; i < pops.length; i++) {
pops[i].setGenerationTo(gen); pops[i].setGeneration(gen);
} }
} }
@@ -924,7 +924,7 @@ public class EsDpiNiching implements InterfaceOptimizer, Serializable, Interface
// (few) duplicates may happen because parents are copied to another peak population // (few) duplicates may happen because parents are copied to another peak population
// if a cluster had a size of 1 AND parents may survive due to elitism. // if a cluster had a size of 1 AND parents may survive due to elitism.
pop.addPopulation(pi, false); pop.addPopulation(pi, false);
// if (i==0) pop.setGenerationTo(pi.getGeneration()); // if (i==0) pop.setGeneration(pi.getGeneration());
// else if (pop.getGeneration()!=pi.getGeneration()) System.err.println("Error, mismatching generation in collectPopulation"); // else if (pop.getGeneration()!=pi.getGeneration()) System.err.println("Error, mismatching generation in collectPopulation");
} }
if (immigrants != null) { if (immigrants != null) {
@@ -1301,7 +1301,7 @@ public class EsDpiNiching implements InterfaceOptimizer, Serializable, Interface
System.err.println("Warning, mismatching population in " + this.getClass().getName()); System.err.println("Warning, mismatching population in " + this.getClass().getName());
} }
if (name.equals(Population.FUN_CALL_INTERVAL_REACHED)) { if (name.equals(Population.FUN_CALL_INTERVAL_REACHED)) {
// getPopulation().SetFunctionCalls(((Population)source).getFunctionCalls()); // this is ugly and I dont know what its for.. possibly if the population instance changes along the GUi? // getPopulation().setFunctionCalls(((Population)source).getFunctionCalls()); // this is ugly and I dont know what its for.. possibly if the population instance changes along the GUi?
this.firePropertyChangedEvent(Population.NEXT_GENERATION_PERFORMED); this.firePropertyChangedEvent(Population.NEXT_GENERATION_PERFORMED);
} else { } else {
// this may come from cloned instances with the same listener - should not happen since they are removed. // this may come from cloned instances with the same listener - should not happen since they are removed.

2
src/eva2/optimization/strategies/EvolutionStrategyIPOP.java
View File

@@ -259,7 +259,7 @@ public class EvolutionStrategyIPOP extends EvolutionStrategies implements Interf
@Override @Override
public void registerPopulationStateChanged(Object source, String name) { public void registerPopulationStateChanged(Object source, String name) {
if (name.equals(Population.FUN_CALL_INTERVAL_REACHED)) { if (name.equals(Population.FUN_CALL_INTERVAL_REACHED)) {
getPopulation().SetFunctionCalls(((Population) source).getFunctionCalls()); // TODO this is ugly getPopulation().setFunctionCalls(((Population) source).getFunctionCalls()); // TODO this is ugly
super.firePropertyChangedEvent(Population.NEXT_GENERATION_PERFORMED); super.firePropertyChangedEvent(Population.NEXT_GENERATION_PERFORMED);
} else { } else {
// System.err.println("Not forwarding event " + name); // System.err.println("Not forwarding event " + name);

8
src/eva2/optimization/strategies/HillClimbing.java
View File

@@ -25,7 +25,7 @@ public class HillClimbing implements InterfaceOptimizer, java.io.Serializable {
private InterfaceOptimizationProblem m_Problem = new B1Problem(); private InterfaceOptimizationProblem m_Problem = new B1Problem();
private InterfaceMutation mutator = null; private InterfaceMutation mutator = null;
// private int m_MultiRuns = 100; // private int m_MultiRuns = 100;
// private int m_FitnessCalls = 100; // private int maxFitnessCalls = 100;
// private int m_FitnessCallsNeeded = 0; // private int m_FitnessCallsNeeded = 0;
// GAIndividualBinaryData m_Best, m_Test; // GAIndividualBinaryData m_Best, m_Test;
// These variables are necessary for the more complex LectureGUI enviroment // These variables are necessary for the more complex LectureGUI enviroment
@@ -158,12 +158,12 @@ public class HillClimbing implements InterfaceOptimizer, java.io.Serializable {
// /** This method will optimize // /** This method will optimize
// */ // */
// public void defaultOptimize() { // public void defaultOptimize() {
// for (int i = 0; i < m_FitnessCalls; i++) { // for (int i = 0; i < maxFitnessCalls; i++) {
// this.m_Test = (GAIndividualBinaryData)((this.m_Best).clone()); // this.m_Test = (GAIndividualBinaryData)((this.m_Best).clone());
// this.m_Test.defaultMutate(); // this.m_Test.defaultMutate();
// if (this.m_Test.defaultEvaulateAsMiniBits() < this.m_Best.defaultEvaulateAsMiniBits()) this.m_Best = this.m_Test; // if (this.m_Test.defaultEvaulateAsMiniBits() < this.m_Best.defaultEvaulateAsMiniBits()) this.m_Best = this.m_Test;
// this.m_FitnessCallsNeeded = i; // this.m_FitnessCallsNeeded = i;
// if (this.m_Best.defaultEvaulateAsMiniBits() == 0) i = this.m_FitnessCalls +1; // if (this.m_Best.defaultEvaulateAsMiniBits() == 0) i = this.maxFitnessCalls +1;
// } // }
// } // }
// /** This main method will start a simple hillclimber. // /** This main method will start a simple hillclimber.
@@ -181,7 +181,7 @@ public class HillClimbing implements InterfaceOptimizer, java.io.Serializable {
// } // }
// TmpMeanCalls = TmpMeanCalls/program.m_MultiRuns; // TmpMeanCalls = TmpMeanCalls/program.m_MultiRuns;
// TmpMeanFitness = TmpMeanFitness/program.m_MultiRuns; // TmpMeanFitness = TmpMeanFitness/program.m_MultiRuns;
// System.out.println("("+program.m_MultiRuns+"/"+program.m_FitnessCalls+") Mean Fitness : " + TmpMeanFitness + " Mean Calls needed: " + TmpMeanCalls); // System.out.println("("+program.m_MultiRuns+"/"+program.maxFitnessCalls+") Mean Fitness : " + TmpMeanFitness + " Mean Calls needed: " + TmpMeanCalls);
// } // }
/** /**

2
src/eva2/optimization/strategies/MemeticAlgorithm.java
View File

@@ -160,7 +160,7 @@ public class MemeticAlgorithm implements InterfaceOptimizer,
} }
} }
// eigentlich muss hier noch subsetsize drauf, aber lassen wir das // eigentlich muss hier noch subsetsize drauf, aber lassen wir das
gop.SetFunctionCalls(gop.getFunctionCalls() gop.setFunctionCalls(gop.getFunctionCalls()
+ (int) Math.round(localSearchSteps * cost * subset.size())); + (int) Math.round(localSearchSteps * cost * subset.size()));
if (TRACE) { if (TRACE) {

2
src/eva2/optimization/strategies/MonteCarloSearch.java
View File

@@ -93,7 +93,7 @@ public class MonteCarloSearch implements InterfaceOptimizer, java.io.Serializabl
m_Population.getEAIndividual(i).defaultInit(null); m_Population.getEAIndividual(i).defaultInit(null);
} }
this.m_Population.SetFunctionCalls(original.getFunctionCalls()); this.m_Population.setFunctionCalls(original.getFunctionCalls());
this.m_Problem.evaluate(this.m_Population); this.m_Problem.evaluate(this.m_Population);
for (int i = 0; i < this.m_Population.size(); i++) { for (int i = 0; i < this.m_Population.size(); i++) {
if (((AbstractEAIndividual) original.get(i)).isDominatingDebConstraints(((AbstractEAIndividual) this.m_Population.get(i)))) { if (((AbstractEAIndividual) original.get(i)).isDominatingDebConstraints(((AbstractEAIndividual) this.m_Population.get(i)))) {

2
src/eva2/optimization/strategies/MultiObjectiveCMAES.java
View File

@@ -233,7 +233,7 @@ public class MultiObjectiveCMAES implements InterfaceOptimizer, Serializable {
// Kinder erzeugen // Kinder erzeugen
Population children = new Population(m_lambdamo * m_lambda); Population children = new Population(m_lambdamo * m_lambda);
children.setGenerationTo(m_Population.getGeneration()); children.setGeneration(m_Population.getGeneration());
for (int j = 0; j < children.getTargetSize(); j++) { for (int j = 0; j < children.getTargetSize(); j++) {
AbstractEAIndividual parent = m_Population.getEAIndividual(j AbstractEAIndividual parent = m_Population.getEAIndividual(j

18
src/eva2/optimization/strategies/NichePSO.java
View File

@@ -241,7 +241,7 @@ public class NichePSO implements InterfaceAdditionalPopulationInformer, Interfac
setMainSwarmSize(mainSwarmSize); // (particles are initialized later via init) setMainSwarmSize(mainSwarmSize); // (particles are initialized later via init)
getMainSwarm().setProblem(m_Problem); getMainSwarm().setProblem(m_Problem);
getMainSwarm().SetMaxAllowedSwarmRadius(maxAllowedSwarmRadius); getMainSwarm().SetMaxAllowedSwarmRadius(maxAllowedSwarmRadius);
getMainSwarm().getPopulation().setGenerationTo(0); getMainSwarm().getPopulation().setGeneration(0);
// choose PSO-type for the mainswarmoptimizer // choose PSO-type for the mainswarmoptimizer
getMainSwarm().setGcpso(false); getMainSwarm().setGcpso(false);
@@ -767,7 +767,7 @@ public class NichePSO implements InterfaceAdditionalPopulationInformer, Interfac
} }
// set correct number of generations // set correct number of generations
metapop.setGenerationTo(getMainSwarm().getPopulation().getGeneration()); metapop.setGeneration(getMainSwarm().getPopulation().getGeneration());
// set correct number of function calls // set correct number of function calls
int calls = getMainSwarm().getPopulation().getFunctionCalls(); int calls = getMainSwarm().getPopulation().getFunctionCalls();
@@ -776,7 +776,7 @@ public class NichePSO implements InterfaceAdditionalPopulationInformer, Interfac
// calls from inactive populations have to be counted as well... // calls from inactive populations have to be counted as well...
calls += currentsubswarm.getPopulation().getFunctionCalls(); calls += currentsubswarm.getPopulation().getFunctionCalls();
} }
metapop.SetFunctionCalls(calls); metapop.setFunctionCalls(calls);
// care for consistent size: // care for consistent size:
metapop.synchSize(); metapop.synchSize();
return metapop; return metapop;
@@ -816,7 +816,7 @@ public class NichePSO implements InterfaceAdditionalPopulationInformer, Interfac
System.out.println("Active populations: " + activeCnt); System.out.println("Active populations: " + activeCnt);
} }
// set correct number of generations // set correct number of generations
metapop.setGenerationTo(getMainSwarm().getPopulation().getGeneration()); metapop.setGeneration(getMainSwarm().getPopulation().getGeneration());
// set correct number of function calls // set correct number of function calls
int calls = getMainSwarm().getPopulation().getFunctionCalls(); int calls = getMainSwarm().getPopulation().getFunctionCalls();
@@ -824,7 +824,7 @@ public class NichePSO implements InterfaceAdditionalPopulationInformer, Interfac
calls += getSubSwarms().get(i).getPopulation().getFunctionCalls(); calls += getSubSwarms().get(i).getPopulation().getFunctionCalls();
} }
// System.out.println("metapop size " + metapop.size()); // System.out.println("metapop size " + metapop.size());
metapop.SetFunctionCalls(calls); metapop.setFunctionCalls(calls);
if (metapop.size() == 0) { if (metapop.size() == 0) {
System.err.println("NichePSO ERROR! " + metapop.getFunctionCalls()); System.err.println("NichePSO ERROR! " + metapop.getFunctionCalls());
@@ -858,8 +858,8 @@ public class NichePSO implements InterfaceAdditionalPopulationInformer, Interfac
if (returnRepresentativeSolutionsOnly) { if (returnRepresentativeSolutionsOnly) {
Population sols = getSubswarmRepresentatives(false); Population sols = getSubswarmRepresentatives(false);
Population metapop = getPopulation(); Population metapop = getPopulation();
sols.SetFunctionCalls(metapop.getFunctionCalls()); sols.setFunctionCalls(metapop.getFunctionCalls());
sols.setGenerationTo(metapop.getGeneration()); sols.setGeneration(metapop.getGeneration());
return new SolutionSet(metapop, sols); return new SolutionSet(metapop, sols);
} else { } else {
Population metapop = getPopulation(); Population metapop = getPopulation();
@@ -869,8 +869,8 @@ public class NichePSO implements InterfaceAdditionalPopulationInformer, Interfac
AbstractEAIndividual pbest = (AbstractEAIndividual) indy.getData("PersonalBestKey"); AbstractEAIndividual pbest = (AbstractEAIndividual) indy.getData("PersonalBestKey");
sols.add(pbest); sols.add(pbest);
} }
sols.SetFunctionCalls(metapop.getFunctionCalls()); sols.setFunctionCalls(metapop.getFunctionCalls());
sols.setGenerationTo(metapop.getFunctionCalls()); sols.setGeneration(metapop.getFunctionCalls());
return new SolutionSet(sols); return new SolutionSet(sols);
} }
} }

2
src/eva2/optimization/strategies/PDDifferentialEvolution.java
View File

@@ -507,7 +507,7 @@ public class PDDifferentialEvolution implements InterfaceOptimizer, java.io.Seri
children.add(indy); children.add(indy);
} }
children.setGenerationTo(m_Population.getGeneration()); children.setGeneration(m_Population.getGeneration());
m_Problem.evaluate(children); m_Problem.evaluate(children);
/** /**

4
src/eva2/optimization/strategies/ParticleFilterOptimization.java
View File

@@ -181,8 +181,8 @@ public class ParticleFilterOptimization implements InterfaceOptimizer, java.io.S
} }
} }
parents.SetFunctionCalls(pop.getFunctionCalls()); parents.setFunctionCalls(pop.getFunctionCalls());
parents.setGenerationTo(pop.getGeneration()); parents.setGeneration(pop.getGeneration());
if (withShow) { if (withShow) {
drawPop(parents, 3, true); drawPop(parents, 3, true);

2
src/eva2/optimization/strategies/ScatterSearch.java
View File

@@ -199,7 +199,7 @@ public class ScatterSearch implements InterfaceOptimizer, java.io.Serializable,
// System.out.println("bla"); // System.out.println("bla");
// } // }
// set funcalls to real value // set funcalls to real value
refSet.SetFunctionCalls(((Population) source).getFunctionCalls()); refSet.setFunctionCalls(((Population) source).getFunctionCalls());
// System.out.println("FunCallIntervalReached at " + (((Population)source).getFunctionCalls())); // System.out.println("FunCallIntervalReached at " + (((Population)source).getFunctionCalls()));

4
src/eva2/optimization/strategies/Tribes.java
View File

@@ -596,8 +596,8 @@ public class Tribes implements InterfaceOptimizer, java.io.Serializable {
TribesPosition tp = iterator.next(); TribesPosition tp = iterator.next();
all.add(positionToExplorer(tp)); all.add(positionToExplorer(tp));
} }
all.SetFunctionCalls(population.getFunctionCalls()); all.setFunctionCalls(population.getFunctionCalls());
all.setGenerationTo(population.getGeneration()); all.setGeneration(population.getGeneration());
//all.addPopulation(pop); //all.addPopulation(pop);
return new SolutionSet(population, all); return new SolutionSet(population, all);
} }

4
src/eva2/optimization/strategies/WingedMultiObjectiveEA.java
View File

@@ -159,7 +159,7 @@ public class WingedMultiObjectiveEA implements InterfaceOptimizer, java.io.Seria
private void communicate() { private void communicate() {
int oldFunctionCalls; int oldFunctionCalls;
this.m_Population.clear(); this.m_Population.clear();
this.m_Population.SetFunctionCalls(0); this.m_Population.setFunctionCalls(0);
Population pop; Population pop;
// first collect all the data // first collect all the data
pop = (Population) this.m_MOOptimizer.getPopulation().clone(); pop = (Population) this.m_MOOptimizer.getPopulation().clone();
@@ -172,7 +172,7 @@ public class WingedMultiObjectiveEA implements InterfaceOptimizer, java.io.Seria
} }
oldFunctionCalls = this.m_Population.getFunctionCalls(); oldFunctionCalls = this.m_Population.getFunctionCalls();
this.m_Problem.evaluate(this.m_Population); this.m_Problem.evaluate(this.m_Population);
this.m_Population.SetFunctionCalls(oldFunctionCalls); this.m_Population.setFunctionCalls(oldFunctionCalls);
this.firePropertyChangedEvent(Population.NEXT_GENERATION_PERFORMED); this.firePropertyChangedEvent(Population.NEXT_GENERATION_PERFORMED);
// double plotValue = (this.problem.getDoublePlotValue(this.population)).doubleValue(); // double plotValue = (this.problem.getDoublePlotValue(this.population)).doubleValue();
// now they are synchronized lets migrate // now they are synchronized lets migrate