Changeset 8661

Timestamp:

09/16/12 16:49:18 (12 years ago)

Author:

ascheibe

Message:

#1886 adapted operators so that they can be used with Scatter Search

Location:

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

Files:

• HeuristicLab.Analysis.AlgorithmBehavior.Analyzers-3.3.csproj (modified) (1 diff)
• MutationPerformanceAnalyzer.cs (modified) (1 diff)
• VariableRemover.cs (added)

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

@@ -117 +117 @@
   <ItemGroup>
     <Compile Include="AlgorithmBehaviorHelpers.cs" />
+    <Compile Include="VariableRemover.cs" />
     <Compile Include="LinearLeastSquaresFitting.cs" />
     <Compile Include="RunCollectionStatisticalTabularView.cs">

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

@@ -129 +129 @@
       var permutationAfter = PermutationAfterMutationParameter.ActualValue;
 
-      qualityPlotHelper.InitializePlot(Results, "Mutation Quality", "Solution Index", "Absolut Quality Difference");
-      diversityPlotHelper.InitializePlot(Results, "Mutation Diversity", "Solution Index", "Diversity");
-      avgDataTableHelper.InitializeChart(Results, "Average Mutation Performance", "Average Mutation Performance per Generation");
+      if (permutationBefore != null) {
+        qualityPlotHelper.InitializePlot(Results, "Mutation Quality", "Solution Index", "Absolut Quality Difference");
+        diversityPlotHelper.InitializePlot(Results, "Mutation Diversity", "Solution Index", "Diversity");
+        avgDataTableHelper.InitializeChart(Results, "Average Mutation Performance", "Average Mutation Performance per Generation");
 
-      divPoint = new Point2D<double>(cnt, TSPSimilarityCalculator.CalculateSimilarity(permutationBefore, permutationAfter));
-      curPoint = new Point2D<double>(cnt++, qualityCX - qualityM);
-      qualityPoints.Add(curPoint.Y);
+        divPoint = new Point2D<double>(cnt, TSPSimilarityCalculator.CalculateSimilarity(permutationBefore, permutationAfter));
+        curPoint = new Point2D<double>(cnt++, qualityCX - qualityM);
+        qualityPoints.Add(curPoint.Y);
 
-      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) {
-          double avg = qualityPoints.Average();
-          avgDataTableHelper.AddPoint(avg);
+        if (GenerationsParameter.ActualValue.Value != 0) {
+          if (GenerationsParameter.ActualValue.Value > lastGeneration) {
+            double avg = qualityPoints.Average();
+            avgDataTableHelper.AddPoint(avg);
+            Reset();
+          }
+        } else {
           Reset();
         }
-      } else {
-        Reset();
       }