Changeset 10371

Timestamp:

01/22/14 14:43:39 (11 years ago)

Author:

rstoll

Message:

Forgot to add GetColumnTypeAsString

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3

Files:

• Implementations/DataGridLogic.cs (modified) (1 diff)
• Implementations/StatisticsLogic.cs (modified) (1 diff)
• Views/StatisticsView.cs (modified) (2 diffs)

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

@@ -30 +30 @@
         return preprocessingData.VariableNames;
       }
-    }
-
-    public string GetColumnTypeAsString(int columnIndex) {
-      if (preprocessingData.IsType<double>(columnIndex)) {
-        return "double";
-      } else if (preprocessingData.IsType<string>(columnIndex)) {
-        return "string";
-      } else if (preprocessingData.IsType<DateTime>(columnIndex)) {
-        return "DateTime";
-      }
-      return "Unknown Type";
     }
 

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

@@ -121 +121 @@
       return preprocessingData.IsType<T>(columnIndex);
     }
+
+    public string GetColumnTypeAsString(int columnIndex) {
+      if (preprocessingData.IsType<double>(columnIndex)) {
+        return "double";
+      } else if (preprocessingData.IsType<string>(columnIndex)) {
+        return "string";
+      } else if (preprocessingData.IsType<DateTime>(columnIndex)) {
+        return "DateTime";
+      }
+      return "Unknown Type";
+    }
+
   }
 }

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

@@ -64 +64 @@
         } else {
           list = new List<string>();
+          for (int j = 0; j < COLUMNS; ++j) {
+            list.Add("");
+          }
         }
         columnsRowsMatrix.Add(list);
@@ -77 +80 @@
       var logic = Content.StatisticsLogic;
       return new List<string> {
-        //logic.GetColumnTypeAsString(columnIndex),
-        //logic.GetMissingValueCount(columnIndex).tostring(),
-        //logic.GetMin<double>(columnIndex),
-        //logic.GetMax<double>(columnIndex),
-        //logic.getmedian(columnIndex),
-        //logic.getaverage(columnIndex),
-        //logic.-(columnIndex),
+        logic.GetColumnTypeAsString(columnIndex),
+        logic.GetMissingValueCount(columnIndex).ToString(),
+        logic.GetMin<double>(columnIndex).ToString(),
+        logic.GetMax<double>(columnIndex).ToString(),
+        logic.GetMedian(columnIndex).ToString(),
+        logic.GetAverage(columnIndex).ToString(),
+        logic.GetStandardDeviation(columnIndex).ToString(),
+        logic.GetVariance(columnIndex).ToString(),
+        logic.GetMostCommonValue<double>(columnIndex).ToString(),
+        logic.GetDifferentValuesCount<double>(columnIndex).ToString()
       };
     }