Changeset 13502 for trunk/sources/HeuristicLab.DataPreprocessing/3.4/Implementations

Timestamp:

01/12/16 17:05:37 (9 years ago)

Author:

pfleck

Message:

#2559

• Adapted import and export for preprocessing.
• Added MenuItem to be able to open Preprocessing without creating a DataAnalysisProblem before.
• Added coloring in ScatterPlot.
• Removed IPreprocessingContext interface.
• Reformatted code:
  • Added missing copyright headers.
  • Corrected namespaces.
  • Deleted unnecessary usings.
  • Applied correct formatting.

Location:

trunk/sources/HeuristicLab.DataPreprocessing/3.4/Implementations

Files:

• CorrelationMatrixContent.cs (modified) (4 diffs)
• Filter/IFilter.cs (modified) (1 diff)
• FilterLogic.cs (modified) (1 diff)
• FilteredPreprocessingData.cs (modified) (1 diff)
• HistogramContent.cs (modified) (1 diff)
• LineChartContent.cs (modified) (1 diff)
• PreprocessingChartContent.cs (modified) (1 diff)
• PreprocessingData.cs (modified) (2 diffs)
• PreprocessingDataTable.cs (modified) (1 diff)
• ScatterPlotContent.cs (modified) (4 diffs)
• StatisticsContent.cs (modified) (1 diff)
• StatisticsLogic.cs (modified) (1 diff)

trunk/sources/HeuristicLab.DataPreprocessing/3.4/Implementations/CorrelationMatrixContent.cs

@@ -21 +21 @@
 
 using System.Drawing;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -32 +33 @@
     }
 
-    private IPreprocessingContext Context { get; set; }
+    private PreprocessingContext Context { get; set; }
     private ITransactionalPreprocessingData PreprocessingData {
       get { return Context.Data; }
@@ -39 +40 @@
     public DataAnalysisProblemData ProblemData {
       get {
-        var creator = new ProblemDataCreator(Context);
-        return (DataAnalysisProblemData)creator.CreateProblemData();
+        // ToDo: avoid iterating
+        return Context.ExportPossibilities.Select(p => p.Value()).OfType<DataAnalysisProblemData>().Single();
+        //var creator = new ProblemDataCreator(Context);
+        //return (DataAnalysisProblemData)creator.CreateProblemData();
       }
     }
 
-    public CorrelationMatrixContent(IPreprocessingContext context) {
+    public CorrelationMatrixContent(PreprocessingContext context) {
       Context = context;
     }
@@ -50 +53 @@
     public CorrelationMatrixContent(CorrelationMatrixContent original, Cloner cloner)
       : base(original, cloner) {
-        Context = original.Context;
+      Context = original.Context;
     }
 

trunk/sources/HeuristicLab.DataPreprocessing/3.4/Implementations/Filter/IFilter.cs

@@ -1 @@
-using HeuristicLab.Core;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
 
-namespace HeuristicLab.DataPreprocessing.Filter
-{
-  public interface IFilter : IConstraint
-  {
+using HeuristicLab.Core;
+
+namespace HeuristicLab.DataPreprocessing.Filter {
+  public interface IFilter : IConstraint {
     new bool[] Check();
     new bool[] Check(out string errorMessage);

trunk/sources/HeuristicLab.DataPreprocessing/3.4/Implementations/FilterLogic.cs

@@ -24 +24 @@
 using System.Linq;
 using HeuristicLab.DataPreprocessing.Filter;
-using HeuristicLab.DataPreprocessing.Interfaces;
+
 namespace HeuristicLab.DataPreprocessing {
   public class FilterLogic : IFilterLogic {

trunk/sources/HeuristicLab.DataPreprocessing/3.4/Implementations/FilteredPreprocessingData.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.DataPreprocessing.Interfaces;
 using HeuristicLab.Problems.DataAnalysis;
 
-namespace HeuristicLab.DataPreprocessing.Implementations {
+namespace HeuristicLab.DataPreprocessing {
   public class FilteredPreprocessingData : NamedItem, IFilteredPreprocessingData {
     private readonly ITransactionalPreprocessingData originalData;

trunk/sources/HeuristicLab.DataPreprocessing/3.4/Implementations/HistogramContent.cs

@@ -25 +25 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.DataPreprocessing.Interfaces;
 
 namespace HeuristicLab.DataPreprocessing {

trunk/sources/HeuristicLab.DataPreprocessing/3.4/Implementations/LineChartContent.cs

@@ -23 +23 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.DataPreprocessing.Interfaces;
 
 namespace HeuristicLab.DataPreprocessing {

trunk/sources/HeuristicLab.DataPreprocessing/3.4/Implementations/PreprocessingChartContent.cs

@@ -28 +28 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.DataPreprocessing.Interfaces;
 
 namespace HeuristicLab.DataPreprocessing {

trunk/sources/HeuristicLab.DataPreprocessing/3.4/Implementations/PreprocessingData.cs

@@ -94 +94 @@
       selection = new Dictionary<int, IList<int>>();
 
+      Import(problemData);
+
+      RegisterEventHandler();
+    }
+
+    public void Import(IDataAnalysisProblemData problemData) {
       Dataset dataset = (Dataset)problemData.Dataset;
       variableNames = new List<string>(problemData.Dataset.VariableNames);
@@ -114 +120 @@
       TrainingPartition = new IntRange(problemData.TrainingPartition.Start, problemData.TrainingPartition.End);
       TestPartition = new IntRange(problemData.TestPartition.Start, problemData.TestPartition.End);
-
-      RegisterEventHandler();
     }
 

trunk/sources/HeuristicLab.DataPreprocessing/3.4/Implementations/PreprocessingDataTable.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using HeuristicLab.Analysis;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 
-namespace HeuristicLab.DataPreprocessing.Implementations {
+namespace HeuristicLab.DataPreprocessing {
   [Item("PreprossingDataTable", "A table of data values.")]
   public class PreprocessingDataTable : DataTable {

trunk/sources/HeuristicLab.DataPreprocessing/3.4/Implementations/ScatterPlotContent.cs

@@ -22 +22 @@
 using System.Collections.Generic;
 using System.Drawing;
+using System.Linq;
 using HeuristicLab.Analysis;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.DataPreprocessing.Interfaces;
 
 namespace HeuristicLab.DataPreprocessing {
@@ -34 +34 @@
     public string SelectedXVariable { get; set; }
     public string SelectedYVariable { get; set; }
+    public string SelectedColorVariable { get; set; }
 
     public ScatterPlotContent(IFilteredPreprocessingData preprocessingData)
@@ -43 +44 @@
       this.SelectedXVariable = content.SelectedXVariable;
       this.SelectedYVariable = content.SelectedYVariable;
+      this.SelectedColorVariable = content.SelectedColorVariable;
     }
 
-    public static new Image StaticItemImage
-    {
+    public static new Image StaticItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.Performance; }
     }
@@ -54 +55 @@
     }
 
-    public ScatterPlot CreateScatterPlot(string variableNameX, string variableNameY) {
+    public ScatterPlot CreateScatterPlot(string variableNameX, string variableNameY, string variableNameColor = "-") {
       ScatterPlot scatterPlot = new ScatterPlot();
 
       IList<double> xValues = PreprocessingData.GetValues<double>(PreprocessingData.GetColumnIndex(variableNameX));
       IList<double> yValues = PreprocessingData.GetValues<double>(PreprocessingData.GetColumnIndex(variableNameY));
+      if (variableNameColor == null || variableNameColor == "-") {
+        List<Point2D<double>> points = new List<Point2D<double>>();
 
-      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);
+        }
 
-      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);
+
+      } else {
+        var colorValues = PreprocessingData.GetValues<double>(PreprocessingData.GetColumnIndex(variableNameColor));
+        var data = xValues.Zip(yValues, (x, y) => new { x, y }).Zip(colorValues, (v, c) => new { v.x, v.y, c }).ToList();
+        var gradients = ColorGradient.Colors;
+        int curGradient = 0;
+        int numColors = colorValues.Distinct().Count();
+        foreach (var colorValue in colorValues.Distinct()) {
+          var values = data.Where(x => x.c == colorValue);
+          var row = new ScatterPlotDataRow(
+            variableNameX + " - " + variableNameY + " (" + colorValue + ")",
+            "",
+            values.Select(v => new Point2D<double>(v.x, v.y)),
+            new ScatterPlotDataRowVisualProperties() { Color = gradients[curGradient] });
+          curGradient += gradients.Count / numColors;
+          scatterPlot.Rows.Add(row);
+        }
       }
-
-      ScatterPlotDataRow scdr = new ScatterPlotDataRow(variableNameX + " - " + variableNameY, "", points);
-      scatterPlot.Rows.Add(scdr);
       return scatterPlot;
     }

trunk/sources/HeuristicLab.DataPreprocessing/3.4/Implementations/StatisticsContent.cs

@@ -19 +19 @@
  */
 #endregion
+
 using System.Drawing;
 using HeuristicLab.Common;

trunk/sources/HeuristicLab.DataPreprocessing/3.4/Implementations/StatisticsLogic.cs

@@ -26 +26 @@
 
 namespace HeuristicLab.DataPreprocessing {
-
   public class StatisticsLogic : IStatisticsLogic {