Changeset 13403 for branches/ProblemRefactoring/HeuristicLab.Problems.TestFunctions/3.3/Instances

Timestamp:

11/25/15 23:24:01 (9 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/Instances

Files:

• SOTFData.cs (modified) (1 diff)
• SOTFDataDescriptor.cs (modified) (1 diff)
• SOTFInstanceProvider.cs (modified) (2 diffs)

branches/ProblemRefactoring/HeuristicLab.Problems.TestFunctions/3.3/Instances/SOTFData.cs

@@ -39 +39 @@
     /// The operator used for evaluations
     /// </summary>
-    public ISingleObjectiveTestFunctionProblemEvaluator Evaluator { get; set; }
+    public ISingleObjectiveTestFunction TestFunction { get; set; }
   }
 }

branches/ProblemRefactoring/HeuristicLab.Problems.TestFunctions/3.3/Instances/SOTFDataDescriptor.cs

@@ -24 +24 @@
 namespace HeuristicLab.Problems.TestFunctions {
   internal class SOTFDataDescriptor : IDataDescriptor {
-    public string Name { get { return Evaluator.FunctionName + " Function"; } }
+    public string Name { get { return TestFunction.ItemName + " Function"; } }
 
     public string Description {
-      get { return Evaluator.Description; }
+      get { return TestFunction.Description; }
     }
 
-    internal ISingleObjectiveTestFunctionProblemEvaluator Evaluator { get; set; }
+    internal ISingleObjectiveTestFunction TestFunction { get; set; }
 
-    public SOTFDataDescriptor(ISingleObjectiveTestFunctionProblemEvaluator evaluator) {
-      Evaluator = evaluator;
+    public SOTFDataDescriptor(ISingleObjectiveTestFunction testFunction) {
+      TestFunction = testFunction;
     }
   }

branches/ProblemRefactoring/HeuristicLab.Problems.TestFunctions/3.3/Instances/SOTFInstanceProvider.cs

@@ -45 +45 @@
 
     public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
-      var evaluators = ApplicationManager.Manager.GetInstances<ISingleObjectiveTestFunctionProblemEvaluator>()
+      var evaluators = ApplicationManager.Manager.GetInstances<ISingleObjectiveTestFunction>()
                                                  .OrderBy(x => x.Name);
       return evaluators.Select(x => new SOTFDataDescriptor(x));
@@ -55 +55 @@
         Name = descriptor.Name,
         Description = descriptor.Description,
-        Evaluator = descriptor.Evaluator
+        TestFunction = descriptor.TestFunction
       };
     }