Changeset 13507 for trunk/sources/HeuristicLab.DataPreprocessing/3.4/PreprocessingContext.cs

Timestamp:

01/13/16 14:51:38 (8 years ago)

Author:

pfleck

Message:

#2559

• Enabled different export types for preprocessing.
• Hid unused buttons in ViewShortcutListView.
• Made data preprocessing a NamedItem to allow naming.

File:

• trunk/sources/HeuristicLab.DataPreprocessing/3.4/PreprocessingContext.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.DataPreprocessing/3.4/PreprocessingContext.cs

@@ -39 +39 @@
         var algorithm = Source as IAlgorithm;
         if (algorithm != null)
-          yield return new KeyValuePair<string, Func<IItem>>(algorithm.Name, () => ExportAlgorithm(algorithm));
+          yield return new KeyValuePair<string, Func<IItem>>(algorithm.GetType().GetPrettyName(), () => ExportAlgorithm(algorithm));
 
         var problem = algorithm != null ? algorithm.Problem as IDataAnalysisProblem : Source as IDataAnalysisProblem;
         if (problem != null)
-          yield return new KeyValuePair<string, Func<IItem>>(problem.Name, () => ExportProblem(problem));
+          yield return new KeyValuePair<string, Func<IItem>>(problem.GetType().GetPrettyName(), () => ExportProblem(problem));
 
         var problemData = problem != null ? problem.ProblemData : Source as IDataAnalysisProblemData;
         if (problemData != null)
-          yield return new KeyValuePair<string, Func<IItem>>(problemData.Name, () => ExportProblemData(problemData));
+          yield return new KeyValuePair<string, Func<IItem>>(problemData.GetType().GetPrettyName(), () => ExportProblemData(problemData));
 
         // ToDo: Export CSV
@@ -63 +63 @@
 
 
-    public PreprocessingContext() : this(new RegressionProblemData()) { }
+    public PreprocessingContext() : this(new RegressionProblemData()) {
+      Name = "Data Preprocessing";
+    }
     public PreprocessingContext(IItem source)
-      : base("PreprocessingContext") {
+      : base("Data Preprocessing") {
       Import(source);
     }
@@ -85 +87 @@
     public void Import(IItem source) {
       Source = source;
+      var namedSource = source as INamedItem;
+      if (namedSource != null) Name = "Preprocessing: " + namedSource.Name;
 
       var dataSource = ExtractProblemData(source);
@@ -100 +104 @@
     #region Export
     public IItem Export() {
-      var creator = new ProblemDataCreator(this);
       if (Source is IAlgorithm)
         return ExportAlgorithm((IAlgorithm)Source);
@@ -124 +127 @@
     private IDataAnalysisProblemData ExportProblemData(IDataAnalysisProblemData source) {
       var creator = new ProblemDataCreator(this);
-      return creator.CreateProblemData(source);
+      var preprocessedProblemData = creator.CreateProblemData(source);
+      preprocessedProblemData.Name = "Preprocessed " + source.Name;
+      return preprocessedProblemData;
     }
     private void SetNewProblemData(IDataAnalysisProblem problem) {