Changeset 10194

Timestamp:

12/04/13 17:01:13 (11 years ago)

Author:

pfleck

Message:

Implemented InsertRow, DeleteRow, InsertColumn, DeleteColumn in PreprocessingData.

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3

Files:

• Implementations/PreprocessingData.cs (modified) (4 diffs)
• Interfaces/IPreprocessingData.cs (modified) (2 diffs)

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

@@ -73 +73 @@
 
       trainingToTestRatio = (double)problemData.TrainingPartition.Size / problemData.TestPartition.Size;
-      Columns = problemData.Dataset.Columns;
-      Rows = problemData.Dataset.Rows;
     }
 
@@ -104 +102 @@
 
     public IEnumerable<T> GetValues<T>(string variableName) {
-        return (IEnumerable<T>)variableValues[variableName];
+      // TODO: test if cast is valid
+      return (IEnumerable<T>)variableValues[variableName]; 
     }
 
@@ -112 +111 @@
 
     public void InsertRow(int rowIndex) {
-      throw new NotImplementedException();
+      foreach (IList column in variableValues.Values) {
+        Type type = column.GetType().GetGenericArguments()[0];
+
+        column.Insert(rowIndex, type.IsValueType ? Activator.CreateInstance(type) : null);
+      }
     }
 
     public void DeleteRow(int rowIndex) {
-      throw new NotImplementedException();
+      foreach (IList column in variableValues.Values) {
+        column.RemoveAt(rowIndex);
+      }
     }
 
-    public void InsertColumn(string variableName, int columnIndex) {
-      throw new NotImplementedException();
+    public void InsertColumn<T>(string variableName, int columnIndex) {
+      variableValues.Add(variableName, new List<T>(Rows));
+      variableNameIndices.Add(variableName, columnIndex);
+      variableNames.Insert(columnIndex, variableName);
     }
 
     public void DeleteColumn(string variableName) {
-      throw new NotImplementedException();
+      variableValues.Remove(variableName);
+      variableNames.RemoveAt(variableNameIndices[variableName]);
+      variableNameIndices.Remove(variableName);
     }
 
@@ -136 +145 @@
 
     public int Columns {
-      get;
-      private set;
+      get { return variableNames.Count; }
     }
 
     public int Rows {
-      get;
-      private set;
+      get { return variableValues.Count; }
     }
-
-    public void ExportTo(IDataAnalysisProblemData problemData) {
-      throw new NotImplementedException();
-    }
-
     public IDictionary<string, IEnumerable<int>> GetMissingValueIndices() {
       var dic = new Dictionary<string, IEnumerable<int>>();

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

@@ -36 +36 @@
     void DeleteRow(int rowIndex);
 
-    void InsertColumn(string variableName, int columnIndex);
+    void InsertColumn<T>(string variableName, int columnIndex);
     void DeleteColumn(string variableName);
 
@@ -44 +44 @@
     int Columns { get; }
     int Rows { get; }
-
-    void ExportTo(IDataAnalysisProblemData problemData);
 
     /// <summary>