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

Timestamp:

12/18/13 13:21:20 (11 years ago)

Author:

sbreuer

Message:

• moved missing value functionality to ISearchLogic
• created IStringConvertibleMatrix implementation and DataGridContentView

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations

Files:

• DataGridContent.cs (added)
• PreprocessingData.cs (modified) (2 diffs)
• PreprocessingDataManipulation.cs (modified) (1 diff)
• SearchLogic.cs (added)
• StatisticInfo.cs (modified) (3 diffs)

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

@@ -102 +102 @@
     }
 
+    public string GetCellAsString(string variableName, int row) {
+      return variableValues[variableName][row].ToString();
+    }
+
     public IEnumerable<T> GetValues<T>(string variableName) {
       // TODO: test if cast is valid
@@ -145 +149 @@
     }
 
-    public IEnumerable<string> VariableNames {
+    public IList<string> VariableNames {
       get { return variableNames; }
     }

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

@@ -14 +14 @@
         public PreprocessingDataManipulation(IPreprocessingData _prepocessingData) {
             preprocessingData = _prepocessingData;
-            statisticInfo = new StatisticInfo(preprocessingData);
+          //todo 
+            statisticInfo = new StatisticInfo(preprocessingData, new SearchLogic(preprocessingData));
         }
 

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

@@ -7 +7 @@
   public class StatisticInfo : IStatisticInfo {
 
-    private IPreprocessingData preprocessingData;
+    private readonly IPreprocessingData preprocessingData;
+    private readonly ISearchLogic searchLogic;
 
-    public StatisticInfo(IPreprocessingData thePreprocessingData) {
+    public StatisticInfo(IPreprocessingData thePreprocessingData, ISearchLogic theSearchLogic) {
       preprocessingData = thePreprocessingData;
+      searchLogic = theSearchLogic;
     }
 
@@ -44 +46 @@
 
     public int GetMissingValueCount(string variableName) {
-      return preprocessingData.GetMissingValueIndices(variableName).Count();
+      return searchLogic.GetMissingValueIndices(variableName).Count();
     }
 
@@ -103 +105 @@
       int count = 0;
       foreach (var variableName in preprocessingData.VariableNames) {
-        if (preprocessingData.IsMissingValue(variableName, rowIndex)) {
+        if (searchLogic.IsMissingValue(variableName, rowIndex)) {
           ++count;
         }