Changeset 10740 for branches/DataPreprocessing

Timestamp:

04/09/14 13:32:50 (11 years ago)

Author:

rstoll

Message:

• changed variableValues from Dictionary<int, IList> to IList<Ilist> because this way DeleteColumn works correctly without any modification of the keys (otherwise the keys would need to be rewriten)

Location:

branches/DataPreprocessing

Files:

• HeuristicLab.DataPreprocessing.Views/3.3/StatisticsView.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing/3.3/Implementations/PreprocessingData.cs (modified) (6 diffs)
• HeuristicLab.DataPreprocessing/3.3/Implementations/TransactionalPreprocessingData.cs (modified) (1 diff)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/StatisticsView.cs

@@ -85 +85 @@
       for (int i = 0; i < COLUMNS; ++i) {
         var column = new DataGridViewTextBoxColumn();
+        column.SortMode = DataGridViewColumnSortMode.Automatic;
         column.FillWeight = 1;
         columns[i] = column;

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

@@ -34 +34 @@
   public class PreprocessingData : NamedItem, IPreprocessingData {
 
-    protected IDictionary<int, IList> variableValues;
+    protected IList<IList> variableValues;
 
     protected IList<string> variableNames;
@@ -57 +57 @@
 
       int columnIndex = 0;
-      variableValues = new Dictionary<int, IList>();
+      variableValues = new List<IList>();
       foreach (var variableName in problemData.Dataset.VariableNames) {
         if (problemData.Dataset.IsType<double>(variableName)) {
-          variableValues[columnIndex] = problemData.Dataset.GetDoubleValues(variableName).ToList();
+          variableValues.Insert(columnIndex, problemData.Dataset.GetDoubleValues(variableName).ToList());
         } else if (problemData.Dataset.IsType<string>(variableName)) {
-          variableValues[columnIndex] = CreateColumn<string>(problemData.Dataset, columnIndex, x => x);
+          variableValues.Insert(columnIndex, CreateColumn<string>(problemData.Dataset, columnIndex, x => x));
         } else if (problemData.Dataset.IsType<DateTime>(variableName)) {
-          variableValues[columnIndex] = CreateColumn<DateTime>(problemData.Dataset, columnIndex, x => DateTime.Parse(x));
+          variableValues.Insert(columnIndex, CreateColumn<DateTime>(problemData.Dataset, columnIndex, x => DateTime.Parse(x)));
         } else {
           throw new ArgumentException("The datatype of column " + variableName + " must be of type List<double>, List<string> or List<DateTime>");
@@ -82 +82 @@
     }
 
-    protected IDictionary<int, IList> CopyVariableValues(IDictionary<int, IList> original) {
-      var copy = new Dictionary<int, IList>(variableValues);
-      for (int i = 0; i < original.Count; i++) {
+    protected IList<IList> CopyVariableValues(IList<IList> original) {
+      var copy = new List<IList>(variableValues);
+      for (int i = 0; i < original.Count; ++i) {
         variableValues[i] = (IList)Activator.CreateInstance(original[i].GetType(), original[i]);
       }
@@ -133 +133 @@
 
     public virtual void InsertRow(int rowIndex) {
-      foreach (IList column in variableValues.Values) {
+      foreach (IList column in variableValues) {
         Type type = column.GetType().GetGenericArguments()[0];
         column.Insert(rowIndex, type.IsValueType ? Activator.CreateInstance(type) : null);
@@ -140 +140 @@
 
     public virtual void DeleteRow(int rowIndex) {
-      foreach (IList column in variableValues.Values) {
+      foreach (IList column in variableValues) {
         column.RemoveAt(rowIndex);
       }
@@ -146 +146 @@
 
     public virtual void InsertColumn<T>(string variableName, int columnIndex) {
-      variableValues.Add(columnIndex, new List<T>(Rows));
+      variableValues.Insert(columnIndex, new List<T>(Rows));
       variableNames.Insert(columnIndex, variableName);
     }
 
     public virtual void DeleteColumn(int columnIndex) {
-      variableValues.Remove(columnIndex);
+      variableValues.RemoveAt(columnIndex);
       variableNames.RemoveAt(columnIndex);
     }

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

@@ -30 +30 @@
 
   internal class PDSnapshot {
-    public IDictionary<int, IList> VariableValues { get; set; }
+    public IList<IList> VariableValues { get; set; }
 
     public IList<string> VariableNames { get; set; }