Changeset 10101

Timestamp:

10/31/13 14:31:42 (10 years ago)

Author:

ascheibe

Message:

#1886 added PermutationPointcut and refactored pointcut code

Location:

branches/HeuristicLab.Analysis.AlgorithmBehavior

Files:

• HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/CombinedOperators/QAPAfterCrossoverCombinedOperator.cs (modified) (2 diffs)
• HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/CombinedOperators/TSPAfterCrossoverCombinedOperator.cs (modified) (2 diffs)
• HeuristicLab.Analysis.SolutionCaching/3.3/CrossoverPointcut.cs (added)
• HeuristicLab.Analysis.SolutionCaching/3.3/HeuristicLab.Analysis.SolutionCaching-3.3.csproj (modified) (1 diff)
• HeuristicLab.Analysis.SolutionCaching/3.3/PermutationEncoding/IPermutationAdvice.cs (added)
• HeuristicLab.Analysis.SolutionCaching/3.3/PermutationEncoding/IPermutationPointcut.cs (added)
• HeuristicLab.Analysis.SolutionCaching/3.3/PermutationEncoding/PermutationCrossoverPointcut.cs (added)
• HeuristicLab.Analysis.SolutionCaching/3.3/RealVectorEncoding/RealVectorCrossoverPointcut.cs (modified) (5 diffs)

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/CombinedOperators/QAPAfterCrossoverCombinedOperator.cs

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Analysis.SolutionCaching.PermutationEncoding;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -27 +28 @@
   [Item("QAPAfterCrossoverCombinedOperator", "An operator that contains all operators that need to be executed after crossover for the QAP.")]
   [StorableClass]
-  public class QAPAfterCrossoverCombinedOperator : AfterCrossoverCombinedOperator {
+  public class QAPAfterCrossoverCombinedOperator : AfterCrossoverCombinedOperator, IPermutationAdvice {
 
     [StorableConstructor]

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/CombinedOperators/TSPAfterCrossoverCombinedOperator.cs

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Analysis.SolutionCaching.PermutationEncoding;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -27 +28 @@
   [Item("TSPAfterCrossoverCombinedOperator", "An operator that contains all operators that need to be executed after crossover for the TSP.")]
   [StorableClass]
-  public class TSPAfterCrossoverCombinedOperator : AfterCrossoverCombinedOperator {
+  public class TSPAfterCrossoverCombinedOperator : AfterCrossoverCombinedOperator, IPermutationAdvice {
     [StorableConstructor]
     protected TSPAfterCrossoverCombinedOperator(bool deserializing) : base(deserializing) { }

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.SolutionCaching/3.3/HeuristicLab.Analysis.SolutionCaching-3.3.csproj

@@ -127 +127 @@
     <Compile Include="Algorithm\SolutionCacheAnalyzerAlgorithm.cs" />
     <Compile Include="Algorithm\ParallelOperatorProcessor.cs" />
+    <Compile Include="CrossoverPointcut.cs" />
     <Compile Include="IAdvice.cs" />
     <Compile Include="IPointcut.cs" />
     <Compile Include="ISolutionCache.cs" />
+    <Compile Include="PermutationEncoding\IPermutationAdvice.cs" />
+    <Compile Include="PermutationEncoding\IPermutationPointcut.cs" />
+    <Compile Include="PermutationEncoding\PermutationCrossoverPointcut.cs" />
     <Compile Include="PermutationEncoding\PermutationSolutionCache.cs" />
     <Compile Include="PermutationEncoding\PermutationSolutionCacheCollector.cs" />

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.SolutionCaching/3.3/RealVectorEncoding/RealVectorCrossoverPointcut.cs

@@ -35 +35 @@
   [Item("RealVectorCrossoverPointcut", "Wraps a crossover and applies after-crossover actions.")]
   [StorableClass]
-  public class RealVectorCrossoverPointcut : SingleSuccessorOperator, IRealVectorCrossover, IStochasticOperator, IRealVectorPointcut {
-    private const string AdviceParameterName = "Advice";
-    private const string CrossoversParameterName = "Crossovers";
-
-    public ConstrainedValueParameter<IRealVectorCrossover> CrossoversParameter {
-      get { return (ConstrainedValueParameter<IRealVectorCrossover>)Parameters[CrossoversParameterName]; }
-    }
-    public ConstrainedValueParameter<IRealVectorAdvice> AdviceParameter {
-      get { return (ConstrainedValueParameter<IRealVectorAdvice>)Parameters[AdviceParameterName]; }
-    }
+  public class RealVectorCrossoverPointcut : CrossoverPointcut<IRealVectorAdvice, IRealVectorCrossover>, IRealVectorCrossover, IRealVectorPointcut {
     public ILookupParameter<ItemArray<RealVector>> ParentsParameter {
       get { return (ScopeTreeLookupParameter<RealVector>)Parameters["Parents"]; }
@@ -54 +45 @@
       get { return (IValueLookupParameter<DoubleMatrix>)Parameters["Bounds"]; }
     }
-    public ILookupParameter<IRandom> RandomParameter {
-      get { return (ILookupParameter<IRandom>)Parameters["Random"]; }
-    }
 
     [StorableConstructor]
@@ -64 +52 @@
     public RealVectorCrossoverPointcut()
       : base() {
-      var cxs = new ConstrainedValueParameter<IRealVectorCrossover>(CrossoversParameterName, "The crossovers.");
+      Parameters.Add(new ScopeTreeLookupParameter<RealVector>("Parents", "The parent vectors which should be crossed."));
+      ParentsParameter.ActualName = "RealVector";
+      Parameters.Add(new LookupParameter<RealVector>("Child", "The child vector resulting from the crossover."));
+      ChildParameter.ActualName = "RealVector";
+      Parameters.Add(new ValueLookupParameter<DoubleMatrix>("Bounds", "The lower and upper bounds of the real vector."));
+
       //Would be nicer if it comes from operator collection, but MultiRealVector Crossover does the same thing.
       //Also: MultiRealVectorCrossover cannot be used here as it would generate a cyclic recursion 
@@ -71 +64 @@
         if ((!typeof(RealVectorCrossoverPointcut).IsAssignableFrom(t)) &&
           (!typeof(MultiOperator<IRealVectorCrossover>).IsAssignableFrom(t))) {
-          cxs.ValidValues.Add((IRealVectorCrossover)Activator.CreateInstance(t));
+          CrossoversParameter.ValidValues.Add((IRealVectorCrossover)Activator.CreateInstance(t));
         }
       }
-      Parameters.Add(cxs);
-
-      var advices = new ConstrainedValueParameter<IRealVectorAdvice>(AdviceParameterName,
-        "Advice to introduce after crossover");
-      foreach (var a in ApplicationManager.Manager.GetInstances<IRealVectorAdvice>()) {
-        advices.ValidValues.Add(a);
-      }
-      Parameters.Add(advices);
-
-      Parameters.Add(new ScopeTreeLookupParameter<RealVector>("Parents", "The parent vectors which should be crossed."));
-      ParentsParameter.ActualName = "RealVector";
-      Parameters.Add(new LookupParameter<RealVector>("Child", "The child vector resulting from the crossover."));
-      ChildParameter.ActualName = "RealVector";
-      Parameters.Add(new ValueLookupParameter<DoubleMatrix>("Bounds", "The lower and upper bounds of the real vector."));
-      Parameters.Add(new LookupParameter<IRandom>("Random", "The random number generator to use."));
 
       ParameterizeCrossovers();
@@ -95 +73 @@
     public override IDeepCloneable Clone(Cloner cloner) {
       return new RealVectorCrossoverPointcut(this, cloner);
-    }
-
-    public override IOperation Apply() {
-      IOperation successor = base.Apply();
-      IOperation crossoverOperation = ExecutionContext.CreateChildOperation(CrossoversParameter.Value);
-      IOperation adviceOperation = ExecutionContext.CreateChildOperation(AdviceParameter.Value);
-
-      var opCol = new OperationCollection();
-      opCol.Add(crossoverOperation);
-      opCol.Add(adviceOperation);
-      if (successor != null)
-        opCol.Add(successor);
-
-      return opCol;
     }