Changeset 14940 for stable/HeuristicLab.Problems.DataAnalysis.Views/3.4/TimeSeriesPrognosis

Timestamp:

05/05/17 20:06:42 (8 years ago)

Author:

gkronber

Message:

#2718: merged r14483 and r14486 from trunk to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Views (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/TimeSeriesPrognosis/TimeSeriesPrognosisLineChartView.cs (modified) (1 diff)

stable/HeuristicLab.Problems.DataAnalysis.Views/3.4/TimeSeriesPrognosis/TimeSeriesPrognosisLineChartView.cs

@@ -40 +40 @@
     }
 
-    protected override void GetTestSeries(out int[] x, out double[] y) {
+    protected override void GetTrainingSeries(out int[] idx, out double[] y) {
+      idx = Content.ProblemData.TrainingIndices.ToArray();
+      y = Content.EstimatedTrainingValues.ToArray();
+    }
+
+    protected override void GetTestSeries(out int[] idx, out double[] y) {
       // treat the whole test partition as prognosis horizon
-      x = Content.ProblemData.TestIndices.ToArray();
+      idx = Content.ProblemData.TestIndices.ToArray();
       y = Content.PrognosedTestValues.ToArray();
     }
 
-    protected override void GetAllValuesSeries(out int[] x, out double[] y) {
+    protected override void GetAllValuesSeries(out int[] idx, out double[] y) {
       // not supported
-      x = new int[0];
+      idx = new int[0];
       y = new double[0];
     }