Changeset 14525 for branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing/3.4/Content/ScatterPlotContent.cs

Timestamp:

12/22/16 16:36:59 (7 years ago)

Author:

pfleck

Message:

#2709

• Added suggestion feature for singlescatterplotview.
• Shows NaN groups in scatterplot (black if gradient is selected).
• Only enables input variables in DataGridContentView per default.
• Added missing resx file (gradient image).

File:

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

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

@@ -73 +73 @@
         var groupValues = PreprocessingData.GetValues<double>(PreprocessingData.GetColumnIndex(variableNameGroup));
         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))
+          .Where(x => !double.IsNaN(x.p.X) && !double.IsNaN(x.p.Y) && !double.IsInfinity(x.p.X) && !double.IsInfinity(x.p.Y))
           .ToList();
 
         foreach (var groupValue in groupValues.Distinct().OrderBy(g => g)) {
-          var values = data.Where(x => x.g == groupValue).Select(v => v.p);
+          var values = data.Where(x => x.g == groupValue || (double.IsNaN(x.g) && double.IsNaN(groupValue))).Select(v => v.p);
           var row = new ScatterPlotDataRow(string.Format("{0} ({1})", variableNameGroup, groupValue), "", values) {
             Name = groupValue.ToString("R"),