Changeset 11002 for branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4

Timestamp:

06/11/14 15:43:05 (10 years ago)

Author:

mleitner

Message:

Refactoring

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4

Files:

• DataCompletenessView.cs (modified) (2 diffs)
• DataGridContentView.cs (modified) (5 diffs)
• DataPreprocessingView.cs (modified) (2 diffs)
• FilterView.cs (modified) (1 diff)
• ManipulationView.cs (modified) (2 diffs)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/DataCompletenessView.cs

@@ -46 +46 @@
     {
       IDictionary<int, IList<int>> missingValueIndices = Content.SearchLogic.GetMissingValueIndices();
-      for (int i = 0; i < Content.DataGridLogic.Columns; i++)
+      for (int i = 0; i < Content.SearchLogic.Columns; i++)
       {
         //append column
         List<bool> column = new List<bool>();
-        for (int j=0; j < Content.DataGridLogic.Rows; j++) {
+        for (int j = 0; j < Content.SearchLogic.Rows; j++) {
           column.Add(missingValueIndices[i].Contains(j));
         }
@@ -74 +74 @@
       //custom x axis label
       double from = 0.5;
-      foreach (String columnName in Content.DataGridLogic.ColumnNames)
+      foreach (String columnName in Content.SearchLogic.VariableNames)
       {
         double to = from + 1;

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

@@ -140 +140 @@
     protected override void dataGridView_SelectionChanged(object sender, EventArgs e) {
       base.dataGridView_SelectionChanged(sender, e);
-      Content.DataGridLogic.SetSelection(GetSelectedCells());
+      Content.Selection = GetSelectedCells();
     }
 
@@ -150 +150 @@
             errorMessage = "A filter is active, you cannot modify data. Press ESC to exit edit mode.";
           } else {
-            Content.DataGridLogic.Validate(e.FormattedValue.ToString(), out errorMessage, e.ColumnIndex);
+            Content.Validate(e.FormattedValue.ToString(), out errorMessage, e.ColumnIndex);
           }
 
@@ -329 +329 @@
       ResumeRepaint(true);
       isSearching = false;
-      Content.DataGridLogic.SetSelection(selectedCells);
+      Content.Selection = selectedCells;
       //update statistic in base
       base.dataGridView_SelectionChanged(sender, e);
@@ -489 +489 @@
             medianToolStripMenuItem_Selection.Enabled =
             randomToolStripMenuItem_Column.Enabled =
-            randomToolStripMenuItem_Selection.Enabled = !Content.DataGridLogic.AreAllStringColumns(columnIndices);
+            randomToolStripMenuItem_Selection.Enabled = !Content.PreProcessingData.AreAllStringColumns(columnIndices);
 
           smoothingToolStripMenuItem_Column.Enabled =
             interpolationToolStripMenuItem_Column.Enabled = !dataGridView.SelectedCells.Contains(dataGridView[e.ColumnIndex, 0])
             && !dataGridView.SelectedCells.Contains(dataGridView[e.ColumnIndex, Content.Rows - 1])
-            && !Content.DataGridLogic.AreAllStringColumns(columnIndices);
+            && !Content.PreProcessingData.AreAllStringColumns(columnIndices);
 
           replaceValueOverColumnToolStripMenuItem.Visible = true;
@@ -544 +544 @@
         }
         triggersOwnEvent(() => {
-          Content.DataGridLogic.DeleteRow(rows);
+          Content.DeleteRow(rows);
           OnContentChanged();
         });

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

@@ -47 +47 @@
         var data = Content.Data;
         var searchLogic = new SearchLogic(data);
-        var dataGridLogic = new DataGridLogic(data);
         var statisticsLogic = new StatisticsLogic(data, searchLogic);
-        var manipulationLogic = new ManipulationLogic(data, searchLogic, statisticsLogic, dataGridLogic);
-        //var correlationMatrixLogic = new ChartLogic(data);
+        var manipulationLogic = new ManipulationLogic(data, searchLogic, statisticsLogic);
         var filterLogic = new FilterLogic(data);
 
-        //var dataCompletenessLogic = new ChartLogic(data);
-
         var viewShortcuts = new ItemList<IViewShortcut> {
-          new DataGridContent(dataGridLogic, manipulationLogic, filterLogic),
+          new DataGridContent(data, manipulationLogic, filterLogic),
           new StatisticsContent(statisticsLogic),
 
@@ -63 +59 @@
           new ScatterPlotContent(data),
           new CorrelationMatrixContent(Content),
-          new DataCompletenessChartContent(dataGridLogic, searchLogic),
+          new DataCompletenessChartContent(searchLogic),
           
           new FilterContent(filterLogic),
-          new ManipulationContent(manipulationLogic, searchLogic, dataGridLogic, filterLogic),
+          new ManipulationContent(manipulationLogic, searchLogic, filterLogic),
           new TransformationContent(data, filterLogic)
         };

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

@@ -113 +113 @@
       {
         UpdateFilterInfo();
-        Content.isAndCombination = rBtnAnd.Checked;
+        Content.IsAndCombination = rBtnAnd.Checked;
       }
     }

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/ManipulationView.cs

@@ -68 +68 @@
       if (Content != null) {
         cmbVariableNames.Items.Clear();
-        foreach (var name in Content.DataGridLogic.ColumnNames) {
+        foreach (var name in Content.ManipulationLogic.VariableNames) {
           cmbVariableNames.Items.Add(name);
         }
@@ -204 +204 @@
         if (string.IsNullOrEmpty(replaceValue)) {
           lblPreviewReplaceMissingValues.Text = "Preview not possible yet - please input the text which will be used as replacement.";
-        } else if (!Content.DataGridLogic.Validate(txtReplaceValue.Text, out errorMessage, columnIndex)) {
+        } else if (!Content.ManipulationLogic.PreProcessingData.Validate(txtReplaceValue.Text, out errorMessage, columnIndex)) {
           lblPreviewReplaceMissingValues.Text = "Preview not possible yet - " + errorMessage;
         } else {