Changeset 3413

Timestamp:

04/19/10 17:33:12 (15 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

Files:

• HeuristicLab 3.3.sln (modified) (3 diffs)
• HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithm.cs (modified) (2 diffs)
• HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithmMainLoop.cs (modified) (5 diffs)
• HeuristicLab.Optimization.Operators/3.3/HeuristicLab.Optimization.Operators-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Optimization.Operators/3.3/OffspringSelector.cs (deleted)
• HeuristicLab.Optimization.Operators/3.3/WeightedParentsQualityComparator.cs (moved) (moved from trunk/sources/HeuristicLab.Optimization.Operators/3.3/ParentsQualityComparator.cs) (2 diffs)
• HeuristicLab.Parameters/3.3/HeuristicLab.Parameters-3.3.csproj (modified) (1 diff)
• HeuristicLab.Parameters/3.3/SelectedSubScopesLookupParameter.cs (deleted)
• HeuristicLab.Selection.OffspringSelection/3.3 (deleted)
• HeuristicLab.Selection/3.3/ConditionalSelector.cs (copied) (copied from trunk/sources/HeuristicLab.Scheduling.JSSP/3.2/ConditionalSelector.cs) (1 diff)
• HeuristicLab.Selection/3.3/GenderSpecificSelector.cs (modified) (4 diffs)
• HeuristicLab.Selection/3.3/HeuristicLab.Selection-3.3.csproj (modified) (1 diff)
• HeuristicLab.Selection/3.3/OffspringSelector.cs (added)

trunk/sources/HeuristicLab 3.3.sln

@@ -30 +30 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Operators.Programmable-3.3", "HeuristicLab.Operators.Programmable\3.3\HeuristicLab.Operators.Programmable-3.3.csproj", "{6A5F8C2D-B0C3-4B36-BC20-9B1A91EE6DB6}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Selection.OffspringSelection-3.3", "HeuristicLab.Selection.OffspringSelection\3.3\HeuristicLab.Selection.OffspringSelection-3.3.csproj", "{81609E8A-9757-4865-8B89-0B6603F769E8}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.ThreadParallelEngine-3.3", "HeuristicLab.ThreadParallelEngine\3.3\HeuristicLab.ThreadParallelEngine-3.3.csproj", "{C2E99CCE-9FB0-456F-9BA0-57900E4AA799}"
@@ -77 +75 @@
     {4ABA047D-46DD-4608-9E4A-41C5F92FDBB1} = {4ABA047D-46DD-4608-9E4A-41C5F92FDBB1}
     {70DFD984-B1D9-46FE-8EB7-4DE92D71A9FC} = {70DFD984-B1D9-46FE-8EB7-4DE92D71A9FC}
-    {81609E8A-9757-4865-8B89-0B6603F769E8} = {81609E8A-9757-4865-8B89-0B6603F769E8}
     {8FA6898D-E4B0-4E08-A6D6-F9F520E7959F} = {8FA6898D-E4B0-4E08-A6D6-F9F520E7959F}
     {D767C38D-8014-46B0-9A32-03A3AECCE34A} = {D767C38D-8014-46B0-9A32-03A3AECCE34A}
@@ -415 +412 @@
     {6A5F8C2D-B0C3-4B36-BC20-9B1A91EE6DB6}.Services|x64.ActiveCfg = Release|x64
     {6A5F8C2D-B0C3-4B36-BC20-9B1A91EE6DB6}.Services|x86.ActiveCfg = Release|x86
-    {81609E8A-9757-4865-8B89-0B6603F769E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {81609E8A-9757-4865-8B89-0B6603F769E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {81609E8A-9757-4865-8B89-0B6603F769E8}.Debug|x64.ActiveCfg = Debug|x64
-    {81609E8A-9757-4865-8B89-0B6603F769E8}.Debug|x64.Build.0 = Debug|x64
-    {81609E8A-9757-4865-8B89-0B6603F769E8}.Debug|x86.ActiveCfg = Debug|x86
-    {81609E8A-9757-4865-8B89-0B6603F769E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {81609E8A-9757-4865-8B89-0B6603F769E8}.Release|Any CPU.Build.0 = Release|Any CPU
-    {81609E8A-9757-4865-8B89-0B6603F769E8}.Release|x64.ActiveCfg = Release|x64
-    {81609E8A-9757-4865-8B89-0B6603F769E8}.Release|x64.Build.0 = Release|x64
-    {81609E8A-9757-4865-8B89-0B6603F769E8}.Release|x86.ActiveCfg = Release|x86
-    {81609E8A-9757-4865-8B89-0B6603F769E8}.Release|x86.Build.0 = Release|x86
-    {81609E8A-9757-4865-8B89-0B6603F769E8}.Services|Any CPU.ActiveCfg = Release|Any CPU
-    {81609E8A-9757-4865-8B89-0B6603F769E8}.Services|Any CPU.Build.0 = Release|Any CPU
-    {81609E8A-9757-4865-8B89-0B6603F769E8}.Services|x64.ActiveCfg = Release|x64
-    {81609E8A-9757-4865-8B89-0B6603F769E8}.Services|x64.Build.0 = Release|x64
-    {81609E8A-9757-4865-8B89-0B6603F769E8}.Services|x86.ActiveCfg = Release|x86
-    {81609E8A-9757-4865-8B89-0B6603F769E8}.Services|x86.Build.0 = Release|x86
     {C2E99CCE-9FB0-456F-9BA0-57900E4AA799}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     {C2E99CCE-9FB0-456F-9BA0-57900E4AA799}.Debug|Any CPU.Build.0 = Debug|Any CPU

trunk/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithm.cs

@@ -362 +362 @@
     private void ParameterizeComparisonFactorModifiers() {
       foreach (IDiscreteDoubleValueModifier modifier in comparisonFactorModifiers) {
-        modifier.IndexParameter.ActualName = "Generations"; // FIXME: hmmm, not so good, this variable is defined within the main loop
+        modifier.IndexParameter.ActualName = "Generations";
         modifier.EndIndexParameter.ActualName = MaximumGenerationsParameter.Name;
         modifier.EndValueParameter.ActualName = ComparisonFactorUpperBoundParameter.Name;
         modifier.StartIndexParameter.Value = new IntValue(0);
         modifier.StartValueParameter.ActualName = ComparisonFactorLowerBoundParameter.Name;
-        modifier.ValueParameter.ActualName = "ComparisonFactor"; // FIXME: hmmm, not so good, this variable is defined within the main loop
+        modifier.ValueParameter.ActualName = "ComparisonFactor";
       }
     }
@@ -386 +386 @@
     private void UpdateComparisonFactorModifiers() {
       IDiscreteDoubleValueModifier oldModifier = ComparisonFactorModifier;
+      if (oldModifier == null) oldModifier = new LinearDiscreteDoubleValueModifier();
+
       ComparisonFactorModifierParameter.ValidValues.Clear();
       foreach (IDiscreteDoubleValueModifier modifier in comparisonFactorModifiers)
         ComparisonFactorModifierParameter.ValidValues.Add(modifier);
-      if (oldModifier != null) {
-        IDiscreteDoubleValueModifier modifier = ComparisonFactorModifierParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldModifier.GetType());
-        if (modifier != null) ComparisonFactorModifierParameter.Value = modifier;
-      } else if (ComparisonFactorModifierParameter.ValidValues.Count > 0) ComparisonFactorModifierParameter.Value = ComparisonFactorModifierParameter.ValidValues.First();
+      
+      IDiscreteDoubleValueModifier mod = ComparisonFactorModifierParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldModifier.GetType());
+      if (mod != null) ComparisonFactorModifierParameter.Value = mod;
     }
     private void UpdateCrossovers() {

trunk/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithmMainLoop.cs

@@ -152 +152 @@
       ConditionalBranch osBeforeMutationBranch = new ConditionalBranch();
       Placeholder evaluator1 = new Placeholder();
-      ParentsQualityComparator qualityComparer1 = new ParentsQualityComparator();
+      WeightedParentsQualityComparator qualityComparer1 = new WeightedParentsQualityComparator();
       StochasticBranch mutationBranch1 = new StochasticBranch();
       Placeholder mutator1 = new Placeholder();
@@ -159 +159 @@
       Placeholder mutator2 = new Placeholder();
       Placeholder evaluator3 = new Placeholder();
-      ParentsQualityComparator qualityComparer2 = new ParentsQualityComparator();
+      WeightedParentsQualityComparator qualityComparer2 = new WeightedParentsQualityComparator();
       SubScopesRemover subScopesRemover = new SubScopesRemover();
+      ConditionalSelector conditionalSelector = new ConditionalSelector();
       OffspringSelector offspringSelector = new OffspringSelector();
       SubScopesProcessor subScopesProcessor2 = new SubScopesProcessor();
@@ -281 +282 @@
       subScopesRemover.RemoveAllSubScopes = true;
 
+      conditionalSelector.CopySelected = new BoolValue(false);
+      conditionalSelector.ConditionParameter.ActualName = "SuccessfulOffspring";
+
       offspringSelector.CurrentSuccessRatioParameter.ActualName = "CurrentSuccessRatio";
       offspringSelector.LuckyLosersParameter.ActualName = "OSLuckyLosers";
@@ -286 +290 @@
       offspringSelector.PopulationSizeParameter.ActualName = PopulationSizeParameter.Name;
       offspringSelector.SelectionPressureParameter.ActualName = "SelectionPressure";
-      offspringSelector.SuccessfulOffspringParameter.ActualName = "SuccessfulOffspring";
       offspringSelector.SuccessRatioParameter.ActualName = SuccessRatioParameter.Name;
       offspringSelector.WinnersParameter.ActualName = "OSWinners";
@@ -369 +372 @@
       childrenCreator.Successor = uniformSubScopesProcessor;
       uniformSubScopesProcessor.Operator = crossover;
-      uniformSubScopesProcessor.Successor = null;
+      uniformSubScopesProcessor.Successor = conditionalSelector;
       crossover.Successor = osBeforeMutationBranch;
       osBeforeMutationBranch.TrueBranch = evaluator1;

trunk/sources/HeuristicLab.Optimization.Operators/3.3/HeuristicLab.Optimization.Operators-3.3.csproj

@@ -81 +81 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="OffspringSelector.cs" />
-    <Compile Include="ParentsQualityComparator.cs" />
     <Compile Include="ProbabilisticQualityComparator.cs" />
     <Compile Include="ResultsCollector.cs" />
@@ -96 +94 @@
     <Compile Include="SolutionsCreator.cs" />
     <Compile Include="UnidirectionalRingMigrator.cs" />
+    <Compile Include="WeightedParentsQualityComparator.cs" />
   </ItemGroup>
   <ItemGroup>

trunk/sources/HeuristicLab.Optimization.Operators/3.3/WeightedParentsQualityComparator.cs

@@ -30 +30 @@
 
 namespace HeuristicLab.Optimization.Operators {
-  [Item("ParentsQualityComparator", "Compares the quality against that of its parents (assumes the parents are subscopes to the child scope). This operator works with any number of subscopes > 0.")]
+  [Item("WeightedParentsQualityComparator", "Compares the quality against that of its parents (assumes the parents are subscopes to the child scope). This operator works with any number of subscopes > 0.")]
   [StorableClass]
-  public class ParentsQualityComparator : SingleSuccessorOperator, ISubScopesQualityComparator {
+  public class WeightedParentsQualityComparator : SingleSuccessorOperator, ISubScopesQualityComparator {
     public IValueLookupParameter<BoolValue> MaximizationParameter {
       get { return (IValueLookupParameter<BoolValue>)Parameters["Maximization"]; }
@@ -49 +49 @@
     }
 
-    public ParentsQualityComparator()
+    public WeightedParentsQualityComparator()
       : base() {
       Parameters.Add(new ValueLookupParameter<BoolValue>("Maximization", "True if the problem is a maximization problem, false otherwise"));

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

@@ -86 +86 @@
     <None Include="HeuristicLabParametersPlugin.cs.frame" />
     <Compile Include="ConstrainedValueParameter.cs" />
-    <Compile Include="SelectedSubScopesLookupParameter.cs" />
     <Compile Include="OptionalConstrainedValueParameter.cs" />
     <Compile Include="ValueParameter.cs" />

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" />