Changeset 15297 for branches/dataset-ids-2695/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression

Timestamp:

07/29/17 16:03:05 (7 years ago)

Author:

gkronber

Message:

#2695: added a parameter to DataAnalysisProblemData to select an id column and extended RegressionLinechartViewBase to show the id on the xAxis

File:

• branches/dataset-ids-2695/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionLineChartViewBase.cs (modified) (3 diffs)

branches/dataset-ids-2695/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionLineChartViewBase.cs

@@ -20 +20 @@
 #endregion
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Drawing;
+using System.Globalization;
 using System.Linq;
 using System.Windows.Forms;
 using System.Windows.Forms.DataVisualization.Charting;
+using HeuristicLab.Common;
 using HeuristicLab.MainForm;
 using HeuristicLab.Visualization.ChartControlsExtensions;
@@ -59 +62 @@
     protected abstract void GetTrainingSeries(out int[] idx, out double[] y);
 
-    protected abstract void GetTestSeries(out int[] x, out double[] y);
-
-    protected abstract void GetAllValuesSeries(out int[] x, out double[] y);
+    protected abstract void GetTestSeries(out int[] idx, out double[] y);
+
+    protected abstract void GetAllValuesSeries(out int[] idx, out double[] y);
 
     protected virtual void RedrawChart() {
       this.chart.Series.Clear();
       if (Content != null) {
+        var allIds = Content.ProblemData.AllIds;
         this.chart.ChartAreas[0].AxisX.Minimum = 0;
-        this.chart.ChartAreas[0].AxisX.Maximum = Content.ProblemData.Dataset.Rows - 1;
+        this.chart.ChartAreas[0].AxisX.Maximum = Content.ProblemData.AllIndices.Last();
 
         this.chart.Series.Add(TARGETVARIABLE_SERIES_NAME);
         this.chart.Series[TARGETVARIABLE_SERIES_NAME].LegendText = TARGETVARIABLE_SERIES_NAME;
         this.chart.Series[TARGETVARIABLE_SERIES_NAME].ChartType = SeriesChartType.FastLine;
-        this.chart.Series[TARGETVARIABLE_SERIES_NAME].Points.DataBindXY(Enumerable.Range(0, Content.ProblemData.Dataset.Rows).ToArray(),
-          Content.ProblemData.Dataset.GetDoubleValues(Content.ProblemData.TargetVariable).ToArray());
+        var ids = Content.ProblemData.AllIds.OfType<object>().Select(o => o.ToString()).ToArray();
+        var vals = Content.ProblemData.Dataset.GetDoubleValues(Content.ProblemData.TargetVariable).ToArray();
+
+        for (int i = 0; i < ids.Length; i++) {
+          chart.Series[TARGETVARIABLE_SERIES_NAME].Points.Add(new DataPoint() { AxisLabel = ids[i], XValue = i, YValues = new double[] { vals[i] } });
+        }
+        // this.chart.Series[TARGETVARIABLE_SERIES_NAME].Points.DataBindXY(Content.ProblemData.AllIndices.ToArray(),
+        //   Content.ProblemData.Dataset.GetDoubleValues(Content.ProblemData.TargetVariable).ToArray());
+        // chart.Series[TARGETVARIABLE_SERIES_NAME].Points.DataBindXY(Content.ProblemData.AllIndices.ToArray(),
+        //   "AxisLabel", Content.ProblemData.AllIds.OfType<object>().Select(o => o.ToString()).ToArray(), string.Empty);
         // training series
         this.chart.Series.Add(ESTIMATEDVALUES_TRAINING_SERIES_NAME);
@@ -133 +145 @@
 
         UpdateCursorInterval();
-        this.UpdateStripLines();
+        UpdateStripLines();
       }
     }