Changeset 14108 for branches

Timestamp:

07/19/16 13:46:15 (8 years ago)

Author:

mkommend

Message:

#1087: Fixed bugs in Spacing and Hypervolume calculation, corrected plugin dependencies and minor changes to the scatter plot view.

Location:

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

Files:

• Analyzers/HypervolumeAnalyzer.cs (modified) (2 diffs)
• Analyzers/InvertedGenerationalDistanceAnalyzer.cs (modified) (1 diff)
• Analyzers/MOTFAnalyzer.cs (modified) (1 diff)
• Calculators/Spacing.cs (modified) (1 diff)
• Plugin.cs.frame (modified) (1 diff)
• Views/MOFrontScatterPlotView.cs (modified) (4 diffs)

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

@@ -50 +50 @@
 
     [StorableConstructor]
-    protected HypervolumeAnalyzer(bool deserializing) : base(deserializing) {
+    protected HypervolumeAnalyzer(bool deserializing)
+      : base(deserializing) {
     }
 
@@ -87 +88 @@
       double hv = Hypervolume.Calculate(front, referencePoint.ToArray(), testFunction.Maximization(objectives));
 
-      if (!double.IsNaN(hv) || best < hv) {
+      if (hv > best) {
         best = hv;
       }

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

@@ -32 +32 @@
   [Item("InvertedGenerationalDistanceAnalyzer", "The inverted generational distance between the current and the best known front (see Multi-Objective Performance Metrics - Shodhganga for more information)")]
   public class InvertedGenerationalDistanceAnalyzer : MOTFAnalyzer {
-
+    public override bool EnabledByDefault { get { return false; } }
 
     private IFixedValueParameter<DoubleValue> DampeningParameter {

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

@@ -33 +33 @@
   [StorableClass]
   public abstract class MOTFAnalyzer : SingleSuccessorOperator, IMultiObjectiveTestFunctionAnalyzer {
-    public bool EnabledByDefault { get { return true; } }
+    public virtual bool EnabledByDefault { get { return true; } }
 
     public IScopeTreeLookupParameter<DoubleArray> QualitiesParameter {

branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Calculators/Spacing.cs

@@ -37 +37 @@
       if (!front.Any()) throw new ArgumentException("Front must  not be empty.");
 
-      List<double> d = new List<double>();
-      foreach (double[] r in front) {
+      var points = front.ToList();
+      var d = new List<double>();
+
+      foreach (double[] r in points) {
         var point = r;
-        var otherPoints = front.Where(p => p != point).DefaultIfEmpty(point);
+        var otherPoints = points.Where(p => p != point).DefaultIfEmpty(point);
         double dist = Utilities.MinimumDistance(point, otherPoints);
         d.Add(dist);

branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Plugin.cs.frame

@@ -27 +27 @@
   [PluginDependency("HeuristicLab.Collections", "3.3")] 
   [PluginDependency("HeuristicLab.Common", "3.3")]
-  [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
   [PluginDependency("HeuristicLab.Core", "3.3")]  
   [PluginDependency("HeuristicLab.Data", "3.3")]

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

@@ -20 +20 @@
 #endregion
 using System;
-using System.Data;
 using System.Drawing;
 using System.Linq;
@@ -47 +46 @@
 
     public MOQualitiesScatterPlotView()
-        : base() {
+      : base() {
       InitializeComponent();
 
@@ -57 +56 @@
       this.chart.TextAntiAliasingQuality = TextAntiAliasingQuality.High;
       this.chart.AxisViewChanged += new EventHandler<System.Windows.Forms.DataVisualization.Charting.ViewEventArgs>(chart_AxisViewChanged);
+      this.chart.GetToolTipText += new System.EventHandler<ToolTipEventArgs>(this.Chart_GetToolTipText);
 
       //configure axis 
@@ -72 +72 @@
     }
 
-    protected override void RegisterContentEvents() {
-      base.RegisterContentEvents();
-      this.chart.GetToolTipText += new System.EventHandler<ToolTipEventArgs>(this.Chart_GetToolTipText);
-    }
-
-    protected override void DeregisterContentEvents() {
-      base.DeregisterContentEvents();
-      this.chart.GetToolTipText -= new System.EventHandler<ToolTipEventArgs>(this.Chart_GetToolTipText);
-    }
 
     private void Chart_GetToolTipText(object sender, ToolTipEventArgs e) {