From 6bfc19b0fb6b264904181fab7bf97b9a6669738e Mon Sep 17 00:00:00 2001 From: Marcel Kronfeld Date: Wed, 4 May 2011 11:49:56 +0000 Subject: [PATCH] Update to simple strategies --- .../server/go/strategies/GradientDescentAlgorithm.java | 4 ++-- src/eva2/server/go/strategies/HillClimbing.java | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/eva2/server/go/strategies/GradientDescentAlgorithm.java b/src/eva2/server/go/strategies/GradientDescentAlgorithm.java index 4d7786cf..5dff23b3 100644 --- a/src/eva2/server/go/strategies/GradientDescentAlgorithm.java +++ b/src/eva2/server/go/strategies/GradientDescentAlgorithm.java @@ -38,10 +38,10 @@ public class GradientDescentAlgorithm implements InterfaceOptimizer, java.io.Ser boolean globalStepSizeAdaption = false; private double globalinitstepsize = 1; double globalmaxstepsize = 3.0; - double globalminstepsize = 0.0001; + double globalminstepsize = 1e-10; boolean manhattan = false; double localmaxstepsize = 10; - double localminstepsize = 0.0001; + double localminstepsize = 1e-10; private boolean momentumterm = false; transient private InterfacePopulationChangedEventListener m_Listener; public double maximumabsolutechange = 0.2; diff --git a/src/eva2/server/go/strategies/HillClimbing.java b/src/eva2/server/go/strategies/HillClimbing.java index e5b859cb..6fe86a76 100644 --- a/src/eva2/server/go/strategies/HillClimbing.java +++ b/src/eva2/server/go/strategies/HillClimbing.java @@ -86,10 +86,11 @@ public class HillClimbing implements InterfaceOptimizer, java.io.Serializable { this.m_Problem.evaluate(this.m_Population); for (int i = 0; i < this.m_Population.size(); i++) { if (((AbstractEAIndividual)original.get(i)).isDominatingDebConstraints(((AbstractEAIndividual)this.m_Population.get(i)))) { - this.m_Population.remove(i); - this.m_Population.add(i, original.get(i)); +// this.m_Population.remove(i); + // throw away mutated one and replace by old one + this.m_Population.set(i, original.get(i)); } else { - // else: mutation improved the individual + // else: mutation improved the individual, so leave the new one } } this.m_Population.incrGeneration(); @@ -233,7 +234,7 @@ public class HillClimbing implements InterfaceOptimizer, java.io.Serializable { * @return The name of the algorithm */ public String getName() { - return "MS-HC"; + return "MS-HC"+getIdentifier(); } public Population getPopulation() { return this.m_Population;