Changeset 3413 for trunk/sources/HeuristicLab.Selection

Timestamp:

04/19/10 17:33:12 (14 years ago)

Author:

abeham

Message:

Updated Gender Specific Selection, Offspring Selector and other changes related to the OSGA #976
Removed old OS plugin, removed SelectedSubScopesLookupParameter

Location:

trunk/sources/HeuristicLab.Selection/3.3

Files:

• ConditionalSelector.cs (copied) (copied from trunk/sources/HeuristicLab.Scheduling.JSSP/3.2/ConditionalSelector.cs) (1 diff)
• GenderSpecificSelector.cs (modified) (4 diffs)
• HeuristicLab.Selection-3.3.csproj (modified) (1 diff)
• OffspringSelector.cs (added)

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

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
 using HeuristicLab.Selection;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Parameters;
 
-namespace HeuristicLab.Scheduling.JSSP {
-  public class ConditionalSelector : SelectorBase {
-    public override string Description {
-      get { return @"TODO\r\nOperator description still missing ..."; }
+namespace HeuristicLab.Selection {
+  [Item("ConditionalSelector", "Selects sub-scopes where a certain boolean variable is true.")]
+  [StorableClass]
+  public class ConditionalSelector : Selector {
+    public SubScopesLookupParameter<BoolValue> ConditionParameter {
+      get { return (SubScopesLookupParameter<BoolValue>)Parameters["Condition"]; }
+    }
+    public ValueParameter<BoolValue> CopySelectedParameter {
+      get { return (ValueParameter<BoolValue>)Parameters["CopySelected"]; }
+    }
+
+    public BoolValue CopySelected {
+      get { return CopySelectedParameter.Value; }
+      set { CopySelectedParameter.Value = value; }
     }
 
     public ConditionalSelector()
       : base() {
-      AddVariableInfo(new VariableInfo("Condition", "Input condition", typeof(BoolData), VariableKind.In));
+      Parameters.Add(new SubScopesLookupParameter<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)));
     }
 
-    private int GetFirstSelectedScopeIndex(IScope source) {
-      for (int i = 0; i < source.SubScopes.Count; i++) {
-        bool condition = GetVariableValue<BoolData>("Condition", source.SubScopes[i], true).Data;
-        if (condition) {
-          return i;
-        }
-      }
-      return -1;
-    }
-
-    protected override void Select(IScope source, IScope target, bool copySelected) {
-      if (copySelected) {
-        for (int i = 0; i < source.SubScopes.Count; i++) {
-          IScope selectedScope = source.SubScopes[i];
-          bool condition = GetVariableValue<BoolData>("Condition", source.SubScopes[i], true).Data;
-          if (condition) {
-            target.AddSubScope((IScope)selectedScope.Clone());
+    protected override IScope[] Select(List<IScope> scopes) {
+      ItemArray<BoolValue> conditions = ConditionParameter.ActualValue;
+      List<IScope> selected = new List<IScope>();
+      if (CopySelected.Value) {
+        for (int i = 0; i < scopes.Count; i++) {
+          if (conditions[i].Value) {
+            selected.Add((IScope)scopes[i].Clone());
           }
         }
       } else {
-        int removeAt = GetFirstSelectedScopeIndex(source);
-        while (removeAt != -1) {
-          IScope selectedScope = source.SubScopes[removeAt];
-          target.AddSubScope(selectedScope);
-          source.RemoveSubScope(selectedScope);
-          removeAt = GetFirstSelectedScopeIndex(source);
+        for (int i = 0; i < scopes.Count; i++) {
+          if (conditions[i + selected.Count].Value) {
+            selected.Add(scopes[i]);
+            scopes.RemoveAt(i);
+            i--;
+          }
         }
       }
+      return selected.ToArray();
     }
   }

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

@@ -36 +36 @@
   [StorableClass]
   public class GenderSpecificSelector : AlgorithmOperator, ISingleObjectiveSelector, IStochasticOperator {
-    private List<ISelector> femaleSelectors;
-    private List<ISelector> maleSelectors;
-
     #region Parameters
     public IValueLookupParameter<BoolValue> MaximizationParameter {
@@ -55 +52 @@
       get { return (ILookupParameter<IRandom>)Parameters["Random"]; }
     }
-    public ConstrainedValueParameter<ISelector> FemaleSelectorParameter {
-      get { return (ConstrainedValueParameter<ISelector>)Parameters["FemaleSelector"]; }
+    public ValueParameter<ISelector> FemaleSelectorParameter {
+      get { return (ValueParameter<ISelector>)Parameters["FemaleSelector"]; }
     }
-    public ConstrainedValueParameter<ISelector> MaleSelectorParameter {
-      get { return (ConstrainedValueParameter<ISelector>)Parameters["MaleSelector"]; }
+    public ValueParameter<ISelector> MaleSelectorParameter {
+      get { return (ValueParameter<ISelector>)Parameters["MaleSelector"]; }
     }
     #endregion
@@ -96 +93 @@
       Parameters.Add(new ValueLookupParameter<BoolValue>("CopySelected", "True if the scopes should be copied, false if they should be moved.", new BoolValue(true)));
       Parameters.Add(new LookupParameter<IRandom>("Random", "The random number generator to use."));
-      Parameters.Add(new ConstrainedValueParameter<ISelector>("FemaleSelector", "The selection operator to select the first parent."));
-      Parameters.Add(new ConstrainedValueParameter<ISelector>("MaleSelector", "The selection operator to select the second parent."));
+      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."));
       #endregion
 
@@ -140 +137 @@
     }
 
+    #region Events
+    private void SelectorParameter_ValueChanged(object sender, EventArgs e) {
+      IValueParameter<ISelector> selectorParam = (sender as IValueParameter<ISelector>);
+      if (selectorParam != null)
+        ParameterizeSelector(selectorParam.Value);
+    }
+    #endregion
+
     #region Helpers
     [StorableHook(HookType.AfterDeserialization)]
     private void Initialize() {
-      InitializeSelectors();
-      UpdateSelectors();
+      FemaleSelectorParameter.ValueChanged += new EventHandler(SelectorParameter_ValueChanged);
+      MaleSelectorParameter.ValueChanged += new EventHandler(SelectorParameter_ValueChanged);
+      if (FemaleSelector == null) FemaleSelector = new ProportionalSelector();
+      if (MaleSelector == null) MaleSelector = new RandomSelector();
     }
-
-    private void InitializeSelectors() {
-      femaleSelectors = new List<ISelector>();
-      maleSelectors = new List<ISelector>();
-      IEnumerable<Type> types = ApplicationManager.Manager.GetTypes(typeof(ISelector)).OrderBy(x => x.FullName);
-      foreach (Type type in types) {
-        if (type != typeof(IMultiObjectiveSelector) && type != typeof(GenderSpecificSelector)) {
-          femaleSelectors.Add((ISelector)Activator.CreateInstance(type));
-          maleSelectors.Add((ISelector)Activator.CreateInstance(type));
-        }
+    private void ParameterizeSelector(ISelector selector) {
+      selector.CopySelected = new BoolValue(true);
+      IStochasticOperator stoOp = (selector as IStochasticOperator);
+      if (stoOp != null) stoOp.RandomParameter.ActualName = RandomParameter.Name;
+      ISingleObjectiveSelector soSelector = (selector as ISingleObjectiveSelector);
+      if (soSelector != null) {
+        soSelector.MaximizationParameter.ActualName = MaximizationParameter.Name;
+        soSelector.QualityParameter.ActualName = QualityParameter.Name;
       }
-      ParameterizeSelectors(femaleSelectors);
-      ParameterizeSelectors(maleSelectors);
-    }
-    private void ParameterizeSelectors(List<ISelector> selectors) {
-      foreach (ISelector selector in selectors) {
-        selector.CopySelected = new BoolValue(true);
-      }
-      foreach (IStochasticOperator op in selectors.OfType<IStochasticOperator>()) {
-        op.RandomParameter.ActualName = RandomParameter.Name;
-      }
-      foreach (ISingleObjectiveSelector selector in selectors.OfType<ISingleObjectiveSelector>()) {
-        selector.MaximizationParameter.ActualName = MaximizationParameter.Name;
-        selector.QualityParameter.ActualName = QualityParameter.Name;
-      }
-    }
-    private void UpdateSelectors() {
-      ISelector oldFemaleSelector = FemaleSelector;
-      FemaleSelectorParameter.ValidValues.Clear();
-      foreach (ISelector selector in femaleSelectors)
-        FemaleSelectorParameter.ValidValues.Add(selector);
-      if (oldFemaleSelector == null) oldFemaleSelector = new ProportionalSelector();
-      ISelector femaleSelector = FemaleSelectorParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldFemaleSelector.GetType());
-      if (femaleSelector != null) FemaleSelectorParameter.Value = femaleSelector;
-
-      ISelector oldMaleSelector = MaleSelector;
-      MaleSelectorParameter.ValidValues.Clear();
-      foreach (ISelector selector in maleSelectors)
-        MaleSelectorParameter.ValidValues.Add(selector);
-      if (oldMaleSelector == null) oldMaleSelector = new RandomSelector();
-      ISelector maleSelector = MaleSelectorParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldMaleSelector.GetType());
-      if (maleSelector != null) MaleSelectorParameter.Value = maleSelector;
     }
     #endregion

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

@@ -83 +83 @@
     <None Include="HeuristicLabSelectionPlugin.cs.frame" />
     <Compile Include="BestSelector.cs" />
+    <Compile Include="ConditionalSelector.cs" />
     <Compile Include="GenderSpecificSelector.cs" />
+    <Compile Include="OffspringSelector.cs" />
     <Compile Include="RightChildReducer.cs" />
     <Compile Include="SingleObjectiveSelector.cs" />