Changeset 15466 for branches/DataPreprocessing Cleanup/HeuristicLab.DataPreprocessing/3.4/Data

Timestamp:

11/09/17 11:51:37 (7 years ago)

Author:

pfleck

Message:

#2809: Simplified the overall filtering logic as suggested by bburlacu

• changed parameter names to actively reflect that filter means "remaining"
• moved filter combination logic to FilterContent
• simplified/restructured code

Location:

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

Files:

• FilteredPreprocessingData.cs (modified) (2 diffs)
• IFilteredPreprocessingData.cs (modified) (1 diff)

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

@@ -43 +43 @@
 
     #region Constructor, Cloning & Persistence
-    public FilteredPreprocessingData(IPreprocessingData preporcessingData)
+    public FilteredPreprocessingData(IPreprocessingData preprocessingData)
       : base() {
-      originalData = preporcessingData;
+      originalData = preprocessingData;
       filteredData = null;
     }
@@ -317 +317 @@
 
     #region Filters
-    public void SetFilter(bool[] rowFilters) {
+    public void SetFilter(bool[] remainingRows) {
       filteredData = (IPreprocessingData)originalData.Clone();
       filteredData.InTransaction(() => {
-        for (int row = (rowFilters.Length - 1); row >= 0; --row) {
-          if (rowFilters[row]) {
+        for (int row = (remainingRows.Length - 1); row >= 0; --row) {
+          if (!remainingRows[row]) {
             filteredData.DeleteRow(row);
           }

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

@@ -25 +25 @@
   public interface IFilteredPreprocessingData : IPreprocessingData {
     #region Filters
-    void SetFilter(bool[] rowFilters);
+    void SetFilter(bool[] remainingRows);
     void PersistFilter();
     void ResetFilter();