Changeset 14521 for branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing

Timestamp:

12/22/16 12:42:09 (8 years ago)

Author:

pfleck

Message:

#2709 Added an option for the preprocessing scatterplot to use a color gradient instead of the chart color palette.

File:

• branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing/3.4/Content/ScatterPlotContent.cs (modified) (1 diff)

branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing/3.4/Content/ScatterPlotContent.cs

@@ -72 +72 @@
       } else {
         var groupValues = PreprocessingData.GetValues<double>(PreprocessingData.GetColumnIndex(variableNameGroup));
-        var data = points.Zip(groupValues, (p, g) => new { p, g });
-        foreach (var groupValue in groupValues.Distinct()) {
+        var data = points.Zip(groupValues, (p, g) => new { p, g })
+          .Where(x => !double.IsNaN(x.p.X) && !double.IsNaN(x.p.Y) && !double.IsNaN(x.g) && !double.IsInfinity(x.p.X) && !double.IsInfinity(x.p.Y) && !double.IsInfinity(x.g))
+          .ToList();
+
+        foreach (var groupValue in groupValues.Distinct().OrderBy(g => g)) {
           var values = data.Where(x => x.g == groupValue).Select(v => v.p);
           var row = new ScatterPlotDataRow(string.Format("{0} ({1})", variableNameGroup, groupValue), "", values) {
+            Name = groupValue.ToString("R"),
             VisualProperties = { PointSize = 6 }
           };