Changeset 10221

Timestamp:

12/11/13 17:21:25 (11 years ago)

Author:

pfleck

Message:

• Cloned Algorithm and swapped Dataset an other members of the DataAnalysisProblemData
• Refactored GetMostOuterContent

Location:

branches/DataPreprocessing

Files:

• HeuristicLab.DataPreprocessing/3.3/DataPreprocessingView.cs (modified) (2 diffs)
• HeuristicLab.DataPreprocessing/3.3/HeuristicLab.DataPreprocessing-3.3.csproj (modified) (1 diff)
• HeuristicLab.DataPreprocessing/3.3/Implementations/PreprocessingContext.cs (modified) (3 diffs)
• HeuristicLab.DataPreprocessing/3.3/Implementations/PreprocessingData.cs (modified) (2 diffs)
• HeuristicLab.DataPreprocessing/3.3/Interfaces/IPreprocessingContext.cs (modified) (2 diffs)
• HeuristicLab.DataPreprocessing/3.3/Interfaces/IPreprocessingData.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing/3.3/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/ProblemDataView.cs (modified) (2 diffs)

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

@@ -1 @@
-using System.Windows.Forms;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+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.MainForm.WindowsForms;
+using HeuristicLab.Problems.DataAnalysis;
 
 namespace HeuristicLab.DataPreprocessing {
@@ -36 +62 @@
       MessageBox.Show("Success, now cloning... ");
 
+      Dataset dataset = Data.ExportToDataset();
+      var variables = new CheckedItemList<StringValue>(Data.VariableNames.Select(s => new StringValue(s))).AsReadOnly();
 
-      //Dataset ds = Data.ExportToDataset();
-      //var cloner = new Cloner();
+      var cloner = new Cloner();
 
-      //cloner.RegisterClonedObject()
+      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.DataPreprocessing/3.3/HeuristicLab.DataPreprocessing-3.3.csproj

@@ -99 +99 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
+      <Project>{958b43bc-cc5c-4fa2-8628-2b3b01d890b6}</Project>
+      <Name>HeuristicLab.Collections-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
       <Project>{0e27a536-1c4a-4624-a65e-dc4f4f23e3e1}</Project>

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/PreprocessingContext.cs

@@ -22 +22 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Problems.DataAnalysis;
 
 namespace HeuristicLab.DataPreprocessing {
   [Item("PreprocessingContext", "PreprocessingContext")]
   public class PreprocessingContext : Item, IPreprocessingContext {
-    public PreprocessingContext(IPreprocessingData data, IItem parentItem) {
+    public PreprocessingContext(IPreprocessingData data, IItem parentItem, IDataAnalysisProblemData dataAnalysisProblemData) {
       Data = data;
       ParentItem = parentItem;
+      DataAnalysisProblemData = dataAnalysisProblemData;
     }
 
@@ -35 +37 @@
       Data = cloner.Clone(original.Data);
       ParentItem = original.ParentItem;
+      DataAnalysisProblemData = original.DataAnalysisProblemData;
     }
 
@@ -44 +47 @@
     public IItem ParentItem { get; private set; }
 
+    public IDataAnalysisProblemData DataAnalysisProblemData { get; private set; }
+
     public override IDeepCloneable Clone(Cloner cloner) {
       return new PreprocessingContext(this, cloner);

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/PreprocessingData.cs

@@ -142 +142 @@
     }
 
+    public IntRange TrainingPartition {
+      get { return new IntRange(0, (int)(Rows * trainingToTestRatio)); }
+    }
+
+    public IntRange TestPartition {
+      get { return new IntRange((int)(Rows * trainingToTestRatio), Math.Max(Rows - 1, 0)); }
+    }
+
     public IEnumerable<string> VariableNames {
       get { return variableNames; }
@@ -155 +163 @@
 
     public int Rows {
-      get { return variableValues.Count; }
+      get { return variableValues[variableNames[0]].Count; }
     }
     public IDictionary<string, IEnumerable<int>> GetMissingValueIndices() {

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Interfaces/IPreprocessingContext.cs

@@ -21 +21 @@
 
 using HeuristicLab.Core;
+using HeuristicLab.Problems.DataAnalysis;
 namespace HeuristicLab.DataPreprocessing {
   public interface IPreprocessingContext : IItem {
@@ -29 +30 @@
     /// </summary>
     IItem ParentItem { get; }
+
+    IDataAnalysisProblemData DataAnalysisProblemData { get; }
   }
 }

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Interfaces/IPreprocessingData.cs

@@ -40 +40 @@
     void DeleteColumn(string variableName);
 
+    IntRange TrainingPartition { get; }
+    IntRange TestPartition { get; }
+
     IEnumerable<string> VariableNames { get; }
     bool IsType<T>(string variableName);

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Plugin.cs.frame

@@ -31 +31 @@
   [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
   [PluginDependency("HeuristicLab.Core", "3.3")]
+  [PluginDependency("HeuristicLab.Collections", "3.3")]
   [PluginDependency("HeuristicLab.Persistence", "3.3")]
   [PluginDependency("HeuristicLab.MainForm", "3.3")]

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

@@ -30 +30 @@
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
-using HeuristicLab.Optimization.Views;
 
 namespace HeuristicLab.Problems.DataAnalysis.Views {
@@ -104 +103 @@
 
     private void DataPreprocessingButton_Click(object sender, EventArgs e) {
-      IItem parentItem = GetAlgorithmOrProblem();
+      IItem parentItem = GetMostOuterContent();
       var preprocessingData = new PreprocessingData(Content);
 
       // TODO: ProblemDataView depends on DataPreprocessing
-      var context = new PreprocessingContext(preprocessingData, parentItem);
+      var context = new PreprocessingContext(preprocessingData, parentItem, Content);
       MainFormManager.MainForm.ShowContent(context);
-
-      //Type viewType = MainFormManager.GetViewTypes(this.Content.GetType(), true).FirstOrDefault(t => typeof(DataPreprocessingView).IsAssignableFrom(t));
-      //MainFormManager.MainForm.ShowContent(Content, viewType);
     }
 
-    private IItem GetAlgorithmOrProblem() {
-      Control a = this;
-      IItem i = null;
+    private IItem GetMostOuterContent() {
+      Control control = this;
+      ItemView itemView = null;
       do {
-        a = a.Parent;
-      } while (a != null && !(a is ProblemView));
+        control = control.Parent;
+        if (control is ItemView)
+          itemView = (ItemView)control;
+      } while (control != null);
 
-      if (a is ProblemView) {
-        i = ((ProblemView)a).Content;
-      }
-
-      do {
-        a = a.Parent;
-      } while (a != null && !(a is AlgorithmView));
-
-      if (a is AlgorithmView) {
-        i = ((AlgorithmView)a).Content;
-      }
-
-      return i;
-
-      //AlgorithmView algV = a as AlgorithmView;
-      //var clone = (IContent)algV.Content.Clone(new Cloner());
-      //MainFormManager.MainForm.ShowContent(clone);
-
+      return itemView.Content;
     }
   }