Changeset 4195 for branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Analyzers

Timestamp:

08/11/10 13:01:40 (14 years ago)

Author:

gkronber

Message:

Created a feature/exploration branch for new data analysis features #1142

Location:

branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.Regression

Files:

• . (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression)
• 3.3/Analyzers/RegressionSolutionAnalyzer.cs (modified) (3 diffs)

branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Analyzers/RegressionSolutionAnalyzer.cs

@@ -28 +28 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.DataAnalysis.Evaluators;
+using HeuristicLab.Analysis;
 
 namespace HeuristicLab.Problems.DataAnalysis.Regression.Symbolic.Analyzers {
@@ -169 +170 @@
         if (CurrentGeneration != null) // this check is needed because linear regression solutions do not have a generations parameter
           results[BestSolutionGeneration].Value = new IntValue(CurrentGeneration.Value);
+        var solutionQualityTable = (DataTable)results["Best solution quality table"].Value;
+        solutionQualityTable.Rows["Training R²"].Values.Add(trainingR2);
+        solutionQualityTable.Rows["Training MSE"].Values.Add(trainingMse);
+        solutionQualityTable.Rows["Test R²"].Values.Add(testR2);
+        solutionQualityTable.Rows["Test MSE"].Values.Add(testMse);
       } else {
         results.Add(new Result(BestSolutionResultName, solution));
@@ -179 +185 @@
         if (CurrentGeneration != null)
           results.Add(new Result(BestSolutionGeneration, new IntValue(CurrentGeneration.Value)));
+        var solutionQualityTable = new DataTable("Best solution quality table");
+        solutionQualityTable.Rows.Add(new DataRow("Training R²"));
+        solutionQualityTable.Rows.Add(new DataRow("Training MSE"));
+        solutionQualityTable.Rows.Add(new DataRow("Test R²"));
+        solutionQualityTable.Rows.Add(new DataRow("Test MSE"));
+        solutionQualityTable.Rows["Training R²"].Values.Add(trainingR2);
+        solutionQualityTable.Rows["Training MSE"].Values.Add(trainingMse);
+        solutionQualityTable.Rows["Test R²"].Values.Add(testR2);
+        solutionQualityTable.Rows["Test MSE"].Values.Add(testMse);
+        results.Add(new Result("Best solution quality table", solutionQualityTable));
       }
       #endregion