Changeset 16103 for branches/1614_GeneralizedQAP

Timestamp:

08/30/18 09:49:33 (6 years ago)

Author:

abeham

Message:

#1614: the exclusion of runs leads to somewhat unexpected results

File:

• branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/QualityAnalysis/ExpectedRuntimeHelper.cs (modified) (3 diffs)

branches/1614_GeneralizedQAP/HeuristicLab.Analysis/3.3/QualityAnalysis/ExpectedRuntimeHelper.cs

@@ -1 @@
-using HeuristicLab.Common;
-using HeuristicLab.Optimization;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+using HeuristicLab.Optimization;
 
 namespace HeuristicLab.Analysis {
@@ -11 +10 @@
       var successful = new List<double>();
       var unsuccessful = new List<double>();
+
       foreach (var graph in convGraphs) {
         var targetAchieved = false;
@@ -28 +28 @@
 
       var nRuns = successful.Count + unsuccessful.Count;
-      if (successful.Count > 0) {
-        var succAvg = successful.Average();
-        var succDev = successful.StandardDeviation() + 1e-7;
-        successful.RemoveAll(x => x < succAvg - 2 * succDev);
-        unsuccessful.RemoveAll(x => x < succAvg - 2 * succDev);
-        nRuns = successful.Count + unsuccessful.Count;
-
-        ert = successful.Average() / (successful.Count / (double)nRuns);
-      }
+      if (successful.Count > 0)
+        ert = (successful.Average() * nRuns) / successful.Count;
       return new ErtCalculationResult(successful.Count, nRuns, ert);
     }