- Timestamp:
- 07/29/17 16:03:05 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/dataset-ids-2695/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionLineChartViewBase.cs
r14531 r15297 20 20 #endregion 21 21 using System; 22 using System.Collections; 22 23 using System.Collections.Generic; 23 24 using System.Drawing; 25 using System.Globalization; 24 26 using System.Linq; 25 27 using System.Windows.Forms; 26 28 using System.Windows.Forms.DataVisualization.Charting; 29 using HeuristicLab.Common; 27 30 using HeuristicLab.MainForm; 28 31 using HeuristicLab.Visualization.ChartControlsExtensions; … … 59 62 protected abstract void GetTrainingSeries(out int[] idx, out double[] y); 60 63 61 protected abstract void GetTestSeries(out int[] x, out double[] y);62 63 protected abstract void GetAllValuesSeries(out int[] x, out double[] y);64 protected abstract void GetTestSeries(out int[] idx, out double[] y); 65 66 protected abstract void GetAllValuesSeries(out int[] idx, out double[] y); 64 67 65 68 protected virtual void RedrawChart() { 66 69 this.chart.Series.Clear(); 67 70 if (Content != null) { 71 var allIds = Content.ProblemData.AllIds; 68 72 this.chart.ChartAreas[0].AxisX.Minimum = 0; 69 this.chart.ChartAreas[0].AxisX.Maximum = Content.ProblemData. Dataset.Rows - 1;73 this.chart.ChartAreas[0].AxisX.Maximum = Content.ProblemData.AllIndices.Last(); 70 74 71 75 this.chart.Series.Add(TARGETVARIABLE_SERIES_NAME); 72 76 this.chart.Series[TARGETVARIABLE_SERIES_NAME].LegendText = TARGETVARIABLE_SERIES_NAME; 73 77 this.chart.Series[TARGETVARIABLE_SERIES_NAME].ChartType = SeriesChartType.FastLine; 74 this.chart.Series[TARGETVARIABLE_SERIES_NAME].Points.DataBindXY(Enumerable.Range(0, Content.ProblemData.Dataset.Rows).ToArray(), 75 Content.ProblemData.Dataset.GetDoubleValues(Content.ProblemData.TargetVariable).ToArray()); 78 var ids = Content.ProblemData.AllIds.OfType<object>().Select(o => o.ToString()).ToArray(); 79 var vals = Content.ProblemData.Dataset.GetDoubleValues(Content.ProblemData.TargetVariable).ToArray(); 80 81 for (int i = 0; i < ids.Length; i++) { 82 chart.Series[TARGETVARIABLE_SERIES_NAME].Points.Add(new DataPoint() { AxisLabel = ids[i], XValue = i, YValues = new double[] { vals[i] } }); 83 } 84 // this.chart.Series[TARGETVARIABLE_SERIES_NAME].Points.DataBindXY(Content.ProblemData.AllIndices.ToArray(), 85 // Content.ProblemData.Dataset.GetDoubleValues(Content.ProblemData.TargetVariable).ToArray()); 86 // chart.Series[TARGETVARIABLE_SERIES_NAME].Points.DataBindXY(Content.ProblemData.AllIndices.ToArray(), 87 // "AxisLabel", Content.ProblemData.AllIds.OfType<object>().Select(o => o.ToString()).ToArray(), string.Empty); 76 88 // training series 77 89 this.chart.Series.Add(ESTIMATEDVALUES_TRAINING_SERIES_NAME); … … 133 145 134 146 UpdateCursorInterval(); 135 this.UpdateStripLines();147 UpdateStripLines(); 136 148 } 137 149 }
Note: See TracChangeset
for help on using the changeset viewer.