Changeset 4043 for trunk

Timestamp:

07/19/10 13:01:33 (14 years ago)

Author:

abeham

Message:

#926

• Added LeftSelector and RightSelector (reverted some changes in r3096)

Location:

trunk/sources/HeuristicLab.Selection/3.3

Files:

• HeuristicLab.Selection-3.3.csproj (modified) (2 diffs)
• LeftSelector.cs (copied) (copied from trunk/sources/HeuristicLab.Selection/3.3/LeftSelector.cs) (2 diffs)
• RightSelector.cs (copied) (copied from trunk/sources/HeuristicLab.Selection/3.3/RightSelector.cs) (2 diffs)

trunk/sources/HeuristicLab.Selection/3.3/HeuristicLab.Selection-3.3.csproj

@@ -84 +84 @@
     <Compile Include="BestSelector.cs" />
     <Compile Include="ConditionalSelector.cs" />
+    <Compile Include="LeftSelector.cs" />
     <Compile Include="RandomReplacer.cs" />
     <Compile Include="GenderSpecificSelector.cs" />
@@ -89 +90 @@
     <Compile Include="Replacer.cs" />
     <Compile Include="RightChildReducer.cs" />
+    <Compile Include="RightSelector.cs" />
     <Compile Include="SingleObjectiveSelector.cs" />
     <Compile Include="LeftReducer.cs" />

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

@@ -22 +22 @@
 using System.Collections.Generic;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
+using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -30 +32 @@
   [Item("LeftSelector", "An operator which selects sub-scopes from left to right.")]
   [StorableClass]
-  [Creatable("Test")]
   public sealed class LeftSelector : Selector {
-    public LeftSelector() : base() { }
+    private 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 LeftSelector()
+      : 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/RightSelector.cs

@@ -22 +22 @@
 using System.Collections.Generic;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
+using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -30 +32 @@
   [Item("RightSelector", "An operator which selects sub-scopes from right to left.")]
   [StorableClass]
-  [Creatable("Test")]
   public sealed class RightSelector : Selector {
-    public RightSelector() : base() { }
+    private 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 RightSelector()
+      : 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) {