Changeset 10181

Timestamp:

12/04/13 12:56:18 (11 years ago)

Author:

pfleck

Message:

Added indexing IPreprocessingData with variable names.
Indexing per column index is marked obsolete.

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3

Files:

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

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

@@ -68 +68 @@
     }
 
-    public IList<T> GetValues<T>(int columnIndex) {
+    public T GetCell<T>(string variableName, int row) {
+      throw new NotImplementedException();
+    }
+
+    public void SetCell<T>(string variableName, int row, T value) {
+      throw new NotImplementedException();
+    }
+
+    public IEnumerable<T> GetValues<T>(int columnIndex) {
+      throw new NotImplementedException();
+    }
+
+    public IEnumerable<T> GetValues<T>(string variableName) {
       throw new NotImplementedException();
     }
 
     public void SetValues<T>(int columnIndex, IEnumerable<T> values) {
+      throw new NotImplementedException();
+    }
+
+    public void SetValues<T>(string variableName, IEnumerable<T> values) {
       throw new NotImplementedException();
     }
@@ -92 +108 @@
     }
 
-    public IList<string> VariableNames {
+    public void DeleteColumn(string variableName) {
+      throw new NotImplementedException();
+    }
+
+    IEnumerable<string> IPreprocessingData.VariableNames {
       get { throw new NotImplementedException(); }
     }
 
     public bool IsType<T>(int columnIndex) {
+      throw new NotImplementedException();
+    }
+
+    public bool IsType<T>(string variableName) {
       throw new NotImplementedException();
     }

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

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Collections.Generic;
 using HeuristicLab.Core;
@@ -27 +28 @@
 
   public interface IPreprocessingData : INamedItem {
-    T GetCell<T>(int rowIndex, int columnIndex);
-    void SetCell<T>(int rowIndex, int columnIndex, T value);
+    [Obsolete]T GetCell<T>(int rowIndex, int columnIndex);
+    [Obsolete]void SetCell<T>(int rowIndex, int columnIndex, T value);
 
-    IList<T> GetValues<T>(int columnIndex);
-    void SetValues<T>(int columnIndex, IEnumerable<T> values);
+    T GetCell<T>(string variableName, int row);
+    void SetCell<T>(string variableName, int row, T value);
+
+    [Obsolete]IEnumerable<T> GetValues<T>(int columnIndex);
+    IEnumerable<T> GetValues<T>(string variableName);
+    [Obsolete]void SetValues<T>(int columnIndex, IEnumerable<T> values);
+    void SetValues<T>(string variableName, IEnumerable<T> values);
 
     void InsertRow(int rowIndex);
@@ -37 +43 @@
 
     void InsertColumn(string variableName, int columnIndex);
-    void DeleteColumn(int columnIndex);
+    [Obsolete]void DeleteColumn(int columnIndex);
+    void DeleteColumn(string variableName);
 
-    IList<string> VariableNames { get; }
-    bool IsType<T>(int columnIndex);
+    IEnumerable<string> VariableNames { get; }
+    [Obsolete]bool IsType<T>(int columnIndex);
+    bool IsType<T>(string variableName);
 
     int Columns { get; }