Changeset 9870 for branches/Sliding Window GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4

Timestamp:

08/07/13 17:00:16 (11 years ago)

Author:

bburlacu

Message:

#1837: Merged trunk changes and fixed sliding window visualization.

Location:

branches/Sliding Window GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Views

Files:

• . (modified) (1 prop)
• 3.4/MenuItems/ExportSymbolicSolutionToExcelMenuItem.cs (modified) (1 diff)
• 3.4/SlidingWindowDataView.cs (modified) (1 diff)

branches/Sliding Window GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/MenuItems/ExportSymbolicSolutionToExcelMenuItem.cs

@@ -44 +44 @@
     }
     public override IEnumerable<string> Structure {
-      get { return new string[] { "&Edit" }; }
+      get { return new string[] { "&Data Analysis" }; }
     }
     public override int Position {
-      get { return 2500; }
+      get { return 5200; }
     }
     public override string ToolTipText {

branches/Sliding Window GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/SlidingWindowDataView.cs

@@ -89 +89 @@
       chart.Series.Add(TARGETVARIABLE_SERIES_NAME);
       chart.Series[TARGETVARIABLE_SERIES_NAME].ChartType = SeriesChartType.FastLine;
-      chart.Series[TARGETVARIABLE_SERIES_NAME].Points.DataBindY(Content.TargetValues.ToArray());
+      var xValues = Enumerable.Range(Content.TrainingPartitionStart + 1, Content.TrainingPartitionEnd - Content.TrainingPartitionStart).ToArray();
+      chart.Series[TARGETVARIABLE_SERIES_NAME].Points.DataBindXY(xValues, Content.TargetValues.ToArray());
 
       if (Content.EstimatedValues.Any()) {
         chart.Series.Add(ESTIMATEDVAlUES_SERIES_NAME);
         chart.Series[ESTIMATEDVAlUES_SERIES_NAME].ChartType = SeriesChartType.FastLine;
-        chart.Series[ESTIMATEDVAlUES_SERIES_NAME].Points.DataBindY(Content.EstimatedValues.ToArray());
+        var yValues = Content.EstimatedValues.ToArray();
+        chart.Series[ESTIMATEDVAlUES_SERIES_NAME].Points.DataBindXY(xValues, yValues);
       }