Changeset 14511 for branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing

Timestamp:

12/20/16 15:28:14 (8 years ago)

Author:

pfleck

Message:

#2709

• Added Check Inputs/All/None buttons instead of showing disabled buttons of the ItemCollectionView.
• Removed the PreprocessingCheckedItemListView. A standard ListView is used instead.
• Fixed slow updating when simultaneously (un-)checking multiple variables in the chart views. (currently only works by using the new buttons)

Location:

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

Files:

• PreprocessingChartContent.cs (modified) (2 diffs)
• ScatterPlotContent.cs (modified) (3 diffs)

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

@@ -36 +36 @@
     private ICheckedItemList<StringValue> variableItemList = null;
     public ICheckedItemList<StringValue> VariableItemList {
-      get { return this.variableItemList; }
-      set { this.variableItemList = value; }
+      get {
+        if (variableItemList == null)
+          variableItemList = CreateVariableItemList();
+        return this.variableItemList;
+      }
+      //set { this.variableItemList = value; }
     }
 
@@ -65 +69 @@
 
 
-    public ICheckedItemList<StringValue> CreateVariableItemList(IList<string> checkedItems = null) {
-      if (checkedItems == null) checkedItems = new string[0];
+    public ICheckedItemList<StringValue> CreateVariableItemList() {
       ICheckedItemList<StringValue> itemList = new CheckedItemList<StringValue>();
       foreach (string name in PreprocessingData.GetDoubleVariableNames()) {
         var n = new StringValue(name);
-        itemList.Add(n, checkedItems.Contains(name));
+        bool isInputTarget = PreprocessingData.InputVariables.Contains(name) || PreprocessingData.TargetVariable == name;
+        itemList.Add(n, isInputTarget);
       }
       return new ReadOnlyCheckedItemList<StringValue>(itemList);

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

@@ -42 +42 @@
       ScatterPlot scatterPlot = new ScatterPlot();
 
-      IList<double> xValues = PreprocessingData.GetValues<double>(PreprocessingData.GetColumnIndex(variableNameX)).Where(x => !double.IsNaN(x) && !double.IsInfinity(x)).ToList();
-      IList<double> yValues = PreprocessingData.GetValues<double>(PreprocessingData.GetColumnIndex(variableNameY)).Where(x => !double.IsNaN(x) && !double.IsInfinity(x)).ToList();
+      IList<double> xValues = PreprocessingData.GetValues<double>(PreprocessingData.GetColumnIndex(variableNameX));
+      IList<double> yValues = PreprocessingData.GetValues<double>(PreprocessingData.GetColumnIndex(variableNameY));
 
-      if (xValues.Any()) {
+      var points = xValues.Zip(yValues, (x, y) => new Point2D<double>(x, y)).ToList();
+      var validPoints = points.Where(p => !double.IsNaN(p.X) && !double.IsNaN(p.Y) && !double.IsInfinity(p.X) && !double.IsInfinity(p.Y)).ToList();
+      if (validPoints.Any()) {
         try {
           double axisMin, axisMax, axisInterval;
-          ChartUtil.CalculateOptimalAxisInterval(xValues.Min(), xValues.Max(), out axisMin, out axisMax, out axisInterval);
+          ChartUtil.CalculateOptimalAxisInterval(validPoints.Min(p => p.X), validPoints.Max(p => p.X), out axisMin, out axisMax, out axisInterval);
           scatterPlot.VisualProperties.XAxisMinimumAuto = false;
           scatterPlot.VisualProperties.XAxisMaximumAuto = false;
@@ -54 +56 @@
           scatterPlot.VisualProperties.XAxisMaximumFixedValue = axisMax;
         } catch (ArgumentOutOfRangeException) { } // error during CalculateOptimalAxisInterval 
-      }
-      if (yValues.Any()) {
         try {
           double axisMin, axisMax, axisInterval;
-          ChartUtil.CalculateOptimalAxisInterval(yValues.Min(), yValues.Max(), out axisMin, out axisMax, out axisInterval);
+          ChartUtil.CalculateOptimalAxisInterval(validPoints.Min(p => p.Y), validPoints.Max(p => p.Y), out axisMin, out axisMax, out axisInterval);
           scatterPlot.VisualProperties.YAxisMinimumAuto = false;
           scatterPlot.VisualProperties.YAxisMaximumAuto = false;
@@ -67 +67 @@
 
       if (variableNameGroup == null || variableNameGroup == "-") {
-        List<Point2D<double>> points = new List<Point2D<double>>();
-
-        for (int i = 0; i < xValues.Count; i++) {
-          Point2D<double> point = new Point2D<double>(xValues[i], yValues[i]);
-          points.Add(point);
-        }
-
-        ScatterPlotDataRow scdr = new ScatterPlotDataRow(variableNameX + " - " + variableNameY, "", points);
+        ScatterPlotDataRow scdr = new ScatterPlotDataRow(variableNameX + " - " + variableNameY, "", validPoints);
         scdr.VisualProperties.IsVisibleInLegend = false;
         scatterPlot.Rows.Add(scdr);
-
       } else {
         var groupValues = PreprocessingData.GetValues<double>(PreprocessingData.GetColumnIndex(variableNameGroup));
-        var data = xValues.Zip(yValues, (x, y) => new { x, y }).Zip(groupValues, (v, c) => new { v.x, v.y, c }).ToList();
+        var data = points.Zip(groupValues, (p, g) => new { p, g });
         foreach (var groupValue in groupValues.Distinct()) {
-          var values = data.Where(x => x.c == groupValue);
-          var row = new ScatterPlotDataRow(
-            variableNameGroup + " (" + groupValue + ")",
-            "",
-            values.Select(v => new Point2D<double>(v.x, v.y))) {
+          var values = data.Where(x => x.g == groupValue).Select(v => v.p);
+          var row = new ScatterPlotDataRow(string.Format("{0} ({1})", variableNameGroup, groupValue), "", values) {
             VisualProperties = { PointSize = 6 }
           };