Changeset 8498

Timestamp:

08/18/12 00:15:40 (12 years ago)

Author:

ascheibe

Message:

#1886 added helper classes for generating charts

Location:

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

Files:

• DataTableHelper.cs (added)
• DuplicateSolutionsAnalyzer.cs (modified) (4 diffs)
• HeuristicLab.Analysis.AlgorithmBehavior.Analyzers-3.3.csproj (modified) (2 diffs)
• MutationPerformanceAnalyzer.cs (modified) (4 diffs)
• Properties/AssemblyInfo.cs.frame (modified) (2 diffs)
• ScatterPlotHelper.cs (added)

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

@@ -56 +56 @@
     }
 
-    private DataRow dtRow;
+    private DataTableHelper chartingHelper;
     #endregion
 
@@ -68 +68 @@
       SimilarityCalculatorParameter.Value.SolutionVariableName = "TSPTour";
       SimilarityCalculatorParameter.Value.QualityVariableName = "TSPTourLength";
+
+      chartingHelper = new DataTableHelper();
     }
 
@@ -75 +77 @@
 
     public override IOperation Apply() {
-      if (!Results.ContainsKey("Duplicate Solutions")) {
-        DataTable dt = new DataTable("Duplicate Solutions");
-        dtRow = new DataRow("Duplicate Solutions per Generation");
-        dt.Rows.Add(dtRow);
-        Results.Add(new Result("Duplicate Solutions", dt));
-      }
+      chartingHelper.InitializeChart(Results, "Duplicate Solutions", "Duplicate Solutions per Generation");
 
       var similarities = SimilarityCalculatorParameter.Value.CalculateSolutionCrowdSimilarity(ExecutionContext.Scope);
@@ -92 +89 @@
         }
       }
-      dtRow.Values.Add(counter);
 
+      chartingHelper.AddPoint(counter);
       return base.Apply();
     }

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

@@ -96 +96 @@
   <ItemGroup>
     <Compile Include="AlgorithmBehaviorHelpers.cs" />
+    <Compile Include="ScatterPlotHelper.cs" />
+    <Compile Include="DataTableHelper.cs" />
     <Compile Include="DuplicateSolutionsAnalyzer.cs" />
     <Compile Include="MutationPerformanceAnalyzer.cs" />
@@ -106 +108 @@
     <None Include="HeuristicLab.snk" />
     <None Include="Plugin.cs.frame" />
+    <None Include="Properties\AssemblyInfo.cs.frame" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

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

@@ -74 +74 @@
     #endregion
 
-    ScatterPlot plot, diversityPlot;
-    DataRow dtRow;
-    int cnt = 0;
+
+    ScatterPlotHelper diversityPlotHelper, qualityPlotHelper;
+    DataTableHelper avgDataTableHelper;
+    int cnt = 0, lastGeneration = 0;
+    List<double> qualityPoints = new List<double>();
 
     [StorableConstructor]
@@ -97 +99 @@
       Parameters.Add(new LookupParameter<Permutation>("PermutationAfterMutation"));
       PermutationAfterMutationParameter.ActualName = "TSPTour";
+
+      diversityPlotHelper = new ScatterPlotHelper();
+      qualityPlotHelper = new ScatterPlotHelper();
+      avgDataTableHelper = new DataTableHelper();
     }
 
@@ -105 +111 @@
     public override IOperation Apply() {
       Point2D<double> curPoint, divPoint;
+
       var qualityCX = QualityAfterCrossoverParameter.ActualValue.Value;
       var qualityM = QualityAfterMutationParameter.ActualValue.Value;
@@ -110 +117 @@
       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");
+
       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();
-      ScatterPlotDataRow row, divRow;
 
-      if (!Results.ContainsKey("Mutation Scatter Plot")) {
-        InitializePlot();
-        InitializeDiversityPlot();
-        Results.Add(new Result("Mutation Scatter Plot", plot));
-        Results.Add(new Result("Mutation Scatter Plot History", new ScatterPlotHistory()));
-        Results.Add(new Result("Mutation Diversity Plot", diversityPlot));
-        Results.Add(new Result("Mutation Diversity Plot History", new ScatterPlotHistory()));
-        cnt = 0;
+      qualityPlotHelper.AddPoint(curGenStr, curPoint);
+      diversityPlotHelper.AddPoint(curGenStr, divPoint);
 
-        DataTable dt = new DataTable("Average Mutation Performance");
-        dtRow = new DataRow("Average Mutation Performance per Generation");
-        dt.Rows.Add(dtRow);
-        Results.Add(new Result("Average Mutation Performance", dt));
-      }
-
-      if (!plot.Rows.ContainsKey(curGenStr)) {
-        if (GenerationsParameter.ActualValue.Value != 0) {
-          if (plot.Rows.ContainsKey((GenerationsParameter.ActualValue.Value - 1).ToString())) {
-            double avg = plot.Rows[(GenerationsParameter.ActualValue.Value - 1).ToString()].Points.Average(x => x.Y);
-            dtRow.Values.Add(avg);
-            ((ScatterPlotHistory)Results["Mutation Scatter Plot History"].Value).Add(plot);
-            ((ScatterPlotHistory)Results["Mutation Diversity Plot History"].Value).Add(diversityPlot);
-          }
-          InitializePlot();
-          InitializeDiversityPlot();
-          Results["Mutation Scatter Plot"].Value = plot;
-          Results["Mutation Diversity Plot"].Value = diversityPlot;
+      if (GenerationsParameter.ActualValue.Value != 0) {
+        if (GenerationsParameter.ActualValue.Value > lastGeneration) {
+          double avg = qualityPoints.Average();
+          avgDataTableHelper.AddPoint(avg);
           cnt = 0;
+          lastGeneration = GenerationsParameter.ActualValue.Value;
+          qualityPoints.Clear();
         }
-
-        var points = new List<Point2D<double>>();
-        points.Add(curPoint);
-        row = new ScatterPlotDataRow(curGenStr, null, points);
-        row.VisualProperties.PointStyle = ScatterPlotDataRowVisualProperties.ScatterPlotDataRowPointStyle.Circle;
-        row.VisualProperties.PointSize = 5;
-        plot.Rows.Add(row);
-
-        points = new List<Point2D<double>>();
-        points.Add(divPoint);
-        divRow = new ScatterPlotDataRow(curGenStr, null, points);
-        divRow.VisualProperties.PointStyle = ScatterPlotDataRowVisualProperties.ScatterPlotDataRowPointStyle.Circle;
-        divRow.VisualProperties.PointSize = 5;
-        diversityPlot.Rows.Add(divRow);
-      } else {
-        plot.Rows[curGenStr].Points.Add(curPoint);
-        diversityPlot.Rows[curGenStr].Points.Add(divPoint);
       }
 
       return base.Apply();
     }
-
-    private void InitializePlot() {
-      plot = new ScatterPlot("Mutation Performance", null);
-      plot.VisualProperties.XAxisTitle = "Solution Index";
-      plot.VisualProperties.YAxisTitle = "Absolut Quality Difference";
-    }
-
-    private void InitializeDiversityPlot() {
-      diversityPlot = new ScatterPlot("Mutation Diversity", null);
-      diversityPlot.VisualProperties.XAxisTitle = "Solution Index";
-      diversityPlot.VisualProperties.YAxisTitle = "Diversity";
-    }
   }
 }

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/Properties/AssemblyInfo.cs.frame

@@ -27 +27 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("HeuristicLab.Analysis.AlgorithmBehavior")]
-[assembly: AssemblyDescription("Provides operators and related classes for tracking the evolution within a GA.")]
+[assembly: AssemblyTitle("HeuristicLab.Analysis.AlgorithmBehavior.Analyzers")]
+[assembly: AssemblyDescription("Provides analyzers for tracking the behavior of GAs.")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
@@ -54 +54 @@
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.6.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.7.$WCREV$")]