Changeset 3713 for trunk/sources

Timestamp:

05/08/10 02:17:21 (15 years ago)

Author:

abeham

Message:

#839, #893, #976

• changed elites replacement in all offspring selection algorithms

File:

• trunk/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithmMainOperator.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithmMainOperator.cs

@@ -137 +137 @@
       OffspringSelector offspringSelector = new OffspringSelector();
       SubScopesProcessor subScopesProcessor2 = new SubScopesProcessor();
-      BestSelector bestSelector1 = new BestSelector();
-      BestSelector bestSelector2 = new BestSelector();
+      BestSelector bestSelector = new BestSelector();
+      WorstSelector worstSelector = new WorstSelector();
       RightReducer rightReducer = new RightReducer();
       LeftReducer leftReducer = new LeftReducer();
@@ -211 +211 @@
       offspringSelector.WinnersParameter.ActualName = "OSWinners";
 
-      bestSelector1.CopySelected = new BoolValue(false);
-      bestSelector1.MaximizationParameter.ActualName = MaximizationParameter.Name;
-      bestSelector1.NumberOfSelectedSubScopesParameter.ActualName = ElitesParameter.Name;
-      bestSelector1.QualityParameter.ActualName = QualityParameter.Name;
-
-      bestSelector2.CopySelected = new BoolValue(false);
-      bestSelector2.MaximizationParameter.ActualName = MaximizationParameter.Name;
-      bestSelector2.NumberOfSelectedSubScopesParameter.ActualName = ElitesParameter.Name;
-      bestSelector2.QualityParameter.ActualName = QualityParameter.Name;
+      bestSelector.CopySelected = new BoolValue(false);
+      bestSelector.MaximizationParameter.ActualName = MaximizationParameter.Name;
+      bestSelector.NumberOfSelectedSubScopesParameter.ActualName = ElitesParameter.Name;
+      bestSelector.QualityParameter.ActualName = QualityParameter.Name;
+
+      worstSelector.CopySelected = new BoolValue(false);
+      worstSelector.MaximizationParameter.ActualName = MaximizationParameter.Name;
+      worstSelector.NumberOfSelectedSubScopesParameter.ActualName = ElitesParameter.Name;
+      worstSelector.QualityParameter.ActualName = QualityParameter.Name;
       #endregion
 
@@ -253 +253 @@
       offspringSelector.OffspringCreator = selector;
       offspringSelector.Successor = subScopesProcessor2;
-      subScopesProcessor2.Operators.Add(bestSelector1);
-      subScopesProcessor2.Operators.Add(bestSelector2);
+      subScopesProcessor2.Operators.Add(bestSelector);
+      subScopesProcessor2.Operators.Add(worstSelector);
       subScopesProcessor2.Successor = mergingReducer;
-      bestSelector1.Successor = rightReducer;
+      bestSelector.Successor = rightReducer;
       rightReducer.Successor = null;
-      bestSelector2.Successor = leftReducer;
+      worstSelector.Successor = leftReducer;
       leftReducer.Successor = null;
       mergingReducer.Successor = null;