Changeset 6055 for branches/histogram/HeuristicLab.Selection

Timestamp:

04/27/11 09:22:20 (14 years ago)

Author:

abeham

Message:

#1465

• updated branch from trunk

Location:

branches/histogram

Files:

• . (modified) (1 prop)
• HeuristicLab.Selection/3.3/ConditionalSelector.cs (modified) (2 diffs)
• HeuristicLab.Selection/3.3/CrowdedTournamentSelector.cs (modified) (2 diffs)
• HeuristicLab.Selection/3.3/GenderSpecificSelector.cs (modified) (2 diffs)
• HeuristicLab.Selection/3.3/LeftSelector.cs (modified) (2 diffs)
• HeuristicLab.Selection/3.3/NoSameMatesSelector.cs (modified) (1 diff)
• HeuristicLab.Selection/3.3/RandomSelector.cs (modified) (2 diffs)
• HeuristicLab.Selection/3.3/RightSelector.cs (modified) (2 diffs)
• HeuristicLab.Selection/3.3/SingleObjectiveSelector.cs (modified) (2 diffs)

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

@@ -34 +34 @@
       get { return (ScopeTreeLookupParameter<BoolValue>)Parameters["Condition"]; }
     }
-    public ValueParameter<BoolValue> CopySelectedParameter {
-      get { return (ValueParameter<BoolValue>)Parameters["CopySelected"]; }
+    protected IValueParameter<BoolValue> CopySelectedParameter {
+      get { return (IValueParameter<BoolValue>)Parameters["CopySelected"]; }
     }
 
@@ -55 +55 @@
       Parameters.Add(new ScopeTreeLookupParameter<BoolValue>("Condition", "The boolean variable based on which the scopes are selected into a true scope-branch and a false scope-branch."));
       Parameters.Add(new ValueParameter<BoolValue>("CopySelected", "The parameter that decides whether the selected scopes should be copied or moved.", new BoolValue(true)));
+      CopySelectedParameter.Hidden = true;
     }
 

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

@@ -39 +39 @@
       get { return (IValueLookupParameter<IntValue>)Parameters["NumberOfSelectedSubScopes"]; }
     }
-    public IValueParameter<BoolValue> CopySelectedParameter {
+    protected IValueParameter<BoolValue> CopySelectedParameter {
       get { return (IValueParameter<BoolValue>)Parameters["CopySelected"]; }
     }
@@ -76 +76 @@
       Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("CrowdingDistance", "The solutions' crowding distance values."));
       Parameters.Add(new ValueLookupParameter<IntValue>("GroupSize", "The size of the group from which the best will be chosen.", new IntValue(2)));
+      CopySelectedParameter.Hidden = true;
     }
 

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

@@ -43 +43 @@
       get { return (IValueLookupParameter<IntValue>)Parameters["NumberOfSelectedSubScopes"]; }
     }
-    public IValueLookupParameter<BoolValue> CopySelectedParameter {
+    protected IValueLookupParameter<BoolValue> CopySelectedParameter {
       get { return (IValueLookupParameter<BoolValue>)Parameters["CopySelected"]; }
     }
@@ -97 +97 @@
       Parameters.Add(new ValueParameter<ISelector>("FemaleSelector", "The selection operator to select the first parent."));
       Parameters.Add(new ValueParameter<ISelector>("MaleSelector", "The selection operator to select the second parent."));
+      CopySelectedParameter.Hidden = true;
       #endregion
 

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

@@ -34 +34 @@
   [StorableClass]
   public sealed class LeftSelector : Selector {
-    private ValueParameter<BoolValue> CopySelectedParameter {
-      get { return (ValueParameter<BoolValue>)Parameters["CopySelected"]; }
+    private IValueParameter<BoolValue> CopySelectedParameter {
+      get { return (IValueParameter<BoolValue>)Parameters["CopySelected"]; }
     }
     public IValueLookupParameter<IntValue> NumberOfSelectedSubScopesParameter {
@@ -59 +59 @@
       Parameters.Add(new ValueParameter<BoolValue>("CopySelected", "True if the selected sub-scopes should be copied, otherwise false.", new BoolValue(true)));
       Parameters.Add(new ValueLookupParameter<IntValue>("NumberOfSelectedSubScopes", "The number of sub-scopes which should be selected."));
+      CopySelectedParameter.Hidden = true;
     }
 

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

@@ -74 +74 @@
       #endregion
 
-      CopySelectedParameter.Hidden = true;
       RegisterParameterEventHandlers();
     }

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

@@ -35 +35 @@
   [StorableClass]
   public sealed class RandomSelector : StochasticSelector, ISelector {
-    private ValueParameter<BoolValue> CopySelectedParameter {
-      get { return (ValueParameter<BoolValue>)Parameters["CopySelected"]; }
+    private IValueParameter<BoolValue> CopySelectedParameter {
+      get { return (IValueParameter<BoolValue>)Parameters["CopySelected"]; }
     }
     public IValueLookupParameter<IntValue> NumberOfSelectedSubScopesParameter {
@@ -59 +59 @@
       Parameters.Add(new ValueParameter<BoolValue>("CopySelected", "True if the selected sub-scopes should be copied, otherwise false.", new BoolValue(true)));
       Parameters.Add(new ValueLookupParameter<IntValue>("NumberOfSelectedSubScopes", "The number of sub-scopes which should be selected."));
+      CopySelectedParameter.Hidden = true;
     }
 

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

@@ -34 +34 @@
   [StorableClass]
   public sealed class RightSelector : Selector {
-    private ValueParameter<BoolValue> CopySelectedParameter {
-      get { return (ValueParameter<BoolValue>)Parameters["CopySelected"]; }
+    private IValueParameter<BoolValue> CopySelectedParameter {
+      get { return (IValueParameter<BoolValue>)Parameters["CopySelected"]; }
     }
     public IValueLookupParameter<IntValue> NumberOfSelectedSubScopesParameter {
@@ -56 +56 @@
       Parameters.Add(new ValueParameter<BoolValue>("CopySelected", "True if the selected sub-scopes should be copied, otherwise false.", new BoolValue(true)));
       Parameters.Add(new ValueLookupParameter<IntValue>("NumberOfSelectedSubScopes", "The number of sub-scopes which should be selected."));
+      CopySelectedParameter.Hidden = true;
     }
 

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

@@ -33 +33 @@
   [StorableClass]
   public abstract class SingleObjectiveSelector : Selector {
-    protected ValueParameter<BoolValue> CopySelectedParameter {
-      get { return (ValueParameter<BoolValue>)Parameters["CopySelected"]; }
+    protected IValueParameter<BoolValue> CopySelectedParameter {
+      get { return (IValueParameter<BoolValue>)Parameters["CopySelected"]; }
     }
     public IValueLookupParameter<IntValue> NumberOfSelectedSubScopesParameter {
-      get { return (ValueLookupParameter<IntValue>)Parameters["NumberOfSelectedSubScopes"]; }
+      get { return (IValueLookupParameter<IntValue>)Parameters["NumberOfSelectedSubScopes"]; }
     }
     public IValueLookupParameter<BoolValue> MaximizationParameter {
@@ -61 +61 @@
       Parameters.Add(new ValueLookupParameter<BoolValue>("Maximization", "True if the current problem is a maximization problem, otherwise false."));
       Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("Quality", "The quality value contained in each sub-scope which is used for selection."));
+      CopySelectedParameter.Hidden = true;
     }
   }