Changeset 12808 for branches/PerformanceComparison/HeuristicLab.Optimization.Views/3.3

Timestamp:

07/28/15 14:41:03 (9 years ago)

Author:

abeham

Message:

#2431:

• added ability to plot curves for multiple targets at once
• fixed bug in IndexedDataTableView regarding log-scaling
• added result that counts restarts
• fixed bugs in IRRestarter
• Set LineWidth = 2 in analyzers for chart
• fixed bugs in RLD view

Location:

branches/PerformanceComparison/HeuristicLab.Optimization.Views/3.3/RunCollectionViews

Files:

• RunCollectionRLDView.Designer.cs (modified) (4 diffs)
• RunCollectionRLDView.cs (modified) (9 diffs)

branches/PerformanceComparison/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionRLDView.Designer.cs

@@ -60 +60 @@
       this.budgetsTextBox = new System.Windows.Forms.TextBox();
       this.fixedCostButton = new System.Windows.Forms.Button();
+      this.allOrEachTargetCheckBox = new System.Windows.Forms.CheckBox();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.SuspendLayout();
@@ -139 +140 @@
       this.targetsTextBox.Location = new System.Drawing.Point(69, 57);
       this.targetsTextBox.Name = "targetsTextBox";
-      this.targetsTextBox.Size = new System.Drawing.Size(265, 20);
+      this.targetsTextBox.Size = new System.Drawing.Size(209, 20);
       this.targetsTextBox.TabIndex = 6;
       this.toolTip.SetToolTip(this.targetsTextBox, "The order of the targets is important, first to-hit targets\r\nshould be given firs" +
@@ -213 +214 @@
       this.fixedCostButton.Click += new System.EventHandler(this.fixedCostButton_Click);
       // 
+      // allOrEachTargetCheckBox
+      // 
+      this.allOrEachTargetCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+      this.allOrEachTargetCheckBox.AutoSize = true;
+      this.allOrEachTargetCheckBox.Location = new System.Drawing.Point(298, 59);
+      this.allOrEachTargetCheckBox.Name = "allOrEachTargetCheckBox";
+      this.allOrEachTargetCheckBox.Size = new System.Drawing.Size(36, 17);
+      this.allOrEachTargetCheckBox.TabIndex = 8;
+      this.allOrEachTargetCheckBox.Text = "all";
+      this.allOrEachTargetCheckBox.UseVisualStyleBackColor = true;
+      this.allOrEachTargetCheckBox.CheckedChanged += new System.EventHandler(this.allOrEachTargetCheckBox_CheckedChanged);
+      // 
       // RunCollectionRLDView
       // 
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
+      this.Controls.Add(this.allOrEachTargetCheckBox);
       this.Controls.Add(this.generateTargetsButton);
       this.Controls.Add(this.fixedCostButton);
@@ -254 +268 @@
     private System.Windows.Forms.TextBox budgetsTextBox;
     private System.Windows.Forms.Label budgetsLabel;
+    private System.Windows.Forms.CheckBox allOrEachTargetCheckBox;
   }
 }

branches/PerformanceComparison/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionRLDView.cs

@@ -27 +27 @@
 using HeuristicLab.Analysis;
 using HeuristicLab.Collections;
-using HeuristicLab.Common;
 using HeuristicLab.Core.Views;
 using HeuristicLab.Data;
@@ -55 +54 @@
       InitializeComponent();
       combinedDataTable = new IndexedDataTable<double>("Combined DataTable", "A data table containing the ECDF of each of a number of groups.") {
-        VisualProperties = { YAxisTitle = "Proportion of reached targets" }
+        VisualProperties = {
+          YAxisTitle = "Proportion of reached targets",
+          YAxisMinimumFixedValue = 0, YAxisMinimumAuto = false,
+          YAxisMaximumFixedValue = 1, YAxisMaximumAuto = false
+        }
       };
       viewHost.Content = combinedDataTable;
@@ -179 +182 @@
         if (string.IsNullOrEmpty(table)) return;
         if (levels == null) {
-          var worst = Content.Select(x => ((IndexedDataTable<double>)x.Results[table]).Rows.First().Values.Max(y => y.Item2)).First();
-          var best = Content.Select(x => ((IndexedDataTable<double>)x.Results[table]).Rows.First().Values.Min(y => y.Item2)).Last();
+          var worstMin = Content.Where(x => x.Results.ContainsKey(table)).Select(x => ((IndexedDataTable<double>)x.Results[table]).Rows.First().Values.First().Item2).Min();
+          var worstMax = Content.Where(x => x.Results.ContainsKey(table)).Select(x => ((IndexedDataTable<double>)x.Results[table]).Rows.First().Values.First().Item2).Max();
+          var bestMin = Content.Where(x => x.Results.ContainsKey(table)).Select(x => ((IndexedDataTable<double>)x.Results[table]).Rows.First().Values.Last().Item2).Min();
+          var bestMax = Content.Where(x => x.Results.ContainsKey(table)).Select(x => ((IndexedDataTable<double>)x.Results[table]).Rows.First().Values.Last().Item2).Max();
+          double worst, best;
+          if (Math.Abs(bestMax - worstMin) > Math.Abs(bestMin - worstMax)) {
+            worst = worstMin;
+            best = bestMax;
+          } else {
+            worst = worstMax;
+            best = bestMin;
+          }
           levels = Enumerable.Range(0, 11).Select(x => worst + (x / 10.0) * (best - worst)).ToArray();
           suppressTargetsEvents = true;
@@ -196 +209 @@
         var xAxisTitles = new HashSet<string>();
         foreach (var group in groupedRuns) {
-          var hits = new SortedList<double, int>();
+          var hits = new Dictionary<string, SortedList<double, double>>();
           foreach (var run in group.Item2) {
+            if (!run.Results.ContainsKey(table)) continue;
             var resultsTable = (IndexedDataTable<double>)run.Results[table];
             xAxisTitles.Add(resultsTable.VisualProperties.XAxisTitle);
             var values = resultsTable.Rows.First().Values;
             var maximization = values.First().Item2 < values.Last().Item2;
-            var i = 0;
-            var j = 0;
-            var current = values[j];
-            var prev = Tuple.Create(-1.0, double.NaN);
-            while (i < levels.Length) {
-              if ((double.IsNaN(prev.Item2) || prev.Item2 != current.Item2)
-                  && (maximization && current.Item2 >= levels[i]
-                  || !maximization && current.Item2 <= levels[i])) {
-                if (hits.ContainsKey(current.Item1))
-                  hits[current.Item1]++;
-                else hits[current.Item1] = 1;
-                i++;
-              } else {
-                j++;
-                if (j >= values.Count) break;
-                prev = current;
-                current = values[j];
+            if (allOrEachTargetCheckBox.Checked) {
+              // each
+              foreach (double l in levels) {
+                var key = "-" + l.ToString();
+                if (!hits.ContainsKey(key)) hits.Add(key, new SortedList<double, double>());
+                foreach (var v in values) {
+                  if (maximization && v.Item2 >= l || !maximization && v.Item2 <= l) {
+                    if (hits[key].ContainsKey(v.Item1))
+                      hits[key][v.Item1] += 1.0 / group.Item2.Count;
+                    else hits[key][v.Item1] = 1.0 / group.Item2.Count;
+                    break;
+                  }
+                }
+              }
+            } else {
+              if (!hits.ContainsKey("all")) hits.Add("all", new SortedList<double, double>());
+              // all
+              var i = 0;
+              var j = 0;
+              var current = values[j];
+              var prev = Tuple.Create(-1.0, double.NaN);
+              while (i < levels.Length) {
+                if ((double.IsNaN(prev.Item2) || prev.Item2 != current.Item2)
+                    && (maximization && current.Item2 >= levels[i]
+                        || !maximization && current.Item2 <= levels[i])) {
+                  if (hits["all"].ContainsKey(current.Item1))
+                    hits["all"][current.Item1] += 1.0 / (group.Item2.Count * levels.Length);
+                  else hits["all"][current.Item1] = 1.0 / (group.Item2.Count * levels.Length);
+                  i++;
+                } else {
+                  j++;
+                  if (j >= values.Count) break;
+                  prev = current;
+                  current = values[j];
+                }
               }
             }
           }
-          var row = new IndexedDataRow<double>(group.Item1) { VisualProperties = { ChartType = DataRowVisualProperties.DataRowChartType.StepLine } };
-          var total = 0.0;
-          foreach (var h in hits) {
-            total += h.Value;
-            row.Values.Add(Tuple.Create(h.Key, total / (group.Item2.Count * levels.Length)));
-          }
-          combinedDataTable.Rows.Add(row);
+          foreach (var list in hits) {
+            var row = new IndexedDataRow<double>(group.Item1 + (list.Key != "all" ? list.Key : string.Empty)) {
+              VisualProperties = {
+                ChartType = DataRowVisualProperties.DataRowChartType.StepLine,
+                LineWidth = 2
+              }
+            };
+            var total = 0.0;
+            foreach (var h in list.Value) {
+              total += h.Value;
+              row.Values.Add(Tuple.Create(h.Key, total));
+            }
+            combinedDataTable.Rows.Add(row);
+          }
         }
         combinedDataTable.VisualProperties.XAxisTitle = string.Join(" / ", xAxisTitles);
-        combinedDataTable.VisualProperties.XAxisLogScale = logScalingCheckBox.Checked;
+        combinedDataTable.VisualProperties.XAxisLogScale = combinedDataTable.Rows.Count > 0 && logScalingCheckBox.Checked;
       } finally { ResumeRepaint(true); }
     }
@@ -317 +356 @@
       } else if (Content.Count > 0 && dataTableComboBox.SelectedIndex >= 0) {
         var table = (string)dataTableComboBox.SelectedItem;
-        var worst = Content.Select(x => ((IndexedDataTable<double>)x.Results[table]).Rows.First().Values.Max(y => y.Item2)).First();
-        var best = Content.Select(x => ((IndexedDataTable<double>)x.Results[table]).Rows.First().Values.Min(y => y.Item2)).Last();
+        var worst = Content.Where(x => x.Results.ContainsKey(table)).Select(x => ((IndexedDataTable<double>)x.Results[table]).Rows.First().Values.Max(y => y.Item2)).First();
+        var best = Content.Where(x => x.Results.ContainsKey(table)).Select(x => ((IndexedDataTable<double>)x.Results[table]).Rows.First().Values.Min(y => y.Item2)).Last();
         max = (decimal)Math.Max(best, worst);
         min = (decimal)Math.Min(best, worst);
@@ -332 +371 @@
             levels = maximization ? dialog.Values.Select(x => (double)x).ToArray()
                                   : dialog.Values.Reverse().Select(x => (double)x).ToArray();
+            suppressTargetsEvents = true;
+            targetsTextBox.Text = string.Join(" ; ", levels);
+            suppressTargetsEvents = false;
+
             UpdateRuns();
             SetEnabledStateOfControls();
@@ -342 +385 @@
       var table = (string)dataTableComboBox.SelectedItem;
       foreach (var run in Content) {
+        if (!run.Results.ContainsKey(table)) continue;
         var resultsTable = (IndexedDataTable<double>)run.Results[table];
         var values = resultsTable.Rows.First().Values;
@@ -384 +428 @@
 
       foreach (var run in Content) {
+        if (!run.Results.ContainsKey(table)) continue;
         var resultsTable = (IndexedDataTable<double>)run.Results[table];
         var values = resultsTable.Rows.First().Values;
@@ -403 +448 @@
       }
     }
+
+    private void allOrEachTargetCheckBox_CheckedChanged(object sender, EventArgs e) {
+      var each = allOrEachTargetCheckBox.Checked;
+      allOrEachTargetCheckBox.Text = each ? "each" : "all";
+      UpdateRuns();
+    }
   }
 }