Changeset 10310 for branches/DataPreprocessing

Timestamp:

01/08/14 15:33:08 (11 years ago)

Author:

tsteinre

Message:

• Created PreprocessingCloner
• Implemented Export Problem Logic

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3

Files:

• HeuristicLab.DataPreprocessing-3.3.csproj (modified) (1 diff)
• PreprocessingCloner.cs (added)
• Views/DataPreprocessingView.cs (modified) (5 diffs)

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

@@ -94 +94 @@
     <Compile Include="Interfaces\ILineChartLogic.cs" />
     <Compile Include="Interfaces\ITransformationLogic.cs" />
+    <Compile Include="PreprocessingCloner.cs" />
     <Compile Include="Views\FilterView.cs">
       <SubType>UserControl</SubType>

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Views/DataPreprocessingView.cs

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Windows.Forms;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Core.Views;
-using HeuristicLab.Data;
 using HeuristicLab.MainForm;
-using HeuristicLab.Optimization;
-using HeuristicLab.Problems.DataAnalysis;
 
 namespace HeuristicLab.DataPreprocessing {
@@ -25 +21 @@
     private Dictionary<ListViewItem, IItem> listViewItemItemMapping;
 
-
     public DataPreprocessingView() {
       InitializeComponent();
     }
-
 
     protected override void OnContentChanged() {
@@ -105 +99 @@
 
     private void exportProblemButton_Click(object sender, EventArgs e) {
+      var cloner = new PreprocessingCloner(Content);
+      var alteredClone = cloner.GenerateAlteredClone(Content.Problem);
+
       var saveFileDialog = new SaveFileDialog {
         Title = "Save Item",
@@ -112 +109 @@
       };
 
-      var content = Content.Problem as IStorableContent;
+      var content = alteredClone as IStorableContent;
       if (saveFileDialog.ShowDialog() == DialogResult.OK) {
         bool compressed = saveFileDialog.FilterIndex != 1;
@@ -120 +117 @@
 
     private void applyInNewTabButton_Click(object sender, EventArgs e) {
-      IPreprocessingData Data = Content.Data;
+      IPreprocessingData data = Content.Data;
 
-      foreach (string variable in Data.VariableNames) {
-        for (int j = 0; j < Data.Rows; j++) {
+      foreach (string variable in data.VariableNames) {
+        for (int j = 0; j < data.Rows; j++) {
           // assume: all double
-          Data.SetCell(variable, j, 1.0);
+          data.SetCell(variable, j, 1.0);
         }
       }
-
       MessageBox.Show("Success, now cloning... ");
 
-      Dataset dataset = Data.ExportToDataset();
-      var variables = new CheckedItemList<StringValue>(Data.VariableNames.Select(s => new StringValue(s))).AsReadOnly();
-
-      var cloner = new Cloner();
-
-      cloner.RegisterClonedObject(Content.DataAnalysisProblemData.Dataset, dataset);
-      cloner.RegisterClonedObject(Content.DataAnalysisProblemData.TrainingPartition, Data.TrainingPartition);
-      cloner.RegisterClonedObject(Content.DataAnalysisProblemData.TestPartition, Data.TestPartition);
-      cloner.RegisterClonedObject(Content.DataAnalysisProblemData.InputVariables, variables);
-      if (Content.Algorithm != null) {
-        cloner.RegisterClonedObject(Content.Algorithm.Runs, new RunCollection { OptimizerName = Content.Algorithm.Name });
-      }
-
-      var item = cloner.Clone(Content.ParentItem);
+      var cloner = new PreprocessingCloner(Content);
+      var item = cloner.GenerateAlteredClone(Content.ParentItem);
 
       MainFormManager.MainForm.ShowContent(item);
     }
-
   }
 }
-