Changeset 10785 for branches/DataPreprocessing

Timestamp:

04/23/14 15:51:41 (11 years ago)

Author:

psteiner

Message:

filter or combination
filter control: checkedlistview

Location:

branches/DataPreprocessing

Files:

• HeuristicLab.DataPreprocessing.Views/3.3/CheckedFilterCollectionView.Designer.cs (added)
• HeuristicLab.DataPreprocessing.Views/3.3/CheckedFilterCollectionView.cs (added)
• HeuristicLab.DataPreprocessing.Views/3.3/DataGridContentView.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing.Views/3.3/FilterView.Designer.cs (modified) (7 diffs)
• HeuristicLab.DataPreprocessing.Views/3.3/FilterView.cs (modified) (7 diffs)
• HeuristicLab.DataPreprocessing.Views/3.3/HeuristicLab.DataPreprocessing.Views-3.3.csproj (modified) (1 diff)
• HeuristicLab.DataPreprocessing/3.3/Implementations/Filter/ComparisonFilter.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing/3.3/Implementations/FilterLogic.cs (modified) (3 diffs)
• HeuristicLab.DataPreprocessing/3.3/Interfaces/IFilterLogic.cs (modified) (1 diff)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/DataGridContentView.cs

@@ -220 +220 @@
       for (int i = 0; i < Content.FilterLogic.PreprocessingData.Columns; i++) {
         comparisonFilter.ConstraintColumn = i;
-        bool[] filteredRows = Content.FilterLogic.Preview(filters);
+        bool[] filteredRows = Content.FilterLogic.Preview(filters, true);
         foundCells[i] = filteredRows.Select((value, index) => new { Index = index, Value = value })
           .Where(pair => pair.Value)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/FilterView.Designer.cs

@@ -30 +30 @@
     {
       this.groupBoxFilter = new System.Windows.Forms.GroupBox();
+      this.checkedFilterView = new HeuristicLab.DataPreprocessing.Views.CheckedFilterCollectionView();
       this.groupBoxFilterInfo = new System.Windows.Forms.GroupBox();
       this.lblPercentage = new System.Windows.Forms.Label();
@@ -38 +39 @@
       this.lblTotal = new System.Windows.Forms.Label();
       this.applyFilterButton = new System.Windows.Forms.Button();
+      this.rBtnOr = new System.Windows.Forms.RadioButton();
+      this.rBtnAnd = new System.Windows.Forms.RadioButton();
+      this.btnReset = new System.Windows.Forms.Button();
+      this.groupBoxFilter.SuspendLayout();
       this.groupBoxFilterInfo.SuspendLayout();
       this.SuspendLayout();
@@ -45 +50 @@
       this.groupBoxFilter.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
+      this.groupBoxFilter.Controls.Add(this.checkedFilterView);
       this.groupBoxFilter.Location = new System.Drawing.Point(4, 4);
       this.groupBoxFilter.Name = "groupBoxFilter";
@@ -52 +58 @@
       this.groupBoxFilter.Text = "Filter";
       // 
+      // checkedFilterView
+      // 
+      this.checkedFilterView.Caption = "filterView";
+      this.checkedFilterView.Content = null;
+      this.checkedFilterView.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.checkedFilterView.Location = new System.Drawing.Point(3, 16);
+      this.checkedFilterView.Name = "checkedFilterView";
+      this.checkedFilterView.ReadOnly = false;
+      this.checkedFilterView.ShowDetails = true;
+      this.checkedFilterView.Size = new System.Drawing.Size(652, 308);
+      this.checkedFilterView.TabIndex = 0;
+      // 
       // groupBoxFilterInfo
       // 
-      this.groupBoxFilterInfo.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
+      this.groupBoxFilterInfo.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
       this.groupBoxFilterInfo.Controls.Add(this.lblPercentage);
@@ -139 +156 @@
       this.applyFilterButton.Click += new System.EventHandler(this.applyFilterButton_Click);
       // 
+      // rBtnOr
+      // 
+      this.rBtnOr.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+      this.rBtnOr.AutoSize = true;
+      this.rBtnOr.Enabled = false;
+      this.rBtnOr.Location = new System.Drawing.Point(60, 480);
+      this.rBtnOr.Name = "rBtnOr";
+      this.rBtnOr.Size = new System.Drawing.Size(36, 17);
+      this.rBtnOr.TabIndex = 3;
+      this.rBtnOr.Text = "Or";
+      this.rBtnOr.UseVisualStyleBackColor = true;
+      // 
+      // rBtnAnd
+      // 
+      this.rBtnAnd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+      this.rBtnAnd.AutoSize = true;
+      this.rBtnAnd.Checked = true;
+      this.rBtnAnd.Enabled = false;
+      this.rBtnAnd.Location = new System.Drawing.Point(10, 480);
+      this.rBtnAnd.Name = "rBtnAnd";
+      this.rBtnAnd.Size = new System.Drawing.Size(44, 17);
+      this.rBtnAnd.TabIndex = 4;
+      this.rBtnAnd.TabStop = true;
+      this.rBtnAnd.Text = "And";
+      this.rBtnAnd.UseVisualStyleBackColor = true;
+      this.rBtnAnd.CheckedChanged += new System.EventHandler(this.rBtnAnd_CheckedChanged);
+      // 
+      // btnReset
+      // 
+      this.btnReset.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+      this.btnReset.Enabled = false;
+      this.btnReset.Location = new System.Drawing.Point(473, 473);
+      this.btnReset.Name = "btnReset";
+      this.btnReset.Size = new System.Drawing.Size(75, 23);
+      this.btnReset.TabIndex = 5;
+      this.btnReset.Text = "Reset";
+      this.btnReset.UseVisualStyleBackColor = true;
+      this.btnReset.Click += new System.EventHandler(this.btnReset_Click);
+      // 
       // FilterView
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.Controls.Add(this.btnReset);
+      this.Controls.Add(this.rBtnAnd);
+      this.Controls.Add(this.rBtnOr);
       this.Controls.Add(this.applyFilterButton);
       this.Controls.Add(this.groupBoxFilterInfo);
@@ -148 +207 @@
       this.Name = "FilterView";
       this.Size = new System.Drawing.Size(670, 506);
+      this.groupBoxFilter.ResumeLayout(false);
       this.groupBoxFilterInfo.ResumeLayout(false);
       this.groupBoxFilterInfo.PerformLayout();
       this.ResumeLayout(false);
+      this.PerformLayout();
 
     }
@@ -165 +226 @@
     private System.Windows.Forms.TextBox tbFiltered;
     private System.Windows.Forms.Label lblFiltered;
+    private System.Windows.Forms.RadioButton rBtnOr;
+    private System.Windows.Forms.RadioButton rBtnAnd;
+    private CheckedFilterCollectionView checkedFilterView;
+    private System.Windows.Forms.Button btnReset;
 
 

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/FilterView.cs

@@ -14 +14 @@
   [Content(typeof(FilterContent), true)]
   public partial class FilterView : ItemView {
-    private CheckedItemCollectionView<IFilter> filterView;
+    //private CheckedItemCollectionView<IFilter> filterView;
 
     public FilterView() {
@@ -21 +21 @@
       tbFiltered.Text = "0";
       tbPercentage.Text = "0%";
-      filterView = new CheckedItemCollectionView<IFilter>();
-      filterView.Dock = DockStyle.Fill;
+      checkedFilterView.Content = new CheckedItemCollection<IFilter>();
+      //filterView = new CheckedItemCollectionView<IFilter>();
+      //filterView = new CheckedFilterCollectionView();
+      /*filterView.Dock = DockStyle.Fill;
       filterView.Content = new CheckedItemCollection<IFilter>();
-      filterView.Content.ItemsAdded += Content_ItemsAdded;
-      filterView.Content.ItemsRemoved += Content_ItemsRemoved;
-      filterView.Content.CheckedItemsChanged += Content_CheckedItemsChanged;
-      groupBoxFilter.Controls.Add(filterView);
+       * */
+      checkedFilterView.Content.ItemsAdded += Content_ItemsAdded;
+      checkedFilterView.Content.ItemsRemoved += Content_ItemsRemoved;
+      checkedFilterView.Content.CheckedItemsChanged += Content_CheckedItemsChanged;
+      //groupBoxFilter.Controls.Add(filterView);*/
     }
 
     public new FilterContent Content {
       get { return (FilterContent)base.Content; }
-      set { base.Content = value; }
+      set { base.Content = value; UpdateFilterInfo(); }
     }
 
@@ -39 +42 @@
       foreach (IFilter filter in e.Items)
       {
- /*       if (filterView.Content.CheckedItems.Contains(filter) && (filter.ConstraintData == null || string.IsNullOrEmpty(((StringValue)filter.ConstraintData).Value)) )
-        {
-          filter.ConstraintData = new StringValue("0");
-        }
-  * */
         filter.Active = !filter.Active;
       }
@@ -52 +50 @@
 
     private void UpdateFilterInfo() {
-      List<IFilter> filters = filterView.ItemCollection.ToList<IFilter>();
+      List<IFilter> filters = checkedFilterView.ItemCollection.ToList<IFilter>();
 
       int activeFilters = filters.Count(c => c.Active);
 
       applyFilterButton.Enabled = (activeFilters > 0);
+      rBtnAnd.Enabled = (activeFilters > 0);
+      rBtnOr.Enabled = (activeFilters > 0);
+      btnReset.Enabled = (activeFilters > 0);
 
-      bool[] result = Content.FilterLogic.Preview(filters);
+      bool[] result = Content.FilterLogic.Preview(filters, rBtnAnd.Checked);
       
-      int filteredCnt = result.Count(c => !c);
+      int filteredCnt = result.Count(c => c);
   
       tbFiltered.Text = filteredCnt.ToString();
@@ -69 +70 @@
 
     private void applyFilterButton_Click(object sender, EventArgs e) {
-      List<IFilter> filters = filterView.ItemCollection.ToList<IFilter>();
-      Content.FilterLogic.Apply(filters);
+      List<IFilter> filters = checkedFilterView.ItemCollection.ToList<IFilter>();
+      Content.FilterLogic.Apply(filters, rBtnAnd.Checked);
     }
 
@@ -78 +79 @@
         filter.ConstrainedValue = Content.FilterLogic.PreprocessingData;
         filter.Active = true;
-        filterView.Content.SetItemCheckedState(filter, false);
+        checkedFilterView.Content.SetItemCheckedState(filter, false);
       }
       UpdateFilterInfo();
@@ -87 +88 @@
     }
 
+    private void rBtnAnd_CheckedChanged(object sender, EventArgs e)
+    {
+      UpdateFilterInfo();
+    }
+
+    private void btnReset_Click(object sender, EventArgs e)
+    {
+      Content.FilterLogic.Reset();
+    }
+
   }
 }

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/HeuristicLab.DataPreprocessing.Views-3.3.csproj

@@ -64 +64 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="CheckedFilterCollectionView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="CheckedFilterCollectionView.Designer.cs">
+      <DependentUpon>CheckedFilterCollectionView.cs</DependentUpon>
+    </Compile>
     <Compile Include="CheckedTransformationCollectionView.cs">
       <SubType>UserControl</SubType>

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/Filter/ComparisonFilter.cs

@@ -128 +128 @@
                 }
 
-                result[row] = base.Check(item);
+                result[row] = !base.Check(item);
             }
 

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/FilterLogic.cs

@@ -35 +35 @@
     }
 
-    public bool[] Preview(IList<IFilter> filters)
+    public bool[] Preview(IList<IFilter> filters, bool isAndCombination)
     {
        IList<IFilter> activeFilters = filters.Where(f => f.Active && f.ConstraintData != null).ToList<IFilter>();
@@ -44 +44 @@
 
        bool[] result = Enumerable.Repeat<bool>(true, preprocessingData.Rows).ToArray();
+         foreach (IFilter filter in activeFilters)
+         {
+           bool[] filterResult = filter.Check();
+           for (int row = 0; row < result.Length; ++row)
+           {
+             result[row] = isAndCombination ?  result[row] && filterResult[row] : result[row] || filterResult[row];
+           }
+         }
 
-       foreach (IFilter filter in activeFilters)
-       {
-            bool[] filterResult = filter.Check();
-
-            for(int row = 0; row < result.Length; ++row) {
-                result[row] = result[row] && filterResult[row];
-            }
-        }
 
         preprocessingData.SetFilter(result);
@@ -59 +59 @@
     }
 
-    public void Apply(IList<IFilter> filters)
+    public void Apply(IList<IFilter> filters, bool isAndCombination)
     {
-        preprocessingData.SetFilter(Preview(filters));
+        preprocessingData.SetFilter(Preview(filters, isAndCombination));
         preprocessingData.PersistFilter();
     }

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Interfaces/IFilterLogic.cs

@@ -24 +24 @@
 namespace HeuristicLab.DataPreprocessing {
   public interface IFilterLogic {
-    bool[] Preview(IList<IFilter> filters);
-    void Apply(IList<IFilter> filters);
+    bool[] Preview(IList<IFilter> filters, bool isAndCombination);
+    void Apply(IList<IFilter> filters, bool isAndCombination);
     IPreprocessingData PreprocessingData{get;}
+    void Reset();
   }
 }