Changeset 2891 for trunk/sources/HeuristicLab.Selection

Timestamp:

03/01/10 04:46:06 (15 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• worked on algorithms and parameters

Location:

trunk/sources/HeuristicLab.Selection/3.3

Files:

• ProportionalSelector.cs (modified) (2 diffs)
• Selector.cs (modified) (2 diffs)

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

@@ -36 +36 @@
   [Creatable("Test")]
   public sealed class ProportionalSelector : StochasticSingleObjectiveSelector {
-    private OptionalValueParameter<BoolData> WindowingParameter {
-      get { return (OptionalValueParameter<BoolData>)Parameters["Windowing"]; }
+    private ValueParameter<BoolData> WindowingParameter {
+      get { return (ValueParameter<BoolData>)Parameters["Windowing"]; }
     }
 
@@ -47 +47 @@
     public ProportionalSelector()
       : base() {
-      Parameters.Add(new OptionalValueParameter<BoolData>("Windowing", "Apply windowing strategy (selection probability is proportional to the quality differences and not to the total quality).", new BoolData(true)));
+      Parameters.Add(new ValueParameter<BoolData>("Windowing", "Apply windowing strategy (selection probability is proportional to the quality differences and not to the total quality).", new BoolData(true)));
       CopySelected.Value = true;
     }

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

@@ -35 +35 @@
   [EmptyStorableClass]
   public abstract class Selector : SingleSuccessorOperator, ISelector {
-    protected OptionalValueParameter<BoolData> CopySelectedParameter {
-      get { return (OptionalValueParameter<BoolData>)Parameters["CopySelected"]; }
+    protected ValueParameter<BoolData> CopySelectedParameter {
+      get { return (ValueParameter<BoolData>)Parameters["CopySelected"]; }
     }
     public IValueLookupParameter<IntData> NumberOfSelectedSubScopesParameter {
@@ -55 +55 @@
     protected Selector()
       : base() {
-      Parameters.Add(new OptionalValueParameter<BoolData>("CopySelected", "True if the selected sub-scopes should be copied, otherwise false.", new BoolData(false)));
+      Parameters.Add(new ValueParameter<BoolData>("CopySelected", "True if the selected sub-scopes should be copied, otherwise false.", new BoolData(false)));
       Parameters.Add(new ValueLookupParameter<IntData>("NumberOfSelectedSubScopes", "The number of sub-scopes which should be selected."));
       Parameters.Add(new ScopeParameter("CurrentScope", "The current scope from which sub-scopes should be selected."));