Changeset 13403 for branches/ProblemRefactoring/HeuristicLab.Problems.TestFunctions/3.3/Functions/SingleObjectiveTestFunction.cs

Timestamp:

11/25/15 23:24:01 (8 years ago)

Author:

abeham

Message:

#2521:

• Adapted single-objective test function problem to new problem infrastructure
• Added additional interfaces to RealVectorEncoding
• Fixed IParticleUpdater interface (must implement IStochasticOperator if it contains a Random parameter)

Location:

branches/ProblemRefactoring/HeuristicLab.Problems.TestFunctions/3.3/Functions

Files:

• . (moved) (moved from branches/ProblemRefactoring/HeuristicLab.Problems.TestFunctions/3.3/Evaluators)
• SingleObjectiveTestFunction.cs (copied) (copied from branches/ProblemRefactoring/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SingleObjectiveTestFunctionProblemEvaluator.cs) (3 diffs)

branches/ProblemRefactoring/HeuristicLab.Problems.TestFunctions/3.3/Functions/SingleObjectiveTestFunction.cs

@@ -24 +24 @@
 using HeuristicLab.Data;
 using HeuristicLab.Encodings.RealVectorEncoding;
-using HeuristicLab.Operators;
-using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -32 +30 @@
   /// Base class for a test function evaluator.
   /// </summary>
-  [Item("Evaluator", "Base calls for single objective test function evaluators.")]
+  [Item("Single-Objective Function", "Base class for single objective functions.")]
   [StorableClass]
-  public abstract class SingleObjectiveTestFunctionProblemEvaluator : InstrumentedOperator, ISingleObjectiveTestFunctionProblemEvaluator {
-    /// <summary>
-    /// The name of the function
-    /// </summary>
-    public abstract string FunctionName { get; }
+  public abstract class SingleObjectiveTestFunction : ParameterizedNamedItem, ISingleObjectiveTestFunction {
     /// <summary>
     /// These operators should not change their name through the GUI
@@ -66 +60 @@
     public abstract int MaximumProblemSize { get; }
 
-    public ILookupParameter<DoubleValue> QualityParameter {
-      get { return (ILookupParameter<DoubleValue>)Parameters["Quality"]; }
-    }
-    public ILookupParameter<RealVector> PointParameter {
-      get { return (ILookupParameter<RealVector>)Parameters["Point"]; }
-    }
-
     [StorableConstructor]
-    protected SingleObjectiveTestFunctionProblemEvaluator(bool deserializing) : base(deserializing) { }
-    protected SingleObjectiveTestFunctionProblemEvaluator(SingleObjectiveTestFunctionProblemEvaluator original, Cloner cloner) : base(original, cloner) { }
-    /// <summary>
-    /// Initializes a new instance of <see cref="SingleObjectiveTestFunctionEvaluator"/> with two parameters
-    /// (<c>Quality</c> and <c>Point</c>).
-    /// </summary>
-    public SingleObjectiveTestFunctionProblemEvaluator()
-      : base() {
-      Parameters.Add(new LookupParameter<DoubleValue>("Quality", "Result of the evaluation of a solution."));
-      Parameters.Add(new LookupParameter<RealVector>("Point", "The point at which the function should be evaluated."));
-    }
-
-    public override IOperation InstrumentedApply() {
-      RealVector point = PointParameter.ActualValue;
-      double quality = Evaluate(point);
-      QualityParameter.ActualValue = new DoubleValue(quality);
-      return base.InstrumentedApply();
-    }
+    protected SingleObjectiveTestFunction(bool deserializing) : base(deserializing) { }
+    protected SingleObjectiveTestFunction(SingleObjectiveTestFunction original, Cloner cloner) : base(original, cloner) { }
+    protected SingleObjectiveTestFunction() : base() { }
 
     public virtual double Evaluate2D(double x, double y) {