Changeset 13757 for branches/PerformanceComparison/HeuristicLab.Analysis

Timestamp:

04/13/16 16:25:12 (9 years ago)

Author:

abeham

Message:

#2547:

• worked on problem instance mapping
• started working on improved suggestion algorithm

File:

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

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

@@ -1 @@
-using System.Collections.Generic;
+using HeuristicLab.Optimization;
+using System;
+using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using HeuristicLab.Optimization;
 
 namespace HeuristicLab.Analysis {
   public static class ExpectedRuntimeHelper {
-    public static ErtCalculationResult CalculateErt(List<IRun> runs, string indexedDataTableName, double target, bool maximization) {
+    public static ErtCalculationResult CalculateErt(IEnumerable<IEnumerable<Tuple<double, double>>> convGraphs, double target, bool maximization) {
       var successful = new List<double>();
       var unsuccessful = new List<double>();
-      foreach (var r in runs) {
+      foreach (var graph in convGraphs) {
         var targetAchieved = false;
-        var row = ((IndexedDataTable<double>)r.Results[indexedDataTableName]).Rows.First();
-        foreach (var v in row.Values) {
+        var lastEffort = double.MaxValue;
+        foreach (var v in graph) {
           if (maximization && v.Item2 >= target || !maximization && v.Item2 <= target) {
             successful.Add(v.Item1);
@@ -18 +19 @@
             break;
           }
+          lastEffort = v.Item1;
         }
-        if (!targetAchieved) unsuccessful.Add(row.Values.Last().Item1);
+        if (!targetAchieved) unsuccessful.Add(lastEffort);
       }
 
@@ -32 +34 @@
       }
       return new ErtCalculationResult(successful.Count, (successful.Count + unsuccessful.Count), ert);
+    }
+
+    public static ErtCalculationResult CalculateErt(List<IRun> runs, string indexedDataTableName, double target, bool maximization) {
+      return CalculateErt(runs.Select(r => ((IndexedDataTable<double>)r.Results[indexedDataTableName]).Rows.First().Values), target, maximization);
     }
   }