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

Timestamp:

08/17/15 09:32:01 (9 years ago)

Author:

abeham

Message:

#2431:

• Added label on last data point
• Changed target in cost view to display as ratio to best-known or best found

File:

• branches/PerformanceComparison/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionRLDView.cs (modified) (8 diffs)

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

@@ -526 +526 @@
       var lineStyleCount = 0;
 
+      var maximization = IsMaximization();
+      var targetsPerProblem = (from r in Content
+                               let pd = new ProblemDescription(r).ToString()
+                               let target = r.Parameters.ContainsKey("BestKnownQuality")
+                                && r.Parameters["BestKnownQuality"] is DoubleValue
+                                  ? ((DoubleValue)r.Parameters["BestKnownQuality"]).Value
+                                  : ((IndexedDataTable<double>)r.Results[(string)dataTableComboBox.SelectedItem]).Rows.First().Values.Last().Item2
+                               group target by pd into g
+                               select new { Problem = g.Key, Target = maximization ? g.Max() : g.Min() })
+                              .ToDictionary(x => x.Problem, x => x.Target);
+
       foreach (var group in groupedRuns) {
         var hits = new Dictionary<string, SortedList<double, double>>();
@@ -534 +545 @@
 
             if (eachOrAllBudgetsCheckBox.Checked) {
-              CalculateHitsForEachBudget(hits, resultsTable.Rows.First(), group.Value.Count, group.Key, problem.Value.Item2.Count);
+              CalculateHitsForEachBudget(hits, resultsTable.Rows.First(), maximization, group.Value.Count, group.Key, problem.Value.Item2.Count, targetsPerProblem[problem.Key]);
             } else {
-              CalculateHitsForAllBudgets(hits, resultsTable.Rows.First(), group.Value.Count, group.Key, problem.Value.Item2.Count);
+              CalculateHitsForAllBudgets(hits, resultsTable.Rows.First(), maximization, group.Value.Count, group.Key, problem.Value.Item2.Count, targetsPerProblem[problem.Key]);
             }
           }
@@ -563 +574 @@
       }
 
-      byCostDataTable.VisualProperties.XAxisTitle = "Targets";
+      byCostDataTable.VisualProperties.XAxisTitle = "Targets to Best-Known Ratio";
       byCostDataTable.VisualProperties.XAxisLogScale = byCostDataTable.Rows.Count > 0 && budgetLogScalingCheckBox.Checked;
     }
@@ -588 +599 @@
     }
 
-    private void CalculateHitsForEachBudget(Dictionary<string, SortedList<double, double>> hits, IndexedDataRow<double> row, int groupCount, string groupName, int problemCount) {
+    private void CalculateHitsForEachBudget(Dictionary<string, SortedList<double, double>> hits, IndexedDataRow<double> row, bool maximization, int groupCount, string groupName, int problemCount, double bestTarget) {
       foreach (var b in budgets) {
         var key = groupName + "-" + b;
@@ -597 +608 @@
             // the budget may be too low to achieve any target
             if (prev == null && v.Item1 != b) break;
-            var tgt = (prev == null || v.Item1 == b) ? v.Item2 : prev.Item2;
+            var tgt = ((prev == null || v.Item1 == b) ? v.Item2 : prev.Item2);
+            tgt = maximization ? bestTarget / tgt : tgt / bestTarget;
             if (hits[key].ContainsKey(tgt))
               hits[key][tgt] += 1.0 / (groupCount * problemCount);
@@ -609 +621 @@
     }
 
-    private void CalculateHitsForAllBudgets(Dictionary<string, SortedList<double, double>> hits, IndexedDataRow<double> row, int groupCount, string groupName, int problemCount) {
+    private void CalculateHitsForAllBudgets(Dictionary<string, SortedList<double, double>> hits, IndexedDataRow<double> row, bool maximization, int groupCount, string groupName, int problemCount, double bestTarget) {
       var values = row.Values;
       if (!hits.ContainsKey(groupName)) hits.Add(groupName, new SortedList<double, double>());
@@ -621 +633 @@
           if (prev != null || current.Item1 == budgets[i]) {
             var tgt = (prev == null || current.Item1 == budgets[i]) ? current.Item2 : prev.Item2;
+            tgt = maximization ? bestTarget / tgt : tgt / bestTarget;
             if (!hits[groupName].ContainsKey(tgt)) hits[groupName][tgt] = 0;
             hits[groupName][tgt] += 1.0 / (groupCount * problemCount * budgets.Length);
@@ -631 +644 @@
       }
       var lastTgt = values.Last().Item2;
+      lastTgt = maximization ? bestTarget / lastTgt : lastTgt / bestTarget;
       if (i < budgets.Length && !hits[groupName].ContainsKey(lastTgt)) hits[groupName][lastTgt] = 0;
       while (i < budgets.Length) {