Changeset 10253 for branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations

Timestamp:

12/18/13 16:23:21 (11 years ago)

Author:

sbreuer

Message:

• added apply sorting button to datagridcontentview with click handler
• modified sorting

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations

Files:

• DataGridContent.cs (modified) (1 diff)
• PreprocessingDataManipulation.cs (modified) (1 diff)

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

@@ -11 +11 @@
 
     private readonly IDataGridLogic dataGridLogic;
-    public DataGridContent(IDataGridLogic theDataGridLogic) {
+    private readonly IPreprocessingDataManipulation preprocessingDataManipulation;
+    public DataGridContent(IDataGridLogic theDataGridLogic, IPreprocessingDataManipulation thePreprocessingDataManipulation) {
       dataGridLogic = theDataGridLogic;
+      preprocessingDataManipulation = thePreprocessingDataManipulation;
     }
 
     public DataGridContent(DataGridContent dataGridContent, Cloner cloner)
       : base(dataGridContent, cloner) {
+    }
 
+    public IPreprocessingDataManipulation PreprocessingDataManipulation {
+      get { return preprocessingDataManipulation; }
     }
 

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

@@ -115 +115 @@
         }
 
-        foreach (string variableName in preprocessingData.VariableNames) {
-          if (preprocessingData.IsType<double>(variableName)) {
-            reOrderToIndices<double>(variableName, shuffledIndices);
-          } else if (preprocessingData.IsType<string>(variableName)) {
-            reOrderToIndices<string>(variableName, shuffledIndices);
-          } else if (preprocessingData.IsType<DateTime>(variableName)) {
-            reOrderToIndices<DateTime>(variableName, shuffledIndices);
-          }
+        reOrdertoIndices(shuffledIndices);
+      }
+    }
+
+    public void reOrdertoIndices(IList<Tuple<int, int>> indices) {
+      foreach (string variableName in preprocessingData.VariableNames) {
+        if (preprocessingData.IsType<double>(variableName)) {
+          reOrderToIndices<double>(variableName, indices);
+        } else if (preprocessingData.IsType<string>(variableName)) {
+          reOrderToIndices<string>(variableName, indices);
+        } else if (preprocessingData.IsType<DateTime>(variableName)) {
+          reOrderToIndices<DateTime>(variableName, indices);
         }
       }
     }
 
-    public void reOrderToIndices<T>(string variableName, List<Tuple<int, int>> indices) {
+    private void reOrderToIndices<T>(string variableName, IList<Tuple<int, int>> indices) {
       // process all columns equally
       foreach (Tuple<int, int> index in indices) {