Changeset 14097 for branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Analyzers/GenerationalDistanceAnalyzer.cs

Timestamp:

07/18/16 15:50:10 (8 years ago)

Author:

bwerth

Message:

#1087 refactored Analyzers to use ResultParameters

File:

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

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

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Linq;
 using HeuristicLab.Common;
@@ -43 +44 @@
     }
 
+    public IResultParameter<DoubleValue> GenerationalDistanceResultParameter {
+      get { return (IResultParameter<DoubleValue>)Parameters["Generational Distance"]; }
+    }
+
     [StorableConstructor]
     protected GenerationalDistanceAnalyzer(bool deserializing) : base(deserializing) { }
@@ -52 +57 @@
     public GenerationalDistanceAnalyzer() {
       Parameters.Add(new FixedValueParameter<DoubleValue>("Dampening", "", new DoubleValue(1)));
+      Parameters.Add(new ResultParameter<DoubleValue>("Generational Distance", "The genrational distance between the current front and the optimal front"));
+      GenerationalDistanceResultParameter.DefaultValue = new DoubleValue(double.NaN);
+
     }
 
     public override IOperation Apply() {
-      var results = ResultsParameter.ActualValue;
       var qualities = QualitiesParameter.ActualValue;
       int objectives = qualities[0].Length;
@@ -62 +69 @@
       if (optimalfront == null) return base.Apply();
 
-      if (!results.ContainsKey("GenerationalDistance")) results.Add(new Result("GenerationalDistance", new DoubleValue()));
-      var resultValue = (DoubleValue)results["GenerationalDistance"].Value;
-
       var distance = GenerationalDistance.Calculate(qualities.Select(x => x.CloneAsArray()), optimalfront, Dampening);
-      resultValue.Value = distance;
+      GenerationalDistanceResultParameter.ActualValue.Value = distance;
 
       return base.Apply();