Changeset 9045 for branches

Timestamp:

12/13/12 10:31:54 (11 years ago)

Author:

ascheibe

Message:

#1886 added mutation performance analyzer for test functions

Location:

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

Files:

• CombinedOperators/QAPAfterMutationCombinedOperator.cs (modified) (1 diff)
• CombinedOperators/TFAfterMutationCombinedOperator.cs (added)
• HeuristicLab.Analysis.AlgorithmBehavior.Analyzers-3.3.csproj (modified) (1 diff)
• MutationPerformanceAnalyzer.cs (modified) (5 diffs)

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

@@ -55 +55 @@
       mAnalyzer.PermutationAfterMutationParameter.ActualName = "Assignment";
 
-      varRemover.VariableNameParameter.Value.Value = "TSPTourClone";
+      varRemover.VariableNameParameter.Value.Value = "AssignmentClone";
     }
   }

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

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

@@ -25 +25 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Encodings.PermutationEncoding;
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
@@ -50 +49 @@
       get { return (ILookupParameter<DoubleValue>)Parameters["QualityAfterMutation"]; }
     }
-    public ILookupParameter<Permutation> PermutationBeforeMutationParameter {
-      get { return (ILookupParameter<Permutation>)Parameters["PermutationBeforeMutation"]; }
+    public ILookupParameter<IItem> PermutationBeforeMutationParameter {
+      get { return (ILookupParameter<IItem>)Parameters["PermutationBeforeMutation"]; }
     }
-    public ILookupParameter<Permutation> PermutationAfterMutationParameter {
-      get { return (ILookupParameter<Permutation>)Parameters["PermutationAfterMutation"]; }
+    public ILookupParameter<IItem> PermutationAfterMutationParameter {
+      get { return (ILookupParameter<IItem>)Parameters["PermutationAfterMutation"]; }
     }
     public ILookupParameter<ItemCollection<IItem>> OperatorsParameter {
@@ -96 +95 @@
       QualityAfterMutationParameter.ActualName = "TSPTourLengthM";
 
-      Parameters.Add(new LookupParameter<Permutation>("PermutationBeforeMutation"));
+      Parameters.Add(new LookupParameter<IItem>("PermutationBeforeMutation"));
       PermutationBeforeMutationParameter.ActualName = "TSPTourClone";
 
-      Parameters.Add(new LookupParameter<Permutation>("PermutationAfterMutation"));
+      Parameters.Add(new LookupParameter<IItem>("PermutationAfterMutation"));
       PermutationAfterMutationParameter.ActualName = "TSPTour";
 
@@ -117 +116 @@
         SimilarityCalculatorParameter.Value = OperatorsParameter.ActualValue.OfType<ISingleObjectiveSolutionSimilarityCalculator>().FirstOrDefault();
       }
+      qualityPlotHelper.InitializePlot(Results, "Mutation Quality", "Solution Index", "Absolut Quality Difference");
+      diversityPlotHelper.InitializePlot(Results, "Mutation Diversity", "Solution Index", "Diversity");
       Reset();
     }
@@ -126 +127 @@
       var qualityCX = QualityAfterCrossoverParameter.ActualValue.Value;
       var qualityM = QualityAfterMutationParameter.ActualValue.Value;
-      var permutationBefore = PermutationBeforeMutationParameter.ActualValue;
-      var permutationAfter = PermutationAfterMutationParameter.ActualValue;
+      var solutionBefore = PermutationBeforeMutationParameter.ActualValue;
+      var solutionAfter = PermutationAfterMutationParameter.ActualValue;
 
-      if (permutationBefore != null) {
-        qualityPlotHelper.InitializePlot(Results, "Mutation Quality", "Solution Index", "Absolut Quality Difference");
-        diversityPlotHelper.InitializePlot(Results, "Mutation Diversity", "Solution Index", "Diversity");
+      Scope permutationBeforeScope = new Scope();
+      Scope permutationAfterScope = new Scope();
+      permutationBeforeScope.Variables.Add(new Variable(PermutationAfterMutationParameter.ActualName, solutionBefore));
+      permutationAfterScope.Variables.Add(new Variable(PermutationAfterMutationParameter.ActualName, solutionAfter));
 
-        Scope permutationBeforeScope = new Scope();
-        Scope permutationAfterScope = new Scope();
-        permutationBeforeScope.Variables.Add(new Variable(PermutationAfterMutationParameter.ActualName, permutationBefore));
-        permutationAfterScope.Variables.Add(new Variable(PermutationAfterMutationParameter.ActualName, permutationAfter));
-
-        divPoint = new Point2D<double>(cnt, SimilarityCalculatorParameter.Value.CalculateSolutionSimilarity(permutationBeforeScope, permutationAfterScope));
-        curPoint = new Point2D<double>(cnt++, qualityCX - qualityM);
+      divPoint = new Point2D<double>(cnt, SimilarityCalculatorParameter.Value.CalculateSolutionSimilarity(permutationBeforeScope, permutationAfterScope));
+      curPoint = new Point2D<double>(cnt++, qualityCX - qualityM);
 
 
-        string curGenStr = GenerationsParameter.ActualValue.Value.ToString();
+      string curGenStr = GenerationsParameter.ActualValue.Value.ToString();
 
-        qualityPlotHelper.AddPoint(curGenStr, curPoint);
-        diversityPlotHelper.AddPoint(curGenStr, divPoint);
+      qualityPlotHelper.AddPoint(curGenStr, curPoint);
+      diversityPlotHelper.AddPoint(curGenStr, divPoint);
 
-        if (GenerationsParameter.ActualValue.Value != 0) {
-          if (GenerationsParameter.ActualValue.Value > lastGeneration) {
-            Reset();
-          }
+      if (GenerationsParameter.ActualValue.Value != 0) {
+        if (GenerationsParameter.ActualValue.Value > lastGeneration) {
+          Reset();
         }
       }