Changeset 9392 for branches/LearningClassifierSystems/HeuristicLab.Optimization.Operators.LCS/3.3/Selection

Timestamp:

04/23/13 13:31:29 (11 years ago)

Author:

sforsten

Message:

#1980:

• several small bug fixes
• added windowing technique ILAS to GAssist
• GAssist and XCS work now with real-valued features
• severely improved the performance of XCS

File:

• branches/LearningClassifierSystems/HeuristicLab.Optimization.Operators.LCS/3.3/Selection/NichingTournamentSelector.cs (modified) (2 diffs)

branches/LearningClassifierSystems/HeuristicLab.Optimization.Operators.LCS/3.3/Selection/NichingTournamentSelector.cs

@@ -88 +88 @@
 
       int parentsPerChild = ParentsPerChildParameter.ActualValue.Value;
-      var possibleNiches = GAssistNichesProblemDataParameter.ActualValue.GetPossibleNiches().ToList();
-      var selectPerNiche = new Dictionary<IGAssistNiche, int>(possibleNiches.First().Comparer);
+      var nicheComparer = GAssistNichesProblemDataParameter.ActualValue.GetPossibleNiches().First().Comparer;
+      var selectPerNiche = new Dictionary<IGAssistNiche, int>(nicheComparer);
+      var nicheScope = new Dictionary<IGAssistNiche, List<int>>(nicheComparer);
 
-      var nicheScope = new Dictionary<IGAssistNiche, List<int>>(possibleNiches.First().Comparer);
-      foreach (var niche in possibleNiches) {
-        nicheScope.Add(niche, new List<int>());
-        selectPerNiche.Add(niche, count / possibleNiches.Count);
+      for (int i = 0; i < individuals.Count; i++) {
+        if (!nicheScope.ContainsKey(individuals[i].Niche)) {
+          nicheScope.Add(individuals[i].Niche, new List<int>());
+        }
+        nicheScope[individuals[i].Niche].Add(i);
       }
 
-      for (int i = 0; i < individuals.Count; i++) {
-        nicheScope[individuals[i].Niche].Add(i);
+      var possibleNiches = nicheScope.Keys.ToList();
+      foreach (var niche in possibleNiches) {
+        selectPerNiche.Add(niche, count / possibleNiches.Count);
       }
 
@@ -144 +147 @@
     }
 
-    private IGAssistNiche GetNiche(IRandom random, Dictionary<IGAssistNiche, int> nicheScope, List<IGAssistNiche> possibleNiches) {
-      int sum = nicheScope.Values.Sum();
+    private IGAssistNiche GetNiche(IRandom random, Dictionary<IGAssistNiche, int> selectPerNiche, List<IGAssistNiche> possibleNiches) {
+      int sum = selectPerNiche.Values.Sum();
       if (sum <= 0) { return possibleNiches[random.Next(possibleNiches.Count)]; }
       int pos = random.Next(sum);
       int total = 0;
-      IGAssistNiche niche = nicheScope.Keys.First();
-      foreach (var item in nicheScope) {
+      IGAssistNiche niche = selectPerNiche.Keys.First();
+      foreach (var item in selectPerNiche) {
         total += item.Value;
         niche = item.Key;