Changeset 13794 for branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem.Common/3.3/Recommenders/OverallBestRecommender.cs

Timestamp:

04/26/16 00:02:05 (8 years ago)

Author:

abeham

Message:

#2457: worked on recommendation algorithms (x-validation)

File:

• branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem.Common/3.3/Recommenders/OverallBestRecommender.cs (modified) (3 diffs)

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem.Common/3.3/Recommenders/OverallBestRecommender.cs

@@ -49 +49 @@
 
     public IRecommendationModel TrainModel(IRun[] problemInstances, KnowledgeCenter kc, string[] characteristics) {
-      var instances = new List<Tuple<IAlgorithm, double>>();
+      var instances = new List<KeyValuePair<IAlgorithm, double>>();
       foreach (var relevantRuns in kc.GetKnowledgeBaseByAlgorithm()) {
         var algorithm = relevantRuns.Key;
@@ -60 +60 @@
         var count = 0;
         foreach (var problemRuns in relevantRuns.Value.GroupBy(x => ((StringValue)x.Parameters["Problem Name"]).Value)) {
-          var bkq = pis[problemRuns.Key];
+          double bkq;
+          if (!pis.TryGetValue(problemRuns.Key, out bkq)) continue;
           var ert = ExpectedRuntimeHelper.CalculateErt(problemRuns.ToList(), "QualityPerEvaluations", kc.GetTarget(bkq, kc.Maximization), kc.Maximization).ExpectedRuntime;
           if (double.IsNaN(ert)) ert = int.MaxValue;
@@ -67 +68 @@
         }
         avgERT /= count;
-        instances.Add(Tuple.Create((IAlgorithm)algorithm.Clone(), avgERT));
+        instances.Add(new KeyValuePair<IAlgorithm, double>(algorithm, avgERT));
       }
 
-      return new FixedRankModel(instances.OrderBy(x => x.Item2));
+      return new FixedRankModel(instances.OrderBy(x => x.Value));
     }
   }