Changeset 14963 for stable/HeuristicLab.DataPreprocessing/3.4

Timestamp:

05/11/17 13:44:01 (7 years ago)

Author:

gkronber

Message:

#2698: merged r14381 r14382 r14384 r14388 r14418 r14425 from trunk to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.DataPreprocessing/3.4 (modified) (1 prop)
• HeuristicLab.DataPreprocessing/3.4/Content/PreprocessingChartContent.cs (modified) (2 diffs)
• HeuristicLab.DataPreprocessing/3.4/Data/FilteredPreprocessingData.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing/3.4/Data/IPreprocessingData.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing/3.4/Data/PreprocessingData.cs (modified) (3 diffs)

stable/HeuristicLab.DataPreprocessing/3.4/Content/PreprocessingChartContent.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Drawing;
-using System.Linq;
 using HeuristicLab.Analysis;
 using HeuristicLab.Common;
@@ -126 +125 @@
 
 
-    public ICheckedItemList<StringValue> CreateVariableItemList(IEnumerable<string> checkedItems = null) {
+    public ICheckedItemList<StringValue> CreateVariableItemList(IList<string> checkedItems = null) {
+      if (checkedItems == null) checkedItems = new string[0];
       ICheckedItemList<StringValue> itemList = new CheckedItemList<StringValue>();
       foreach (string name in PreprocessingData.GetDoubleVariableNames()) {
         var n = new StringValue(name);
-        itemList.Add(n, (checkedItems == null) ? true : checkedItems.Contains(name));
+        itemList.Add(n, checkedItems.Contains(name));
       }
       return new ReadOnlyCheckedItemList<StringValue>(itemList);

stable/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 {

stable/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; }

stable/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;