Changeset 12804 for branches/PerformanceComparison/HeuristicLab.Analysis/3.3/QualityAnalysis/QualityPerClockAnalyzer.cs

Timestamp:

07/26/15 21:32:52 (9 years ago)

Author:

abeham

Message:

#2431:

• worked on IRRRun (early abort still troublesome)
• Updated RLD view to allow defining targets
• Attempting to handle maximization/minimization

File:

• branches/PerformanceComparison/HeuristicLab.Analysis/3.3/QualityAnalysis/QualityPerClockAnalyzer.cs (modified) (1 diff)

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

@@ -75 +75 @@
 
     public override IOperation Apply() {
-      var lastUpdateTime = LastUpdateTimeParameter.ActualValue;
-      if (lastUpdateTime == null) {
-        lastUpdateTime = new DateTimeValue(DateTime.UtcNow.AddMilliseconds(-1));
-        LastUpdateTimeParameter.ActualValue = lastUpdateTime;
-      }
-      var now = DateTime.UtcNow;
-
       var bestQuality = BestQualityParameter.ActualValue.Value;
-
       var dataTable = QualityPerClockParameter.ResultValue;
       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((now - lastUpdateTime.Value).TotalSeconds, bestQuality));
 
-      lastUpdateTime.Value = now;
+      if (values.Count == 0 || values.Last().Item2 != bestQuality) {
+        var lastUpdateTime = LastUpdateTimeParameter.ActualValue;
+        if (lastUpdateTime == null) {
+          lastUpdateTime = new DateTimeValue(DateTime.UtcNow.AddMilliseconds(-1));
+          LastUpdateTimeParameter.ActualValue = lastUpdateTime;
+        }
+
+        var now = DateTime.UtcNow;
+        var runtimeSoFar = (now - lastUpdateTime.Value).TotalSeconds + (values.Count > 0 ? values.Last().Item1 : 0);
+        dataTable.Rows["First-hit Graph"].Values.Add(Tuple.Create(runtimeSoFar, bestQuality));
+        lastUpdateTime.Value = now;
+      }
       return base.Apply();
     }