Changeset 2805 for trunk/sources/HeuristicLab.Selection

Timestamp:

02/16/10 06:50:14 (14 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• worked on parameters, TSP and selection

Location:

trunk/sources/HeuristicLab.Selection/3.3

Files:

• HeuristicLab.Selection-3.3.csproj (modified) (3 diffs)
• HeuristicLabSelectionPlugin.cs.frame (modified) (1 diff)
• LeftSelector.cs (modified) (2 diffs)
• RandomSelector.cs (modified) (2 diffs)
• RightSelector.cs (modified) (2 diffs)
• Selector.cs (added)
• SelectorBase.cs (deleted)
• StochasticSelector.cs (added)
• StochasticSelectorBase.cs (deleted)
• StochasticSingleObjectiveSelector.cs (added)
• TournamentSelector.cs (modified) (2 diffs)

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

@@ -82 +82 @@
   <ItemGroup>
     <None Include="HeuristicLabSelectionPlugin.cs.frame" />
+    <Compile Include="RightSelector.cs" />
+    <Compile Include="StochasticSelector.cs" />
+    <Compile Include="LeftSelector.cs" />
+    <Compile Include="RandomSelector.cs" />
+    <Compile Include="StochasticSingleObjectiveSelector.cs" />
     <Compile Include="HeuristicLabSelectionPlugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Selector.cs" />
+    <Compile Include="TournamentSelector.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -90 +97 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
+      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
+      <Name>HeuristicLab.Collections-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
@@ -101 +112 @@
       <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
       <Name>HeuristicLab.Operators-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
+      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
+      <Name>HeuristicLab.Parameters-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
+      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
+      <Name>HeuristicLab.Persistence-3.3</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj">

trunk/sources/HeuristicLab.Selection/3.3/HeuristicLabSelectionPlugin.cs.frame

@@ -31 +31 @@
   [Plugin("HeuristicLab.Selection", "3.3.0.$WCREV$")]
   [PluginFile("HeuristicLab.Selection-3.3.dll", PluginFileType.Assembly)]
+  [PluginDependency("HeuristicLab.Collections", "3.3")]
   [PluginDependency("HeuristicLab.Core", "3.3")]
   [PluginDependency("HeuristicLab.Data", "3.3")]
   [PluginDependency("HeuristicLab.Operators", "3.3")]
+  [PluginDependency("HeuristicLab.Parameters", "3.3")]
+  [PluginDependency("HeuristicLab.Persistence", "3.3")]
   public class HeuristicLabSelectionPlugin : PluginBase {
   }

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2008 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -20 +20 @@
 #endregion
 
-using System;
 using System.Collections.Generic;
-using System.Text;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
+using HeuristicLab.Parameters;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Selection {
   /// <summary>
-  /// Copies or moves a defined number of sub scopes from a source scope to a target scope, starting at
-  /// the left side of the tree.
+  /// An operator which selects sub-scopes from left to right.
   /// </summary>
-  public class LeftSelector : StochasticSelectorBase {
-    /// <inheritdoc select="summary"/>
-    public override string Description {
-      get { return @"TODO\r\nOperator description still missing ..."; }
-    }
+  [Item("LeftSelector", "An operator which selects sub-scopes from left to right.")]
+  [EmptyStorableClass]
+  [Creatable("Test")]
+  public sealed class LeftSelector : Selector {
+    public LeftSelector() : base() { }
 
-    /// <summary>
-    /// Copies or moves a number of sub scopes (<paramref name="selected"/>) from <paramref name="source"/>
-    /// starting at the left end to the <paramref name="target"/>.
-    /// </summary>
-    /// <param name="random">A random number generator.</param>
-    /// <param name="source">The source scope from which to copy/move the sub scopes.</param>
-    /// <param name="selected">The number of sub scopes to move. Can be also bigger than the total 
-    /// number of sub scopes in <paramref name="source"/>, then the copying process starts again from the 
-    /// beginning.</param>
-    /// <param name="target">The target where to copy/move the sub scopes.</param>
-    /// <param name="copySelected">Boolean flag whether the sub scopes shall be copied or moved.</param>
-    protected override void Select(IRandom random, IScope source, int selected, IScope target, bool copySelected) {
-      int index = 0;
-      for (int i = 0; i < selected; i++) {
-        if (copySelected) {
-          target.AddSubScope((IScope)source.SubScopes[index].Clone());
-          index++;
-          if (index >= source.SubScopes.Count) index = 0;
+    protected override void Select(ScopeList source, ScopeList target) {
+      int count = NumberOfSelectedSubScopesParameter.ActualValue.Value;
+      bool copy = CopySelectedParameter.Value.Value;
+
+      int j = 0;
+      for (int i = 0; i < count; i++) {
+        if (copy) {
+          target.Add((IScope)source[j].Clone());
+          j++;
+          if (j >= source.Count) j = 0;
         } else {
-          IScope s = source.SubScopes[0];
-          source.RemoveSubScope(s);
-          target.AddSubScope(s);
+          target.Add(source[0]);
+          source.RemoveAt(0);
         }
       }

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2008 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -20 +20 @@
 #endregion
 
-using System;
 using System.Collections.Generic;
-using System.Text;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
+using HeuristicLab.Parameters;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Selection {
   /// <summary>
-  /// Copies or moves a defined number of sub scopes from a source scope to a target scope, being selected
-  /// randomly.
+  /// A random selection operator.
   /// </summary>
-  public class RandomSelector : StochasticSelectorBase {
-    /// <inheritdoc select="summary"/>
-    public override string Description {
-      get { return @"TODO\r\nOperator description still missing ..."; }
-    }
+  [Item("RandomSelector", "A random selection operator.")]
+  [EmptyStorableClass]
+  [Creatable("Test")]
+  public sealed class RandomSelector : StochasticSelector {
+    public RandomSelector() : base() { }
 
-    /// <summary>
-    /// Copies or moves a number of sub scopes (<paramref name="selected"/>) from <paramref name="source"/>
-    /// to the <paramref name="target"/>, chosen randomly.
-    /// </summary>
-    /// <param name="random">The random number generator.</param>
-    /// <param name="source">The source scope from which to copy/move the sub scopes.</param>
-    /// <param name="selected">The number of sub scopes to move.</param>
-    /// <param name="target">The target where to copy/move the sub scopes.</param>
-    /// <param name="copySelected">Boolean flag whether the sub scopes shall be copied or moved.</param>
-    protected override void Select(IRandom random, IScope source, int selected, IScope target, bool copySelected) {
-      for (int i = 0; i < selected; i++) {
-        if (copySelected) {
-          target.AddSubScope((IScope)source.SubScopes[random.Next(source.SubScopes.Count)].Clone());
-        } else {
-          IScope s = source.SubScopes[random.Next(source.SubScopes.Count)];
-          source.RemoveSubScope(s);
-          target.AddSubScope(s);
+    protected override void Select(ScopeList source, ScopeList target) {
+      int count = NumberOfSelectedSubScopesParameter.ActualValue.Value;
+      bool copy = CopySelectedParameter.Value.Value;
+      IRandom random = RandomParameter.ActualValue;
+
+      for (int i = 0; i < count; i++) {
+        if (copy)
+          target.Add((IScope)source[random.Next(source.Count)].Clone());
+        else {
+          int index = random.Next(source.Count);
+          target.Add(source[index]);
+          source.RemoveAt(index);
         }
       }

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2008 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -20 +20 @@
 #endregion
 
-using System;
 using System.Collections.Generic;
-using System.Text;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
+using HeuristicLab.Parameters;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Selection {
   /// <summary>
-  /// Copies or moves a defined number of sub scopes from a source scope to a target scope, starting at
-  /// the right side of the tree.
+  /// An operator which selects sub-scopes from right to left.
   /// </summary>
-  public class RightSelector : StochasticSelectorBase {
-    /// <inheritdoc select="summary"/>
-    public override string Description {
-      get { return @"TODO\r\nOperator description still missing ..."; }
-    }
+  [Item("RightSelector", "An operator which selects sub-scopes from right to left.")]
+  [EmptyStorableClass]
+  [Creatable("Test")]
+  public sealed class RightSelector : Selector {
+    public RightSelector() : base() { }
 
-    /// <summary>
-    /// Copies or moves a number of sub scopes (<paramref name="selected"/>) from <paramref name="source"/>
-    /// starting at the right end to the <paramref name="target"/>.
-    /// </summary>
-    /// <param name="random">A random number generator.</param>
-    /// <param name="source">The source scope from which to copy/move the sub scopes.</param>
-    /// <param name="selected">The number of sub scopes to move. Can be also bigger than the total 
-    /// number of sub scopes in <paramref name="source"/>, then the copying process starts again from the 
-    /// beginning.</param>
-    /// <param name="target">The target where to copy/move the sub scopes.</param>
-    /// <param name="copySelected">Boolean flag whether the sub scopes shall be copied or moved.</param>
-    protected override void Select(IRandom random, IScope source, int selected, IScope target, bool copySelected) {
-      int index = source.SubScopes.Count - 1;
-      for (int i = 0; i < selected; i++) {
-        if (copySelected) {
-          target.AddSubScope((IScope)source.SubScopes[index].Clone());
-          index--;
-          if (index < 0) index = source.SubScopes.Count - 1;
+    protected override void Select(ScopeList source, ScopeList target) {
+      int count = NumberOfSelectedSubScopesParameter.ActualValue.Value;
+      bool copy = CopySelectedParameter.Value.Value;
+
+      int j = source.Count - 1;
+      for (int i = 0; i < count; i++) {
+        if (copy) {
+          target.Add((IScope)source[j].Clone());
+          j--;
+          if (j < 0) j = source.Count - 1;
         } else {
-          IScope s = source.SubScopes[source.SubScopes.Count - 1];
-          source.RemoveSubScope(s);
-          target.AddSubScope(s);
+          target.Add(source[source.Count - 1]);
+          source.RemoveAt(source.Count - 1);
         }
       }

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2008 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -20 +20 @@
 #endregion
 
-using System;
 using System.Collections.Generic;
-using System.Text;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Parameters;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Selection {
   /// <summary>
-  /// Moves or copies a defined number of the best sub scopes from a source scope to a target scope.
+  /// A tournament selection operator which considers a single double quality value for selection.
   /// </summary>
-  public class TournamentSelector : StochasticSelectorBase {
-    /// <inheritdoc select="summary"/>
-    public override string Description {
-      get { return @"TODO\r\nOperator description still missing ..."; }
+  [Item("TournamentSelector", "A tournament selection operator which considers a single double quality value for selection.")]
+  [EmptyStorableClass]
+  [Creatable("Test")]
+  public sealed class TournamentSelector : StochasticSingleObjectiveSelector {
+    public ValueLookupParameter<IntData> GroupSizeParameter {
+      get { return (ValueLookupParameter<IntData>)Parameters["GroupSize"]; }
     }
 
-    /// <summary>
-    /// Initializes a new instance of <see cref="TournamentSelector"/> with three variable infos 
-    /// (<c>Maximization</c>, <c>Quality</c> and <c>GroupSize</c>, being a local variable and set to 
-    /// <c>2</c>) with <c>CopySelected</c> set to <c>true</c>.
-    /// </summary>
-    public TournamentSelector() {
-      AddVariableInfo(new VariableInfo("Maximization", "Maximization problem", typeof(BoolData), VariableKind.In));
-      AddVariableInfo(new VariableInfo("Quality", "Quality value", typeof(DoubleData), VariableKind.In));
-      AddVariableInfo(new VariableInfo("GroupSize", "Size of the tournament group", typeof(IntData), VariableKind.In));
-      GetVariableInfo("GroupSize").Local = true;
-      AddVariable(new Variable("GroupSize", new IntData(2)));
-      GetVariable("CopySelected").GetValue<BoolData>().Data = true;
+    public TournamentSelector() : base() {
+      Parameters.Add(new ValueLookupParameter<IntData>("GroupSize", "The size of the tournament group.", new IntData(2)));
     }
 
-    /// <summary>
-    /// Copies or moves the best sub scopes from the given <paramref name="source"/> to the specified
-    /// <paramref name="target"/>.
-    /// </summary>
-    /// <exception cref="InvalidOperationException">Thrown when no source sub scopes are available.</exception>
-    /// <param name="random">The random number generator.</param>
-    /// <param name="source">The source scope from where to copy/move the sub scopes.</param>
-    /// <param name="selected">The number of sub scopes to copy/move.</param>
-    /// <param name="target">The target scope where to add the sub scopes.</param>
-    /// <param name="copySelected">Boolean flag whether the sub scopes shall be moved or copied.</param>
-    protected override void Select(IRandom random, IScope source, int selected, IScope target, bool copySelected) {
-      IVariableInfo qualityInfo = GetVariableInfo("Quality");
-      bool maximization = GetVariableValue<BoolData>("Maximization", source, true).Data;
-      int groupSize = GetVariableValue<IntData>("GroupSize", source, true).Data;
-      for (int i = 0; i < selected; i++) {
-        if (source.SubScopes.Count < 1) throw new InvalidOperationException("No source scopes available to select.");
+    protected override void Select(ScopeList source, ScopeList target) {
+      int count = NumberOfSelectedSubScopesParameter.ActualValue.Value;
+      bool copy = CopySelectedParameter.Value.Value;
+      IRandom random = RandomParameter.ActualValue;
+      bool maximization = MaximizationParameter.ActualValue.Value;
+      List<DoubleData> qualities = new List<DoubleData>(QualityParameter.ActualValue);
+      int groupSize = GroupSizeParameter.ActualValue.Value;
 
-        IScope selectedScope = source.SubScopes[random.Next(source.SubScopes.Count)];
-        double best = selectedScope.GetVariableValue<DoubleData>(qualityInfo.FormalName, false).Data;
+      for (int i = 0; i < count; i++) {
+        int best = random.Next(source.Count);
+        int index;
         for (int j = 1; j < groupSize; j++) {
-          IScope scope = source.SubScopes[random.Next(source.SubScopes.Count)];
-          double quality = scope.GetVariableValue<DoubleData>(qualityInfo.FormalName, false).Data;
-          if (((maximization) && (quality > best)) ||
-              ((!maximization) && (quality < best))) {
-            best = quality;
-            selectedScope = scope;
+          index = random.Next(source.Count);
+          if (((maximization) && (qualities[index].Value > qualities[best].Value)) ||
+              ((!maximization) && (qualities[index].Value < qualities[best].Value))) {
+            best = index;
           }
         }
 
-        if (copySelected)
-          target.AddSubScope((IScope)selectedScope.Clone());
+        if (copy)
+          target.Add((IScope)source[best].Clone());
         else {
-          source.RemoveSubScope(selectedScope);
-          target.AddSubScope(selectedScope);
+          target.Add(source[best]);
+          source.RemoveAt(best);
+          qualities.RemoveAt(best);
         }
       }