Changeset 10676

Timestamp:

03/27/14 12:49:33 (11 years ago)

Author:

pfleck

Message:

• Data preprocessor now works with all types of data analysis problems. Only in case of a symbolic data analysis problem the inverse transformation information is added.

Location:

branches/DataPreprocessing

Files:

• HeuristicLab.DataPreprocessing.Views/3.3/DataPreprocessorStarter.cs (modified) (4 diffs)
• HeuristicLab.DataPreprocessing.Views/3.3/HeuristicLab.DataPreprocessing.Views-3.3.csproj (modified) (1 diff)
• HeuristicLab.DataPreprocessing.Views/3.3/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.DataPreprocessing/3.3/Implementations/PreprocessingContext.cs (modified) (5 diffs)
• HeuristicLab.DataPreprocessing/3.3/Interfaces/IPreprocessingContext.cs (modified) (2 diffs)

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

@@ -26 +26 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Problems.DataAnalysis;
-using HeuristicLab.Problems.DataAnalysis.Symbolic;
 using HeuristicLab.Problems.DataAnalysis.Views;
 using View = HeuristicLab.MainForm.WindowsForms.View;
@@ -35 +34 @@
     public void Start(IDataAnalysisProblemData problemData, View currentView) {
       IAlgorithm algorithm;
-      ISymbolicDataAnalysisProblem problem;
+      IDataAnalysisProblem problem;
       IItem parentItem = GetMostOuterContent(currentView, out algorithm, out problem);
       var context = new PreprocessingContext(problemData, algorithm, problem);
@@ -41 +40 @@
     }
 
-    private IItem GetMostOuterContent(Control control, out IAlgorithm algorithm, out ISymbolicDataAnalysisProblem problem) {
+    private IItem GetMostOuterContent(Control control, out IAlgorithm algorithm, out IDataAnalysisProblem problem) {
       algorithm = null;
       problem = null;
@@ -52 +51 @@
             algorithm = (IAlgorithm)itemView.Content;
           }
-          if (itemView.Content is ISymbolicDataAnalysisProblem) {
-            problem = (ISymbolicDataAnalysisProblem)itemView.Content;
+          if (itemView.Content is IDataAnalysisProblem) {
+            problem = (IDataAnalysisProblem)itemView.Content;
           }
         }

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

@@ -214 +214 @@
       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj">
-      <Project>{3d28463f-ec96-4d82-afee-38be91a0ca00}</Project>
-      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic-3.4</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Views\3.4\HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj">
       <Project>{3E9E8944-44FF-40BB-A622-3A4A7DD0F198}</Project>

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

@@ -34 +34 @@
   [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")] 
   [PluginDependency("HeuristicLab.Problems.DataAnalysis.Views","3.4")]
-  [PluginDependency("HeuristicLab.Problems.DataAnalysis.Symbolic", "3.4")]
   public class HeuristicLabDataPreprocessingPlugin : PluginBase {
   }

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

@@ -27 +27 @@
 using HeuristicLab.Problems.DataAnalysis;
 using HeuristicLab.Problems.DataAnalysis.Symbolic;
+using Variable = HeuristicLab.Problems.DataAnalysis.Symbolic.Variable;
 
 namespace HeuristicLab.DataPreprocessing {
@@ -39 +40 @@
     public IAlgorithm Algorithm { get; private set; }
 
-    public ISymbolicDataAnalysisProblem Problem { get; private set; }
+    public IDataAnalysisProblem Problem { get; private set; }
 
-    public PreprocessingContext(IDataAnalysisProblemData dataAnalysisProblemData, IAlgorithm algorithm, ISymbolicDataAnalysisProblem problem) {
+    public PreprocessingContext(IDataAnalysisProblemData dataAnalysisProblemData, IAlgorithm algorithm, IDataAnalysisProblem problem) {
       Data = new TransactionalPreprocessingData(dataAnalysisProblemData);
       DataAnalysisProblemData = dataAnalysisProblemData;
@@ -63 +64 @@
       if (Algorithm != null) {
         return ExportAlgorithm();
-      } else {
-        return ExportProblem();
       }
+      return ExportProblem();
     }
+
     public IProblem ExportProblem() {
       return Export(Problem, SetupProblem);
@@ -74 +75 @@
     }
 
-    private ISymbolicDataAnalysisProblem SetupProblem(IProblem problem) {
-      return (ISymbolicDataAnalysisProblem)problem;
+    private IDataAnalysisProblem SetupProblem(IProblem problem) {
+      return (IDataAnalysisProblem)problem;
     }
-    private ISymbolicDataAnalysisProblem SetupAlgorithm(IAlgorithm algorithm) {
+    private IDataAnalysisProblem SetupAlgorithm(IAlgorithm algorithm) {
       algorithm.Name = algorithm.Name + "(Preprocessed)";
       algorithm.Runs.Clear();
-      return (ISymbolicDataAnalysisProblem)algorithm.Problem;
+      return (IDataAnalysisProblem)algorithm.Problem;
     }
-    private T Export<T>(T original, Func<T, ISymbolicDataAnalysisProblem> setup)
+    private T Export<T>(T original, Func<T, IDataAnalysisProblem> setup)
         where T : IItem {
       var creator = new ProblemDataCreator(this);
@@ -93 +94 @@
       problem.Name = "Preprocessed " + problem.Name;
 
-      var tree = new SymbolicExpressionTree(new ProgramRootSymbol().CreateTreeNode());
-      var variableNode = (VariableTreeNode)new HeuristicLab.Problems.DataAnalysis.Symbolic.Variable("dummy", "dummy description").CreateTreeNode();
-      variableNode.VariableName = "dummy";
-      tree.Root.AddSubtree(variableNode);
+      var symbolicProblem = problem as ISymbolicDataAnalysisProblem;
+      if (symbolicProblem != null) {
+        var tree = new SymbolicExpressionTree(new ProgramRootSymbol().CreateTreeNode());
+        var variableNode = (VariableTreeNode)new Variable("dummy", "dummy description").CreateTreeNode();
+        variableNode.VariableName = "dummy";
+        tree.Root.AddSubtree(variableNode);
 
-      problem.TransformationsParameter.Value.Add(tree);
+        symbolicProblem.TransformationsParameter.Value.Add(tree);
+      }
 
       return clone;

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

@@ -24 +24 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Problems.DataAnalysis;
-using HeuristicLab.Problems.DataAnalysis.Symbolic;
 
 namespace HeuristicLab.DataPreprocessing {
@@ -37 +36 @@
     IAlgorithm Algorithm { get; }
 
-    ISymbolicDataAnalysisProblem Problem { get; }
+    IDataAnalysisProblem Problem { get; }
 
     IItem ExportAlgorithmOrProblem();