Changeset 8281 for branches

Timestamp:

07/11/12 00:51:56 (12 years ago)

Author:

ascheibe

Message:

#1886 added datatable to convergence speed analyzer

Location:

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

Files:

• ConvergenceSpeedAnalyzer.cs (modified) (1 diff)
• DistinctSolutionsAnalyzer.cs (modified) (2 diffs)

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

@@ -117 +117 @@
       }
 
-      var schemataMatrix = new Dictionary<int, string>();
+
+      DataTable dt = new DataTable();
+      DataRow row = new DataRow("Diversity");
+      dt.Rows.Add(row);
       foreach (var ind in occurences.Keys) {
-        if (!schemataMatrix.ContainsKey(ind)) {
-          string result = occurences[ind].ToString();
-          schemataMatrix.Add(ind, result);
-        }
+        dt.Rows["Diversity"].Values.Add(occurences[ind]);
       }
 
-      var stringMatrix = new StringMatrix(schemataMatrix.Keys.Count, 2);
-      for (int i = 0; i < schemataMatrix.Keys.Count; i++) {
-        var element = schemataMatrix.ElementAt(i);
-        stringMatrix[i, 0] = element.Key.ToString();
-        stringMatrix[i, 1] = element.Value;
-      }
-      stringMatrix.ColumnNames = new[] { "Generation", "Diversity" };
-
-      Results.Add(new Result(SchemaOccurenceInGenerationsMatrixParameterName, stringMatrix));
-
+      Results.Add(new Result(SchemaOccurenceInGenerationsMatrixParameterName, dt));
       return base.Apply();
     }

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

@@ -43 +43 @@
     private const string PopulationGraphResultParameterName = "PopulationGraph";
     private const string SchemataParameterName = "Schemata";
-    private const string SchemaOccurenceInGenerationsMatrixParameterName = "SchemaOccurenceInGenerationsMatrix";
+    private const string DistinctSolutionsInGenerationsMatrixParameterName = "DistinctSolutionsInGenerationsMatrix";
     private const string QualitiesParameterName = "Qualities";
     private const string DistanceMatrixParameterName = "DistanceMatrix";
@@ -121 +121 @@
       }
 
-      Results.Add(new Result(SchemaOccurenceInGenerationsMatrixParameterName, dt));
+      Results.Add(new Result(DistinctSolutionsInGenerationsMatrixParameterName, dt));
       return base.Apply();
     }