Changeset 15489 for branches/DataPreprocessing Cleanup

Timestamp:

11/30/17 10:31:27 (7 years ago)

Author:

pfleck

Message:

#2809:

• Fixed wrong number of remaining/toral rows after filter changed
• Improved performance for filtering as suggested by bburlacu. Thanks for the patch.
• Start all charts with index zero.

Location:

branches/DataPreprocessing Cleanup

Files:

• HeuristicLab.DataPreprocessing.Views/3.4/FilterView.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing/3.4/Content/PreprocessingChartContent.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing/3.4/Data/FilteredPreprocessingData.cs (modified) (2 diffs)

branches/DataPreprocessing Cleanup/HeuristicLab.DataPreprocessing.Views/3.4/FilterView.cs

@@ -71 +71 @@
       applyFilterButton.Enabled = activeFilters;
 
+      Content.PreprocessingData.ResetFilter();
+
       int numTotal = Content.PreprocessingData.Rows;
       int numRemaining = numTotal;
 
-      Content.PreprocessingData.ResetFilter();
       if (activeFilters) {
         var remainingRows = Content.GetRemainingRows();
-        Content.PreprocessingData.SetFilter(remainingRows);
         numRemaining = remainingRows.Count(x => x);
+
+        if (numRemaining < numTotal) {
+          Content.PreprocessingData.SetFilter(remainingRows);
+        }
       }
 

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

@@ -82 +82 @@
 
     public static DataRow CreateDataRow(IFilteredPreprocessingData preprocessingData, string variableName, DataRowVisualProperties.DataRowChartType chartType) {
-      IList<double> values = preprocessingData.GetValues<double>(preprocessingData.GetColumnIndex(variableName));
-      DataRow row = new DataRow(variableName, "", values);
-      row.VisualProperties.ChartType = chartType;
+      var values = preprocessingData.GetValues<double>(preprocessingData.GetColumnIndex(variableName));
+      var row = new DataRow(variableName, "", values) {
+        VisualProperties = {
+          ChartType = chartType,
+          StartIndexZero = true
+        }
+      };
       return row;
     }

branches/DataPreprocessing Cleanup/HeuristicLab.DataPreprocessing/3.4/Data/FilteredPreprocessingData.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -320 +321 @@
       filteredData = (IPreprocessingData)originalData.Clone();
       filteredData.InTransaction(() => {
-        for (int row = (remainingRows.Length - 1); row >= 0; --row) {
-          if (!remainingRows[row]) {
-            filteredData.DeleteRow(row);
+        var remainingIndices = Enumerable.Range(0, remainingRows.Length).Where(x => remainingRows[x]);
+
+        foreach (var v in filteredData.VariableNames) {
+          var ci = filteredData.GetColumnIndex(v);
+          if (filteredData.VariableHasType<double>(ci)) {
+            var values = filteredData.GetValues<double>(ci);
+            var filteredValues = remainingIndices.Select(x => values[x]).ToList();
+            filteredData.SetValues(ci, filteredValues);
+          } else if (filteredData.VariableHasType<DateTime>(ci)) {
+            var values = filteredData.GetValues<DateTime>(ci);
+            var filteredValues = remainingIndices.Select(x => values[x]).ToList();
+            filteredData.SetValues(ci, filteredValues);
+          } else if (filteredData.VariableHasType<string>(ci)) {
+            var values = filteredData.GetValues<string>(ci);
+            var filteredValues = remainingIndices.Select(x => values[x]).ToList();
+            filteredData.SetValues(ci, filteredValues);
           }
         }