Changeset 10803 for branches/DataPreprocessing/HeuristicLab.DataPreprocessing

Timestamp:

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

Author:

aesterer

Message:

Added coloring selection feature to line chart

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3

Files:

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

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);
   }