Changeset 14231 for branches/HeuristicLab.OSGAEvaluator/HeuristicLab.OSGAEvaluator/OSGAPredictionCountsAnalyzer.cs

Timestamp:

08/03/16 18:26:24 (8 years ago)

Author:

bburlacu

Message:

#2635: Add evaluator option to aggregate statistics during evaluation (slower). Improve analyzer.

File:

• branches/HeuristicLab.OSGAEvaluator/HeuristicLab.OSGAEvaluator/OSGAPredictionCountsAnalyzer.cs (modified) (4 diffs)

branches/HeuristicLab.OSGAEvaluator/HeuristicLab.OSGAEvaluator/OSGAPredictionCountsAnalyzer.cs

@@ -44 +44 @@
 
       ResultCollection predictionResults;
-      DataTable rejectedStatsTable, totalStatsTable;
+      DataTable rejectedStatsTable, totalStatsTable, rejectedStatsPerGenerationTable, nonRejectedStatsPerGenerationTable;
       if (!ResultCollection.ContainsKey("OS Prediction")) {
         predictionResults = new ResultCollection();
@@ -57 +57 @@
         }
         predictionResults.Add(new Result("Total Stats", totalStatsTable));
-
+        rejectedStatsPerGenerationTable = new DataTable("Rejected Per Generation");
+        nonRejectedStatsPerGenerationTable = new DataTable("Non Rejected Stats per Generation");
+        foreach (var rowName in rejectedStats.RowNames) {
+          rejectedStatsPerGenerationTable.Rows.Add(new DataRow(rowName) { VisualProperties = { StartIndexZero = true, ChartType = DataRowVisualProperties.DataRowChartType.Line, LineWidth = 1 } });
+          rejectedStatsPerGenerationTable.Rows[rowName].Values.Add(0d);
+          nonRejectedStatsPerGenerationTable.Rows.Add(new DataRow(rowName) { VisualProperties = { StartIndexZero = true, ChartType = DataRowVisualProperties.DataRowChartType.Line, LineWidth = 1 } });
+          nonRejectedStatsPerGenerationTable.Rows[rowName].Values.Add(0d);
+        }
+        predictionResults.Add(new Result("Rejected Stats Per Generation", rejectedStatsPerGenerationTable));
+        predictionResults.Add(new Result("Non Rejected Stats Per Generation", nonRejectedStatsPerGenerationTable));
         ResultCollection.Add(new Result("OS Prediction", predictionResults));
       } else {
@@ -63 +72 @@
         rejectedStatsTable = (DataTable)predictionResults["Rejected Stats"].Value;
         totalStatsTable = (DataTable)predictionResults["Total Stats"].Value;
+        rejectedStatsPerGenerationTable = (DataTable)predictionResults["Rejected Stats Per Generation"].Value;
+        nonRejectedStatsPerGenerationTable = (DataTable)predictionResults["Non Rejected Stats Per Generation"].Value;
       }
 
       int i = 0;
       foreach (var rowName in rejectedStats.RowNames) {
-        // add a padding zero below to prevent columns from being cut off to the left
+        // pad values with a 0 on each side to prevent clipping
         rejectedStatsTable.Rows[rowName].Values.Replace(new[] { 0d }.Concat(Enumerable.Range(0, rejectedStats.Columns).Select(j => (double)rejectedStats[i, j])).Concat(new[] { 0d }));
         ++i;
@@ -74 +85 @@
       foreach (var rowName in totalStats.RowNames) {
         totalStatsTable.Rows[rowName].Values.Replace(new[] { 0d }.Concat(Enumerable.Range(0, totalStats.Columns).Select(j => (double)totalStats[i, j])).Concat(new[] { 0d }));
+        var row = rejectedStatsPerGenerationTable.Rows[rowName];
+        var sum = row.Values.Sum();
+        row.Values.Add(totalStats[i, 0] - sum);
+        row = nonRejectedStatsPerGenerationTable.Rows[rowName];
+        sum = row.Values.Sum();
+        row.Values.Add(totalStats[i, 1] - sum);
         ++i;
       }