Changeset 14161 for stable/HeuristicLab.Problems.DataAnalysis.Views/3.4
- Timestamp:
- 07/21/16 16:57:58 (8 years ago)
- Location:
- stable
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
stable
- Property svn:mergeinfo changed
/trunk/sources merged: 13764-13765,13807,14007-14008,14152,14155-14156,14159
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Problems.DataAnalysis.Views
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.DataAnalysis.Views merged: 13764,14008
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionLineChartView.cs
r12009 r14161 26 26 using System.Windows.Forms.DataVisualization.Charting; 27 27 using HeuristicLab.MainForm; 28 using HeuristicLab.Visualization.ChartControlsExtensions; 28 29 29 30 namespace HeuristicLab.Problems.DataAnalysis.Views { … … 96 97 this.ToggleSeriesData(this.chart.Series[ESTIMATEDVALUES_ALL_SERIES_NAME]); 97 98 99 // set the y-axis bounds 100 var axisY = this.chart.ChartAreas[0].AxisY; 101 double min = double.MaxValue, max = double.MinValue; 102 foreach (var point in chart.Series.SelectMany(x => x.Points)) { 103 if (!point.YValues.Any() || double.IsInfinity(point.YValues[0]) || double.IsNaN(point.YValues[0])) 104 continue; 105 var y = point.YValues[0]; 106 if (y < min) 107 min = y; 108 if (y > max) 109 max = y; 110 } 111 112 double axisMin, axisMax, axisInterval; 113 ChartUtil.CalculateOptimalAxisInterval(min, max, out axisMin, out axisMax, out axisInterval); 114 axisY.Minimum = axisMin; 115 axisY.Maximum = axisMax; 116 axisY.Interval = axisInterval; 117 98 118 UpdateCursorInterval(); 99 119 this.UpdateStripLines(); -
stable/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionScatterPlotView.cs
r14112 r14161 26 26 using HeuristicLab.MainForm; 27 27 using HeuristicLab.MainForm.WindowsForms; 28 using HeuristicLab.Visualization.ChartControlsExtensions; 28 29 29 30 namespace HeuristicLab.Problems.DataAnalysis.Views { … … 169 170 double min = Content.EstimatedTrainingValues.Concat(Content.EstimatedTestValues.Concat(Content.EstimatedValues.Concat(dataset.GetDoubleValues(targetVariableName)))).Min(); 170 171 171 max = max + 0.2 * Math.Abs(max); 172 min = min - 0.2 * Math.Abs(min); 173 174 double interestingValuesRange = max - min; 175 int digits = Math.Max(0, 3 - (int)Math.Log10(interestingValuesRange)); 176 177 max = Math.Round(max, digits); 178 min = Math.Round(min, digits); 179 180 this.chart.ChartAreas[0].AxisX.Maximum = max; 181 this.chart.ChartAreas[0].AxisX.Minimum = min; 182 this.chart.ChartAreas[0].AxisY.Maximum = max; 183 this.chart.ChartAreas[0].AxisY.Minimum = min; 172 double axisMin, axisMax, axisInterval; 173 ChartUtil.CalculateOptimalAxisInterval(min, max, out axisMin, out axisMax, out axisInterval); 174 this.chart.ChartAreas[0].AxisX.Maximum = axisMax; 175 this.chart.ChartAreas[0].AxisX.Minimum = axisMin; 176 this.chart.ChartAreas[0].AxisX.Interval = axisInterval; 177 this.chart.ChartAreas[0].AxisY.Maximum = axisMax; 178 this.chart.ChartAreas[0].AxisY.Minimum = axisMin; 179 this.chart.ChartAreas[0].AxisY.Interval = axisInterval; 180 184 181 UpdateCursorInterval(); 185 182 }
Note: See TracChangeset
for help on using the changeset viewer.