Changeset 9020

Timestamp:

12/10/12 17:26:19 (12 years ago)

Author:

ascheibe

Message:

#1886 added an analyzer for unwanted mutation for the TSP

Location:

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

Files:

• CrossoverPerformanceAnalyzer.cs (modified) (8 diffs)
• HeuristicLab.Analysis.AlgorithmBehavior.Analyzers-3.3.csproj (modified) (2 diffs)
• PathRelinkerPerformanceAnalyzer.cs (deleted)
• UnwantedMutationAnalyzer.cs (added)

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

@@ -80 +80 @@
 
     [Storable]
-    private ScatterPlotHelper worseParentCrossoverPerformancePlot, betterParentCrossoverPerformancePlot, childDiversityToWorseParentHelper, childDiversityToBetterParentHelper, parentDiversityHelper, parentQualityHelper;
+    private ScatterPlotHelper worseParentCrossoverPerformancePlot, betterParentCrossoverPerformancePlot, childDiversityToWorseParentHelper, childDiversityToBetterParentHelper, parentDiversityHelper, parentQualityHelper, unwantedMutationsHelper;
     [Storable]
     private DataTableHelper successHelper, equalParentsHelper;
@@ -106 +106 @@
       parentDiversityHelper = (ScatterPlotHelper)original.parentDiversityHelper.Clone(cloner);
       parentQualityHelper = (ScatterPlotHelper)original.parentQualityHelper.Clone(cloner);
+      unwantedMutationsHelper = (ScatterPlotHelper)original.unwantedMutationsHelper.Clone(cloner);
       successHelper = (DataTableHelper)original.successHelper.Clone(cloner);
       equalParentsHelper = (DataTableHelper)original.equalParentsHelper.Clone(cloner);
@@ -137 +138 @@
       childDiversityToWorseParentHelper = new ScatterPlotHelper(false, true);
       childDiversityToBetterParentHelper = new ScatterPlotHelper(false, true);
+      unwantedMutationsHelper = new ScatterPlotHelper(false, true);
       parentDiversityHelper = new ScatterPlotHelper(false, true);
       parentQualityHelper = new ScatterPlotHelper(false, true);
@@ -171 +173 @@
       parentQualityHelper.InitializePlot(Results, "Parent Quality Difference", "Solution Index", "Absolut Quality Difference");
       equalParentsHelper.InitializeChart(Results, "Number of equal parents", new string[] { "Absolut number of equal parents" });
+      unwantedMutationsHelper.InitializePlot(Results, "Unwanted Mutations", "Solution Index", "Unwanted Mutation");
 
       List<string> successfullCXRowNames = new List<string>();
@@ -183 +186 @@
       Initialize();
 
-      Point2D<double> worseQualityPoint, betterQualityPoint, childDiversityToWorseParent, childDiversityToBetterParent, diversityPointParent, qualityPointParent;
+      Point2D<double> worseQualityPoint, betterQualityPoint, childDiversityToWorseParent, childDiversityToBetterParent, diversityPointParent, qualityPointParent, unwantedMutationPoint;
       var parent1 = ParentsParameter.ActualValue.First();
       var parent2 = ParentsParameter.ActualValue.Last();
@@ -196 +199 @@
       diversityPointParent = new Point2D<double>(cnt, parentDiversity);
       qualityPointParent = new Point2D<double>(cnt, Math.Abs(qualityParent1 - qualityParent2));
-
+      unwantedMutationPoint = new Point2D<double>(cnt, UnwantedMutationAnalyzer.AnalyzeUnwantedMutationsForPermutationEncoding(parent1, parent2, child));
 
       double worseQuality, betterQuality;
@@ -259 +262 @@
         parentDiversityHelper.AddPoint(curGenStr, diversityPointParent);
         parentQualityHelper.AddPoint(curGenStr, qualityPointParent);
+        unwantedMutationsHelper.AddPoint(curGenStr, unwantedMutationPoint);
       }
 
@@ -288 +292 @@
       parentDiversityHelper.CleanUp();
       parentQualityHelper.CleanUp();
+      unwantedMutationsHelper.CleanUp();
     }
   }

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

@@ -121 +121 @@
     <Compile Include="AfterMutationCombinedOperator.cs" />
     <Compile Include="InitializableOperator.cs" />
-    <Compile Include="PathRelinkerPerformanceAnalyzer.cs" />
+    <Compile Include="UnwantedMutationAnalyzer.cs" />
     <Compile Include="VariableRemover.cs" />
     <Compile Include="LinearLeastSquaresFitting.cs" />
@@ -145 +145 @@
     <None Include="Properties\AssemblyInfo.cs.frame" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="RunCollectionStatisticalTabularView.resx">
-      <DependentUpon>RunCollectionStatisticalTabularView.cs</DependentUpon>
-    </EmbeddedResource>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>