Ignore:
Timestamp:
11/13/15 20:57:14 (4 years ago)
Author:
gkronber
Message:

#2467: merged r12889 from trunk to stable branch

Location:
stable
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.DataPreprocessing.Views

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

    r12718 r13149  
    3333
    3434    private List<List<string>> columnsRowsMatrix;
    35     private readonly int COLUMNS = 10;
     35    private readonly int COLUMNS = 12;
    3636
    3737    public new StatisticsContent Content {
     
    8383
    8484      columnsRowsMatrix = new List<List<string>>();
    85       DataGridViewColumn[] columns = new DataGridViewColumn[10];
     85      DataGridViewColumn[] columns = new DataGridViewColumn[COLUMNS];
    8686      for (int i = 0; i < COLUMNS; ++i) {
    8787        var column = new DataGridViewTextBoxColumn();
     
    9999      columns[6].HeaderCell.Value = "std. Deviation";
    100100      columns[7].HeaderCell.Value = "Variance";
    101       columns[8].HeaderCell.Value = "Most Common Value";
    102       columns[9].HeaderCell.Value = "Num. diff. Values";
     101      columns[8].HeaderCell.Value = "25th Percentile";
     102      columns[9].HeaderCell.Value = "75th Percentile";
     103      columns[10].HeaderCell.Value = "Most Common Value";
     104      columns[11].HeaderCell.Value = "Num. diff. Values";
    103105
    104106      if (rowCount > 0) {
     
    150152        logic.GetStandardDeviation(columnIndex).ToString(),
    151153        logic.GetVariance(columnIndex).ToString(),
     154        logic.GetOneQuarterPercentile(columnIndex).ToString(),
     155        logic.GetThreeQuarterPercentile(columnIndex).ToString(),
    152156        logic.GetMostCommonValue<double>(columnIndex).ToString(),
    153157        logic.GetDifferentValuesCount<double>(columnIndex).ToString()
     
    166170        "", //standard deviation
    167171        "", //variance
     172        "", //quarter percentile
     173        "", //three quarter percentile
    168174        logic.GetMostCommonValue<string>(columnIndex) ?? "",
    169175        logic.GetDifferentValuesCount<string>(columnIndex).ToString()
     
    178184        logic.GetMin<DateTime>(columnIndex).ToString(),
    179185        logic.GetMax<DateTime>(columnIndex).ToString(),
    180         logic.GetMedianDateTime(columnIndex).ToString(), 
     186        logic.GetMedianDateTime(columnIndex).ToString(),
    181187        logic.GetAverageDateTime(columnIndex).ToString(),
    182188        logic.GetStandardDeviation(columnIndex).ToString(),
    183189        logic.GetVariance(columnIndex).ToString(), //variance
     190        logic.GetOneQuarterPercentile(columnIndex).ToString(),
     191        logic.GetThreeQuarterPercentile(columnIndex).ToString(),
    184192        logic.GetMostCommonValue<DateTime>(columnIndex).ToString(),
    185193        logic.GetDifferentValuesCount<DateTime>(columnIndex).ToString()
Note: See TracChangeset for help on using the changeset viewer.