Changeset 2865 for trunk/sources/HeuristicLab.Permutation

Timestamp:

02/25/10 06:35:43 (15 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• worked on algorithms

Location:

trunk/sources/HeuristicLab.Permutation/3.3

Files:

• AbsolutePositionTopologicalCrossover.cs (modified) (1 diff)
• CosaCrossover.cs (modified) (1 diff)
• EdgeRecombinationCrossover.cs (modified) (1 diff)
• HeuristicLab.Permutation-3.3.csproj (modified) (2 diffs)
• IPermutationCreator.cs (added)
• IPermutationCrossover.cs (moved) (moved from trunk/sources/HeuristicLab.Permutation/3.3/IPermutationCrossoverOperator.cs) (2 diffs)
• IPermutationManipulator.cs (moved) (moved from trunk/sources/HeuristicLab.Permutation/3.3/IPermutationManipulationOperator.cs) (2 diffs)
• IPermutationOperator.cs (added)
• InsertionManipulator.cs (modified) (1 diff)
• OrderBasedCrossover.cs (modified) (1 diff)
• PermutationCrossover.cs (modified) (1 diff)
• PermutationManipulator.cs (modified) (1 diff)
• RandomPermutationCreator.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Permutation/3.3/AbsolutePositionTopologicalCrossover.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 

trunk/sources/HeuristicLab.Permutation/3.3/CosaCrossover.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 

trunk/sources/HeuristicLab.Permutation/3.3/EdgeRecombinationCrossover.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 

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

@@ -83 +83 @@
     <None Include="HeuristicLabPermutationPlugin.cs.frame" />
     <Compile Include="AbsolutePositionTopologicalCrossover.cs" />
+    <Compile Include="IPermutationCreator.cs" />
+    <Compile Include="IPermutationOperator.cs" />
     <Compile Include="CosaCrossover.cs" />
     <Compile Include="CyclicCrossover.cs" />
@@ -90 +92 @@
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="IPermutationCrossoverOperator.cs" />
-    <Compile Include="IPermutationManipulationOperator.cs" />
+    <Compile Include="IPermutationCrossover.cs" />
+    <Compile Include="IPermutationManipulator.cs" />
     <Compile Include="MaximalPreservativeCrossover.cs" />
     <Compile Include="OrderBasedCrossover.cs" />

trunk/sources/HeuristicLab.Permutation/3.3/IPermutationCrossover.cs

@@ -21 +21 @@
 
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Optimization;
 
@@ -28 +27 @@
   /// An interface which represents an operator for crossing permutations.
   /// </summary>
-  public interface IPermutationCrossoverOperator : ICrossoverOperator { }
+  public interface IPermutationCrossover : IPermutationOperator, ICrossover {
+    ILookupParameter<ItemArray<Permutation>> ParentsParameter { get; }
+    ILookupParameter<Permutation> ChildParameter { get; }
+  }
 }

trunk/sources/HeuristicLab.Permutation/3.3/IPermutationManipulator.cs

@@ -21 +21 @@
 
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Optimization;
 
@@ -28 +27 @@
   /// An interface which represents an operator for manipulating solutions.
   /// </summary>
-  public interface IPermutationManipulationOperator : IManipulationOperator { }
+  public interface IPermutationManipulator : IPermutationOperator, IManipulator {
+    ILookupParameter<Permutation> PermutationParameter { get; }
+  }
 }

trunk/sources/HeuristicLab.Permutation/3.3/InsertionManipulator.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Text;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;

trunk/sources/HeuristicLab.Permutation/3.3/OrderBasedCrossover.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 

trunk/sources/HeuristicLab.Permutation/3.3/PermutationCrossover.cs

@@ -32 +32 @@
   [Item("PermutationCrossover", "A base class for permutation crossover operators.")]
   [EmptyStorableClass]
-  public abstract class PermutationCrossover : SingleSuccessorOperator, IPermutationCrossoverOperator {
+  public abstract class PermutationCrossover : SingleSuccessorOperator, IPermutationCrossover, IStochasticOperator {
     public ILookupParameter<IRandom> RandomParameter {
       get { return (LookupParameter<IRandom>)Parameters["Random"]; }
     }
-    public SubScopesLookupParameter<Permutation> ParentsParameter {
+    public ILookupParameter<ItemArray<Permutation>> ParentsParameter {
       get { return (SubScopesLookupParameter<Permutation>)Parameters["Parents"]; }
     }
-    public LookupParameter<Permutation> ChildParameter {
-      get { return (LookupParameter<Permutation>)Parameters["Child"]; }
+    public ILookupParameter<Permutation> ChildParameter {
+      get { return (ILookupParameter<Permutation>)Parameters["Child"]; }
     }
 

trunk/sources/HeuristicLab.Permutation/3.3/PermutationManipulator.cs

@@ -32 +32 @@
   [Item("PermutationManipulator", "A base class for permutation manipulation operators.")]
   [EmptyStorableClass]
-  public abstract class PermutationManipulator : SingleSuccessorOperator, IPermutationManipulationOperator {
+  public abstract class PermutationManipulator : SingleSuccessorOperator, IPermutationManipulator, IStochasticOperator {
     public ILookupParameter<IRandom> RandomParameter {
       get { return (LookupParameter<IRandom>)Parameters["Random"]; }
     }
-    public LookupParameter<Permutation> PermutationParameter {
-      get { return (LookupParameter<Permutation>)Parameters["Permutation"]; }
+    public ILookupParameter<Permutation> PermutationParameter {
+      get { return (ILookupParameter<Permutation>)Parameters["Permutation"]; }
     }
 

trunk/sources/HeuristicLab.Permutation/3.3/RandomPermutationCreator.cs

@@ -34 +34 @@
   [EmptyStorableClass]
   [Creatable("Test")]
-  public sealed class RandomPermutationCreator : SingleSuccessorOperator, ISolutionCreator {
+  public sealed class RandomPermutationCreator : SingleSuccessorOperator, IPermutationCreator, IStochasticOperator {
     public ILookupParameter<IRandom> RandomParameter {
       get { return (LookupParameter<IRandom>)Parameters["Random"]; }
     }
-    public ValueLookupParameter<IntData> LengthParameter {
-      get { return (ValueLookupParameter<IntData>)Parameters["Length"]; }
+    public IValueLookupParameter<IntData> LengthParameter {
+      get { return (IValueLookupParameter<IntData>)Parameters["Length"]; }
     }
-    public LookupParameter<Permutation> PermutationParameter {
-      get { return (LookupParameter<Permutation>)Parameters["Permutation"]; }
+    public ILookupParameter<Permutation> PermutationParameter {
+      get { return (ILookupParameter<Permutation>)Parameters["Permutation"]; }
     }