Changeset 10803

Timestamp:

05/07/14 10:44:11 (11 years ago)

Author:

aesterer

Message:

Added coloring selection feature to line chart

Location:

branches/DataPreprocessing

Files:

• HeuristicLab.DataPreprocessing.Views/3.3/PreprocessingChartView.cs (modified) (7 diffs)
• HeuristicLab.DataPreprocessing.Views/3.3/PreprocessingDataTableView.cs (modified) (6 diffs)
• HeuristicLab.DataPreprocessing/3.3/HeuristicLab.DataPreprocessing-3.3.csproj (modified) (1 diff)
• HeuristicLab.DataPreprocessing/3.3/Implementations/ChartLogic.cs (modified) (2 diffs)
• HeuristicLab.DataPreprocessing/3.3/Implementations/PreprocessingDataTable.cs (added)
• HeuristicLab.DataPreprocessing/3.3/Interfaces/IChartLogic.cs (modified) (1 diff)

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

@@ -30 +30 @@
 using HeuristicLab.Core.Views;
 using HeuristicLab.Data;
+using HeuristicLab.DataPreprocessing.Implementations;
 using HeuristicLab.MainForm;
 
@@ -39 +40 @@
 
     private IChartLogic logic;
-    private DataTable dataTable;
-    private List<DataTable> dataTablePerVariable;
+    private PreprocessingDataTable dataTable;
+    private List<PreprocessingDataTable> dataTablePerVariable;
     private ICheckedItemList<StringValue> variableItemList;
     private List<DataRow> dataRows;
@@ -67 +68 @@
           DataRow row = GetDataRow(variableName);
           dataTable.Rows.Add(row);
-          DataTable d = new DataTable(variableName);
+          PreprocessingDataTable d = new PreprocessingDataTable(variableName);
           d.Rows.Add(row);
           dataTablePerVariable.Add(d);
@@ -109 +110 @@
 
       // init data table
-      dataTable = new DataTable(chartTitle);
+      dataTable = new PreprocessingDataTable(chartTitle);
       dataTable.Rows.AddRange(dataRows);
+      
 
       // init data table per variable
-      dataTablePerVariable = new List<DataTable>();
+      dataTablePerVariable = new List<PreprocessingDataTable>();
       foreach(var checkedItem in variableItemList.CheckedItems)  {
         string variableName = variableItemList[checkedItem.Index].Value;
-        DataTable d = new DataTable(variableName);
+        PreprocessingDataTable d = new PreprocessingDataTable(variableName);
         DataRow row = GetDataRow(variableName);
+        //DataRow rowSelect = logic.CreateDataRowRange(variableName, 200, 400, chartType);
+        //rowSelect.Name = variableName + "(Selected)";
+        //rowSelect.VisualProperties.Color = Color.Green;
+        
         d.Rows.Add(row);
+        //d.SelectedRows.Add(rowSelect);
+        
         dataTablePerVariable.Add(d);
-      }
-
+
+      }
     }
 
@@ -179 +187 @@
       DataRow row = logic.CreateDataRow(name, chartType);
       dataTable.Rows.Add(row);
-      DataTable d = new DataTable(name);
+      PreprocessingDataTable d = new PreprocessingDataTable(name);
       d.Rows.Add(row);
       dataTablePerVariable.Add(d);
@@ -264 +272 @@
       tableLayoutPanel.RowCount = rows;
 
-      List<DataTable>.Enumerator enumerator = dataTablePerVariable.GetEnumerator();
+      List<PreprocessingDataTable>.Enumerator enumerator = dataTablePerVariable.GetEnumerator();
       for (int x = 0; x < columns; x++) {
         
@@ -284 +292 @@
           PreprocessingDataTableView dataView = new PreprocessingDataTableView();
           enumerator.MoveNext();
-          DataTable d = enumerator.Current;
+          PreprocessingDataTable d = enumerator.Current;
           if (d == null) {
             // dummy panel for empty field 

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

@@ -29 +29 @@
 using System.Windows.Forms;
 using System.Windows.Forms.DataVisualization.Charting;
+using HeuristicLab.DataPreprocessing.Implementations;
 
 namespace HeuristicLab.Analysis.Views {
   [View("Preprocessing DataTable View")]
-  [Content(typeof(DataTable), false)]
+  [Content(typeof(PreprocessingDataTable), false)]
   public partial class PreprocessingDataTableView : ItemView, IConfigureableView {
     protected List<Series> invisibleSeries;
     protected Dictionary<IObservableList<double>, DataRow> valuesRowsTable;
 
-    public new DataTable Content {
-      get { return (DataTable)base.Content; }
+    public new PreprocessingDataTable Content {
+      get { return (PreprocessingDataTable)base.Content; }
       set { base.Content = value; }
     }
@@ -103 +104 @@
         //chart.Titles[0].Text = Content.Name;
         AddDataRows(Content.Rows);
+        AddSelectedDataRows(Content.SelectedRows);
         ConfigureChartArea(chart.ChartAreas[0]);
         RecalculateAxesScale(chart.ChartAreas[0]);
@@ -130 +132 @@
         chart.Series.Add(series);
       }
+
       ConfigureChartArea(chart.ChartAreas[0]);
       RecalculateAxesScale(chart.ChartAreas[0]);
       UpdateYCursorInterval();
+    }
+
+    protected virtual void AddSelectedDataRows(IEnumerable<DataRow> rows) {
+      foreach (var row in rows) {
+        if (row.VisualProperties.ChartType == DataRowVisualProperties.DataRowChartType.Line) {
+          //RegisterDataRowEvents(row);
+          row.VisualProperties.IsVisibleInLegend = false;
+          var series = new Series(row.Name);
+          ConfigureSeries(series, row);
+          FillSeriesWithRowValues(series, row);
+          chart.Series.Add(series);
+        }
+      }
     }
 
@@ -156 +172 @@
       else series.Color = Color.Empty;
       series.IsVisibleInLegend = row.VisualProperties.IsVisibleInLegend;
-
+     
       switch (row.VisualProperties.ChartType) {
         case DataRowVisualProperties.DataRowChartType.Line:
@@ -518 +534 @@
     }
 
+    // get minimum ignores nan values
+    private double GetMinimum(IEnumerable<double> values)
+    {
+      double min = Double.MaxValue;
+
+      foreach (double value in values) {
+        if (!Double.IsNaN(value) && value < min)
+          min = value;      
+      }
+      return min;
+    }
+
+    //get maximium ignores nan values
+    private double GetMaximum(IEnumerable<double> values) {
+      double max = Double.MinValue;
+
+      foreach (double value in values) {
+        if (!Double.IsNaN(value) && value > max)
+          max = value;
+      }
+      return max;
+    }
+
     protected virtual void CalculateHistogram(Series series, DataRow row) {
       series.Points.Clear();
@@ -523 +562 @@
       int bins = row.VisualProperties.Bins;
 
-      double minValue = row.Values.Min();
-      double maxValue = row.Values.Max();
+      double minValue = GetMinimum(row.Values);
+      double maxValue = GetMaximum(row.Values);
       double intervalWidth = (maxValue - minValue) / bins;
       if (intervalWidth < 0) return;

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

@@ -77 +77 @@
     <Compile Include="Implementations\PreprocessingData.cs" />
     <Compile Include="Implementations\DataGridLogic.cs" />
+    <Compile Include="Implementations\PreprocessingDataTable.cs" />
     <Compile Include="Interfaces\IFilteredPreprocessingData.cs" />
     <Compile Include="PreprocessingTransformator.cs" />

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

@@ -38 +38 @@
     public DataRow CreateDataRow(string variableName, DataRowVisualProperties.DataRowChartType chartType) {
       IList<double> values = preprocessingData.GetValues<double>(variableName);
-
-      //TODO: handle NAN values correctly
-      // CalculateHistogram in DataTableView fails with NAN values ( Min(), Max() returns NAN)
-      ReplayNANwithZero(values);
       DataRow row = new DataRow(variableName, "", values);
       row.VisualProperties.ChartType = chartType;
@@ -47 +43 @@
     }
 
-    private void ReplayNANwithZero(IList<double> values) {
+    public DataRow CreateDataRowRange(string variableName,int start, int end, DataRowVisualProperties.DataRowChartType chartType) {
+      IList<double> values = preprocessingData.GetValues<double>(variableName);
+      IList<double> valuesRange = new List<double>();
+      for (int i = 0; i < values.Count; i++) {
+        if (i >= start && i <= end)
+          valuesRange.Add(values[i]);
+        else
+          valuesRange.Add(Double.NaN);
+      }
+
+      DataRow row = new DataRow(variableName, "", valuesRange);
+      row.VisualProperties.ChartType = chartType;
+      return row;
+    }
+
+    private void ReplaceNANwithZero(IList<double> values) {
       for (int i = 0; i < values.Count; i++) {
         if (Double.IsNaN(values[i]))

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

@@ -36 +36 @@
     DataRow CreateDataRow(string variableName,DataRowVisualProperties.DataRowChartType chartType);
 
+    DataRow CreateDataRowRange(string variableName, int start, int end, DataRowVisualProperties.DataRowChartType chartType);
+
     string GetVariableNameByIndex(int index);
   }