Changeset 14097 for branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3

Timestamp:

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

Author:

bwerth

Message:

#1087 refactored Analyzers to use ResultParameters

Location:

branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3

Files:

• Analyzers/CrowdingAnalyzer.cs (modified) (2 diffs)
• Analyzers/GenerationalDistanceAnalyzer.cs (modified) (4 diffs)
• Analyzers/HypervolumeAnalyzer.cs (modified) (4 diffs)
• Analyzers/InvertedGenerationalDistanceAnalyzer.cs (modified) (3 diffs)
• Analyzers/ScatterPlotAnalyzer.cs (modified) (3 diffs)
• Analyzers/SpacingAnalyzer.cs (modified) (2 diffs)
• HeuristicLab.Problems.MultiObjectiveTestFunctions-3.3.csproj (modified) (1 diff)
• MultiObjectiveTestFunctionProblem.cs (modified) (2 diffs)
• Utilities.cs (moved) (moved from branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Calculators/Utilities.cs) (2 diffs)
• Views/ScatterPlotContent.cs (modified) (5 diffs)

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

@@ -37 +37 @@
     }
 
+    public IResultParameter<DoubleValue> CrowdingResultParameter {
+      get { return (IResultParameter<DoubleValue>)Parameters["Crowding"]; }
+    }
+
     [StorableConstructor]
     protected CrowdingAnalyzer(bool deserializing) : base(deserializing) { }
@@ -49 +53 @@
       Parameters.Add(new LookupParameter<DoubleMatrix>("Bounds",
         "The bounds of the solution given as either one line for all variables or a line for each variable. The first column specifies lower bound, the second upper bound."));
+      Parameters.Add(new ResultParameter<DoubleValue>("Crowding", "The average corwding value of all points (excluding infinities)"));
+      CrowdingResultParameter.DefaultValue = new DoubleValue(double.NaN);
+
     }
 
     public override IOperation Apply() {
-      var results = ResultsParameter.ActualValue;
       var qualities = QualitiesParameter.ActualValue;
       var bounds = BoundsParameter.ActualValue;
 
-      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()), bounds.CloneAsMatrix());
-      resultValue.Value = crowdingDistance;
+      CrowdingResultParameter.ActualValue.Value = crowdingDistance;
 
       return base.Apply();

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();

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

@@ -38 +38 @@
       get { return (ILookupParameter<DoubleArray>)Parameters["ReferencePoint"]; }
     }
+    public IResultParameter<DoubleValue> HypervolumeResultParameter {
+      get { return (IResultParameter<DoubleValue>)Parameters["Hypervolume"]; }
+    }
+    public IResultParameter<DoubleValue> BestKnownHypervolumeResultParameter {
+      get { return (IResultParameter<DoubleValue>)Parameters["Best known hypervolume"]; }
+    }
+    public IResultParameter<DoubleValue> HypervolumeDistanceResultParameter {
+      get { return (IResultParameter<DoubleValue>)Parameters["Absolute Distance to BestKnownHypervolume"]; }
+    }
+
 
     [StorableConstructor]
@@ -52 +62 @@
     public HypervolumeAnalyzer() {
       Parameters.Add(new LookupParameter<DoubleArray>("ReferencePoint", "The reference point for hypervolume calculation"));
+      Parameters.Add(new ResultParameter<DoubleValue>("Hypervolume", "The hypervolume of the current generation"));
+      Parameters.Add(new ResultParameter<DoubleValue>("Best known hypervolume", "The optimal hypervolume"));
+      Parameters.Add(new ResultParameter<DoubleValue>("Absolute Distance to BestKnownHypervolume", "The difference between the best known and the current hypervolume"));
+      HypervolumeResultParameter.DefaultValue = new DoubleValue(0);
+      BestKnownHypervolumeResultParameter.DefaultValue = new DoubleValue(0);
+      HypervolumeDistanceResultParameter.DefaultValue = new DoubleValue(0);
+
+
     }
 
     public override IOperation Apply() {
-      var results = ResultsParameter.ActualValue;
       var qualities = QualitiesParameter.ActualValue;
       var testFunction = TestFunctionParameter.ActualValue;
@@ -61 +78 @@
       var referencePoint = ReferencePointParameter.ActualValue;
 
-      if (!results.ContainsKey("Hypervolume")) results.Add(new Result("Hypervolume", new DoubleValue(0)));
-      if (!results.ContainsKey("Absolute Distance to BestKnownHypervolume")) results.Add(new Result("Absolute Distance to BestKnownHypervolume", new DoubleValue(0)));
-
-      double best = testFunction.OptimalHypervolume(objectives);
-      if (!results.ContainsKey("BestKnownHypervolume")) {
-        results.Add(new Result("BestKnownHypervolume", new DoubleValue(0)));
-      } else {
-        best = Math.Max(best, ((DoubleValue)(results["BestKnownHypervolume"].Value)).Value);
+      double best = BestKnownHypervolumeResultParameter.ActualValue.Value;
+      if (referencePoint.SequenceEqual(testFunction.ReferencePoint(objectives))) {
+        best = Math.Max(best, testFunction.OptimalHypervolume(objectives));
       }
-
 
       IEnumerable<double[]> front = NonDominatedSelect.SelectNonDominatedVectors(qualities.Select(q => q.ToArray()), testFunction.Maximization(objectives), true);
@@ -76 +87 @@
       double hv = Hypervolume.Calculate(front, referencePoint.ToArray(), testFunction.Maximization(objectives));
 
-      if (double.IsNaN(best) || best < hv) {
+      if (!double.IsNaN(hv) || best < hv) {
         best = hv;
-        BestKnownFrontParameter.ActualValue = new DoubleMatrix(MultiObjectiveTestFunctionProblem.To2D(qualities.Select(q => q.ToArray()).ToArray()));
       }
 
-      ((DoubleValue)(results["Hypervolume"].Value)).Value = hv;
-      ((DoubleValue)(results["BestKnownHypervolume"].Value)).Value = best;
-      ((DoubleValue)(results["Absolute Distance to BestKnownHypervolume"].Value)).Value = best - hv;
+      HypervolumeResultParameter.ActualValue.Value = hv;
+      BestKnownHypervolumeResultParameter.ActualValue.Value = best;
+      HypervolumeDistanceResultParameter.ActualValue.Value = best - hv;
 
       return base.Apply();

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

@@ -43 +43 @@
     }
 
+    public IResultParameter<DoubleValue> InvertedGenerationalDistanceResultParameter {
+      get { return (IResultParameter<DoubleValue>)Parameters["Inverted Generational Distance"]; }
+    }
+
     public InvertedGenerationalDistanceAnalyzer() {
       Parameters.Add(new FixedValueParameter<DoubleValue>("Dampening", "", new DoubleValue(1)));
+      Parameters.Add(new ResultParameter<DoubleValue>("Inverted Generational Distance", "The genrational distance between the current front and the optimal front"));
+      InvertedGenerationalDistanceResultParameter.DefaultValue = new DoubleValue(double.NaN);
+
     }
+
 
     [StorableConstructor]
@@ -55 +63 @@
 
     public override IOperation Apply() {
-      var results = ResultsParameter.ActualValue;
       var qualities = QualitiesParameter.ActualValue;
       var testFunction = TestFunctionParameter.ActualValue;
@@ -63 +70 @@
       if (optimalfront == null) return base.Apply();
 
-      if (!results.ContainsKey("InvertedGenerationalDistance")) results.Add(new Result("InvertedGenerationalDistance", new DoubleValue(double.NaN)));
-      var resultValue = (DoubleValue)results["InvertedGenerationalDistance"].Value;
-
       var invertedGenerationalDistance = InvertedGenerationalDistance.Calculate(qualities.Select(q => q.ToArray()), optimalfront, DampeningParameter.Value.Value);
-      resultValue.Value = invertedGenerationalDistance;
+      InvertedGenerationalDistanceResultParameter.ActualValue.Value = invertedGenerationalDistance;
 
       return base.Apply();

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

@@ -37 +37 @@
     }
 
+    public IResultParameter<ScatterPlotContent> ScatterPlotResultParameter {
+      get { return (IResultParameter<ScatterPlotContent>)Parameters["Scatterplot"]; }
+    }
+
+
     [StorableConstructor]
     protected ScatterPlotAnalyzer(bool deserializing) : base(deserializing) { }
@@ -46 +51 @@
     public ScatterPlotAnalyzer() {
       Parameters.Add(new ScopeTreeLookupParameter<RealVector>("Individuals", "The individual solutions to the problem"));
+      Parameters.Add(new ResultParameter<ScatterPlotContent>("Scatterplot", "The scatterplot for the current and optimal (if known front)"));
+
     }
 
     public override IOperation Apply() {
-      var results = ResultsParameter.ActualValue;
       var qualities = QualitiesParameter.ActualValue;
       var testFunction = TestFunctionParameter.ActualValue;
       int objectives = qualities[0].Length;
       var individuals = IndividualsParameter.ActualValue;
-
-      if (!results.ContainsKey("Scatterplot")) {
-        results.Add(new Result("Scatterplot", typeof(ScatterPlotContent)));
-      }
 
       double[][] optimalFront = new double[0][];
@@ -66 +68 @@
       var solutionClones = individuals.Select(s => s.ToArray()).ToArray();
 
-      results["Scatterplot"].Value = new ScatterPlotContent(qualityClones, solutionClones, optimalFront, objectives);
+      ScatterPlotResultParameter.ActualValue = new ScatterPlotContent(qualityClones, solutionClones, optimalFront, objectives);
 
       return base.Apply();

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

@@ -31 +31 @@
   [Item("SpacingAnalyzer", "The spacing of the current front (see Multi-Objective Performance Metrics - Shodhganga for more information)")]
   public class SpacingAnalyzer : MOTFAnalyzer {
+
+    public IResultParameter<DoubleValue> SpacingResultParameter {
+      get { return (IResultParameter<DoubleValue>)Parameters["Spacing"]; }
+    }
     [StorableConstructor]
     protected SpacingAnalyzer(bool deserializing) : base(deserializing) { }
+
 
     protected SpacingAnalyzer(SpacingAnalyzer original, Cloner cloner) : base(original, cloner) { }
@@ -39 +44 @@
     }
 
-    public SpacingAnalyzer() { }
+    public SpacingAnalyzer() {
+      Parameters.Add(new ResultParameter<DoubleValue>("Spacing", "The spacing of the current front"));
+      SpacingResultParameter.DefaultValue = new DoubleValue(double.NaN);
+    }
 
     public override IOperation Apply() {
-      var results = ResultsParameter.ActualValue;
       var qualities = QualitiesParameter.ActualValue;
-
-      if (!results.ContainsKey("Spacing")) results.Add(new Result("Spacing", new DoubleValue(0)));
-      var resultValue = (DoubleValue)results["Spacing"].Value;
-
       var spacing = Spacing.Calculate(qualities.Select(q => q.ToArray()));
-      resultValue.Value = spacing;
+      SpacingResultParameter.ActualValue.Value = spacing;
 
       return base.Apply();

branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/HeuristicLab.Problems.MultiObjectiveTestFunctions-3.3.csproj

@@ -161 +161 @@
     <Compile Include="Calculators\InvertedGenerationalDistance.cs" />
     <Compile Include="Calculators\GenerationalDistance.cs" />
-    <Compile Include="Calculators\Utilities.cs" />
+    <Compile Include="Utilities.cs" />
     <Compile Include="Instances\MISCInstanceProvider.cs" />
     <Compile Include="Instances\ZDTInstanceProvider.cs" />

branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/MultiObjectiveTestFunctionProblem.cs

@@ -174 +174 @@
       var front = TestFunction.OptimalParetoFront(Objectives);
       if (front != null) {
-        BestKnownFrontParameter.Value = (DoubleMatrix)new DoubleMatrix(To2D(front.ToArray())).AsReadOnly();
+        BestKnownFrontParameter.Value = (DoubleMatrix)Utilities.ToMatrix(front).AsReadOnly();
       } else BestKnownFrontParameter.Value = null;
 
@@ -249 +249 @@
     }
 
-    public static T[,] To2D<T>(T[][] source) {
-      try {
-        int firstDimension = source.Length;
-        int secondDimension = source.GroupBy(row => row.Length).Single().Key; // throws InvalidOperationException if source is not rectangular
-
-        var result = new T[firstDimension, secondDimension];
-        for (int i = 0; i < firstDimension; ++i)
-          for (int j = 0; j < secondDimension; ++j)
-            result[i, j] = source[i][j];
-
-        return result;
-      }
-      catch (InvalidOperationException) {
-        throw new InvalidOperationException("The given jagged array is not rectangular.");
-      }
-    }
-
     #endregion
   }

branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Utilities.cs

@@ -22 +22 @@
 using System.Collections.Generic;
 using System.Linq;
+using HeuristicLab.Data;
 
 namespace HeuristicLab.Problems.MultiObjectiveTestFunctions {
@@ -44 +45 @@
     }
 
+    internal static DoubleMatrix ToMatrix(IEnumerable<double[]> source) {
+      try {
+        int firstDimension = source.Count();
+        int secondDimension = source.GroupBy(row => row.Length).Single().Key; // throws InvalidOperationException if source is not rectangular
+
+        var result = new DoubleMatrix(firstDimension, secondDimension);
+        var enumarator = source.GetEnumerator();
+        for (int i = 0; i < firstDimension && enumarator.MoveNext(); ++i)
+          for (int j = 0; j < secondDimension; ++j)
+            result[i, j] = enumarator.Current[j];
+        return result;
+      }
+      catch (InvalidOperationException) {
+        throw new InvalidOperationException("The given jagged array is not rectangular.");
+      }
+    }
+
     internal class DimensionComparer : IComparer<double[]> {
       private readonly int dim;

branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Views/ScatterPlotContent.cs

@@ -28 +28 @@
 namespace HeuristicLab.Problems.MultiObjectiveTestFunctions {
   [StorableClass]
+  [Item("ScatterPlot", "The optimal front, current front and its associated Points in the searchspace")]
   public class ScatterPlotContent : Item {
 
@@ -37 +38 @@
       }
 
-      set {
+      private set {
         qualities = value;
       }
@@ -49 +50 @@
       }
 
-      set {
+      private set {
         objectives = value;
       }
@@ -61 +62 @@
       }
 
-      set {
+      private set {
         solutions = value;
       }
@@ -73 +74 @@
       }
 
-      set {
+      private set {
         paretoFront = value;
       }