Index: branches/ProblemRefactoring/HeuristicLab.Problems.TestFunctions/3.3/Functions/SingleObjectiveTestFunction.cs
===================================================================
--- branches/ProblemRefactoring/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SingleObjectiveTestFunctionProblemEvaluator.cs (revision 13331)
+++ branches/ProblemRefactoring/HeuristicLab.Problems.TestFunctions/3.3/Functions/SingleObjectiveTestFunction.cs (revision 13403)
@@ -24,6 +24,4 @@
using HeuristicLab.Data;
using HeuristicLab.Encodings.RealVectorEncoding;
-using HeuristicLab.Operators;
-using HeuristicLab.Parameters;
using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -32,11 +30,7 @@
/// Base class for a test function evaluator.
///
- [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 {
- ///
- /// The name of the function
- ///
- public abstract string FunctionName { get; }
+ public abstract class SingleObjectiveTestFunction : ParameterizedNamedItem, ISingleObjectiveTestFunction {
///
/// These operators should not change their name through the GUI
@@ -66,30 +60,8 @@
public abstract int MaximumProblemSize { get; }
- public ILookupParameter QualityParameter {
- get { return (ILookupParameter)Parameters["Quality"]; }
- }
- public ILookupParameter PointParameter {
- get { return (ILookupParameter)Parameters["Point"]; }
- }
-
[StorableConstructor]
- protected SingleObjectiveTestFunctionProblemEvaluator(bool deserializing) : base(deserializing) { }
- protected SingleObjectiveTestFunctionProblemEvaluator(SingleObjectiveTestFunctionProblemEvaluator original, Cloner cloner) : base(original, cloner) { }
- ///
- /// Initializes a new instance of with two parameters
- /// (Quality and Point).
- ///
- public SingleObjectiveTestFunctionProblemEvaluator()
- : base() {
- Parameters.Add(new LookupParameter("Quality", "Result of the evaluation of a solution."));
- Parameters.Add(new LookupParameter("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) {