Changeset 15210 for trunk/sources/HeuristicLab.DataPreprocessing

Timestamp:

07/12/17 15:45:31 (8 years ago)

Author:

pfleck

Message:

#2709 Fixed some small issues and some default behavior.

Location:

trunk/sources/HeuristicLab.DataPreprocessing/3.4/Content

Files:

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

trunk/sources/HeuristicLab.DataPreprocessing/3.4/Content/HistogramContent.cs

@@ -54 +54 @@
     }
 
-    public static DataTable CreateHistogram(IFilteredPreprocessingData preprocessingData, string variableName, string groupingVariableName, DataTableVisualProperties.DataTableHistogramAggregation aggregation, LegendOrder legendOrder = LegendOrder.Appearance) {
+    public static DataTable CreateHistogram(IFilteredPreprocessingData preprocessingData, string variableName, string groupingVariableName, DataTableVisualProperties.DataTableHistogramAggregation aggregation, LegendOrder legendOrder = LegendOrder.Alphabetically) {
       var dataTable = new DataTable {
         VisualProperties = { Title = variableName, HistogramAggregation = aggregation },

trunk/sources/HeuristicLab.DataPreprocessing/3.4/Content/PreprocessingChartContent.cs

@@ -34 +34 @@
   public class PreprocessingChartContent : Item, IViewShortcut {
     public enum LegendOrder {
-      Appearance,
-      Alphabetically
+      Alphabetically,
+      Appearance
     }
 
@@ -91 +91 @@
     }
 
-    private const int MAX_DISTINCT_VALUES_FOR_GROUPING = 20;
-    public static IEnumerable<string> GetVariableNamesForGrouping(IPreprocessingData preprocessingData) {
+    public static IEnumerable<string> GetVariableNamesForGrouping(IPreprocessingData preprocessingData, int maxDistinctValues = 20) {
       var variableNames = new List<string>();
 
@@ -104 +103 @@
           distinctValues = preprocessingData.GetValues<DateTime>(i).GroupBy(x => x).Count();
 
-        if (distinctValues <= MAX_DISTINCT_VALUES_FOR_GROUPING)
+        if (distinctValues <= maxDistinctValues)
           variableNames.Add(preprocessingData.GetVariableName(i));
       }

trunk/sources/HeuristicLab.DataPreprocessing/3.4/Content/ScatterPlotContent.cs

@@ -40 +40 @@
     }
 
-    public static ScatterPlot CreateScatterPlot(IFilteredPreprocessingData preprocessingData, string variableNameX, string variableNameY, string variableNameGroup = "-", LegendOrder legendOrder = LegendOrder.Appearance) {
+    public static ScatterPlot CreateScatterPlot(IFilteredPreprocessingData preprocessingData, string variableNameX, string variableNameY, string variableNameGroup = "-", LegendOrder legendOrder = LegendOrder.Alphabetically) {
       ScatterPlot scatterPlot = new ScatterPlot();