Changeset 10882 for branches/DataPreprocessing/HeuristicLab.DataPreprocessing

Timestamp:

05/21/14 15:28:27 (10 years ago)

Author:

aesterer

Message:

Added scatter plot view

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3

Files:

• HeuristicLab.DataPreprocessing-3.3.csproj (modified) (1 diff)
• Implementations/ChartLogic.cs (modified) (3 diffs)
• Implementations/ScatterPlotContent.cs (copied) (copied from branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/LineChartContent.cs) (2 diffs)
• Interfaces/IChartLogic.cs (modified) (1 diff)

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

@@ -72 +72 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Implementations\ScatterPlotContent.cs" />
     <Compile Include="Implementations\DataCompletenessChartContent.cs" />
     <Compile Include="Implementations\FilteredPreprocessingData.cs" />

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

@@ -27 +27 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.DataPreprocessing {
@@ -60 +61 @@
       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]))
-          values[i] = 0;
-      }
     }
 
@@ -148 +142 @@
     }
 
+    public ScatterPlot CreateScatterPlot(string name, string variableNameX, string variableNameY) {
+      ScatterPlot scatterPlot = new ScatterPlot(name, "");
+      
+
+      List<double> xValues = GetVariableValues(variableNameX);
+      List<double> yValues = GetVariableValues(variableNameY);
+
+      List<Point2D<double>> points = new List<Point2D<double>>();
+
+      for( int i = 0; i < xValues.Count; i++)
+      {
+          Point2D<double> point = new Point2D<double>(xValues[i],yValues[i]);
+          points.Add(point);
+      }
+
+      ScatterPlotDataRow scdr = new ScatterPlotDataRow(variableNameX + " - " + variableNameY,"",points);
+      scatterPlot.Rows.Add(scdr);
+      return scatterPlot;
+    }
+
     #endregion
   }

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

@@ -26 +26 @@
 namespace HeuristicLab.DataPreprocessing {
 
-  [Item("LineChart", "Represents the line chart grid.")]
-  public class LineChartContent : PreprocessingChartContent {
+  [Item("ScatterPlot", "Represents a scatter plot.")]
+  public class ScatterPlotContent : PreprocessingChartContent {
 
-    public LineChartContent(IChartLogic chartlogic)
+    public ScatterPlotContent(IChartLogic chartlogic)
       : base(chartlogic) {
     }
 
-    public LineChartContent(LineChartContent content, Cloner cloner)
+    public ScatterPlotContent(ScatterPlotContent content, Cloner cloner)
       : base(content, cloner) {
 
@@ -43 +43 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new LineChartContent(this, cloner);
+      return new ScatterPlotContent(this, cloner);
     }
 

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

@@ -45 +45 @@
     DataRow CreateDataRowRange(string variableName, int start, int end, DataRowVisualProperties.DataRowChartType chartType);
 
+    ScatterPlot CreateScatterPlot(string name,string variableNameX,string variableNameY);
+
     string GetVariableNameByIndex(int index);