Changeset 13149 for stable

Timestamp:

11/13/15 20:57:14 (9 years ago)

Author:

gkronber

Message:

#2467: merged r12889 from trunk to stable branch

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.DataPreprocessing.Views (modified) (1 prop)
• HeuristicLab.DataPreprocessing.Views/3.4/StatisticsView.cs (modified) (6 diffs)
• HeuristicLab.DataPreprocessing/3.4 (modified) (1 prop)
• HeuristicLab.DataPreprocessing/3.4/Implementations/StatisticsLogic.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing/3.4/Interfaces/IStatisticsLogic.cs (modified) (1 diff)

stable/HeuristicLab.DataPreprocessing.Views/3.4/StatisticsView.cs

@@ -33 +33 @@
 
     private List<List<string>> columnsRowsMatrix;
-    private readonly int COLUMNS = 10;
+    private readonly int COLUMNS = 12;
 
     public new StatisticsContent Content {
@@ -83 +83 @@
 
       columnsRowsMatrix = new List<List<string>>();
-      DataGridViewColumn[] columns = new DataGridViewColumn[10];
+      DataGridViewColumn[] columns = new DataGridViewColumn[COLUMNS];
       for (int i = 0; i < COLUMNS; ++i) {
         var column = new DataGridViewTextBoxColumn();
@@ -99 +99 @@
       columns[6].HeaderCell.Value = "std. Deviation";
       columns[7].HeaderCell.Value = "Variance";
-      columns[8].HeaderCell.Value = "Most Common Value";
-      columns[9].HeaderCell.Value = "Num. diff. Values";
+      columns[8].HeaderCell.Value = "25th Percentile";
+      columns[9].HeaderCell.Value = "75th Percentile";
+      columns[10].HeaderCell.Value = "Most Common Value";
+      columns[11].HeaderCell.Value = "Num. diff. Values";
 
       if (rowCount > 0) {
@@ -150 +152 @@
         logic.GetStandardDeviation(columnIndex).ToString(),
         logic.GetVariance(columnIndex).ToString(),
+        logic.GetOneQuarterPercentile(columnIndex).ToString(),
+        logic.GetThreeQuarterPercentile(columnIndex).ToString(),
         logic.GetMostCommonValue<double>(columnIndex).ToString(),
         logic.GetDifferentValuesCount<double>(columnIndex).ToString()
@@ -166 +170 @@
         "", //standard deviation
         "", //variance
+        "", //quarter percentile
+        "", //three quarter percentile
         logic.GetMostCommonValue<string>(columnIndex) ?? "",
         logic.GetDifferentValuesCount<string>(columnIndex).ToString()
@@ -178 +184 @@
         logic.GetMin<DateTime>(columnIndex).ToString(),
         logic.GetMax<DateTime>(columnIndex).ToString(),
-        logic.GetMedianDateTime(columnIndex).ToString(), 
+        logic.GetMedianDateTime(columnIndex).ToString(),
         logic.GetAverageDateTime(columnIndex).ToString(),
         logic.GetStandardDeviation(columnIndex).ToString(),
         logic.GetVariance(columnIndex).ToString(), //variance
+        logic.GetOneQuarterPercentile(columnIndex).ToString(),
+        logic.GetThreeQuarterPercentile(columnIndex).ToString(),
         logic.GetMostCommonValue<DateTime>(columnIndex).ToString(),
         logic.GetDifferentValuesCount<DateTime>(columnIndex).ToString()

stable/HeuristicLab.DataPreprocessing/3.4/Implementations/StatisticsLogic.cs

@@ -163 +163 @@
     }
 
+    public double GetOneQuarterPercentile(int columnIndex) {
+      double percentile = double.NaN;
+      if (preprocessingData.VariableHasType<double>(columnIndex)) {
+        percentile = GetValuesWithoutNaN<double>(columnIndex).Percentile(0.25);
+      } else if (preprocessingData.VariableHasType<DateTime>(columnIndex)) {
+        percentile = GetDateTimeAsSeconds(columnIndex).Percentile(0.25);
+      }
+      return percentile;
+    }
+
+    public double GetThreeQuarterPercentile(int columnIndex) {
+      double percentile = double.NaN;
+      if (preprocessingData.VariableHasType<double>(columnIndex)) {
+        percentile = GetValuesWithoutNaN<double>(columnIndex).Percentile(0.75);
+      } else if (preprocessingData.VariableHasType<DateTime>(columnIndex)) {
+        percentile = GetDateTimeAsSeconds(columnIndex).Percentile(0.75);
+      }
+      return percentile;
+    }
+
     public int GetDifferentValuesCount<T>(int columnIndex) {
       return preprocessingData.GetValues<T>(columnIndex).GroupBy(x => x).Count();

stable/HeuristicLab.DataPreprocessing/3.4/Interfaces/IStatisticsLogic.cs

@@ -41 +41 @@
     DateTime GetAverageDateTime(int columnIndex, bool considerSelection = false);
 
+    double GetOneQuarterPercentile(int columnIndex);
+    double GetThreeQuarterPercentile(int columnIndex);
     double GetStandardDeviation(int columnIndex);
     double GetVariance(int columnIndex);