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

Update to simple strategies

Browse Source
This commit is contained in:
Marcel Kronfeld 2011-05-04 11:49:56 +00:00
parent 886d3fd0e4
commit 6bfc19b0fb
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/eva2/server/go/strategies/GradientDescentAlgorithm.java
View File

@ -38,10 +38,10 @@ public class GradientDescentAlgorithm implements InterfaceOptimizer, java.io.Ser
boolean globalStepSizeAdaption = false; boolean globalStepSizeAdaption = false;
private double globalinitstepsize = 1; private double globalinitstepsize = 1;
double globalmaxstepsize = 3.0; double globalmaxstepsize = 3.0;
double globalminstepsize = 0.0001; double globalminstepsize = 1e-10;
boolean manhattan = false; boolean manhattan = false;
double localmaxstepsize = 10; double localmaxstepsize = 10;
double localminstepsize = 0.0001; double localminstepsize = 1e-10;
private boolean momentumterm = false; private boolean momentumterm = false;
transient private InterfacePopulationChangedEventListener m_Listener; transient private InterfacePopulationChangedEventListener m_Listener;
public double maximumabsolutechange = 0.2; public double maximumabsolutechange = 0.2;

9
src/eva2/server/go/strategies/HillClimbing.java
View File

@ -86,10 +86,11 @@ public class HillClimbing implements InterfaceOptimizer, java.io.Serializable {
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)))) {
this.m_Population.remove(i); // this.m_Population.remove(i);
this.m_Population.add(i, original.get(i)); // throw away mutated one and replace by old one
this.m_Population.set(i, original.get(i));
} else { } else {
// else: mutation improved the individual // else: mutation improved the individual, so leave the new one
} }
} }
this.m_Population.incrGeneration(); this.m_Population.incrGeneration();
@ -233,7 +234,7 @@ public class HillClimbing implements InterfaceOptimizer, java.io.Serializable {
* @return The name of the algorithm * @return The name of the algorithm
*/ */
public String getName() { public String getName() {
return "MS-HC"; return "MS-HC"+getIdentifier();
} }
public Population getPopulation() { public Population getPopulation() {
return this.m_Population; return this.m_Population;