Changeset 10236 for branches/DataPreprocessing/HeuristicLab.DataPreprocessing

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

Files:

• DataGridContentView.Designer.cs (added)
• DataGridContentView.cs (added)
• HeuristicLab.DataPreprocessing-3.3.csproj (modified) (3 diffs)
• Implementations/DataGridContent.cs (added)
• Implementations/PreprocessingData.cs (modified) (2 diffs)
• Implementations/PreprocessingDataManipulation.cs (modified) (1 diff)
• Implementations/SearchLogic.cs (added)
• Implementations/StatisticInfo.cs (modified) (3 diffs)
• Interfaces/IDataGridContent.cs (added)
• Interfaces/IPreprocessingData.cs (modified) (3 diffs)
• Interfaces/ISearchLogic.cs (added)

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

@@ -84 +84 @@
       <DependentUpon>DataPreprocessingView.cs</DependentUpon>
     </Compile>
+    <Compile Include="Implementations\DataGridContent.cs" />
     <Compile Include="Implementations\PreprocessingContext.cs" />
     <Compile Include="Implementations\PreprocessingData.cs" />
     <Compile Include="Implementations\PreprocessingDataManipulation.cs" />
+    <Compile Include="Implementations\SearchLogic.cs" />
     <Compile Include="Implementations\StatisticInfo.cs" />
+    <Compile Include="DataGridContentView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="DataGridContentView.Designer.cs">
+      <DependentUpon>DataGridContentView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Interfaces\IDataGridContent.cs" />
     <Compile Include="Interfaces\IPreprocessingContext.cs" />
+    <Compile Include="Interfaces\ISearchLogic.cs" />
     <Compile Include="Interfaces\IStatisticInfo.cs" />
     <Compile Include="Interfaces\IPreprocessingData.cs" />
@@ -122 +132 @@
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Data.Views\3.3\HeuristicLab.Data.Views-3.3.csproj">
+      <Project>{72104a0b-90e7-42f3-9abe-9bbbadd4b943}</Project>
+      <Name>HeuristicLab.Data.Views-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
       <Project>{bbab9df5-5ef3-4ba8-ade9-b36e82114937}</Project>
@@ -149 +163 @@
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <EmbeddedResource Include="DataPreprocessingView.resx">
+      <DependentUpon>DataPreprocessingView.cs</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

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;
         }

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

@@ -30 +30 @@
     T GetCell<T>(string variableName, int row);
     void SetCell<T>(string variableName, int row, T value);
+    string GetCellAsString(string variableName, int row);
 
     IEnumerable<T> GetValues<T>(string variableName);
@@ -43 +44 @@
     IntRange TestPartition { get; }
 
-    IEnumerable<string> VariableNames { get; }
+    IList<string> VariableNames { get; }
     bool IsType<T>(string variableName);
 
@@ -49 +50 @@
     int Rows { get; }
 
-    /// <summary>
-    /// Return the indices of the missing values where the key 
-    /// correspdonds to the variable name and the values to the row indices
-    /// </summary>
-    /// <returns></returns>
-    IDictionary<string, IEnumerable<int>> GetMissingValueIndices();
-
-    /// <summary>
-    /// Return the row indices of the cells which contain a missing value
-    /// </summary>
-    /// <returns></returns>
-    IEnumerable<int> GetMissingValueIndices(string variableName);
-
-    bool IsMissingValue(string variableName, int rowIndex);
-
     Dataset ExportToDataset();
   }