Changeset 14085 for branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Analyzers/CrowdingAnalyzer.cs

Timestamp:

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

Author:

mkommend

Message:

#1087: Further refactoring of testfunction problem and analyzers.

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

@@ -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;