Changeset 7100 for branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Views/3.4/TimeSeriesPrognosis

Timestamp:

11/29/11 20:05:38 (13 years ago)

Author:

gkronber

Message:

#1081 worked on multi-variate time series prognosis

File:

• branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Views/3.4/TimeSeriesPrognosis/TimeSeriesPrognosisSolutionPrognosedValuesView.cs (modified) (3 diffs)

branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis.Views/3.4/TimeSeriesPrognosis/TimeSeriesPrognosisSolutionPrognosedValuesView.cs

@@ -20 +20 @@
 #endregion
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
@@ -32 +33 @@
   public partial class TimeSeriesPrognosisSolutionEstimatedValuesView : DataAnalysisSolutionEvaluationView {
     private const string TARGETVARIABLE_SERIES_NAME = "Target Variable";
-    private const string PROGNOSEDVALUES_SERIES_NAME = "Prognosed Values (all)";
     private const string PROGNOSEDVALUES_TRAINING_SERIES_NAME = "Prognosed Values (training)";
     private const string PROGNOSEDVALUES_TEST_SERIES_NAME = "Prognosed Values (test)";
@@ -85 +85 @@
       else {
         StringMatrix matrix = null;
+        List<string> columnNames = new List<string>();
         if (Content != null) {
-          string[,] values = new string[Content.ProblemData.Dataset.Rows, 7];
+          columnNames.Add("Id");
 
-          double[] target = Content.ProblemData.Dataset.GetDoubleValues(Content.ProblemData.TargetVariable).ToArray();
-          var prognosed = Content.PrognosedValues.GetEnumerator();
-          var prognosed_training = Content.PrognosedTrainingValues.GetEnumerator();
-          var prognosed_test = Content.PrognosedTestValues.GetEnumerator();
+          string[,] values = new string[Content.ProblemData.Dataset.Rows, 1 + 3 * Content.ProblemData.TargetVariables.Count()];
+          foreach (var row in Enumerable.Range(0, Content.ProblemData.Dataset.Rows))
+            values[row, 0] = row.ToString();
 
-          foreach (var row in Content.ProblemData.TrainingIndizes) {
-            prognosed_training.MoveNext();
-            values[row, 3] = prognosed_training.Current.ToString();
-          }
+          var prognosedTraining = Content.PrognosedTrainingValues.ToArray();
+          var prognosedTest = Content.PrognosedTestValues.ToArray();
 
-          foreach (var row in Content.ProblemData.TestIndizes) {
-            prognosed_test.MoveNext();
-            values[row, 4] = prognosed_test.Current.ToString();
-          }
+          int i = 0;
+          int targetVariableIndex = 0;
+          foreach (var targetVariable in Content.ProblemData.TargetVariables) {
+            double[] target = Content.ProblemData.Dataset.GetDoubleValues(targetVariable).ToArray();
 
-          foreach (var row in Enumerable.Range(0, Content.ProblemData.Dataset.Rows)) {
-            prognosed.MoveNext();
-            double est = prognosed.Current;
-            double res = Math.Abs(est - target[row]);
-            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 / est).ToString();
-          }
+            var prognosedTrainingEnumerator = prognosedTraining[targetVariableIndex].GetEnumerator();
+            foreach (var row in Content.ProblemData.TrainingIndizes) {
+              prognosedTrainingEnumerator.MoveNext();
+              values[row, i + 2] = prognosedTrainingEnumerator.Current.ToString();
+            }
+
+            var prognosedTestEnumerator = prognosedTest[targetVariableIndex].GetEnumerator();
+            foreach (var row in Content.ProblemData.TestIndizes) {
+              prognosedTestEnumerator.MoveNext();
+              values[row, i + 3] = prognosedTestEnumerator.Current.ToString();
+            }
+
+            foreach (var row in Enumerable.Range(0, Content.ProblemData.Dataset.Rows)) {
+              values[row, i + 1] = target[row].ToString();
+            }
+
+            columnNames.AddRange(new string[] { targetVariable + "(actual)", targetVariable + "(training)", targetVariable + "(test)" });
+            i += 3;
+            targetVariableIndex++;
+          } // foreach
+
 
           matrix = new StringMatrix(values);
-          matrix.ColumnNames = new string[] { "Id", TARGETVARIABLE_SERIES_NAME, PROGNOSEDVALUES_SERIES_NAME, PROGNOSEDVALUES_TRAINING_SERIES_NAME, PROGNOSEDVALUES_TEST_SERIES_NAME, "Absolute Error (all)", "Relative Error (all)" };
+          matrix.ColumnNames = columnNames.ToArray();
           matrix.SortableView = true;
-        }
+
+        } // if
         matrixView.Content = matrix;
       }