Changeset 14044 for branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Analyzers/CrowdingAnalyzer.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/CrowdingAnalyzer.cs (modified) (3 diffs)

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

@@ -19 +19 @@
  */
 #endregion
+
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -29 +31 @@
   [Item("CrowdingAnalyzer", "The mean crowding distance for each point of the Front (see Multi-Objective Performance Metrics - Shodhganga for more information)")]
   public class CrowdingAnalyzer : MOTFAnalyzer {
-    [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserialization() {
-    }
+
     [StorableConstructor]
     protected CrowdingAnalyzer(bool deserializing) : base(deserializing) { }
-    public CrowdingAnalyzer(CrowdingAnalyzer original, Cloner cloner) : base(original, cloner) {
+    public CrowdingAnalyzer(CrowdingAnalyzer original, Cloner cloner)
+      : base(original, cloner) {
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -40 +41 @@
     }
 
-
-
     public CrowdingAnalyzer() { }
 
-    public override void Analyze(Individual[] individuals, double[][] qualities, ResultCollection results) {
+    public override IOperation Apply() {
+      var results = ResultsParameter.ActualValue;
+      var qualities = QualitiesParameter.ActualValue;
+      var testFunction = TestFunctionParameter.ActualValue;
       int objectives = qualities[0].Length;
-      if (!results.ContainsKey("Crowding")) results.Add(new Result("Crowding", typeof(DoubleValue)));
-      results["Crowding"].Value = new DoubleValue(Crowding.Calculate(qualities, TestFunctionParameter.ActualValue.Bounds(objectives)));
+
+      if (!results.ContainsKey("Crowding")) results.Add(new Result("Crowding", new DoubleValue()));
+      var resultValue = (DoubleValue)results["Crowding"].Value;
+
+      var crowdingDistance = Crowding.Calculate(qualities.Select(x => x.ToArray()), testFunction.Bounds(objectives));
+      resultValue.Value = crowdingDistance;
+
+      return base.Apply();
     }
+
   }
 }