Changeset 3425 for trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3

Timestamp:

04/19/10 23:34:34 (14 years ago)

Author:

abeham

Message:

Changed MultiCrossover to StochasticMultiOperator
Derived StochasticMultiBranch from StochasticMultiOperator
Derived encoding specific mutation/crossover operators from StochasticMultiOperator
#976

Location:

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3

Files:

• Crossovers/MultiPermutationCrossover.cs (modified) (4 diffs)
• HeuristicLab.Encodings.PermutationEncoding-3.3.csproj (modified) (1 diff)
• Manipulators/MultiPermutationManipulator.cs (added)

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Crossovers/MultiPermutationCrossover.cs

@@ -20 +20 @@
 #endregion
 
+using System.Linq;
 using HeuristicLab.Collections;
 using HeuristicLab.Core;
@@ -27 +28 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Encodings.PermutationEncoding.Crossovers {
+namespace HeuristicLab.Encodings.PermutationEncoding {
   [Item("MultiPermutationCrossover", "Randomly selects and applies one of its crossovers every time it is called.")]
   [StorableClass]
-  public class MultiPermutationCrossover : MultiCrossover<IPermutationCrossover>, IPermutationCrossover {
+  public class MultiPermutationCrossover : StochasticMultiOperator<IPermutationCrossover>, IPermutationCrossover {
     public override bool CanChangeName {
       get { return false; }
     }
+    protected override bool CreateChildOperation {
+      get { return true; }
+    }
+    public override bool AutomaticTypeDiscovery {
+      get { return true; }
+    }
+
     public ILookupParameter<ItemArray<Permutation>> ParentsParameter {
       get { return (ILookupParameter<ItemArray<Permutation>>)Parameters["Parents"]; }
@@ -58 +66 @@
     private void Initialize() {
       Operators.ItemsAdded += new CollectionItemsChangedEventHandler<IndexedItem<IPermutationCrossover>>(Operators_ItemsAdded);
+      Operators.ItemsReplaced += new CollectionItemsChangedEventHandler<IndexedItem<IPermutationCrossover>>(Operators_ItemsReplaced);
+    }
+
+    private void Operators_ItemsReplaced(object sender, CollectionItemsChangedEventArgs<IndexedItem<IPermutationCrossover>> e) {
+      ParameterizeCrossovers();
     }
 
@@ -65 +78 @@
 
     private void ParameterizeCrossovers() {
-      foreach (IPermutationCrossover crossover in Operators) {
+      foreach (IPermutationCrossover crossover in Operators.OfType<IPermutationCrossover>()) {
         crossover.ChildParameter.ActualName = ChildParameter.Name;
         crossover.ParentsParameter.ActualName = ParentsParameter.Name;
       }
-      foreach (IStochasticOperator crossover in Operators) {
+      foreach (IStochasticOperator crossover in Operators.OfType<IStochasticOperator>()) {
         crossover.RandomParameter.ActualName = RandomParameter.Name;
       }

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/HeuristicLab.Encodings.PermutationEncoding-3.3.csproj

@@ -103 +103 @@
     <Compile Include="Manipulators\InsertionManipulator.cs" />
     <Compile Include="Manipulators\InversionManipulator.cs" />
+    <Compile Include="Manipulators\MultiPermutationManipulator.cs" />
     <Compile Include="Manipulators\ScrambleManipulator.cs" />
     <Compile Include="Manipulators\Swap2Manipulator.cs" />