Changeset 12352

Timestamp:

04/28/15 17:14:39 (10 years ago)

Author:

ascheibe

Message:

#2267 improved offspring selector

File:

• branches/VOSGA/HeuristicLab.Algorithms.VOffspringSelectionGeneticAlgorithm/OffspringSelectors/PopDivOffspringSelector.cs (modified) (1 diff)

branches/VOSGA/HeuristicLab.Algorithms.VOffspringSelectionGeneticAlgorithm/OffspringSelectors/PopDivOffspringSelector.cs

@@ -224 +224 @@
         if (takeWorseOffspring) {
           IScope currentOffspring = offspring.SubScopes[i];
-          offspring.SubScopes.Remove(currentOffspring);
-          i--;
-          population.Add(currentOffspring);
-          worseOffspringNeeded--;
+          Scope tmpScope = new Scope();
+          tmpScope.SubScopes.AddRange(population);
+          Scope tmpCurrentScope = new Scope();
+          tmpCurrentScope.SubScopes.Add(currentOffspring);
+          double curDiv = SimilarityCalculatorParameter.ActualValue.CalculateSolutionCrowdSimilarity(tmpCurrentScope, tmpScope)[0].Average();
+          if (curDiv < avgPopDiv) {
+            offspring.SubScopes.Remove(currentOffspring);
+            i--;
+            population.Add(currentOffspring);
+            worseOffspringNeeded--;
+          }
         } else if (tmp.Value) {
           IScope currentOffspring = offspring.SubScopes[i];