Changeset 10367 for branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Interfaces/IPreprocessingData.cs

Timestamp:

01/22/14 14:13:11 (11 years ago)

Author:

rstoll

Message:

• modified PreprocessingData, uses columnIndex now instead of variableName (is faster and more convenient), set variabelName based methods to Obsolete
• Already changed SearchLogic, DataGridLogic, StatisticLogic as well as PreprocessingDataManipulation

*

File:

• branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Interfaces/IPreprocessingData.cs (modified) (4 diffs)

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

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Collections.Generic;
 using HeuristicLab.Core;
@@ -28 +29 @@
 
   public interface IPreprocessingData : INamedItem {
-    T GetCell<T>(string variableName, int row);
-    void SetCell<T>(string variableName, int row, T value);
-    string GetCellAsString(string variableName, int row);
+    [Obsolete("use the index based variant, is faster")]
+    T GetCell<T>(string variableName, int rowIndex);
+    T GetCell<T>(int columnIndex, int rowIndex);
 
+    [Obsolete("use the index based variant, is faster")]
+    void SetCell<T>(string variableName, int rowIndex, T value);
+    void SetCell<T>(int columnIndex, int rowIndex, T value);
+
+    [Obsolete("use the index based variant, is faster")]
+    string GetCellAsString(string variableName, int rowIndex);
+    string GetCellAsString(int columnIndex, int rowIndex);
+
+    [Obsolete("use the index based variant, is faster")]
     IList<T> GetValues<T>(string variableName);
+    IList<T> GetValues<T>(int columnIndex);
+
+    [Obsolete("use the index based variant, is faster")]
     void SetValues<T>(string variableName, IList<T> values);
+    void SetValues<T>(int columnIndex, IList<T> values);
 
     void InsertRow(int rowIndex);
@@ -39 +53 @@
 
     void InsertColumn<T>(string variableName, int columnIndex);
+
+    [Obsolete("use the index based variant, is faster")]
     void DeleteColumn(string variableName);
+    void DeleteColumn(int columnIndex);
 
     IntRange TrainingPartition { get; }
@@ -46 +63 @@
     IEnumerable<string> VariableNames { get; }
     string GetVariableName(int columnIndex);
+    int GetColumnIndex(string variableName);
+
+    [Obsolete("use the index based variant, is faster")]
     bool IsType<T>(string variableName);
+    bool IsType<T>(int columnIndex);
+
 
     int Columns { get; }