Changeset 8711

Timestamp:

10/01/12 22:53:20 (12 years ago)

Author:

ascheibe

Message:

#1886 added a combined operator for mutation

Location:

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3

Files:

• AfterCrossoverCombinedOperator.cs (modified) (6 diffs)
• AfterMutationCombinedOperator.cs (added)
• CombinedOperator.cs (added)
• HeuristicLab.Analysis.AlgorithmBehavior.Analyzers-3.3.csproj (modified) (1 diff)
• VariableRemover.cs (modified) (1 diff)

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/AfterCrossoverCombinedOperator.cs

@@ -22 +22 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Operators;
 using HeuristicLab.Optimization;
 using HeuristicLab.Optimization.Operators;
@@ -31 +30 @@
   [Item("AfterCrossoverCombinedOperator", "An operator that contains all operators that need to be executed after crossover.")]
   [StorableClass]
-  public class AfterCrossoverCombinedOperator : MultiOperator<IOperator> {
-
-    private CrossoverPerformanceAnalyzer cxAnalyzer;
-
-    private ScopeParameter CurrentScopeParameter {
-      get { return (ScopeParameter)Parameters["CurrentScope"]; }
-    }
-    public IScope CurrentScope {
-      get { return CurrentScopeParameter.ActualValue; }
-    }
+  public class AfterCrossoverCombinedOperator : CombinedOperator {
     public ILookupParameter<IEvaluator> EvaluatorParameter {
       get { return ((LookupParameter<IEvaluator>)Parameters["Evaluator"]); }
@@ -49 +39 @@
 
     [StorableConstructor]
-    private AfterCrossoverCombinedOperator(bool deserializing) : base(deserializing) { }
-    private AfterCrossoverCombinedOperator(AfterCrossoverCombinedOperator original, Cloner cloner)
+    protected AfterCrossoverCombinedOperator(bool deserializing) : base(deserializing) { }
+    protected AfterCrossoverCombinedOperator(AfterCrossoverCombinedOperator original, Cloner cloner)
       : base(original, cloner) {
     }
@@ -56 +46 @@
     public AfterCrossoverCombinedOperator()
       : base() {
-      Parameters.Add(new ScopeParameter("CurrentScope", "The current scope whose variables and sub-scopes should be removed."));
       Parameters.Add(new LookupParameter<IEvaluator>("Evaluator", "The operator which is used to evaluate new solutions."));
       Parameters.Add(new ValueParameter<SingleObjectiveSolutionSimilarityCalculator>("SimilarityCalculator"));
 
       SimilarityCalculatorParameter.ValueChanged += new System.EventHandler(SimilarityCalculatorParameter_ValueChanged);
-
-      cxAnalyzer = new CrossoverPerformanceAnalyzer();
-      var varDuplicator = new VariableDuplicator();
-
-      Operators.Add(cxAnalyzer);
-      Operators.Add(varDuplicator);
     }
 
@@ -72 +55 @@
       SimilarityCalculatorParameter.Value.QualityVariableName = "TSPTourLength";
       SimilarityCalculatorParameter.Value.SolutionVariableName = "TSPTour";
-      cxAnalyzer.SimilarityCalculatorParameter.Value = SimilarityCalculatorParameter.Value;
     }
 
@@ -79 +61 @@
     }
 
-    public override IOperation Apply() {
-      if (!Operators.Contains(EvaluatorParameter.ActualValue)) {
-        Operators.Insert(0, EvaluatorParameter.ActualValue);
-      }
+    public override void InitializeOperators() {
+      var cxAnalyzer = new CrossoverPerformanceAnalyzer();
+      cxAnalyzer.SimilarityCalculatorParameter.Value = SimilarityCalculatorParameter.Value;
+      var varDuplicator = new VariableDuplicator();
 
-      OperationCollection next = new OperationCollection(base.Apply());
-      OperationCollection inner = new OperationCollection();
-      inner.Parallel = false;
-
-      for (int i = 0; i < Operators.Count; i++) {
-        inner.Add(ExecutionContext.CreateOperation(Operators[i], CurrentScope));
-      }
-      next.Insert(0, inner);
-      return next;
+      Operators.Add(EvaluatorParameter.ActualValue);
+      Operators.Add(cxAnalyzer);
+      Operators.Add(varDuplicator);
     }
   }

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

@@ -116 +116 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="CombinedOperator.cs" />
+    <Compile Include="AlgorithmBehaviorHelpers.cs" />
     <Compile Include="AfterCrossoverCombinedOperator.cs" />
-    <Compile Include="AlgorithmBehaviorHelpers.cs" />
+    <Compile Include="AfterMutationCombinedOperator.cs" />
     <Compile Include="PathRelinkerPerformanceAnalyzer.cs" />
     <Compile Include="VariableRemover.cs" />

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/VariableRemover.cs

@@ -52 +52 @@
       Parameters.Add(new ValueParameter<StringValue>("VariableName", "The name of the variable to remove from the current scope."));
       Parameters.Add(new ScopeParameter("CurrentScope", "The current scope whose variables and sub-scopes should be removed."));
+      VariableNameParameter.Value.Value = "TSPTourClone";
     }