Changeset 10534 for branches/DataPreprocessing

Timestamp:

03/05/14 13:28:31 (11 years ago)

Author:

rstoll

Message:

• StatisticsView column specific information added

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3

Files:

• Implementations/StatisticsLogic.cs (modified) (2 diffs)
• Interfaces/IStatisticsLogic.cs (modified) (1 diff)
• Views/DataGridContentView.cs (modified) (1 diff)
• Views/StatisticsView.Designer.cs (modified) (1 diff)
• Views/StatisticsView.cs (modified) (4 diffs)

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

@@ -92 +92 @@
 
     public T GetMostCommonValue<T>(int columnIndex) {
+      var t = preprocessingData.GetValues<T>(columnIndex);
+      var t2 = t.GroupBy(x => x);
+      var t3 = t2.Select(g => g.Key);
+
       return preprocessingData.GetValues<T>(columnIndex)
 
@@ -153 +157 @@
       return "Unknown Type";
     }
-
     private IEnumerable<double> GetDateTimeAsSeconds(int columnIndex) {
       return preprocessingData.GetValues<DateTime>(columnIndex).Select(x => (double)x.Ticks / TimeSpan.TicksPerSecond);

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Interfaces/IStatisticsLogic.cs

@@ -27 +27 @@
     bool IsType<T>(int columnIndex);
     string GetColumnTypeAsString(int columnIndex);
-
+    string GetVariableName(int columnIndex);
   }
 }

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

@@ -1 +1 @@
 
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Windows.Forms;
-using HeuristicLab.Core.Views;
+using HeuristicLab.Data.Views;
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
-using HeuristicLab.Problems.DataAnalysis;
-using HeuristicLab.Data.Views;
-using System.Collections.Generic;
-using System.Linq;
-using System;
 
 namespace HeuristicLab.DataPreprocessing {

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

@@ -130 +130 @@
       // dataGridView
       // 
+      this.dataGridView.AllowUserToAddRows = false;
+      this.dataGridView.AllowUserToDeleteRows = false;
+      this.dataGridView.AllowUserToOrderColumns = true;
+      this.dataGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
       this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
       this.dataGridView.Location = new System.Drawing.Point(5, 117);
       this.dataGridView.Name = "dataGridView";
-      this.dataGridView.Size = new System.Drawing.Size(531, 278);
+      this.dataGridView.ReadOnly = true;
+      this.dataGridView.RowHeadersWidth = 80;
+      this.dataGridView.Size = new System.Drawing.Size(530, 278);
       this.dataGridView.TabIndex = 4;
+      this.dataGridView.VirtualMode = true;
       this.dataGridView.CellValueNeeded += new System.Windows.Forms.DataGridViewCellValueEventHandler(this.dataGridView_CellValueNeeded);
       // 

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

@@ -53 +53 @@
       }
 
+      columns[0].HeaderCell.Value = "Type";
+      columns[1].HeaderCell.Value = "Missing Values";
+      columns[2].HeaderCell.Value = "Min";
+      columns[3].HeaderCell.Value = "Max";
+      columns[4].HeaderCell.Value = "Median";
+      columns[5].HeaderCell.Value = "Average";
+      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";
+
       for (int i = 0; i < logic.GetColumnCount(); ++i) {
         List<string> list;
@@ -72 +83 @@
       dataGridView.Columns.Clear();
       dataGridView.Columns.AddRange(columns);
-      dataGridView.RowCount = columnsRowsMatrix[0].Count;
+      dataGridView.RowCount = columnsRowsMatrix.Count;
 
+      for (int i = 0; i < columnsRowsMatrix.Count; ++i) {
+        dataGridView.Rows[i].HeaderCell.Value = logic.GetVariableName(i);
+      }
+      dataGridView.AllowUserToResizeColumns = true;
     }
 
@@ -115 +130 @@
         logic.GetMin<DateTime>(columnIndex).ToString(),
         logic.GetMax<DateTime>(columnIndex).ToString(),
-        "", //median
-        "", //average
-        "", //standard deviation
-        "", //variance
-        logic.GetMostCommonValue<string>(columnIndex).ToString(),
-        logic.GetDifferentValuesCount<string>(columnIndex).ToString()
+        logic.GetMedianDateTime(columnIndex).ToString(), 
+        logic.GetAverageDateTime(columnIndex).ToString(),
+        logic.GetStandardDeviation(columnIndex).ToString(),
+        logic.GetVariance(columnIndex).ToString(), //variance
+        logic.GetMostCommonValue<DateTime>(columnIndex).ToString(),
+        logic.GetDifferentValuesCount<DateTime>(columnIndex).ToString()
       };
     }
@@ -129 +144 @@
 
     private void dataGridView_CellValueNeeded(object sender, DataGridViewCellValueEventArgs e) {
-      if (Content != null && e.RowIndex < columnsRowsMatrix.Count && e.ColumnIndex < Content.StatisticsLogic.GetColumnCount()) {
-        dataGridView[e.ColumnIndex, e.RowIndex].Value = columnsRowsMatrix[e.ColumnIndex][e.RowIndex];
+      if (Content != null && e.RowIndex < columnsRowsMatrix.Count && e.ColumnIndex < columnsRowsMatrix[0].Count) {
+        e.Value = columnsRowsMatrix[e.RowIndex][e.ColumnIndex];
       }
     }