Changeset 12834

Timestamp:

08/03/15 23:33:19 (9 years ago)

Author:

abeham

Message:

#2431: Changed analyzer to always output last value (even if quality is equal)

Location:

branches/PerformanceComparison/HeuristicLab.Analysis/3.3/QualityAnalysis

Files:

• QualityPerClockAnalyzer.cs (modified) (1 diff)
• QualityPerEvaluationsAnalyzer.cs (modified) (1 diff)

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

@@ -79 +79 @@
       var values = dataTable.Rows["First-hit Graph"].Values;
 
-      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 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;
+      var now = DateTime.UtcNow;
+      var runtimeSoFar = (now - lastUpdateTime.Value).TotalSeconds + (values.Count > 0 ? values.Last().Item1 : 0);
+      lastUpdateTime.Value = now;
+      var newEntry = Tuple.Create(runtimeSoFar, bestQuality);
+
+      if (values.Count == 0) {
+        values.Add(newEntry);
+        values.Add(Tuple.Create(runtimeSoFar, bestQuality)); // duplicate entry that will be replaced
+        return base.Apply();
+      }
+
+      var improvement = values.Last().Item2 != bestQuality;
+      if (improvement) {
+        values[values.Count - 1] = newEntry;
+        values.Add(Tuple.Create(runtimeSoFar, bestQuality)); // duplicate entry that will be replaced
+      } else {
+        values[values.Count - 1] = Tuple.Create(runtimeSoFar, bestQuality);
       }
       return base.Apply();

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

@@ -91 +91 @@
       var values = dataTable.Rows["First-hit Graph"].Values;
       if (evaluations == 0 || values.Count > 0 && evaluations < values.Last().Item1) evaluations = 1;
-      if (values.Count == 0 || values.Last().Item2 != bestQuality)
-        values.Add(Tuple.Create((double)evaluations, bestQuality));
+      var newEntry = Tuple.Create(evaluations, bestQuality);
 
+      if (values.Count == 0) {
+        values.Add(newEntry);
+        values.Add(Tuple.Create(evaluations, bestQuality)); // duplicate entry that will be replaced
+        return base.Apply();
+      }
+
+      var improvement = values.Last().Item2 != bestQuality;
+      if (improvement) {
+        values[values.Count - 1] = newEntry;
+        values.Add(Tuple.Create(evaluations, bestQuality)); // duplicate entry that will be replaced
+      } else {
+        values[values.Count - 1] = Tuple.Create(evaluations, bestQuality);
+      }
       return base.Apply();
     }