Changeset 8622 for branches/RAPGA/HeuristicLab.Algorithms.RAPGA/3.3/ProgressiveOffspringPreserver.cs

Timestamp:

09/10/12 17:10:27 (12 years ago)

Author:

jkarder

Message:

#1247:

• fixed some bugs
• minor code improvements

File:

• branches/RAPGA/HeuristicLab.Algorithms.RAPGA/3.3/ProgressiveOffspringPreserver.cs (modified) (1 diff)

branches/RAPGA/HeuristicLab.Algorithms.RAPGA/3.3/ProgressiveOffspringPreserver.cs

@@ -93 +93 @@
 
     public override IOperation Apply() {
-      if (CurrentScope.SubScopes.Any()) {
-        if (OffspringList.Any()) {
-          var currentOffspring = new Scope();
-          currentOffspring.SubScopes.AddRange(OffspringList);
-          var similarityMatrix = SimilarityCalculator.CalculateSolutionCrowdSimilarity(CurrentScope, currentOffspring);
-          for (int i = CurrentScope.SubScopes.Count - 1; i >= 0 && OffspringList.Count < MaximumPopulationSize.Value - Elites.Value; i--)
-            if (similarityMatrix[i].Any(x => x == 1.0)) CurrentScope.SubScopes.RemoveAt(i);
-            else OffspringList.Add(CurrentScope.SubScopes[i]);
-        } else OffspringList.AddRange(CurrentScope.SubScopes);
+      if (CurrentScope.SubScopes.Any()) { // offspring created
+        if (!OffspringList.Any()) OffspringList.AddRange(CurrentScope.SubScopes);
+        else { // stored offspring exists
+          var storedOffspringScope = new Scope();
+          storedOffspringScope.SubScopes.AddRange(OffspringList);
+          var similarityMatrix = SimilarityCalculator.CalculateSolutionCrowdSimilarity(CurrentScope, storedOffspringScope);
+
+          var createdOffspring = CurrentScope.SubScopes.ToArray();
+
+          int i = 0;
+          // as long as offspring is available and not enough offspring has been preserved
+          while (i < createdOffspring.Length && OffspringList.Count < MaximumPopulationSize.Value - Elites.Value) {
+            if (similarityMatrix[i].Any(x => x == 1.0)) createdOffspring[i] = null; // discard duplicates
+            else OffspringList.Add(createdOffspring[i]);
+            i++;
+          }
+
+          // discard remaining offspring
+          while (i < createdOffspring.Length) createdOffspring[i++] = null;
+
+          // clean current scope
+          CurrentScope.SubScopes.Replace(createdOffspring.Where(x => x != null));
+        }
       }
       return base.Apply();