Changeset 5376 for trunk/sources/HeuristicLab.Selection

Timestamp:

01/25/11 17:58:38 (14 years ago)

Author:

abeham

Message:

#1393

• Replacer will use Random replacement when no other replacement is defined

File:

• trunk/sources/HeuristicLab.Selection/3.3/Replacer.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Selection/3.3/Replacer.cs

@@ -83 +83 @@
       ISelector selectedSelector = SelectedSelectorParameter.ActualValue;
 
-      if (replacedSelector != null) {
-        replacedSelector.CopySelected = new BoolValue(false);
-        replacedSelector.NumberOfSelectedSubScopesParameter.Value = new IntValue(Math.Min(remaining, selected));
+      if (replacedSelector == null) {
+        ReplacedSelectorParameter.Value = new RandomSelector();
+        replacedSelector = ReplacedSelectorParameter.Value;
       }
-      if (selectedSelector != null) {
-        selectedSelector.CopySelected = new BoolValue(false);
-        selectedSelector.NumberOfSelectedSubScopesParameter.Value = new IntValue(Math.Min(remaining, selected));
+      replacedSelector.CopySelected = new BoolValue(false);
+      replacedSelector.NumberOfSelectedSubScopesParameter.Value = new IntValue(Math.Min(remaining, selected));
+
+      if (selectedSelector == null) {
+        SelectedSelectorParameter.Value = new RandomSelector();
+        selectedSelector = SelectedSelectorParameter.Value;
       }
+      selectedSelector.CopySelected = new BoolValue(false);
+      selectedSelector.NumberOfSelectedSubScopesParameter.Value = new IntValue(Math.Min(remaining, selected));
 
       return base.Apply();