Changeset 15309 for branches/DataPreprocessing Cleanup/HeuristicLab.DataPreprocessing.Views/3.4/StatisticsView.cs

Timestamp:

08/07/17 09:43:58 (7 years ago)

Author:

pfleck

Message:

#2809 Worked on type-save PreprocessingDataColumns.

File:

• branches/DataPreprocessing Cleanup/HeuristicLab.DataPreprocessing.Views/3.4/StatisticsView.cs (modified) (4 diffs)

branches/DataPreprocessing Cleanup/HeuristicLab.DataPreprocessing.Views/3.4/StatisticsView.cs

@@ -92 +92 @@
       numericColumnsTextBox.Text = GetColumnCount<double>().ToString();
       nominalColumnsTextBox5.Text = GetColumnCount<string>().ToString();
-      missingValuesTextBox.Text = data.GetMissingValueCount().ToString();
-      totalValuesTextBox.Text = (data.Rows * data.Rows - data.GetMissingValueCount()).ToString();
+      missingValuesTextBox.Text = data.DataColumns.Sum(c => c.GetNumberOfMissingValues()).ToString();
+      totalValuesTextBox.Text = (data.Rows * data.Rows - data.DataColumns.Sum(c => c.GetNumberOfMissingValues())).ToString();
 
       var variableNames = Content.PreprocessingData.VariableNames.ToList();
@@ -111 +111 @@
         for (int j = 0; j < statistics.Count; j++) {
           if (horizontal)
-            statisticsMatrix[j, i] = statistics[j];
+            statisticsMatrix[j, i] = statistics[j].ToString();
           else
-            statisticsMatrix[i, j] = statistics[j];
+            statisticsMatrix[i, j] = statistics[j].ToString();
         }
       }
@@ -148 +148 @@
     }
 
-    private List<string> GetStatistics(int varIdx) {
-      List<string> list;
+    private IList GetStatistics(int varIdx) {
+      IList list;
       var data = Content.PreprocessingData;
       if (data.VariableHasType<double>(varIdx)) {
@@ -166 +166 @@
     }
 
-    private List<string> GetDoubleColumns(int statIdx) {
-      var data = Content.PreprocessingData;
-      return new List<string> {
-        data.GetVariableType(statIdx).Name,
-        data.GetMissingValueCount(statIdx).ToString(),
-        data.GetMin<double>(statIdx, emptyValue: double.NaN).ToString(),
-        data.GetMax<double>(statIdx, emptyValue: double.NaN).ToString(),
-        data.GetMedian<double>(statIdx, emptyValue: double.NaN).ToString(),
-        data.GetMean<double>(statIdx, emptyValue: double.NaN).ToString(),
-        data.GetStandardDeviation<double>(statIdx, emptyValue: double.NaN).ToString(),
-        data.GetVariance<double>(statIdx, emptyValue: double.NaN).ToString(),
-        data.GetQuantile<double>(0.25, statIdx, emptyValue: double.NaN).ToString(),
-        data.GetQuantile<double>(0.75, statIdx, emptyValue: double.NaN).ToString(),
-        data.GetMode<double>(statIdx, emptyValue: double.NaN).ToString(),
-        data.GetDistinctValues<double>(statIdx).ToString()
+    private IList GetDoubleColumns(int statIdx) {
+      var column = (DoublePreprocessingDataColumn)Content.PreprocessingData.DataColumns[statIdx];
+      return new List<object> {
+        column.GetValueType().Name,
+        column.GetNumberOfMissingValues(),
+        column.GetMin(),
+        column.GetMax(),
+        column.GetMedian(),
+        column.GetMean(),
+        column.GetStandardDeviation(),
+        column.GetVariance(),
+        column.GetQuantile(0.25),
+        column.GetQuantile(0.75),
+        column.GetMode(),
+        column.GetDistinctValues()
       };
     }
 
-    private List<string> GetStringColumns(int statIdx) {
-      var data = Content.PreprocessingData;
-      return new List<string> {
-        data.GetVariableType(statIdx).Name,
-        data.GetMissingValueCount(statIdx).ToString(),
-        "", // data.GetMin<string>(statIdx, emptyValue: string.Empty), //min
-        "", // data.GetMax<string>(statIdx, emptyValue: string.Empty), //max
-        "", // data.GetMedian<string>(statIdx, emptyValue: string.Empty), //median
+    private IList GetStringColumns(int statIdx) {
+      var column = (StringPreprocessingDataColumn)Content.PreprocessingData.DataColumns[statIdx];
+      return new List<object> {
+        column.GetValueType().Name,
+        column.GetNumberOfMissingValues(),
+        "", //min
+        "", //max
+        "", //median
         "", //average
         "", //standard deviation
         "", //variance
-        "", // data.GetQuantile<string>(0.25, statIdx, emptyValue: string.Empty), //quarter percentile
-        "", // data.GetQuantile<string>(0.75, statIdx, emptyValue: string.Empty), //three quarter percentile
-        data.GetMode<string>(statIdx, emptyValue: string.Empty),
-        data.GetDistinctValues<string>(statIdx).ToString()
+        "", //quarter percentile
+        "", //three quarter percentile
+        column.GetMode(),
+        column.GetDistinctValues()
       };
     }
 
-    private List<string> GetDateTimeColumns(int statIdx) {
-      var data = Content.PreprocessingData;
-      return new List<string> {
-        data.GetVariableType(statIdx).Name,
-        data.GetMissingValueCount(statIdx).ToString(),
-        data.GetMin<DateTime>(statIdx).ToString(),
-        data.GetMax<DateTime>(statIdx).ToString(),
-        data.GetMedian<DateTime>(statIdx).ToString(),
-        data.GetMean<DateTime>(statIdx).ToString(),
-        "", // should be of type TimeSpan //data.GetStandardDeviation<DateTime>(statIdx).ToString(),
-        "", // should be of type TimeSpan //data.GetVariance<DateTime>(statIdx).ToString(),
-        data.GetQuantile<DateTime>(0.25, statIdx).ToString(),
-        data.GetQuantile<DateTime>(0.75, statIdx).ToString(),
-        data.GetMode<DateTime>(statIdx).ToString(),
-        data.GetDistinctValues<DateTime>(statIdx).ToString()
+    private IList GetDateTimeColumns(int statIdx) {
+      var column = (DateTimePreprocessingDataColumn)Content.PreprocessingData.DataColumns[statIdx];
+      return new List<object> {
+        column.GetValueType().Name,
+        column.GetNumberOfMissingValues(),
+        column.GetMin(),
+        column.GetMax(),
+        column.GetMedian(),
+        column.GetMean(),
+        column.GetStandardDeviation(),  
+        /*column.GetVariance()*/"", // variance (in ticks) is usually to high to display a valid TimeSpan or DateTime
+        column.GetQuantile(0.25),
+        column.GetQuantile(0.75),
+        column.GetMode(),
+        column.GetDistinctValues()
       };
     }