Changeset 10640 for branches

Timestamp:

03/19/14 16:52:02 (11 years ago)

Author:

mkommend

Message:

#1997: Merged trunk changes regarding offspring selector in the symbolic island algorithms branch.

Location:

branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm

Files:

• . (modified) (1 prop)
• 3.3/IslandOffspringSelectionGeneticAlgorithmMainLoop.cs (modified) (3 diffs)

branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/IslandOffspringSelectionGeneticAlgorithmMainLoop.cs

@@ -20 +20 @@
 #endregion
 
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -28 +29 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Selection;
 
 namespace HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm {
@@ -275 +277 @@
       mainOperator.SelectorParameter.ActualName = SelectorParameter.Name;
       mainOperator.SuccessRatioParameter.ActualName = SuccessRatioParameter.Name;
+      foreach (var offspringSelector in mainOperator.OperatorGraph.Operators.OfType<OffspringSelector>())
+        offspringSelector.FillPopulationWithParents = true;
 
       islandAnalyzer2.Name = "Island Analyzer (placeholder)";