Changeset 9032 for branches

Timestamp:

12/12/12 10:07:34 (12 years ago)

Author:

ascheibe

Message:

#1886 added a crossover analyzer for the QAP

Location:

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

Files:

• AfterCrossoverCombinedOperator.cs (modified) (4 diffs)
• HeuristicLab.Analysis.AlgorithmBehavior.Analyzers-3.3.csproj (modified) (1 diff)
• QAPAfterCrossoverCombinedOperator.cs (added)

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

@@ -31 +31 @@
   [StorableClass]
   public class AfterCrossoverCombinedOperator : CombinedOperator {
+    [Storable]
+    protected CrossoverPerformanceAnalyzer cxAnalyzer;
+
+    [Storable]
+    protected VariableDuplicator varDuplicator;
+
     public ILookupParameter<IEvaluator> EvaluatorParameter {
       get { return ((LookupParameter<IEvaluator>)Parameters["Evaluator"]); }
@@ -42 +48 @@
     protected AfterCrossoverCombinedOperator(AfterCrossoverCombinedOperator original, Cloner cloner)
       : base(original, cloner) {
+      cxAnalyzer = (CrossoverPerformanceAnalyzer)original.cxAnalyzer.Clone(cloner);
+      varDuplicator = (VariableDuplicator)original.cxAnalyzer.Clone(cloner);
     }
 
@@ -52 +60 @@
     }
 
-    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 +70 @@
 
     public override void InitializeOperators() {
-      var cxAnalyzer = new CrossoverPerformanceAnalyzer();
+      cxAnalyzer = new CrossoverPerformanceAnalyzer();
       cxAnalyzer.SimilarityCalculatorParameter.Value = SimilarityCalculatorParameter.Value;
-      var varDuplicator = new VariableDuplicator();
+      varDuplicator = new VariableDuplicator();
 
       Operators.Add(EvaluatorParameter.ActualValue);

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="QAPAfterCrossoverCombinedOperator.cs" />
     <Compile Include="InitializableOperator.cs" />
     <Compile Include="UnwantedMutationAnalyzer.cs" />