Changeset 14085

Timestamp:

07/15/16 14:14:50 (8 years ago)

Author:

mkommend

Message:

#1087: Further refactoring of testfunction problem and analyzers.

Location:

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

Files:

• Analyzers/CrowdingAnalyzer.cs (modified) (3 diffs)
• Analyzers/GenerationalDistanceAnalyzer.cs (modified) (1 diff)
• Analyzers/HypervolumeAnalyzer.cs (modified) (5 diffs)
• Analyzers/InvertedGenerationalDistanceAnalyzer.cs (modified) (1 diff)
• Interfaces/IMultiObjectiveTestFunction.cs (modified) (1 diff)
• MultiObjectiveTestFunctionProblem.cs (modified) (6 diffs)
• NonDominatedSelect.cs (modified) (1 diff)
• Testfunctions/MultiObjectiveTestFunction.cs (modified) (1 diff)

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

@@ -25 +25 @@
 using HeuristicLab.Data;
 using HeuristicLab.Optimization;
+using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -31 +32 @@
   [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 {
+
+    public ILookupParameter<DoubleMatrix> BoundsParameter {
+      get { return (ILookupParameter<DoubleMatrix>)Parameters["Bounds"]; }
+    }
 
     [StorableConstructor]
@@ -41 +46 @@
     }
 
-    public CrowdingAnalyzer() { }
+    public CrowdingAnalyzer() {
+      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."));
+    }
 
     public override IOperation Apply() {
       var results = ResultsParameter.ActualValue;
       var qualities = QualitiesParameter.ActualValue;
-      var testFunction = TestFunctionParameter.ActualValue;
-      int objectives = qualities[0].Length;
+      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()), testFunction.Bounds(objectives));
+      var crowdingDistance = Crowding.Calculate(qualities.Select(x => x.ToArray()), bounds.CloneAsMatrix());
       resultValue.Value = crowdingDistance;
 

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

@@ -65 +65 @@
       var resultValue = (DoubleValue)results["GenerationalDistance"].Value;
 
-      var distance = GenerationalDistance.Calculate(qualities.Select(x => x.ToArray()), optimalfront, Dampening);
+      var distance = GenerationalDistance.Calculate(qualities.Select(x => x.CloneAsArray()), optimalfront, Dampening);
       resultValue.Value = distance;
 

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

@@ -34 +34 @@
   public class HypervolumeAnalyzer : MOTFAnalyzer {
 
-    public IValueParameter<DoubleArray> ReferencePointParameter {
-      get { return (IValueParameter<DoubleArray>)Parameters["ReferencePoint"]; }
+    public ILookupParameter<DoubleArray> ReferencePointParameter {
+      get { return (ILookupParameter<DoubleArray>)Parameters["ReferencePoint"]; }
     }
 
@@ -49 +49 @@
     [StorableConstructor]
     protected HypervolumeAnalyzer(bool deserializing) : base(deserializing) { }
-    [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserialization() {
-      RegisterEventHandlers();
-    }
 
     protected HypervolumeAnalyzer(HypervolumeAnalyzer original, Cloner cloner)
       : base(original, cloner) {
-      RegisterEventHandlers();
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -63 +58 @@
 
     public HypervolumeAnalyzer() {
-      Parameters.Add(new ValueParameter<DoubleArray>("ReferencePoint", "The reference point for hypervolume calculation"));
+      Parameters.Add(new LookupParameter<DoubleArray>("ReferencePoint", "The reference point for hypervolume calculation"));
       Parameters.Add(new FixedValueParameter<DoubleValue>("BestKnownHyperVolume", "The currently best known hypervolume", new DoubleValue(0)));
-
-      RegisterEventHandlers();
-    }
-
-    private void RegisterEventHandlers() {
-      ReferencePointParameter.ValueChanged += (o, e) => BestKnownHyperVolume = 0;
     }
 
@@ -77 +66 @@
       var qualities = QualitiesParameter.ActualValue;
       var testFunction = TestFunctionParameter.ActualValue;
+      var referencePoint = ReferencePointParameter.ActualValue;
       int objectives = qualities[0].Length;
+
+
 
       if (!results.ContainsKey("Hypervolume")) results.Add(new Result("Hypervolume", typeof(DoubleValue)));
@@ -93 +85 @@
       IEnumerable<double[]> front = NonDominatedSelect.SelectNonDominatedVectors(qualities.Select(q => q.ToArray()), testFunction.Maximization(objectives), true);
 
-      double hv = front.Any() ? Hypervolume.Calculate(front, testFunction.ReferencePoint(objectives), testFunction.Maximization(objectives)) : 0;
+      double hv = front.Any() ? Hypervolume.Calculate(front, referencePoint.CloneAsArray(), testFunction.Maximization(objectives)) : 0;
 
 

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

@@ -60 +60 @@
       int objectives = qualities[0].Length;
 
-      var optimalfront = TestFunctionParameter.ActualValue.OptimalParetoFront(objectives);
+      var optimalfront = testFunction.OptimalParetoFront(objectives);
       if (optimalfront == null) return base.Apply();
 

branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Interfaces/IMultiObjectiveTestFunction.cs

@@ -31 +31 @@
     bool[] Maximization(int objectives);
     double[,] Bounds(int objectives);
+
     IEnumerable<double[]> OptimalParetoFront(int objectives);
+    double OptimalHypervolume(int objectives);
     double[] ReferencePoint(int objectives);
-    double BestKnownHypervolume(int objectives);
 
     int MinimumSolutionLength { get; }

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

@@ -65 +65 @@
     public override bool[] Maximization {
       get {
-        //necessary because of virtual member call in base ctor to this property
-        if (!Parameters.ContainsKey("TestFunction")) return new bool[2];
-        return TestFunction.Maximization(Objectives);
+        if (!Parameters.ContainsKey("Maximization")) return new bool[2];
+        return MaximizationParameter.Value.ToArray();
       }
     }
@@ -87 +86 @@
       set { TestFunctionParameter.Value = value; }
     }
-    public IEnumerable<double[]> BestKnownFront {
-      get { return Parameters.ContainsKey("BestKnownFront") ? TestFunction.OptimalParetoFront(Objectives) : null; }
+    public DoubleArray ReferencePoint {
+      get { return ReferencePointParameter.Value; }
+      set { ReferencePointParameter.Value = value; }
+    }
+    public DoubleMatrix BestKnownFront {
+      get { return BestKnownFrontParameter.Value; }
+      set { BestKnownFrontParameter.Value = value; }
     }
     #endregion
@@ -112 +116 @@
       Parameters.Add(new FixedValueParameter<IntValue>("Objectives", "The dimensionality of the solution vector (number of objectives).", new IntValue(2)));
       Parameters.Add(new ValueParameter<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.", new DoubleMatrix(new double[,] { { -4, 4 } })));
+      Parameters.Add(new ValueParameter<DoubleArray>("ReferencePoint", "The reference point used for hypervolume calculation."));
       Parameters.Add(new ValueParameter<IMultiObjectiveTestFunction>("TestFunction", "The function that is to be optimized.", new Fonseca()));
       Parameters.Add(new ValueParameter<DoubleMatrix>("BestKnownFront", "The currently best known Pareto front"));
@@ -165 +170 @@
     #region Events
     private void UpdateParameterValues() {
-      MaximizationParameter.ActualValue = (BoolArray)new BoolArray(Maximization).AsReadOnly();
-      var front = BestKnownFront;
-      if (front != null) { BestKnownFrontParameter.Value = (DoubleMatrix)new DoubleMatrix(To2D(front.ToArray())).AsReadOnly(); }
-
+      MaximizationParameter.Value = (BoolArray)new BoolArray(TestFunction.Maximization(Objectives)).AsReadOnly();
+
+      var front = TestFunction.OptimalParetoFront(Objectives);
+      if (front != null) {
+        BestKnownFrontParameter.Value = (DoubleMatrix)new DoubleMatrix(To2D(front.ToArray())).AsReadOnly();
+      } else BestKnownFrontParameter.Value = null;
+
+
+      BoundsParameter.Value = new DoubleMatrix(TestFunction.Bounds(Objectives));
+      ReferencePointParameter.Value = new DoubleArray(TestFunction.ReferencePoint(Objectives));
     }
 
@@ -186 +197 @@
       Objectives = Math.Max(TestFunction.MinimumObjectives, Math.Min(Objectives, TestFunction.MaximumObjectives));
 
-      Bounds = (DoubleMatrix)new DoubleMatrix(TestFunction.Bounds(Objectives)).Clone();
       ParameterizeAnalyzers();
       UpdateParameterValues();
@@ -228 +238 @@
         analyzer.BestKnownFrontParameter.ActualName = BestKnownFrontParameter.Name;
 
+        var crowdingAnalyzer = analyzer as CrowdingAnalyzer;
+        if (crowdingAnalyzer != null) {
+          crowdingAnalyzer.BoundsParameter.ActualName = BoundsParameter.Name;
+        }
+
         var hyperVolumeAnalyzer = analyzer as HypervolumeAnalyzer;
         if (hyperVolumeAnalyzer != null) {
-          hyperVolumeAnalyzer.ReferencePointParameter.Value = new DoubleArray(TestFunction.ReferencePoint(Objectives));
-          hyperVolumeAnalyzer.BestKnownHyperVolume = TestFunction.BestKnownHypervolume(Objectives);
+          hyperVolumeAnalyzer.ReferencePointParameter.ActualName = ReferencePointParameter.Name;
+          hyperVolumeAnalyzer.BestKnownHyperVolume = TestFunction.OptimalHypervolume(Objectives);
         }
 

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

@@ -24 +24 @@
 namespace HeuristicLab.Problems.MultiObjectiveTestFunctions {
 
-  public class NonDominatedSelect {
+  public static class NonDominatedSelect {
     public enum DominationResult { Dominates, IsDominated, IsNonDominated };
 

branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Testfunctions/MultiObjectiveTestFunction.cs

@@ -105 +105 @@
     /// returns the best known Hypervolume for this test function   (default=-1) 
     /// </summary>     
-    public virtual double BestKnownHypervolume(int objectives) {
+    public virtual double OptimalHypervolume(int objectives) {
       CheckObjectives(objectives);
       return GetBestKnownHypervolume(objectives);