Changeset 10254 for branches/DataPreprocessing

Timestamp:

12/18/13 16:24:16 (10 years ago)

Author:

pfleck

Message:

Reintegrated cloning into tryout-Button.

Location:

branches/DataPreprocessing

Files:

• HeuristicLab.DataPreprocessing/3.3/DataPreprocessingView.Designer.cs (deleted)
• HeuristicLab.DataPreprocessing/3.3/DataPreprocessingView.cs (deleted)
• HeuristicLab.DataPreprocessing/3.3/Views/DataPreprocessingView.cs (modified) (6 diffs)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/ProblemDataView.cs (modified) (2 diffs)

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

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
 using System.Linq;
-using System.Text;
 using System.Windows.Forms;
-using HeuristicLab.Core.Views;
-using HeuristicLab.DataPreprocessing.Implementations;
-using HeuristicLab.MainForm;
 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
-{
+namespace HeuristicLab.DataPreprocessing {
   [View("DataPreprocessing View")]
   [Content(typeof(PreprocessingContext), true)]
@@ -29 +24 @@
 
       InitializeContents();
-      
+
     }
 
@@ -36 +31 @@
       ListViewItem listViewItem = new ListViewItem();
 
-        listViewItem.Text = item.ToString();
-        //listViewItem.ToolTipText = item.ItemName + ": " + item.ItemDescription;
-        //itemsListView.SmallImageList.Images.Add(content.);
-        //listViewItem.ImageIndex = itemsListView.SmallImageList.Images.Count - 1;
-        //listViewItem.Tag = item;
+      listViewItem.Text = item.ToString();
+      //listViewItem.ToolTipText = item.ItemName + ": " + item.ItemDescription;
+      //itemsListView.SmallImageList.Images.Add(content.);
+      //listViewItem.ImageIndex = itemsListView.SmallImageList.Images.Count - 1;
+      //listViewItem.Tag = item;
       return listViewItem;
     }
 
     private void InitializeContents() {
-      dataGridContent = new DataGridContent(new DataGridLogic(this.Content));
+      dataGridContent = new DataGridContent(new DataGridLogic(Content != null ? this.Content.Data : null));
 
-      listViewItemItemMapping = new Dictionary<ListViewItem,IItem>();
+      listViewItemItemMapping = new Dictionary<ListViewItem, IItem>();
       ListViewItem contentListViewItem = CreateListViewItem(dataGridContent);
       listViewItemItemMapping[contentListViewItem] = dataGridContent;
@@ -54 +49 @@
     }
 
-    public new PreprocessingData Content {
-      get { return (PreprocessingData)base.Content; }
+    public new PreprocessingContext Content {
+      get { return (PreprocessingContext)base.Content; }
       set { base.Content = value; }
     }
@@ -61 +56 @@
     private void listView1_SelectedIndexChanged(object sender, EventArgs e) {
 
-        if (contentListView.SelectedItems.Count > 0)
-        {
-            ListViewItem listViewItem = (ListViewItem)contentListView.SelectedItems[0];
-            this.viewHost.Content = listViewItemItemMapping[listViewItem];
-        }
+      if (contentListView.SelectedItems.Count > 0) {
+        ListViewItem listViewItem = (ListViewItem)contentListView.SelectedItems[0];
+        this.viewHost.Content = listViewItemItemMapping[listViewItem];
+      }
     }
 
@@ -73 +67 @@
     }
 
-    private void tryOutAlgorithmButton_Click(object sender, EventArgs e)
-    {
+    private void tryOutAlgorithmButton_Click(object sender, EventArgs e) {
+      IPreprocessingData Data = Content.Data;
 
+      foreach (string variable in Data.VariableNames) {
+        for (int j = 0; j < Data.Rows; j++) {
+          // assume: all double
+          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);
+
+      MainFormManager.MainForm.ShowContent(item);
     }
-
-    //private void button1_Click(object sender, System.EventArgs e)
-    //{
-
-    //    IPreprocessingData Data = Content.Data;
-
-    //    foreach (string variable in Data.VariableNames)
-    //    {
-    //        for (int j = 0; j < Data.Rows; j++)
-    //        {
-    //            // assume: all double
-    //            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);
-
-    //    var item = cloner.Clone(Content.ParentItem);
-
-    //    MainFormManager.MainForm.ShowContent(item);
-
-    //    //var clone = null;
-
-    //}
-
-
   }
 }
 
-    

branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Views/3.4/ProblemDataView.cs

@@ -29 +29 @@
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
-using HeuristicLab.Optimization;
 using HeuristicLab.PluginInfrastructure;
 
@@ -104 +103 @@
 
     private void DataPreprocessingButton_Click(object sender, EventArgs e) {
-      // TODO: ProblemDataView depends on DataPreprocessing
       var preprocessingStarters = ApplicationManager.Manager.GetInstances<IDataPreprocessorStarter>();
       var starter = preprocessingStarters.FirstOrDefault();