Changeset 14772

Timestamp:

03/21/17 18:17:14 (8 years ago)

Author:

mkommend

Message:

#2750: Added residuals to estiamted values view for regression solutions.

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression

Files:

• ConfidenceRegressionSolutionEstimatedValuesView.cs (modified) (1 diff)
• RegressionSolutionEstimatedValuesView.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/ConfidenceRegressionSolutionEstimatedValuesView.cs

@@ -61 +61 @@
       foreach (var row in Enumerable.Range(0, Content.ProblemData.Dataset.Rows)) {
         estimated_var.MoveNext();
-        matrix[row, 7] = estimated_var.Current.ToString();
+        matrix[row, 8] = estimated_var.Current.ToString();
       }
 
       foreach (var row in Content.ProblemData.TrainingIndices) {
         estimated_var_training.MoveNext();
-        matrix[row, 8] = estimated_var_training.Current.ToString();
+        matrix[row, 9] = estimated_var_training.Current.ToString();
       }
 
       foreach (var row in Content.ProblemData.TestIndices) {
         estimated_var_test.MoveNext();
-        matrix[row, 9] = estimated_var_test.Current.ToString();
+        matrix[row, 10] = estimated_var_test.Current.ToString();
       }
 

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionEstimatedValuesView.cs

@@ -81 +81 @@
 
     protected virtual StringMatrix CreateValueMatrix() {
-      string[,] values = new string[Content.ProblemData.Dataset.Rows, 7];
+      string[,] values = new string[Content.ProblemData.Dataset.Rows, 8];
 
       double[] target = Content.ProblemData.Dataset.GetDoubleValues(Content.ProblemData.TargetVariable).ToArray();
@@ -101 +101 @@
         estimated.MoveNext();
         double est = estimated.Current;
-        double res = Math.Abs(est - target[row]);
+        double res = target[row] - est;
         values[row, 0] = row.ToString();
         values[row, 1] = target[row].ToString();
         values[row, 2] = est.ToString();
-        values[row, 5] = Math.Abs(res).ToString();
-        values[row, 6] = Math.Abs(res / target[row]).ToString();
+        values[row, 5] = res.ToString();
+        values[row, 6] = Math.Abs(res).ToString();
+        values[row, 7] = Math.Abs(res / target[row]).ToString();
       }
 
       var matrix = new StringMatrix(values);
-      matrix.ColumnNames = new string[] { "Id", TARGETVARIABLE_SERIES_NAME, ESTIMATEDVALUES_SERIES_NAME, ESTIMATEDVALUES_TRAINING_SERIES_NAME, ESTIMATEDVALUES_TEST_SERIES_NAME, "Absolute Error (all)", "Relative Error (all)" };
+      matrix.ColumnNames = new string[] { "Id", TARGETVARIABLE_SERIES_NAME, ESTIMATEDVALUES_SERIES_NAME, ESTIMATEDVALUES_TRAINING_SERIES_NAME, ESTIMATEDVALUES_TEST_SERIES_NAME, "Residuals (all)", "Absolute Error (all)", "Relative Error (all)" };
       matrix.SortableView = true;
       return matrix;