Changeset 6011 for branches/histogram/HeuristicLab.Selection/3.3/NoSameMatesSelector.cs

Timestamp:

04/15/11 14:54:43 (14 years ago)

Author:

abeham

Message:

#1465

• updated branch with changes from trunk
• fixed some bugs
• introduced secondary x-axis option

Location:

branches/histogram

Files:

• . (modified) (1 prop)
• HeuristicLab.Selection/3.3/NoSameMatesSelector.cs (modified) (7 diffs)

branches/histogram/HeuristicLab.Selection/3.3/NoSameMatesSelector.cs

@@ -1 +1 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
-using System.Collections.Generic;
 using System.Threading;
 using HeuristicLab.Common;
@@ -55 +55 @@
     [StorableConstructor]
     protected NoSameMatesSelector(bool deserializing) : base(deserializing) { }
-    protected NoSameMatesSelector(NoSameMatesSelector original, Cloner cloner) : base(original, cloner) {
+    protected NoSameMatesSelector(NoSameMatesSelector original, Cloner cloner)
+      : base(original, cloner) {
       RegisterParameterEventHandlers();
     }
@@ -62 +63 @@
     }
 
-    public NoSameMatesSelector() : base() {
+    public NoSameMatesSelector()
+      : base() {
       #region Create parameters
       Parameters.Add(new ValueParameter<ISingleObjectiveSelector>(SelectorParameterName, "The inner selection operator to select the parents.", new TournamentSelector()));
@@ -85 +87 @@
           Parameters.Add(new ValueParameter<ISingleObjectiveSelector>(SelectorParameterName, "The inner selection operator to select the parents.", selector));
         }
-      }   
+      }
       // FixedValueParameter for quality difference percentage, max attempts, use range
       if (Parameters.ContainsKey(QualityDifferencePercentageParameterName)) {
@@ -153 +155 @@
         ScopeList parents = CurrentScope.SubScopes[1].SubScopes;
 
-        for (int indexParent1 = 0, indexParent2 = 1; 
-             indexParent1 < parents.Count - 1 && selectedParents < parentsToSelect - 1; 
+        for (int indexParent1 = 0, indexParent2 = 1;
+             indexParent1 < parents.Count - 1 && selectedParents < parentsToSelect - 1;
              indexParent1 += 2, indexParent2 += 2) {
           double qualityParent1 = ((DoubleValue)parents[indexParent1].Variables[qualityName].Value).Value;
@@ -168 +170 @@
           }
 
-          if (parentsDifferent) { 
+          if (parentsDifferent) {
             // inner selector already copied scopes, no cloning necessary here
             selected[selectedParents++] = parents[indexParent1];
@@ -204 +206 @@
       if (CopySelected.Value != true) {
         CopySelected.Value = true;
-        throw new ArgumentException(Name + ": CopySelected must always be true.");
-      }
-    }
-    #endregion
-
-    #region Helpers  
+      }
+    }
+    #endregion
+
+    #region Helpers
     private void ParameterizeSelector(ISingleObjectiveSelector selector) {
       selector.CopySelected = new BoolValue(true); // must always be true