Changeset 10616 for branches/DataPreprocessing

Timestamp:

03/19/14 12:47:42 (10 years ago)

Author:

rstoll

Message:

Changed row and columnIndex in order to be consistent with PreprocessingData

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3

Files:

• Implementations/DataGridContent.cs (modified) (1 diff)
• Implementations/DataGridLogic.cs (modified) (1 diff)
• Interfaces/IDataGridLogic.cs (modified) (1 diff)

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

@@ -120 +120 @@
 
     public string GetValue(int rowIndex, int columnIndex) {
-      return dataGridLogic.GetValue(rowIndex, columnIndex);
+      return dataGridLogic.GetValue(columnIndex, rowIndex);
     }
 
-    public bool SetValue(string value, int rowIndex, int columnIndex) {
-      return dataGridLogic.SetValue(value, rowIndex, columnIndex);
+    public bool SetValue(string value,int columnIndex,int rowIndex, ) {
+      return dataGridLogic.SetValue(value, columnIndex, rowIndex);
     }
 

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

@@ -91 +91 @@
     }
 
-    public string GetValue(int rowIndex, int columnIndex) {
+    public string GetValue(int columnIndex, int rowIndex) {
       return preprocessingData.GetCellAsString(columnIndex, rowIndex);
     }
 
-    public bool SetValue(string value, int rowIndex, int columnIndex) {
+    public bool SetValue(string value, int columnIndex, int rowIndex) {
       bool valid = false;
       if (preprocessingData.IsType<double>(columnIndex)) {
         double val;
         valid = double.TryParse(value, out val);
-        if (valid) {
-          preprocessingData.SetCell<double>(columnIndex, rowIndex, val);
-        }
+        SetValueIfValid(columnIndex, rowIndex, valid, value);
       } else if (preprocessingData.IsType<string>(columnIndex)) {
         valid = value != null;
-        if (valid) {
-          preprocessingData.SetCell<string>(columnIndex, rowIndex, value);
-        }
+        SetValueIfValid(columnIndex, rowIndex, valid, value);
       } else if (preprocessingData.IsType<DateTime>(columnIndex)) {
         DateTime date;
         valid = DateTime.TryParse(value, out date);
-        if (valid) {
-          preprocessingData.SetCell<DateTime>(columnIndex, rowIndex, date);
-        }
+        SetValueIfValid(columnIndex, rowIndex, valid, value);
       } else {
         throw new ArgumentException("column " + columnIndex + " contains a non supported type.");
       }
+      return valid;
+    }
 
-      return valid;
+    private void SetValueIfValid<T>(int columnIndex, int rowIndex, bool valid, T value) {
+      if (valid) {
+        preprocessingData.SetCell<T>(columnIndex, rowIndex, value);
+      }
     }
 

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

@@ -29 +29 @@
     int Rows { get; }
 
-    string GetValue(int rowIndex, int columnIndex);
-    bool SetValue(string value, int rowIndex, int columnIndex);
+    string GetValue(int columnIndex, int rowIndex);
+    bool SetValue(string value, int columnIndex, int rowIndex);
     bool Validate(string value, out string errorMessage, int columnIndex);