Changeset 3129

Timestamp:

03/19/10 18:07:11 (15 years ago)

Author:

abeham

Message:

Removed interface ISelector from Selector #931

Location:

trunk/sources/HeuristicLab.Selection/3.3

Files:

• RandomSelector.cs (modified) (2 diffs)
• Selector.cs (modified) (3 diffs)
• SingleObjectiveSelector.cs (modified) (2 diffs)

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

@@ -22 +22 @@
 using System.Collections.Generic;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
+using HeuristicLab.Optimization;
+using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -31 +34 @@
   [StorableClass]
   [Creatable("Test")]
-  public sealed class RandomSelector : StochasticSelector {
-    public RandomSelector() : base() { }
+  public sealed class RandomSelector : StochasticSelector, ISelector {
+    protected ValueParameter<BoolValue> CopySelectedParameter {
+      get { return (ValueParameter<BoolValue>)Parameters["CopySelected"]; }
+    }
+    public IValueLookupParameter<IntValue> NumberOfSelectedSubScopesParameter {
+      get { return (ValueLookupParameter<IntValue>)Parameters["NumberOfSelectedSubScopes"]; }
+    }
+
+    public BoolValue CopySelected {
+      get { return CopySelectedParameter.Value; }
+      set { CopySelectedParameter.Value = value; }
+    }
+    
+    public RandomSelector() : base() {
+      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."));
+    }
 
     protected override IScope[] Select(List<IScope> scopes) {

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

@@ -34 +34 @@
   [Item("Selector", "A base class for selection operators.")]
   [StorableClass]
-  public abstract class Selector : SingleSuccessorOperator, ISelector {
+  public abstract class Selector : SingleSuccessorOperator {
     public override bool CanChangeName {
       get { return false; }
-    }
-
-    protected ValueParameter<BoolValue> CopySelectedParameter {
-      get { return (ValueParameter<BoolValue>)Parameters["CopySelected"]; }
-    }
-    public IValueLookupParameter<IntValue> NumberOfSelectedSubScopesParameter {
-      get { return (ValueLookupParameter<IntValue>)Parameters["NumberOfSelectedSubScopes"]; }
     }
     protected ScopeParameter CurrentScopeParameter {
@@ -49 +42 @@
     }
 
-    public BoolValue CopySelected {
-      get { return CopySelectedParameter.Value; }
-      set { CopySelectedParameter.Value = value; }
-    }
     public IScope CurrentScope {
       get { return CurrentScopeParameter.ActualValue; }
@@ -59 +48 @@
     protected Selector()
       : base() {
-      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."));
       Parameters.Add(new ScopeParameter("CurrentScope", "The current scope from which sub-scopes should be selected."));
     }

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

@@ -33 +33 @@
   [StorableClass]
   public abstract class SingleObjectiveSelector : Selector, ISingleObjectiveSelector {
+    protected ValueParameter<BoolValue> CopySelectedParameter {
+      get { return (ValueParameter<BoolValue>)Parameters["CopySelected"]; }
+    }
+    public IValueLookupParameter<IntValue> NumberOfSelectedSubScopesParameter {
+      get { return (ValueLookupParameter<IntValue>)Parameters["NumberOfSelectedSubScopes"]; }
+    }
     public IValueLookupParameter<BoolValue> MaximizationParameter {
       get { return (IValueLookupParameter<BoolValue>)Parameters["Maximization"]; }
@@ -40 +46 @@
     }
 
+    public BoolValue CopySelected {
+      get { return CopySelectedParameter.Value; }
+      set { CopySelectedParameter.Value = value; }
+    }
+
     protected SingleObjectiveSelector()
       : base() {
+      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."));
       Parameters.Add(new ValueLookupParameter<BoolValue>("Maximization", "True if the current problem is a maximization problem, otherwise false."));
       Parameters.Add(new SubScopesLookupParameter<DoubleValue>("Quality", "The quality value contained in each sub-scope which is used for selection."));