Changeset 9050

Timestamp:

12/13/12 13:41:34 (12 years ago)

Author:

ascheibe

Message:

#1886 added performance analyzers for the VRP

Location:

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

Files:

• CombinedOperators/QAPAfterCrossoverCombinedOperator.cs (modified) (2 diffs)
• CombinedOperators/VRPAfterCrossoverCombinedOperator.cs (added)
• CombinedOperators/VRPAfterMutationCombinedOperator.cs (added)
• CrossoverPerformanceAnalyzer.cs (modified) (2 diffs)
• HeuristicLab.Analysis.AlgorithmBehavior.Analyzers-3.3.csproj (modified) (1 diff)

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

@@ -40 +40 @@
 
     protected override void SimilarityCalculatorParameter_ValueChanged(object sender, System.EventArgs e) {
-      SimilarityCalculatorParameter.Value.QualityVariableName = "Assignment";
-      SimilarityCalculatorParameter.Value.SolutionVariableName = "Quality";
+      SimilarityCalculatorParameter.Value.QualityVariableName = "Quality";
+      SimilarityCalculatorParameter.Value.SolutionVariableName = "Assignment";
     }
 
@@ -59 +59 @@
       var umAnalyzer = new PermutationUnwantedMutationAnalyzer();
       umAnalyzer.SolutionVariableName = "Assignment";
-      cxAnalyzer.UnwantedMutationAnalyzerParameter.Value = umAnalyzer;  
+      cxAnalyzer.UnwantedMutationAnalyzerParameter.Value = umAnalyzer;
     }
   }

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

@@ -27 +27 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Encodings.PermutationEncoding;
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
@@ -113 +112 @@
       Parameters.Add(new LookupParameter<IntValue>(GenerationsParameterName, "Nr of generations."));
 
-      Parameters.Add(new ScopeTreeLookupParameter<Permutation>("Parents", "The parent permutations which have been crossed."));
-
-      Parameters.Add(new LookupParameter<Permutation>("Child", "The child permutation resulting from the crossover."));
-
       Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("ParentsQuality", "The quality of the parent solutions."));
       ParentsQualityParameter.ActualName = "TSPTourLength";

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="CombinedOperators\VRPAfterMutationCombinedOperator.cs" />
+    <Compile Include="CombinedOperators\VRPAfterCrossoverCombinedOperator.cs" />
     <Compile Include="CombinedOperators\TFAfterMutationCombinedOperator.cs" />
     <Compile Include="CombinedOperators\TFAfterCrossoverCombinedOperator.cs" />