Changeset 9042 for branches/HeuristicLab.Analysis.AlgorithmBehavior

Timestamp:

12/12/12 22:10:04 (12 years ago)

Author:

ascheibe

Message:

#1886 added mutation performance analyzer for the QAP

Location:

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

Files:

• AfterMutationCombinedOperator.cs (modified) (3 diffs)
• HeuristicLab.Analysis.AlgorithmBehavior.Analyzers-3.3.csproj (modified) (1 diff)
• QAPAfterMutationCombinedOperator.cs (added)
• TSPAfterCrossoverCombinedOperator.cs (added)
• TSPAfterMutationCombinedOperator.cs (added)

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

@@ -38 +38 @@
     }
 
+    [Storable]
+    protected MutationPerformanceAnalyzer mAnalyzer;
+    [Storable]
+    protected VariableRemover varRemover;
+    [Storable]
+    protected IEvaluator evaluatorClone;
+
     [StorableConstructor]
     protected AfterMutationCombinedOperator(bool deserializing) : base(deserializing) { }
     protected AfterMutationCombinedOperator(AfterMutationCombinedOperator original, Cloner cloner)
       : base(original, cloner) {
+      this.mAnalyzer = (MutationPerformanceAnalyzer)original.mAnalyzer.Clone(cloner);
+      this.varRemover = (VariableRemover)original.varRemover.Clone(cloner);
     }
 
@@ -52 +61 @@
     }
 
-    void SimilarityCalculatorParameter_ValueChanged(object sender, System.EventArgs e) {
+    protected virtual void SimilarityCalculatorParameter_ValueChanged(object sender, System.EventArgs e) {
       SimilarityCalculatorParameter.Value.QualityVariableName = "TSPTourLength";
       SimilarityCalculatorParameter.Value.SolutionVariableName = "TSPTour";
@@ -62 +71 @@
 
     public override void InitializeOperators() {
-      var evaluatorClone = (IEvaluator)EvaluatorParameter.ActualValue.Clone();
+      evaluatorClone = (IEvaluator)EvaluatorParameter.ActualValue.Clone();
       ((ILookupParameter)evaluatorClone.Parameters["Quality"]).ActualName = "TSPTourLengthM";
-      var mAnalyzer = new MutationPerformanceAnalyzer();
-      var varRemover = new VariableRemover();
+      mAnalyzer = new MutationPerformanceAnalyzer();
+      varRemover = new VariableRemover();
 
       Operators.Add(evaluatorClone);

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

@@ -120 +120 @@
     <Compile Include="AfterCrossoverCombinedOperator.cs" />
     <Compile Include="AfterMutationCombinedOperator.cs" />
+    <Compile Include="TSPAfterMutationCombinedOperator.cs" />
+    <Compile Include="TSPAfterCrossoverCombinedOperator.cs" />
+    <Compile Include="QAPAfterMutationCombinedOperator.cs" />
     <Compile Include="QAPAfterCrossoverCombinedOperator.cs" />
     <Compile Include="InitializableOperator.cs" />