Changeset 10672 for branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3

Timestamp:

03/26/14 16:11:08 (11 years ago)

Author:

sbreuer

Message:

• change function headers in manipulationlogic to interface datatypes
• implemented find and replace logic

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3

Files:

• DataGridContentView.cs (modified) (4 diffs)
• DataPreprocessingView.cs (modified) (1 diff)
• FindAndReplaceDialog.Designer.cs (modified) (8 diffs)
• FindAndReplaceDialog.cs (modified) (5 diffs)

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

@@ -25 +25 @@
 using System.Linq;
 using System.Windows.Forms;
+using HeuristicLab.Data;
 using HeuristicLab.MainForm;
 
@@ -34 +35 @@
     private bool notOwnEvent = true;
     private FindAndReplaceDialog findAndReplaceDialog;
+    private IDictionary<int, IList<int>> foundCells;
+    private Tuple<int, int> currentCell;
+    private string currentSearchText;
 
     public new IDataGridContent Content {
@@ -146 +150 @@
       findAndReplaceDialog.FindNextEvent += findAndReplaceDialog_FindNextEvent;
       findAndReplaceDialog.ReplaceAllEvent += findAndReplaceDialog_ReplaceAllEvent;
-      findAndReplaceDialog.ReplaceNextEvent += findAndReplaceDialog_ReplaceNextEvent;
-    }
-
-    void findAndReplaceDialog_ReplaceNextEvent(object sender, EventArgs e) {
-      throw new NotImplementedException();
+      findAndReplaceDialog.ReplaceNextEvent += findAndReplaceDialog_ReplaceEvent;
+      foundCells = null;
+      currentCell = null;
+    }
+
+    void findAndReplaceDialog_ReplaceEvent(object sender, EventArgs e) {
+      if (foundCells != null)
+      {
+        Replace(GetIndexOfCurrentSelectedCell());
+      }
     }
 
     void findAndReplaceDialog_ReplaceAllEvent(object sender, EventArgs e) {
-      throw new NotImplementedException();
+      Replace(FindAll(findAndReplaceDialog.GetSearchText()));
     }
 
     void findAndReplaceDialog_FindNextEvent(object sender, EventArgs e) {
-      throw new NotImplementedException();
+      IDictionary<int, IList<int>> highlightCell;
+      do {
+        if (foundCells == null || currentSearchText != findAndReplaceDialog.GetSearchText()) {
+          currentSearchText = findAndReplaceDialog.GetSearchText();
+          foundCells = FindAll(findAndReplaceDialog.GetSearchText());
+          currentCell = new Tuple<int, int>(0, 0);
+        } else {
+          if (currentCell.Item2 < foundCells[currentCell.Item1].Count - 1) {
+            currentCell = new Tuple<int, int>(currentCell.Item1, currentCell.Item2 + 1);
+          } else if (currentCell.Item1 < foundCells.Count - 1) {
+            currentCell = new Tuple<int, int>(currentCell.Item1 + 1, 0);
+          } else {
+            currentCell = new Tuple<int, int>(0, 0);
+          }
+        }
+
+        highlightCell = GetIndexOfCurrentSelectedCell();
+
+      } while (!Content.GetValue(currentCell.Item1, highlightCell[currentCell.Item1].ElementAt(0)).Equals(currentSearchText));
+      HightlightedCells = highlightCell;
     }
 
     void findAndReplaceDialog_FindAllEvent(object sender, EventArgs e) {
-      throw new NotImplementedException();
+      HightlightedCells = FindAll(findAndReplaceDialog.GetSearchText());
+    }
+
+    private IDictionary<int, IList<int>> FindAll(string match) {
+      var comparisonFilter = new Filter.ComparisonFilter(Content.FilterLogic.PreprocessingData, Core.ConstraintOperation.Equal, new StringValue(match), true);
+      var filters = new List<Filter.IFilter>() { comparisonFilter };
+      var foundCells = new Dictionary<int, IList<int>>();
+      for (int i = 0; i < Content.FilterLogic.PreprocessingData.Columns; i++) {
+        comparisonFilter.ConstraintColumn = i;
+        bool[] filteredRows = Content.FilterLogic.Preview(filters);
+        foundCells[i] = filteredRows.Select((value, index) => new { Index = index, Value = value })
+          .Where(pair => pair.Value)
+          .Select(pair => pair.Index)
+          .ToList();
+      }
+      return foundCells;
+    }
+
+    private void Replace(IDictionary<int, IList<int>> cells) {
+      if (findAndReplaceDialog != null) {
+        switch (findAndReplaceDialog.GetReplaceAction()) {
+          case ReplaceAction.Value:
+            Content.PreprocessingDataManipulation.ReplaceIndicesByValue(cells, findAndReplaceDialog.GetReplaceText());
+            break;
+          case ReplaceAction.Average:
+            Content.PreprocessingDataManipulation.ReplaceIndicesByAverageValue(cells);
+            break;
+          case ReplaceAction.Median:
+            Content.PreprocessingDataManipulation.ReplaceIndicesByMedianValue(cells);
+            break;
+          case ReplaceAction.Random:
+            Content.PreprocessingDataManipulation.ReplaceIndicesByRandomValue(cells);
+            break;
+          case ReplaceAction.MostCommon:
+            Content.PreprocessingDataManipulation.ReplaceIndicesByMostCommonValue(cells);
+            break;
+          case ReplaceAction.Interpolation:
+            Content.PreprocessingDataManipulation.ReplaceIndicesByLinearInterpolationOfNeighbours(cells);
+            break;
+        }
+      }
+    }
+
+    private IDictionary<int, IList<int>> GetIndexOfCurrentSelectedCell() {
+      var highlightCells = new Dictionary<int, IList<int>>();
+      int highlightCell = foundCells[currentCell.Item1].ElementAt(currentCell.Item2);
+      highlightCells.Add(currentCell.Item1, new List<int>() { highlightCell });
+      return highlightCells;
     }
 
@@ -254 +329 @@
     }
 
-    private Dictionary<int, List<int>> GetSelectedCells() {
-      var selectedCells = new Dictionary<int, List<int>>();
+    private IDictionary<int, IList<int>> GetSelectedCells() {
+      IDictionary<int, IList<int>> selectedCells = new Dictionary<int, IList<int>>();
       for (int i = 0; i < dataGridView.SelectedCells.Count; i++) {
         var columnIndex = dataGridView.SelectedCells[i].ColumnIndex;

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

@@ -48 +48 @@
         var dataGridLogic = new DataGridLogic(data);
         var statisticsLogic = new StatisticsLogic(data, searchLogic);
-        var manipulationLogic = new ManipulationLogic(data, searchLogic, statisticsLogic);
+        var manipulationLogic = new ManipulationLogic(data, searchLogic, statisticsLogic, dataGridLogic);
         var transformationLogic = new TransformationLogic(data, searchLogic, statisticsLogic);
         var lineChartLogic = new ChartLogic(data);

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

@@ -26 +26 @@
       this.tabSearchReplace = new System.Windows.Forms.TabControl();
       this.tabSearch = new System.Windows.Forms.TabPage();
+      this.tabReplace = new System.Windows.Forms.TabPage();
       this.txtSearchString = new System.Windows.Forms.TextBox();
       this.lblSearch = new System.Windows.Forms.Label();
       this.btnFindAll = new System.Windows.Forms.Button();
       this.btnFindNext = new System.Windows.Forms.Button();
-      this.tabReplace = new System.Windows.Forms.TabPage();
       this.lblValue = new System.Windows.Forms.Label();
       this.btnReplaceAll = new System.Windows.Forms.Button();
-      this.btnReplaceNext = new System.Windows.Forms.Button();
+      this.btnReplace = new System.Windows.Forms.Button();
       this.cmbReplaceWith = new System.Windows.Forms.ComboBox();
       this.txtValue = new System.Windows.Forms.TextBox();
@@ -53 +53 @@
       this.tabSearchReplace.Size = new System.Drawing.Size(564, 135);
       this.tabSearchReplace.TabIndex = 0;
+      this.tabSearchReplace.SelectedIndexChanged += new System.EventHandler(this.tabSearchReplace_SelectedIndexChanged);
       // 
       // tabSearch
@@ -59 +60 @@
       this.tabSearch.Name = "tabSearch";
       this.tabSearch.Padding = new System.Windows.Forms.Padding(3);
-      this.tabSearch.Size = new System.Drawing.Size(556, 148);
+      this.tabSearch.Size = new System.Drawing.Size(556, 109);
       this.tabSearch.TabIndex = 0;
       this.tabSearch.Text = "Search";
       this.tabSearch.UseVisualStyleBackColor = true;
-      // 
-      // txtSearchString
-      // 
-      this.txtSearchString.Location = new System.Drawing.Point(103, 20);
-      this.txtSearchString.Name = "txtSearchString";
-      this.txtSearchString.Size = new System.Drawing.Size(254, 20);
-      this.txtSearchString.TabIndex = 23;
-      // 
-      // lblSearch
-      // 
-      this.lblSearch.AutoSize = true;
-      this.lblSearch.Location = new System.Drawing.Point(41, 26);
-      this.lblSearch.Name = "lblSearch";
-      this.lblSearch.Size = new System.Drawing.Size(56, 13);
-      this.lblSearch.TabIndex = 22;
-      this.lblSearch.Text = "Search for";
-      // 
-      // btnFindAll
-      // 
-      this.btnFindAll.Location = new System.Drawing.Point(458, 20);
-      this.btnFindAll.Name = "btnFindAll";
-      this.btnFindAll.Size = new System.Drawing.Size(80, 23);
-      this.btnFindAll.TabIndex = 21;
-      this.btnFindAll.Text = "Find All";
-      this.btnFindAll.UseVisualStyleBackColor = true;
-      // 
-      // btnFindNext
-      // 
-      this.btnFindNext.Location = new System.Drawing.Point(372, 20);
-      this.btnFindNext.Name = "btnFindNext";
-      this.btnFindNext.Size = new System.Drawing.Size(80, 23);
-      this.btnFindNext.TabIndex = 20;
-      this.btnFindNext.Text = "Find Next";
-      this.btnFindNext.UseVisualStyleBackColor = true;
       // 
       // tabReplace
@@ -106 +73 @@
       this.tabReplace.Controls.Add(this.lblValue);
       this.tabReplace.Controls.Add(this.btnReplaceAll);
-      this.tabReplace.Controls.Add(this.btnReplaceNext);
+      this.tabReplace.Controls.Add(this.btnReplace);
       this.tabReplace.Controls.Add(this.cmbReplaceWith);
       this.tabReplace.Controls.Add(this.txtValue);
@@ -118 +85 @@
       this.tabReplace.UseVisualStyleBackColor = true;
       // 
+      // txtSearchString
+      // 
+      this.txtSearchString.Location = new System.Drawing.Point(103, 20);
+      this.txtSearchString.Name = "txtSearchString";
+      this.txtSearchString.Size = new System.Drawing.Size(254, 20);
+      this.txtSearchString.TabIndex = 23;
+      // 
+      // lblSearch
+      // 
+      this.lblSearch.AutoSize = true;
+      this.lblSearch.Location = new System.Drawing.Point(41, 26);
+      this.lblSearch.Name = "lblSearch";
+      this.lblSearch.Size = new System.Drawing.Size(56, 13);
+      this.lblSearch.TabIndex = 22;
+      this.lblSearch.Text = "Search for";
+      // 
+      // btnFindAll
+      // 
+      this.btnFindAll.Location = new System.Drawing.Point(458, 20);
+      this.btnFindAll.Name = "btnFindAll";
+      this.btnFindAll.Size = new System.Drawing.Size(80, 23);
+      this.btnFindAll.TabIndex = 21;
+      this.btnFindAll.Text = "Find All";
+      this.btnFindAll.UseVisualStyleBackColor = true;
+      // 
+      // btnFindNext
+      // 
+      this.btnFindNext.Location = new System.Drawing.Point(372, 20);
+      this.btnFindNext.Name = "btnFindNext";
+      this.btnFindNext.Size = new System.Drawing.Size(80, 23);
+      this.btnFindNext.TabIndex = 20;
+      this.btnFindNext.Text = "Find Next";
+      this.btnFindNext.UseVisualStyleBackColor = true;
+      // 
       // lblValue
       // 
@@ -136 +137 @@
       this.btnReplaceAll.UseVisualStyleBackColor = true;
       // 
-      // btnReplaceNext
-      // 
-      this.btnReplaceNext.Location = new System.Drawing.Point(372, 47);
-      this.btnReplaceNext.Name = "btnReplaceNext";
-      this.btnReplaceNext.Size = new System.Drawing.Size(80, 23);
-      this.btnReplaceNext.TabIndex = 17;
-      this.btnReplaceNext.Text = "Replace Next";
-      this.btnReplaceNext.UseVisualStyleBackColor = true;
+      // btnReplace
+      // 
+      this.btnReplace.Location = new System.Drawing.Point(372, 47);
+      this.btnReplace.Name = "btnReplace";
+      this.btnReplace.Size = new System.Drawing.Size(80, 23);
+      this.btnReplace.TabIndex = 17;
+      this.btnReplace.Text = "Replace";
+      this.btnReplace.UseVisualStyleBackColor = true;
       // 
       // cmbReplaceWith
       // 
+      this.cmbReplaceWith.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
       this.cmbReplaceWith.FormattingEnabled = true;
       this.cmbReplaceWith.Location = new System.Drawing.Point(103, 46);
@@ -152 +154 @@
       this.cmbReplaceWith.Size = new System.Drawing.Size(254, 21);
       this.cmbReplaceWith.TabIndex = 16;
+      this.cmbReplaceWith.SelectedIndexChanged += new System.EventHandler(this.cmbReplaceWith_SelectedIndexChanged);
       // 
       // txtValue
@@ -195 +198 @@
     private System.Windows.Forms.Label lblValue;
     private System.Windows.Forms.Button btnReplaceAll;
-    private System.Windows.Forms.Button btnReplaceNext;
+    private System.Windows.Forms.Button btnReplace;
     private System.Windows.Forms.ComboBox cmbReplaceWith;
     private System.Windows.Forms.TextBox txtValue;

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

@@ -1 +1 @@
 using System;
+using System.Collections.Generic;
 using System.Windows.Forms;
 
 namespace HeuristicLab.DataPreprocessing.Views {
+  public enum ReplaceAction {
+    Value,
+    Average,
+    Median,
+    Random,
+    MostCommon,
+    Interpolation
+  }
+
   public partial class FindAndReplaceDialog : Form {
+    private string[] cmbItemsText = { "Value", "Average", "Median", "Random", "Most Common", "Interpolation" };
+
     public FindAndReplaceDialog() {
       InitializeComponent();
-      string[] cmbItems = { "Value", "Average", "Median", "Random", "Most Common", "Interpolation" };
-      cmbReplaceWith.Items.AddRange(cmbItems);
+      cmbReplaceWith.Items.AddRange(cmbItemsText);
+      cmbReplaceWith.SelectedIndex = (int)ReplaceAction.Value;
     }
 
@@ -24 +36 @@
     }
 
+    private void cmbReplaceWith_SelectedIndexChanged(object sender, System.EventArgs e) {
+      lblValue.Visible = txtValue.Visible = cmbReplaceWith.SelectedIndex == (int)ReplaceAction.Value;
+    }
+
     private void AddControlsToCurrentTab() {
       tabSearchReplace.SelectedTab.Controls.Add(btnFindAll);
@@ -31 +47 @@
     }
 
-    public string GetSearchText() {
+    public String GetSearchText() {
       return txtSearchString.Text;
     }
@@ -39 +55 @@
     }
 
-    public string GetReplaceAction() {
-      return cmbReplaceWith.SelectedText;
+    public ReplaceAction GetReplaceAction() {
+      return (ReplaceAction)cmbReplaceWith.SelectedIndex;
     }
 
@@ -59 +75 @@
 
     public event EventHandler ReplaceNextEvent {
-      add { btnReplaceNext.Click += value; }
-      remove { btnReplaceNext.Click -= value; }
+      add { btnReplace.Click += value; }
+      remove { btnReplace.Click -= value; }
     }