Changeset 10369

Timestamp:

01/22/14 14:33:36 (10 years ago)

Author:

rstoll

Message:

• Renamed PreprocessingDataManipulation to ManipulationLogic
• Proceeded with StatisticsView

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3

Files:

• HeuristicLab.DataPreprocessing-3.3.csproj (modified) (2 diffs)
• Implementations/DataGridContent.cs (modified) (2 diffs)
• Implementations/ManipulationLogic.cs (moved) (moved from branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/PreprocessingDataManipulation.cs) (1 diff)
• Implementations/StatisticsLogic.cs (modified) (3 diffs)
• Interfaces/IDataGridContent.cs (modified) (1 diff)
• Interfaces/IDataGridLogic.cs (modified) (1 diff)
• Interfaces/IManipulationLogic.cs (moved) (moved from branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Interfaces/IPreprocessingDataManipulation.cs) (1 diff)
• Interfaces/IStatisticsLogic.cs (modified) (1 diff)
• Views/DataPreprocessingView.cs (modified) (1 diff)
• Views/StatisticsView.cs (modified) (3 diffs)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/HeuristicLab.DataPreprocessing-3.3.csproj

@@ -79 +79 @@
     <Compile Include="Implementations\DataGridLogic.cs" />
     <Compile Include="Interfaces\IDataGridLogic.cs" />
-    <Compile Include="Interfaces\IPreprocessingDataManipulation.cs" />
+    <Compile Include="Interfaces\IManipulationLogic.cs" />
     <Compile Include="Implementations\FilterContent.cs" />
     <Compile Include="Implementations\DataPreprocessorStarter.cs" />
@@ -135 +135 @@
     <Compile Include="Implementations\PreprocessingContext.cs" />
     <Compile Include="Implementations\PreprocessingData.cs" />
-    <Compile Include="Implementations\PreprocessingDataManipulation.cs" />
+    <Compile Include="Implementations\ManipulationLogic.cs" />
     <Compile Include="Implementations\SearchLogic.cs" />
     <Compile Include="Implementations\StatisticsLogic.cs" />

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

@@ -11 +11 @@
 
     private readonly IDataGridLogic dataGridLogic;
-    private readonly IPreprocessingDataManipulation preprocessingDataManipulation;
-    public DataGridContent(IDataGridLogic theDataGridLogic, IPreprocessingDataManipulation thePreprocessingDataManipulation) {
+    private readonly IManipulationLogic preprocessingDataManipulation;
+    public DataGridContent(IDataGridLogic theDataGridLogic, IManipulationLogic thePreprocessingDataManipulation) {
       dataGridLogic = theDataGridLogic;
       preprocessingDataManipulation = thePreprocessingDataManipulation;
@@ -21 +21 @@
     }
 
-    public IPreprocessingDataManipulation PreprocessingDataManipulation {
+    public IManipulationLogic PreprocessingDataManipulation {
       get { return preprocessingDataManipulation; }
     }

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

@@ -5 +5 @@
 
 namespace HeuristicLab.DataPreprocessing {
-  public class PreprocessingDataManipulation : IPreprocessingDataManipulation {
+  public class ManipulationLogic : IManipulationLogic {
     private IPreprocessingData preprocessingData;
     private IStatisticsLogic statisticInfo;
     private ISearchLogic searchLogic;
 
-    public PreprocessingDataManipulation(IPreprocessingData _prepocessingData, ISearchLogic theSearchLogic, IStatisticsLogic theStatisticsLogic) {
+    public ManipulationLogic(IPreprocessingData _prepocessingData, ISearchLogic theSearchLogic, IStatisticsLogic theStatisticsLogic) {
       preprocessingData = _prepocessingData;
       searchLogic = theSearchLogic;

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

@@ -25 +25 @@
     public int GetNumericColumnCount() {
       int count = 0;
-      foreach (var variableName in preprocessingData.VariableNames) {
-        if (preprocessingData.IsType<double>(variableName)) {
+
+      for (int i = 0; i < preprocessingData.Columns; ++i) {
+        if (preprocessingData.IsType<double>(i)) {
           ++count;
         }
@@ -39 +40 @@
     public int GetMissingValueCount() {
       int count = 0;
-      for(int i = 0; i < preprocessingData.Columns; ++i){
+      for (int i = 0; i < preprocessingData.Columns; ++i) {
         count += GetMissingValueCount(i);
       }
@@ -104 +105 @@
     public int GetRowMissingValueCount(int rowIndex) {
       int count = 0;
-       for(int i = 0; i < preprocessingData.Columns; ++i){
+      for (int i = 0; i < preprocessingData.Columns; ++i) {
         if (searchLogic.IsMissingValue(i, rowIndex)) {
           ++count;

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

@@ -8 +8 @@
   public interface IDataGridContent : IStringConvertibleMatrix {
     IDataGridLogic DataGridLogic { get; }
-    IPreprocessingDataManipulation PreprocessingDataManipulation { get; }
+    IManipulationLogic PreprocessingDataManipulation { get; }
   }
 }

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

@@ -3 +3 @@
   public interface IDataGridLogic {
     IEnumerable<string> ColumnNames { get; }
-    string GetColumnTypeAsString(int columnIndex);
     IEnumerable<string> RowNames { get; }
     int Columns { get; }

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

@@ -2 +2 @@
 using System.Collections.Generic;
 namespace HeuristicLab.DataPreprocessing {
-  public interface IPreprocessingDataManipulation {
+  public interface IManipulationLogic {
     void reOrderToIndices(IEnumerable<int> indices);
     void reOrderToIndices(IList<Tuple<int, int>> indices);

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

@@ -19 +19 @@
     double GetVariance(int columnIndex);
     int GetDifferentValuesCount<T>(int columnIndex);
+
     bool IsType<T>(int columnIndex);
+    string GetColumnTypeAsString(int columnIndex);
   }
 }

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

@@ -46 +46 @@
       ISearchLogic searchLogic = new SearchLogic(data);
       var dataGridLogic = new DataGridLogic(data);
-      dataGridContent = new DataGridContent(dataGridLogic, new PreprocessingDataManipulation(data, searchLogic, new StatisticsLogic(data, searchLogic)));
+      dataGridContent = new DataGridContent(dataGridLogic, new ManipulationLogic(data, searchLogic, new StatisticsLogic(data, searchLogic)));
       statisticsContent = new StatisticsContent(new StatisticsLogic(data, searchLogic), dataGridLogic);
       filterContent = new FilterContent(new FilterLogic());

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

@@ -1 @@
-using System.Windows.Forms;
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
 using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
@@ -9 +11 @@
   [Content(typeof(StatisticsContent), false)]
   public partial class StatisticsView : ItemView {
+
+    private List<List<string>> columnsRowsMatrix;
+    private readonly int COLUMNS = 5;
 
     public new StatisticsContent Content {
@@ -21 +26 @@
     protected override void OnContentChanged() {
       base.OnContentChanged();
-      if (Content != null) {
-        var logic = Content.StatisticsLogic;
-        txtRows.Text = logic.GetRowCount().ToString();
-        txtColumns.Text = logic.GetColumnCount().ToString();
-        txtNumericColumns.Text = logic.GetNumericColumnCount().ToString();
-        txtNominalColumns.Text = logic.GetNominalColumnCount().ToString();
-        txtMissingValuesTotal.Text = logic.GetMissingValueCount().ToString();
+      if (Content == null) {
+        txtRows.Text = "";
+        txtColumns.Text = "";
+        txtNumericColumns.Text = "";
+        txtNominalColumns.Text = "";
+        txtMissingValuesTotal.Text = "";
+        dataGridView.Columns.Clear();
+      } else {
+        UpdateData();
+      }
+    }
+    private void UpdateData() {
+      var statisticsLogic = Content.StatisticsLogic;
+      var dataGridLogic = Content.DataDridLogic;
+      txtRows.Text = statisticsLogic.GetRowCount().ToString();
+      txtColumns.Text = statisticsLogic.GetColumnCount().ToString();
+      txtNumericColumns.Text = statisticsLogic.GetNumericColumnCount().ToString();
+      txtNominalColumns.Text = statisticsLogic.GetNominalColumnCount().ToString();
+      txtMissingValuesTotal.Text = statisticsLogic.GetMissingValueCount().ToString();
+
+      DataGridViewColumn[] columns = new DataGridViewColumn[COLUMNS];
+
+      columnsRowsMatrix = new List<List<string>>();
+
+
+      for (int i = 0; i < Content.DataDridLogic.Columns; ++i) {
+        var column = new DataGridViewTextBoxColumn();
+        column.FillWeight = 1;
+        columns[i] = column;
+
+        List<string> list;
+        if (statisticsLogic.IsType<double>(i)) {
+          list = GetDoubleColumns(i);
+        } else if (statisticsLogic.IsType<string>(i)) {
+          list = GetStringColumns(i);
+        } else if (statisticsLogic.IsType<DateTime>(i)) {
+          list = GetDateTimeColumns(i);
+        } else {
+          list = new List<string>();
+        }
+        columnsRowsMatrix.Add(list);
+      }
+
+      dataGridView.Columns.Clear();
+      dataGridView.Columns.AddRange(columns);
+      dataGridView.RowCount = columnsRowsMatrix[0].Count;
+
+    }
+
+    private List<string> GetDoubleColumns(int columnIndex) {
+      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),
+      };
+    }
+
+    private List<string> GetStringColumns(int columnIndex) {
+      return null;
+    }
+    private List<string> GetDateTimeColumns(int columndIndex) {
+      return null;
+    }
+
+    private List<string> GetDoubleColums(int i) {
+      throw new NotImplementedException();
+    }
+
+    private void dataGridView_CellValueNeeded(object sender, DataGridViewCellValueEventArgs e) {
+      if (Content != null && e.RowIndex < columnsRowsMatrix.Count && e.ColumnIndex < Content.DataDridLogic.Columns) {
+
       }
     }