Changeset 14381 for trunk/sources/HeuristicLab.DataPreprocessing

Timestamp:

11/09/16 16:20:23 (8 years ago)

Author:

pfleck

Message:

#2698

• Refactored CheckedVariablesView out of the ChartView to allow reuse of the checked variables list.
  • The new list visualizes the non-input/target variables in gray.
  • Added context menu to quickly (un)check all variables or only the inputs+target variables.
• In the Multi-Scatterplot
  • New structure and layout of the single charts to support fixed header rows and columns (for the variable names). Instead, removed the legend of each plot for better usage of plot area.
  • Adapted the new CheckedVariablesView (but hidden until (un)checking is implemented).

Location:

trunk/sources/HeuristicLab.DataPreprocessing/3.4/Data

Files:

• FilteredPreprocessingData.cs (modified) (1 diff)
• IPreprocessingData.cs (modified) (1 diff)
• PreprocessingData.cs (modified) (3 diffs)

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

@@ -47 +47 @@
       get { return ActiveData.VariableNames; }
     }
+
+    public IList<string> InputVariables { get { return ActiveData.InputVariables; } }
+    public string TargetVariable { get { return ActiveData.TargetVariable; } } // optional
 
     public IDictionary<int, IList<int>> Selection {

trunk/sources/HeuristicLab.DataPreprocessing/3.4/Data/IPreprocessingData.cs

@@ -65 +65 @@
     bool VariableHasType<T>(int columnIndex);
 
+    IList<string> InputVariables { get; }
+    string TargetVariable { get; } // optional
+
     int Columns { get; }
     int Rows { get; }

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

@@ -59 +59 @@
     }
 
+    public IList<string> InputVariables { get; private set; }
+    public string TargetVariable { get; private set; } // optional
+
     public int Columns {
       get { return variableNames.Count; }
@@ -82 +85 @@
       TrainingPartition = (IntRange)original.TrainingPartition.Clone(cloner);
       TestPartition = (IntRange)original.TestPartition.Clone(cloner);
-      transformations = new List<ITransformation>();
+      transformations = new List<ITransformation>(original.transformations.Select(cloner.Clone));
+
+      InputVariables = new List<string>(original.InputVariables);
+      TargetVariable = original.TargetVariable;
 
       RegisterEventHandler();
@@ -102 +108 @@
       Dataset dataset = (Dataset)problemData.Dataset;
       variableNames = new List<string>(problemData.Dataset.VariableNames);
+      InputVariables = new List<string>(problemData.AllowedInputVariables);
+      TargetVariable = (problemData is IRegressionProblemData) ? ((IRegressionProblemData)problemData).TargetVariable
+        : (problemData is IClassificationProblemData) ? ((IClassificationProblemData)problemData).TargetVariable
+        : null;
 
       int columnIndex = 0;