Changeset 14993 for branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing/3.4/Content

Timestamp:

05/17/17 13:22:51 (8 years ago)

Author:

pfleck

Message:

#2709

• Added Legend order when grouping for histogram and (single and multi)scatterplot.
• Removed the limitation of distinct values for the singlescatterplot (for the color gradient).
• Added a legend-visible checkbox for the multi-scatterplot.

Location:

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

Files:

• HistogramContent.cs (modified) (2 diffs)
• PreprocessingChartContent.cs (modified) (1 diff)
• ScatterPlotContent.cs (modified) (4 diffs)

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

@@ -39 +39 @@
     public bool ExactBins { get; set; }
 
+    public LegendOrder Order { get; set; }
+
     public HistogramContent(IFilteredPreprocessingData preprocessingData)
       : base(preprocessingData) {
@@ -52 +54 @@
     }
 
-    public static DataTable CreateHistogram(IFilteredPreprocessingData preprocessingData, string variableName, string groupingVariableName, DataRowVisualProperties.DataRowHistogramAggregation aggregation) {
-      {
-        var dataTable = new DataTable();
+    public static DataTable CreateHistogram(IFilteredPreprocessingData preprocessingData, string variableName, string groupingVariableName, DataRowVisualProperties.DataRowHistogramAggregation aggregation, LegendOrder legendOrder = LegendOrder.Appearance) {
+      var dataTable = new DataTable();
 
-        if (string.IsNullOrEmpty(groupingVariableName)) {
-          var row = PreprocessingChartContent.CreateDataRow(preprocessingData, variableName, DataRowVisualProperties.DataRowChartType.Histogram);
-          dataTable.Rows.Add(row);
-          return dataTable;
-        }
-
-        dataTable.VisualProperties.Title = variableName;
-
-        int variableIndex = preprocessingData.GetColumnIndex(variableName);
-        var variableValues = preprocessingData.GetValues<double>(variableIndex);
-        int groupVariableIndex = preprocessingData.GetColumnIndex(groupingVariableName);
-        var groupingValues = Enumerable.Empty<string>();
-
-        if (preprocessingData.VariableHasType<double>(groupVariableIndex)) {
-          groupingValues = preprocessingData.GetValues<double>(groupVariableIndex).Select(x => x.ToString());
-        } else if (preprocessingData.VariableHasType<string>(groupVariableIndex)) {
-          groupingValues = preprocessingData.GetValues<string>(groupVariableIndex);
-        } else if (preprocessingData.VariableHasType<DateTime>(groupVariableIndex)) {
-          groupingValues = preprocessingData.GetValues<DateTime>(groupVariableIndex).Select(x => x.ToString());
-        }
-
-        var groups = groupingValues.Zip(variableValues, Tuple.Create).GroupBy(t => t.Item1, t => t.Item2);
-
-        foreach (var group in groups) {
-          var classRow = new DataRow();
-          classRow.Name = group.Key;
-          classRow.VisualProperties.ChartType = DataRowVisualProperties.DataRowChartType.Histogram;
-          classRow.VisualProperties.Aggregation = aggregation;
-          classRow.Values.AddRange(group);
-          dataTable.Rows.Add(classRow);
-        }
+      if (string.IsNullOrEmpty(groupingVariableName)) {
+        var row = PreprocessingChartContent.CreateDataRow(preprocessingData, variableName, DataRowVisualProperties.DataRowChartType.Histogram);
+        dataTable.Rows.Add(row);
         return dataTable;
       }
+
+      dataTable.VisualProperties.Title = variableName;
+
+      int variableIndex = preprocessingData.GetColumnIndex(variableName);
+      var variableValues = preprocessingData.GetValues<double>(variableIndex);
+      int groupVariableIndex = preprocessingData.GetColumnIndex(groupingVariableName);
+      var groupingValues = Enumerable.Empty<string>();
+
+      if (preprocessingData.VariableHasType<double>(groupVariableIndex)) {
+        groupingValues = preprocessingData.GetValues<double>(groupVariableIndex).Select(x => x.ToString());
+      } else if (preprocessingData.VariableHasType<string>(groupVariableIndex)) {
+        groupingValues = preprocessingData.GetValues<string>(groupVariableIndex);
+      } else if (preprocessingData.VariableHasType<DateTime>(groupVariableIndex)) {
+        groupingValues = preprocessingData.GetValues<DateTime>(groupVariableIndex).Select(x => x.ToString());
+      }
+
+      var groups = groupingValues.Zip(variableValues, Tuple.Create).GroupBy(t => t.Item1, t => t.Item2);
+
+      if (legendOrder == LegendOrder.Alphabetically)
+        groups = groups.OrderBy(x => x.Key, new NaturalStringComparer());
+
+      foreach (var group in groups) {
+        var classRow = new DataRow {
+          Name = group.Key,
+          VisualProperties = {
+              ChartType = DataRowVisualProperties.DataRowChartType.Histogram,
+              Aggregation = aggregation
+            }
+        };
+        classRow.Values.AddRange(group);
+        dataTable.Rows.Add(classRow);
+      }
+      return dataTable;
     }
-
-
   }
 }

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

@@ -33 +33 @@
   [Item("PreprocessingChart", "Represents a preprocessing chart.")]
   public class PreprocessingChartContent : Item, IViewShortcut {
+
+    public enum LegendOrder {
+      Appearance,
+      Alphabetically
+    }
+
     public static new Image StaticItemImage {
       get { return VSImageLibrary.PieChart; }

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

@@ -40 +40 @@
     }
 
-    public static ScatterPlot CreateScatterPlot(IFilteredPreprocessingData preprocessingData, string variableNameX, string variableNameY, string variableNameGroup = "-") {
+    public static ScatterPlot CreateScatterPlot(IFilteredPreprocessingData preprocessingData, string variableNameX, string variableNameY, string variableNameGroup = "-", LegendOrder legendOrder = LegendOrder.Appearance) {
       ScatterPlot scatterPlot = new ScatterPlot();
 
@@ -56 +56 @@
           scatterPlot.VisualProperties.XAxisMinimumFixedValue = axisMin;
           scatterPlot.VisualProperties.XAxisMaximumFixedValue = axisMax;
-        }
-        catch (ArgumentOutOfRangeException) { } // error during CalculateOptimalAxisInterval 
+        } catch (ArgumentOutOfRangeException) { } // error during CalculateOptimalAxisInterval 
         try {
           double axisMin, axisMax, axisInterval;
@@ -65 +64 @@
           scatterPlot.VisualProperties.YAxisMinimumFixedValue = axisMin;
           scatterPlot.VisualProperties.YAxisMaximumFixedValue = axisMax;
-        }
-        catch (ArgumentOutOfRangeException) { } // error during CalculateOptimalAxisInterval 
+        } catch (ArgumentOutOfRangeException) { } // error during CalculateOptimalAxisInterval 
       }
 
@@ -91 +89 @@
       var groups = groupingValues.Zip(validPoints, Tuple.Create).GroupBy(t => t.Item1, t => t.Item2);
 
+      if (legendOrder == LegendOrder.Alphabetically)
+        groups = groups.OrderBy(x => x.Key, new NaturalStringComparer());
+
       foreach (var group in groups) {
-        var scdr = new ScatterPlotDataRow();
-        scdr.Name = group.Key;
-        scdr.VisualProperties.IsVisibleInLegend = true;
-        scdr.VisualProperties.PointSize = 6;
+        var scdr = new ScatterPlotDataRow {
+          Name = group.Key,
+          VisualProperties = {
+            IsVisibleInLegend = true,
+            PointSize = 6
+          }
+        };
         scdr.Points.AddRange(group);
         scatterPlot.Rows.Add(scdr);