Changeset 14044 for branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Analyzers/MOTFAnalyzer.cs

Timestamp:

07/12/16 18:20:50 (8 years ago)

Author:

mkommend

Message:

#1087: Refactored and improved analyzers for multi-objective test functions.

File:

• branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Analyzers/MOTFAnalyzer.cs (modified) (4 diffs)

branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Analyzers/MOTFAnalyzer.cs

@@ -20 +20 @@
 #endregion
 
-using System.Collections.Generic;
-using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -35 +33 @@
   [StorableClass]
   public abstract class MOTFAnalyzer : SingleSuccessorOperator, IMultiObjectiveTestFunctionAnalyzer {
-
-    public ILookupParameter<IEncoding> EncodingParameter {
-      get { return (ILookupParameter<IEncoding>)Parameters["Encoding"]; }
-    }
+    public bool EnabledByDefault { get { return true; } }
 
     public IScopeTreeLookupParameter<DoubleArray> QualitiesParameter {
@@ -49 +44 @@
 
     public ILookupParameter<IMultiObjectiveTestFunction> TestFunctionParameter {
-      get {
-        return (ILookupParameter<IMultiObjectiveTestFunction>)Parameters["TestFunction"];
-      }
+      get { return (ILookupParameter<IMultiObjectiveTestFunction>)Parameters["TestFunction"]; }
     }
 
     public ILookupParameter<DoubleMatrix> BestKnownFrontParameter {
-      get {
-        return (ILookupParameter<DoubleMatrix>)Parameters["BestKnownFront"];
-      }
+      get { return (ILookupParameter<DoubleMatrix>)Parameters["BestKnownFront"]; }
     }
 
-    protected MOTFAnalyzer(MOTFAnalyzer original, Cloner cloner) : base(original, cloner) {
-    }
+    protected MOTFAnalyzer(MOTFAnalyzer original, Cloner cloner) : base(original, cloner) { }
+
     [StorableConstructor]
     protected MOTFAnalyzer(bool deserializing) : base(deserializing) { }
-    public MOTFAnalyzer() {
-      Parameters.Add(new LookupParameter<IEncoding>("Encoding", "An item that holds the problem's encoding."));
+    protected MOTFAnalyzer() {
       Parameters.Add(new ScopeTreeLookupParameter<DoubleArray>("Qualities", "The qualities of the parameter vector."));
       Parameters.Add(new LookupParameter<ResultCollection>("Results", "The results collection to write to."));
@@ -71 +61 @@
       Parameters.Add(new LookupParameter<DoubleMatrix>("BestKnownFront", "The currently best known Pareto front"));
     }
-    [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserialization() {
-    }
-
-    public bool EnabledByDefault {
-      get { return true; }
-    }
-
-    public override IOperation Apply() {
-      var encoding = EncodingParameter.ActualValue;
-      var results = ResultsParameter.ActualValue;
-
-      IEnumerable<IScope> scopes = new[] { ExecutionContext.Scope };
-      for (var i = 0; i < QualitiesParameter.Depth; i++)
-        scopes = scopes.Select(x => (IEnumerable<IScope>)x.SubScopes).Aggregate((a, b) => a.Concat(b));
-
-      var individuals = scopes.Select(encoding.GetIndividual).ToArray();
-      if (individuals.Length > 0) {
-        Analyze(individuals, QualitiesParameter.ActualValue.Select(x => x.ToArray()).ToArray(), results);
-      }
-      return base.Apply();
-    }
-
-    public abstract void Analyze(Individual[] individuals, double[][] qualities, ResultCollection results);
   }
 }