Changeset 8287

Timestamp:

07/12/12 06:37:58 (12 years ago)

Author:

ascheibe

Message:

#1886 worked on analyzers

Location:

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

Files:

• Analyzers/AlleleOccurencesInGenerationsAnalyzer.cs (modified) (3 diffs)
• Analyzers/AlleleOccurencesInGenerationsPerIndAnalyzer.cs (added)
• Analyzers/DistinctSolutionsAnalyzer.cs (modified) (6 diffs)
• HeuristicLab.Analysis.AlgorithmBehavior-3.3.csproj (modified) (1 diff)

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

@@ -99 +99 @@
       var graph = (GenealogyGraph<Permutation>)Results[PopulationGraphResultParameterName].Value;
       var subtours = AlgorithmBehaviorHelpers.ExtractSubtours(BestSolution.Permutation, 2);
+      List<Point2D<double>> points = new List<Point2D<double>>();
+
 
       Dictionary<IntArray, Dictionary<int, List<int>>> occurences = new Dictionary<IntArray, Dictionary<int, List<int>>>();
@@ -106 +108 @@
 
       for (int i = 0; i < GenerationsParameter.ActualValue.Value; i++) {
-        var individuals = graph.Values.Where(x => x.Rank.Contains(i) || x.Rank.Contains(i + 0.5));
+        var individuals = graph.Values.Where(x => x.Rank.Contains(i));
+        int k = 0;
         foreach (var subtour in subtours) {
           int cnt = 0;
           double quality = 0.0;
+          double min = double.MaxValue;
+          double max = double.MinValue;
           foreach (var individual in individuals) {
             var ind = (IntArray)individual.Data;
             if (AlgorithmBehaviorHelpers.IsSubtour(subtour, (Permutation)ind)) {
               cnt++;
-              quality += TSPDistanceMatrixEvaluator.Apply(DistanceMatrix, (Permutation)individual.Data);
+              double tmp = TSPDistanceMatrixEvaluator.Apply(DistanceMatrix, (Permutation)individual.Data);
+              if (tmp < min) min = tmp;
+              if (tmp > max) max = tmp;
+              quality += tmp;
             }
           }
@@ -122 +130 @@
           if (cnt != 0) {
             double avgQuality = quality / cnt;
-            double qualityRatio = avgQuality / Qualities.Rows["CurrentAverageQuality"].Values[i] * 100;
+            double qualityRatio = avgQuality / Qualities.Rows["CurrentAverageQuality"].Values[i];
             vals.Add((int)qualityRatio);
+
+            points.Add(new Point2D<double>(k++, qualityRatio));
           }
           occurences[subtour][i] = vals;
         }
+
+        var plot = new ScatterPlot("Contained Edges of Best Found Solution and Relative Solution Qualtiy", null);
+        plot.VisualProperties.XAxisTitle = "Contained Alleles of Best Found Solution";
+        plot.VisualProperties.YAxisTitle = "Relative Solution Quality";
+        plot.VisualProperties.XAxisMinimumAuto = false;
+        plot.VisualProperties.XAxisMinimumFixedValue = 0.0;
+        plot.VisualProperties.XAxisMaximumAuto = false;
+        plot.VisualProperties.XAxisMaximumFixedValue = subtours.Count;
+        /*plot.VisualProperties.YAxisMinimumAuto = false;
+        plot.VisualProperties.YAxisMinimumFixedValue = 0.0;
+        plot.VisualProperties.YAxisMaximumAuto = false;
+        plot.VisualProperties.YAxisMaximumFixedValue = 1.0;*/
+        var row = new ScatterPlotDataRow("Solutions of Current Generation", null, points);
+        row.VisualProperties.PointStyle = ScatterPlotDataRowVisualProperties.ScatterPlotDataRowPointStyle.Circle;
+        row.VisualProperties.PointSize = 5;
+        plot.Rows.Add(row);
+
+        if (!Results.ContainsKey("Scatter Plot"))
+          Results.Add(new Result("Scatter Plot", plot));
+        else
+          Results["Scatter Plot"].Value = plot;
+
+        if (!Results.ContainsKey("Scatter Plot History")) {
+          Results.Add(new Result("Scatter Plot History", new ScatterPlotHistory()));
+        }
+        ((ScatterPlotHistory)Results["Scatter Plot History"].Value).Add(plot);
+        points.Clear();
       }
 

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

@@ -44 +44 @@
     private const string SchemataParameterName = "Schemata";
     private const string DistinctSolutionsInGenerationsMatrixParameterName = "DistinctSolutionsInGenerationsMatrix";
+    private const string OverallDistinctSolutionsParameterName = "OverallDistinctSolutions";
     private const string QualitiesParameterName = "Qualities";
     private const string DistanceMatrixParameterName = "DistanceMatrix";
@@ -49 +50 @@
     private const string PopulationSizeParameterName = "PopulationSize";
     private const string BestSolutionParameterName = "Best TSP Solution";
+    private const string EvaluatedSolutionsParameterName = "EvaluatedSolutions";
 
     #region IAnalyzer Members
@@ -81 +83 @@
       get { return ((HeuristicLab.Analysis.DataTable)ResultsParameter.ActualValue[QualitiesParameterName].Value); }
     }
+    public IntValue EvaluatedSolutions {
+      get { return ((IntValue)ResultsParameter.ActualValue[EvaluatedSolutionsParameterName].Value); }
+    }
     public PathTSPTour BestSolution {
       get { return ((PathTSPTour)ResultsParameter.ActualValue[BestSolutionParameterName].Value); }
@@ -105 +110 @@
       int generations = GenerationsParameter.ActualValue.Value;
       int popSize = PopulationSizeParameter.ActualValue.Value;
+      int evaluatedSolutions = EvaluatedSolutions.Value;
+      int overallDistinctSolutions = 0;
 
       Dictionary<int, int> distinctSolsInGen = new Dictionary<int, int>();
@@ -111 +118 @@
         var individuals = graph.Values.Where(x => x.Rank.Contains(i));
         distinctSolsInGen.Add(i, individuals.Count());
+        overallDistinctSolutions += individuals.Count();
       }
 
@@ -122 +130 @@
 
       Results.Add(new Result(DistinctSolutionsInGenerationsMatrixParameterName, dt));
+      Results.Add(new Result(OverallDistinctSolutionsParameterName, new DoubleValue(evaluatedSolutions / (double)overallDistinctSolutions)));
       return base.Apply();
     }

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

@@ -102 +102 @@
     <Compile Include="Analyzers\AlleleOccurencesInGenerationsAnalyzer.cs" />
     <Compile Include="Analyzers\ConvergenceSpeedAnalyzer.cs" />
+    <Compile Include="Analyzers\AlleleOccurencesInGenerationsPerIndAnalyzer.cs" />
     <Compile Include="Analyzers\DistinctSolutionsAnalyzer.cs" />
     <Compile Include="Creators\BestIndividualSchemataCreator.cs" />