Changeset 3450 for trunk/sources/HeuristicLab.Problems.TestFunctions/3.3

Timestamp:

04/20/10 18:53:14 (14 years ago)

Author:

abeham

Message:

Changed handling of strategy parameters and renamed operators in realvector #890, #932, #934

Location:

trunk/sources/HeuristicLab.Problems.TestFunctions/3.3

Files:

• Evaluators/AckleyEvaluator.cs (modified) (3 diffs)
• MoveEvaluators/RealVectorAdditiveMoveWrapper.cs (modified) (1 diff)
• SingleObjectiveTestFunctionProblem.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/AckleyEvaluator.cs

@@ -72 +72 @@
     /// <returns>The result value of the Ackley function at the given point.</returns>
     public static double Apply(RealVector point) {
-      double result = 20 + Math.E;
+      double result;
       double val;
 
@@ -80 +80 @@
       val /= point.Length;
       val = -0.2 * Math.Sqrt(val);
-      result -= 20 * Math.Exp(val);
+      result = 20 - 20 * Math.Exp(val);
 
       val = 0;
@@ -86 +86 @@
         val += Math.Cos(2 * Math.PI * point[i]);
       val /= point.Length;
-      result -= Math.Exp(val);
+      result += Math.E - Math.Exp(val);
       return (result);
     }

trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/MoveEvaluators/RealVectorAdditiveMoveWrapper.cs

@@ -31 +31 @@
     private RealVector vector;
 
+    public RealVectorAdditiveMoveWrapper() {
+      dimension = -1;
+      moveDistance = 0;
+      this.vector = new RealVector();
+    }
+
     public RealVectorAdditiveMoveWrapper(AdditiveMove move, RealVector vector) {
       dimension = move.Dimension;

trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionProblem.cs

@@ -40 +40 @@
   public sealed class SingleObjectiveTestFunctionProblem : ParameterizedNamedItem, ISingleObjectiveProblem {
     [Storable]
-    private StrategyVectorCreator strategyVectorCreator;
+    private StdDevStrategyVectorCreator strategyVectorCreator;
     [Storable]
-    private StrategyVectorCrossover strategyVectorCrossover;
+    private StdDevStrategyVectorCrossover strategyVectorCrossover;
     [Storable]
-    private StrategyVectorManipulator strategyVectorManipulator;
+    private StdDevStrategyVectorManipulator strategyVectorManipulator;
 
     public override Image ItemImage {
@@ -151 +151 @@
       Parameters.Add(new OptionalValueParameter<DoubleValue>("BestKnownQuality", "The quality of the best known solution of this TSP instance.", new DoubleValue(evaluator.BestKnownQuality)));
 
-      strategyVectorCreator = new StrategyVectorCreator();
+      strategyVectorCreator = new StdDevStrategyVectorCreator();
       strategyVectorCreator.LengthParameter.ActualName = ProblemSizeParameter.Name;
-      strategyVectorCrossover = new StrategyVectorCrossover();
-      strategyVectorManipulator = new StrategyVectorManipulator();
+      strategyVectorCrossover = new StdDevStrategyVectorCrossover();
+      strategyVectorManipulator = new StdDevStrategyVectorManipulator();
+      strategyVectorManipulator.LearningRateParameter.Value = new DoubleValue(0.5);
+      strategyVectorManipulator.GeneralLearningRateParameter.Value = new DoubleValue(0.5);
 
       creator.RealVectorParameter.ActualName = "Point";