Changeset 9346

Timestamp:

04/09/13 09:15:23 (12 years ago)

Author:

jkarder

Message:

#1696: adapted CustomEvaluator to changes of r9345

Location:

branches/FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/TestFunctions

Files:

• CustomAdditiveMoveEvaluator.cs (modified) (1 diff)
• CustomEvaluator.cs (modified) (1 diff)

branches/FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/TestFunctions/CustomAdditiveMoveEvaluator.cs

@@ -56 +56 @@
       var eval = EvaluatorParameter.ActualValue as CustomEvaluator;
       if (eval != null)
-        return eval.Evaluate(vector);
+        return eval.EvaluateFunction(vector);
       throw new InvalidOperationException("evaluator is not a custom evaluator");
     }

branches/FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/TestFunctions/CustomEvaluator.cs

@@ -64 +64 @@
     }
 
-    public double Evaluate(RealVector point) {
-      return EvaluateFunction(point);
-    }
-
-    protected override double EvaluateFunction(RealVector point) {
+    public override double EvaluateFunction(RealVector point) {
       if (point[0] < 0 || point[1] < 0)
         return 0;