Changeset 16310 for branches/2943_MOBasicProblem_MOCMAES/HeuristicLab.Analysis/3.3/MultiObjective/MultiObjectiveSuccessAnalyzer.cs

Timestamp:

11/20/18 14:53:51 (5 years ago)

Author:

bwerth

Message:

#2943 worked on MOBasicProblem and MOAnalyzers

Location:

branches/2943_MOBasicProblem_MOCMAES/HeuristicLab.Analysis

Files:

• . (modified) (1 prop)
• 3.3/MultiObjective/MultiObjectiveSuccessAnalyzer.cs (copied) (copied from branches/2943_MOBasicProblem_MOCMAES/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/Analyzers/MOTFAnalyzer.cs) (1 diff)

branches/2943_MOBasicProblem_MOCMAES/HeuristicLab.Analysis/3.3/MultiObjective/MultiObjectiveSuccessAnalyzer.cs

@@ -29 +29 @@
 
 
-namespace HeuristicLab.Problems.TestFunctions.MultiObjective {
+namespace HeuristicLab.Analysis {
 
   [StorableClass]
-  public abstract class MOTFAnalyzer : SingleSuccessorOperator, IMultiObjectiveTestFunctionAnalyzer {
-    public virtual bool EnabledByDefault { get { return true; } }
+  public abstract class MultiObjectiveSuccessAnalyzer : SingleSuccessorOperator, IAnalyzer, IMultiObjectiveOperator {
+    public virtual bool EnabledByDefault => true;
+    public abstract string ResultName { get; }
 
-    public IScopeTreeLookupParameter<DoubleArray> QualitiesParameter {
-      get { return (IScopeTreeLookupParameter<DoubleArray>)Parameters["Qualities"]; }
-    }
+    public IScopeTreeLookupParameter<DoubleArray> QualitiesParameter => (IScopeTreeLookupParameter<DoubleArray>)Parameters["Qualities"];
 
-    public ILookupParameter<ResultCollection> ResultsParameter {
-      get { return (ILookupParameter<ResultCollection>)Parameters["Results"]; }
-    }
+    public ILookupParameter<BoolArray> MaximizationParameter => (ILookupParameter<BoolArray>)Parameters["Maximization"];
 
-    public ILookupParameter<IMultiObjectiveTestFunction> TestFunctionParameter {
-      get { return (ILookupParameter<IMultiObjectiveTestFunction>)Parameters["TestFunction"]; }
-    }
+    public ResultParameter<DoubleValue> ResultParameter => (ResultParameter<DoubleValue>)Parameters[ResultName];
 
-    public ILookupParameter<DoubleMatrix> BestKnownFrontParameter {
-      get { return (ILookupParameter<DoubleMatrix>)Parameters["BestKnownFront"]; }
-    }
-
-    protected MOTFAnalyzer(MOTFAnalyzer original, Cloner cloner) : base(original, cloner) { }
-
+    protected MultiObjectiveSuccessAnalyzer(MultiObjectiveSuccessAnalyzer original, Cloner cloner) : base(original, cloner) { }
     [StorableConstructor]
-    protected MOTFAnalyzer(bool deserializing) : base(deserializing) { }
-    protected MOTFAnalyzer() {
+    protected MultiObjectiveSuccessAnalyzer(bool deserializing) : base(deserializing) { }
+    protected MultiObjectiveSuccessAnalyzer() {
       Parameters.Add(new ScopeTreeLookupParameter<DoubleArray>("Qualities", "The qualities of the parameter vector."));
-      Parameters.Add(new LookupParameter<ResultCollection>("Results", "The results collection to write to."));
-      Parameters.Add(new LookupParameter<IMultiObjectiveTestFunction>("TestFunction", "The Testfunction that is analyzed"));
       Parameters.Add(new LookupParameter<DoubleMatrix>("BestKnownFront", "The currently best known Pareto front"));
+      Parameters.Add(new LookupParameter<BoolArray>("Maximization", ""));
     }
   }