Changeset 12774

Timestamp:

07/17/15 12:34:45 (9 years ago)

Author:

abeham

Message:

#2431: minor improvements

Location:

branches/PerformanceComparison

Files:

• HeuristicLab.Analysis/3.3/QualityAnalysis/QualityPerClockAnalyzer.cs (modified) (2 diffs)
• HeuristicLab.Analysis/3.3/QualityAnalysis/QualityPerEvaluationsAnalyzer.cs (modified) (2 diffs)
• HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionECDFView.cs (modified) (3 diffs)

branches/PerformanceComparison/HeuristicLab.Analysis/3.3/QualityAnalysis/QualityPerClockAnalyzer.cs

@@ -21 +21 @@
 
 using System;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -74 +75 @@
 
     public override IOperation Apply() {
-      var executionTime = Math.Max(ExecutionTimeParameter.ResultValue.Value.TotalSeconds, 0.001);
+      var executionTime = Math.Max(ExecutionTimeParameter.ResultValue.Value.TotalSeconds, 0.2);
       var bestQuality = BestQualityParameter.ActualValue.Value;
 
       var dataTable = QualityPerClockParameter.ResultValue;
-      dataTable.Rows["First-hit Graph"].Values.Add(Tuple.Create(executionTime, bestQuality));
+      var values = dataTable.Rows["First-hit Graph"].Values;
+      if (values.Count == 0 || values.Last().Item2 != bestQuality)
+        dataTable.Rows["First-hit Graph"].Values.Add(Tuple.Create(executionTime, bestQuality));
 
       return base.Apply();

branches/PerformanceComparison/HeuristicLab.Analysis/3.3/QualityAnalysis/QualityPerEvaluationsAnalyzer.cs

@@ -21 +21 @@
 
 using System;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -76 +77 @@
 
       var dataTable = QualityPerEvaluationsParameter.ResultValue;
-      dataTable.Rows["First-hit Graph"].Values.Add(Tuple.Create((double)evaluations, bestQuality));
+      var values = dataTable.Rows["First-hit Graph"].Values;
+      if (values.Count == 0 || values.Last().Item2 != bestQuality)
+        values.Add(Tuple.Create((double)evaluations, bestQuality));
 
       return base.Apply();

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

@@ -163 +163 @@
       SuspendRepaint();
       try {
+        combinedDataTable.VisualProperties.XAxisLogScale = false;
         combinedDataTable.Rows.Clear();
         var table = (string)dataTableComboBox.SelectedItem;
@@ -211 +212 @@
           foreach (var h in hits) {
             total += h.Value;
-            row.Values.Add(Tuple.Create(Math.Max(1, h.Key), total / (group.Item2.Count * levels.Length)));
+            row.Values.Add(Tuple.Create(h.Key, total / (group.Item2.Count * levels.Length)));
           }
           combinedDataTable.Rows.Add(row);
         }
         combinedDataTable.VisualProperties.XAxisTitle = string.Join(" / ", xAxisTitles);
+        combinedDataTable.VisualProperties.XAxisLogScale = logScalingCheckBox.Checked;
       } finally { ResumeRepaint(true); }
     }
@@ -222 +224 @@
       string selectedItem = (string)groupComboBox.SelectedItem;
 
-      var groupings = Content.ParameterNames.ToArray();
+      var groupings = Content.ParameterNames.OrderBy(x => x).ToArray();
       groupComboBox.Items.Clear();
       groupComboBox.Items.Add(AllRuns);