Changeset 10240 for branches/DataPreprocessing

Timestamp:

12/18/13 14:08:20 (11 years ago)

Author:

pfleck

Message:

Deleted Runs on Algorithm-Cloning for Preprocessing.

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) (4 diffs)
• HeuristicLab.DataPreprocessing/3.3/Interfaces/IPreprocessingContext.cs (modified) (2 diffs)
• 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

@@ -28 +28 @@
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
+using HeuristicLab.Optimization;
 using HeuristicLab.Problems.DataAnalysis;
 
@@ -71 +72 @@
       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);
-
-      //var clone = null;
-
     }
   }

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

@@ -150 +150 @@
       <Name>HeuristicLab.MainForm-3.3</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
+      <Project>{14ab8d24-25bc-400c-a846-4627aa945192}</Project>
+      <Name>HeuristicLab.Optimization-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
       <Project>{102bc7d3-0ef9-439c-8f6d-96ff0fdb8e1b}</Project>

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

@@ -22 +22 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Optimization;
 using HeuristicLab.Problems.DataAnalysis;
 
@@ -27 +28 @@
   [Item("PreprocessingContext", "PreprocessingContext")]
   public class PreprocessingContext : Item, IPreprocessingContext {
-    public PreprocessingContext(IPreprocessingData data, IItem parentItem, IDataAnalysisProblemData dataAnalysisProblemData) {
+    public PreprocessingContext(IPreprocessingData data, IItem parentItem, IDataAnalysisProblemData dataAnalysisProblemData, IAlgorithm algorithm) {
       Data = data;
       ParentItem = parentItem;
       DataAnalysisProblemData = dataAnalysisProblemData;
+      Algorithm = algorithm;
     }
 
@@ -38 +40 @@
       ParentItem = original.ParentItem;
       DataAnalysisProblemData = original.DataAnalysisProblemData;
+      Algorithm = original.Algorithm;
     }
 
@@ -49 +52 @@
     public IDataAnalysisProblemData DataAnalysisProblemData { get; private set; }
 
+    public IAlgorithm Algorithm { get; private set; }
+
     public override IDeepCloneable Clone(Cloner cloner) {
       return new PreprocessingContext(this, cloner);

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

@@ -21 +21 @@
 
 using HeuristicLab.Core;
+using HeuristicLab.Optimization;
 using HeuristicLab.Problems.DataAnalysis;
 namespace HeuristicLab.DataPreprocessing {
@@ -32 +33 @@
 
     IDataAnalysisProblemData DataAnalysisProblemData { get; }
+
+    IAlgorithm Algorithm { get; }
   }
 }

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

@@ -33 +33 @@
   [PluginDependency("HeuristicLab.Collections", "3.3")]
   [PluginDependency("HeuristicLab.Persistence", "3.3")]
+  [PluginDependency("HeuristicLab.Optimization", "3.3")]
   [PluginDependency("HeuristicLab.MainForm", "3.3")]
   [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")] 

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

@@ -30 +30 @@
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
+using HeuristicLab.Optimization;
 
 namespace HeuristicLab.Problems.DataAnalysis.Views {
@@ -103 +104 @@
 
     private void DataPreprocessingButton_Click(object sender, EventArgs e) {
-      IItem parentItem = GetMostOuterContent();
+      IAlgorithm algorithm;
+      IItem parentItem = GetMostOuterContent(out algorithm);
       var preprocessingData = new PreprocessingData(Content);
 
       // TODO: ProblemDataView depends on DataPreprocessing
       //ApplicationManager.Manager.GetInstances<IPreprocessingContext>();
-      var context = new PreprocessingContext(preprocessingData, parentItem, Content);
+      var context = new PreprocessingContext(preprocessingData, parentItem, Content, algorithm);
       MainFormManager.MainForm.ShowContent(context);
     }
 
-    private IItem GetMostOuterContent() {
+    private IItem GetMostOuterContent(out IAlgorithm algorithm) {
+      algorithm = null;
       Control control = this;
       ItemView itemView = null;
       do {
         control = control.Parent;
-        if (control is ItemView)
+        if (control is ItemView) {
           itemView = (ItemView)control;
+          if (itemView.Content is IAlgorithm) {
+            algorithm = (IAlgorithm)itemView.Content;
+          }
+        }
       } while (control != null);