Changeset 10698 for branches/DataPreprocessing

Timestamp:

04/02/14 12:27:46 (10 years ago)

Author:

sbreuer

Message:

• refactoring - extract iterator class
• create utils folder

Location:

branches/DataPreprocessing

Files:

• HeuristicLab.Core/3.3/Constraints/ComparisonConstraint.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing.Views/3.3/DataGridContentView.cs (modified) (4 diffs)
• HeuristicLab.DataPreprocessing.Views/3.3/HeuristicLab.DataPreprocessing.Views-3.3.csproj (modified) (1 diff)
• HeuristicLab.DataPreprocessing.Views/3.3/Utils (added)
• HeuristicLab.DataPreprocessing.Views/3.3/Utils/FindPreprocessingItemsIterator.cs (added)
• HeuristicLab.DataPreprocessing.Views/3.3/Utils/IFindPreprocessingItemsIterator.cs (added)
• HeuristicLab.DataPreprocessing/3.3/HeuristicLab.DataPreprocessing-3.3.csproj (modified) (1 diff)
• HeuristicLab.DataPreprocessing/3.3/Utils (added)
• HeuristicLab.DataPreprocessing/3.3/Utils/DataPreprocessingChangedEvent.cs (moved) (moved from branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/DataPreprocessingChangedEvent.cs)

branches/DataPreprocessing/HeuristicLab.Core/3.3/Constraints/ComparisonConstraint.cs

@@ -37 +37 @@
     }
     public ComparisonConstraint(IItem constrainedValue, ConstraintOperation comparisonOperation, object comparisonValue, bool active)
-      : base(constrainedValue, comparisonOperation, comparisonOperation, active) {
+      : base(constrainedValue, comparisonOperation, comparisonValue, active) {
     }
 

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

@@ -35 +35 @@
     private bool notOwnEvent = true;
     private FindAndReplaceDialog findAndReplaceDialog;
-    private IDictionary<int, IList<int>> foundCells;
-    private Tuple<int, int> currentCell;
+    private IFindPreprocessingItemsIterator searchIterator;
     private string currentSearchText;
 
@@ -142 +141 @@
     }
 
-
+    #region FindAndReplaceDialog
 
     private void CreateFindAndReplaceDialog() {
       findAndReplaceDialog = new FindAndReplaceDialog();
-      findAndReplaceDialog.Show();
+      findAndReplaceDialog.Show(this);
       findAndReplaceDialog.FindAllEvent += findAndReplaceDialog_FindAllEvent;
       findAndReplaceDialog.FindNextEvent += findAndReplaceDialog_FindNextEvent;
       findAndReplaceDialog.ReplaceAllEvent += findAndReplaceDialog_ReplaceAllEvent;
       findAndReplaceDialog.ReplaceNextEvent += findAndReplaceDialog_ReplaceEvent;
-      foundCells = null;
-      currentCell = null;
     }
 
     void findAndReplaceDialog_ReplaceEvent(object sender, EventArgs e) {
-      if (foundCells != null)
+      if (searchIterator != null && searchIterator.GetCurrent() != null)
       {
-        Replace(GetIndexOfCurrentSelectedCell());
+        Replace(TransformToDictionary(searchIterator.GetCurrent()));
       }
     }
@@ -167 +164 @@
 
     void findAndReplaceDialog_FindNextEvent(object sender, EventArgs e) {
-      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;
+      if (searchIterator == null || currentSearchText != findAndReplaceDialog.GetSearchText()) {
+        searchIterator = new FindPreprocessingItemsIterator(FindAll(findAndReplaceDialog.GetSearchText()));
+        currentSearchText = findAndReplaceDialog.GetSearchText();
+      }
+
+      while (searchIterator.MoveNext() && (searchIterator.GetCurrent() == null || !Content.GetValue(searchIterator.GetCurrent().Item1, searchIterator.GetCurrent().Item2).Equals(currentSearchText))) {
+        
+      }
+
+      if (searchIterator.GetCurrent() != null) {
+        HightlightedCells = TransformToDictionary(searchIterator.GetCurrent());
+      } else {
+        HightlightedCells.Clear();
+      }
     }
 
@@ -233 +224 @@
     }
 
-    private IDictionary<int, IList<int>> GetIndexOfCurrentSelectedCell() {
+    private IDictionary<int, IList<int>> TransformToDictionary(Tuple<int, int> tuple) {
       var highlightCells = new Dictionary<int, IList<int>>();
-      int highlightCell = foundCells[currentCell.Item1].ElementAt(currentCell.Item2);
-      highlightCells.Add(currentCell.Item1, new List<int>() { highlightCell });
+      highlightCells.Add(tuple.Item1, new List<int>() { tuple.Item2 });
       return highlightCells;
     }
+
+    #endregion FindAndReplaceDialog
 
     private void dataGridView_CellMouseClick(object sender, DataGridViewCellMouseEventArgs e) {

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

@@ -141 +141 @@
       <DependentUpon>TransformationView.cs</DependentUpon>
     </Compile>
+    <Compile Include="Utils\FindPreprocessingItemsIterator.cs" />
+    <Compile Include="Utils\IFindPreprocessingItemsIterator.cs" />
     <Compile Include="ViewShortcutCollectionView.cs">
       <SubType>UserControl</SubType>

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

@@ -75 +75 @@
     <Compile Include="Implementations\PreprocessingData.cs" />
     <Compile Include="Implementations\DataGridLogic.cs" />
-    <Compile Include="Implementations\DataPreprocessingChangedEvent.cs" />
+    <Compile Include="Utils\DataPreprocessingChangedEvent.cs" />
     <Compile Include="Implementations\Filter\ComparisonFilter.cs" />
     <Compile Include="Implementations\Filter\IFilter.cs" />