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

Timestamp:

12/07/11 22:47:12 (13 years ago)

Author:

gkronber

Message:

#1081: worked on multi-variate time series prognosis

Location:

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

Files:

• TimeSeriesPrognosisSolutionLineChartView.cs (modified) (3 diffs)
• TimeSeriesPrognosisSolutionPrognosedValuesView.cs (modified) (2 diffs)

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

@@ -91 +91 @@
           this.chart.Series[PROGNOSEDVALUES_TRAINING_SERIES_NAME].Points
             .DataBindXY(Content.ProblemData.TrainingIndizes.ToArray(),
-                        Content.PrognosedTrainingValues.ElementAt(varIndex).ToArray());
+                        Content.PrognosedTrainingValues.SelectMany(x => x).Skip(varIndex).TakeEvery(Content.ProblemData.TargetVariables.Count()).ToArray());
         } else {
           this.chart.Series[PROGNOSEDVALUES_TRAINING_SERIES_NAME].Points
             .DataBindXY(Content.ProblemData.TrainingIndizes.ToArray(),
-                        Content.GetPrognosedValues(Content.ProblemData.TrainingIndizes, 1).Select(v => v.ElementAt(varIndex).First()).ToArray());
+                        Content.GetPrognosedValues(Content.ProblemData.TrainingIndizes, 1).SelectMany(x => x.Single()).Skip(varIndex).TakeEvery(Content.ProblemData.TargetVariables.Count()).ToArray());
         }
         this.chart.Series[PROGNOSEDVALUES_TRAINING_SERIES_NAME].Tag = Content;
@@ -109 +109 @@
           this.chart.Series[PROGNOSEDVALUES_TEST_SERIES_NAME].Points
             .DataBindXY(Content.ProblemData.TestIndizes.ToArray(),
-                        Content.PrognosedTestValues.ElementAt(varIndex).ToArray());
+                        Content.PrognosedTestValues.SelectMany(x => x).Skip(varIndex).TakeEvery(Content.ProblemData.TargetVariables.Count()).ToArray());
         } else {
           this.chart.Series[PROGNOSEDVALUES_TEST_SERIES_NAME].Points
             .DataBindXY(Content.ProblemData.TestIndizes.ToArray(),
-                        Content.GetPrognosedValues(Content.ProblemData.TestIndizes, 1).Select(
-                          v => v.ElementAt(varIndex).First()).ToArray());
+                        Content.GetPrognosedValues(Content.ProblemData.TestIndizes, 1).SelectMany(x => x.Single()).Skip(varIndex).TakeEvery(Content.ProblemData.TargetVariables.Count()).ToArray());
         }
         this.chart.Series[PROGNOSEDVALUES_TEST_SERIES_NAME].Tag = Content;
@@ -242 +241 @@
           case PROGNOSEDVALUES_TRAINING_SERIES_NAME:
             indizes = Content.ProblemData.TrainingIndizes.ToArray();
-            predictedValues = Content.PrognosedTrainingValues.ElementAt(varIndex).ToArray();
+            predictedValues =
+              Content.PrognosedTrainingValues.SelectMany(x => x).Skip(varIndex).TakeEvery(
+                Content.ProblemData.TargetVariables.Count()).ToArray();
             break;
           case PROGNOSEDVALUES_TEST_SERIES_NAME:
             indizes = Content.ProblemData.TestIndizes.ToArray();
-            predictedValues = Content.PrognosedTestValues.ElementAt(varIndex).ToArray();
+            Content.PrognosedTestValues.SelectMany(x => x).Skip(varIndex).TakeEvery(
+              Content.ProblemData.TargetVariables.Count()).ToArray();
             break;
         }

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

@@ -93 +93 @@
             values[row, 0] = row.ToString();
 
-          var prognosedTraining = Content.PrognosedTrainingValues.ToArray();
-          var prognosedTest = Content.PrognosedTestValues.ToArray();
+          var allPrognosedTraining = Content.PrognosedTrainingValues.SelectMany(x=>x).ToArray();
+          var allPrognosedTest = Content.PrognosedTestValues.SelectMany(x => x).ToArray();
 
           int i = 0;
           int targetVariableIndex = 0;
           foreach (var targetVariable in Content.ProblemData.TargetVariables) {
+            var prognosedTraining =
+              allPrognosedTraining.Skip(targetVariableIndex).TakeEvery(Content.ProblemData.TargetVariables.Count());
+            var prognosedTest =
+              allPrognosedTest.Skip(targetVariableIndex).TakeEvery(Content.ProblemData.TargetVariables.Count());
+
             double[] target = Content.ProblemData.Dataset.GetDoubleValues(targetVariable).ToArray();
 
-            var prognosedTrainingEnumerator = prognosedTraining[targetVariableIndex].GetEnumerator();
+            var prognosedTrainingEnumerator = prognosedTraining.GetEnumerator();
             foreach (var row in Content.ProblemData.TrainingIndizes) {
               prognosedTrainingEnumerator.MoveNext();
@@ -107 +112 @@
             }
 
-            var prognosedTestEnumerator = prognosedTest[targetVariableIndex].GetEnumerator();
+            var prognosedTestEnumerator = prognosedTest.GetEnumerator();
             foreach (var row in Content.ProblemData.TestIndizes) {
               prognosedTestEnumerator.MoveNext();