Changeset 13787 for branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem.Common/3.3/Recommenders/KNearestNeighborRecommender.cs

Timestamp:

04/24/16 10:03:52 (8 years ago)

Author:

abeham

Message:

#2457: worked on performance modeling

Location:

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

Files:

• . (added)
• KNearestNeighborRecommender.cs (moved) (moved from branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem.Common/3.3/KNearestNeighborRecommender.cs) (4 diffs)

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

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using System.Collections.Generic;
-using System.Linq;
 
 namespace HeuristicLab.OptimizationExpertSystem.Common {
@@ -33 +30 @@
   [StorableClass]
   public sealed class KNearestNeighborRecommender : ParameterizedNamedItem, IAlgorithmInstanceRecommender {
-    private KnowledgeCenter okc;
-
-    private IFixedValueParameter<EnumValue<ProblemInstanceProximityType>> ProximityTypeParameter {
-      get { return (IFixedValueParameter<EnumValue<ProblemInstanceProximityType>>)Parameters["ProximityType"]; }
-    }
-
-    public ProblemInstanceProximityType ProximityType {
-      get { return ProximityTypeParameter.Value.Value; }
-      set { ProximityTypeParameter.Value.Value = value; }
-    }
-
+    
     private IFixedValueParameter<IntValue> KParameter {
       get { return (IFixedValueParameter<IntValue>)Parameters["K"]; }
@@ -52 +39 @@
     private KNearestNeighborRecommender(KNearestNeighborRecommender original, Cloner cloner)
       : base(original, cloner) { }
-    public KNearestNeighborRecommender(KnowledgeCenter okc) {
-      this.okc = okc;
-      Parameters.Add(new FixedValueParameter<EnumValue<ProblemInstanceProximityType>>("ProximityType", "The type of neighbor proximity.", new EnumValue<ProblemInstanceProximityType>(ProblemInstanceProximityType.FeatureSpace)));
+    public KNearestNeighborRecommender() {
       Parameters.Add(new FixedValueParameter<IntValue>("K", "The number of nearest neighbors to consider.", new IntValue(5)));
     }
@@ -62 +47 @@
     }
 
-    public IEnumerable<IAlgorithm> GetRanking() {
-      if (okc.Problem.ProblemId == -1) yield break;
-
-      var distances = okc.GetProblemDistances(ProximityType);
-      var K = KParameter.Value.Value;
-      var performances = new Dictionary<IAlgorithm, List<double>>();
-      for (var k = 0; k < K; k++) {
-        if (distances.Count == 0) break;
-        var min = distances.MinItems(x => x.Value).First();
-        // lookup algorithm performances in min
-        var perfs = okc.GetAlgorithmPerformance(min.Key);
-        if (perfs.Count == 0) {
-          k--;
-          continue;
-        }
-        foreach (var p in perfs) {
-          var ert = p.Value;
-          if (double.IsNaN(ert)) ert = int.MaxValue;
-          List<double> erts;
-          if (!performances.TryGetValue(p.Key, out erts)) {
-            performances[p.Key] = new List<double>() { ert }; ;
-          } else erts.Add(ert);
-        }
-        distances.Remove(min.Key);
-      }
-      foreach (var alg in performances.Select(x => new { Alg = x.Key, Perf = x.Value.Average() })
-                         .OrderBy(x => x.Perf)
-                         .Select(x => x.Alg))
-        yield return alg;
+    public IRecommendationModel TrainModel(KnowledgeCenter kc, string[] characteristics) {
+      return new KNearestNeighborModel(KParameter.Value.Value, characteristics);
     }
   }