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

Timestamp:

01/18/17 15:40:34 (7 years ago)

Author:

bburlacu

Message:

#2635: Improve reporting of statistics about rejected individuals.

File:

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

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

@@ -1 @@
-using System.Linq;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System.Linq;
 using HeuristicLab.Analysis;
 using HeuristicLab.Common;
@@ -44 +65 @@
 
       ResultCollection predictionResults;
-      DataTable rejectedStatsTable, totalStatsTable, rejectedStatsPerGenerationTable, nonRejectedStatsPerGenerationTable;
+      DataTable rejectedStatsTable, totalStatsTable, rejectedStatsPerGenerationTable;
       if (!ResultCollection.ContainsKey("OS Prediction")) {
         predictionResults = new ResultCollection();
@@ -58 +79 @@
         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 {
@@ -73 +90 @@
         totalStatsTable = (DataTable)predictionResults["Total Stats"].Value;
         rejectedStatsPerGenerationTable = (DataTable)predictionResults["Rejected Stats Per Generation"].Value;
-        nonRejectedStatsPerGenerationTable = (DataTable)predictionResults["Non Rejected Stats Per Generation"].Value;
       }
 
@@ -88 +104 @@
         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;
       }