Changeset 8580

Timestamp:

09/05/12 16:22:28 (12 years ago)

Author:

gkronber

Message:

#1902: fixed coloring in line chart for GPR

File:

• trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/GaussianProcessRegressionSolutionLineChartView.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/GaussianProcessRegressionSolutionLineChartView.cs

@@ -115 +115 @@
         this.ToggleSeriesData(this.chart.Series[ESTIMATEDVALUES_ALL_SERIES_NAME]);
 
+
         // the series have been added in different order than in the normal line chart 
         // --> adapt coloring;
-        var s1Color = chart.Series[0].Color;
-        var s2Color = chart.Series[1].Color;
-        var s3Color = chart.Series[2].Color;
-        var s4Color = chart.Series[3].Color;
-
-        chart.Series[3].Color = s1Color;
-        chart.Series[0].Color = s2Color;
-        chart.Series[1].Color = s3Color;
-        chart.Series[2].Color = s4Color;
+        chart.ApplyPaletteColors();
+        this.chart.Palette = ChartColorPalette.None;
+        var s0Color = chart.Series[0].Color;
+        var s1Color = chart.Series[1].Color;
+        var s2Color = chart.Series[2].Color;
+        var s3Color = chart.Series[3].Color;
+        this.chart.PaletteCustomColors = new Color[] { s1Color, s2Color, s3Color, s0Color };
 
         UpdateCursorInterval();
@@ -282 +281 @@
             mean = Content.EstimatedTestValues.ToArray();
             s2 = Content.EstimatedTestVariance.ToArray();
-            lower = mean.Zip(s2, (m, s) => m - s).ToArray();
-            upper = mean.Zip(s2, (m, s) => m + s).ToArray();
+            lower = mean.Zip(s2, (m, s) => m - 1.96 * Math.Sqrt(s)).ToArray();
+            upper = mean.Zip(s2, (m, s) => m + 1.96 * Math.Sqrt(s)).ToArray();
             break;
         }