Changeset 10776 for branches/DataPreprocessing/HeuristicLab.DataPreprocessing

Timestamp:

04/23/14 14:04:01 (11 years ago)

Author:

rstoll

Message:

• Missing values manipulations

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3

Files:

• Implementations/ManipulationContent.cs (modified) (2 diffs)
• Implementations/SearchLogic.cs (modified) (6 diffs)
• Interfaces/ISearchLogic.cs (modified) (2 diffs)

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

@@ -30 +30 @@
 
     private IManipulationLogic manipulationLogic;
+    private ISearchLogic searchLogic;
 
-    public ManipulationContent(IManipulationLogic theManipulationLogic) {
+    public ManipulationContent(IManipulationLogic theManipulationLogic, ISearchLogic theSearchLogic) {
       manipulationLogic = theManipulationLogic;
+      searchLogic = theSearchLogic;
     }
 
@@ -47 +49 @@
     }
 
+    public ISearchLogic SearchLogic {
+      get {
+        return searchLogic;
+      }
+    }
 
     public static new Image StaticItemImage {

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

@@ -29 +29 @@
     private readonly ITransactionalPreprocessingData preprocessingData;
 
-    private Dictionary<int, IEnumerable<int>> MissingValueIndicies { get; set; }
+    private Dictionary<int, IList<int>> MissingValueIndicies { get; set; }
     private Dictionary<int, IEnumerable> ValuesWithoutNaN { get; set; }
 
@@ -35 +35 @@
       preprocessingData = thePreprocessingData;
 
-      MissingValueIndicies = new Dictionary<int, IEnumerable<int>>();
+      MissingValueIndicies = new Dictionary<int, IList<int>>();
       ValuesWithoutNaN = new Dictionary<int, IEnumerable>();
 
@@ -57 +57 @@
         case DataPreprocessingChangedEventType.Any:
         case DataPreprocessingChangedEventType.Transformation:
-          MissingValueIndicies = new Dictionary<int, IEnumerable<int>>();
+          MissingValueIndicies = new Dictionary<int, IList<int>>();
           ValuesWithoutNaN = new Dictionary<int, IEnumerable>();
           break;
@@ -63 +63 @@
     }
 
-    public IDictionary<string, IEnumerable<int>> GetMissingValueIndices() {
-      var dic = new Dictionary<string, IEnumerable<int>>();
-      foreach (string variableName in preprocessingData.VariableNames) {
-        dic.Add(variableName, GetMissingValueIndices(preprocessingData.GetColumnIndex(variableName)));
+    public IDictionary<int, IList<int>> GetMissingValueIndices() {
+      var dic = new Dictionary<int, IList<int>>();
+      for (int i = 0; i < preprocessingData.Columns; ++i) {
+        dic.Add(i, GetMissingValueIndices(i));
       }
       return dic;
@@ -83 +83 @@
     }
 
-    public IEnumerable<int> GetMissingValueIndices(int columnIndex) {
+    public IList<int> GetMissingValueIndices(int columnIndex) {
       if (!MissingValueIndicies.ContainsKey(columnIndex)){        
           if (preprocessingData.IsType<double>(columnIndex)) {
@@ -98 +98 @@
       return MissingValueIndicies[columnIndex];
    }
-    private IEnumerable<int> GetMissingValueIndices<T>(int columnIndex) {
+    private IList<int> GetMissingValueIndices<T>(int columnIndex) {
       List<int> missingIndices = new List<int>();
      

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

@@ -26 +26 @@
     /// <summary>
     /// Return the indices of the missing values where the key 
-    /// correspdonds to the variable name and the values to the row indices
+    /// correspdonds to the columbn index and the values to the row indices
     /// </summary>
     /// <returns></returns>
-    IDictionary<string, IEnumerable<int>> GetMissingValueIndices();
+    IDictionary<int, IList<int>> GetMissingValueIndices();
 
     /// <summary>
@@ -35 +35 @@
     /// </summary>
     /// <returns></returns>
-    IEnumerable<int> GetMissingValueIndices(int columnIndex);
+    IList<int> GetMissingValueIndices(int columnIndex);
 
     bool IsMissingValue(int columnIndex, int rowIndex);