Changeset 10673 for branches/DataPreprocessing/HeuristicLab.DataPreprocessing

Timestamp:

03/26/14 16:37:02 (11 years ago)

Author:

pfleck

Message:

• Preprocessing Plugin now uses ISymbolicDataAnalysisProblem instead of IDataAnalysisProblem
• Added TransformationCollection to ISymbolicDataAnalysisProblem as hidden parameter

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3

Files:

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

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

@@ -160 +160 @@
       <Private>False</Private>
     </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\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
       <Project>{df87c13e-a889-46ff-8153-66dcaa8c5674}</Project>

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

@@ -23 +23 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Optimization;
 using HeuristicLab.Problems.DataAnalysis;
+using HeuristicLab.Problems.DataAnalysis.Symbolic;
 
 namespace HeuristicLab.DataPreprocessing {
@@ -37 +39 @@
     public IAlgorithm Algorithm { get; private set; }
 
-    public IDataAnalysisProblem Problem { get; private set; }
+    public ISymbolicDataAnalysisProblem Problem { get; private set; }
 
-    public PreprocessingContext(IDataAnalysisProblemData dataAnalysisProblemData, IAlgorithm algorithm, IDataAnalysisProblem problem) {
+    public PreprocessingContext(IDataAnalysisProblemData dataAnalysisProblemData, IAlgorithm algorithm, ISymbolicDataAnalysisProblem problem) {
       Data = new TransactionalPreprocessingData(dataAnalysisProblemData);
       DataAnalysisProblemData = dataAnalysisProblemData;
@@ -72 +74 @@
     }
 
-    private IDataAnalysisProblem SetupProblem(IProblem problem) {
-      return (IDataAnalysisProblem)problem;
+    private ISymbolicDataAnalysisProblem SetupProblem(IProblem problem) {
+      return (ISymbolicDataAnalysisProblem)problem;
     }
-    private IDataAnalysisProblem SetupAlgorithm(IAlgorithm algorithm) {
+    private ISymbolicDataAnalysisProblem SetupAlgorithm(IAlgorithm algorithm) {
       algorithm.Name = algorithm.Name + "(Preprocessed)";
       algorithm.Runs.Clear();
-      return (IDataAnalysisProblem)algorithm.Problem;
+      return (ISymbolicDataAnalysisProblem)algorithm.Problem;
     }
-    private T Export<T>(T original, Func<T, IDataAnalysisProblem> setup)
+    private T Export<T>(T original, Func<T, ISymbolicDataAnalysisProblem> setup)
         where T : IItem {
       var creator = new ProblemDataCreator(this);
@@ -91 +93 @@
       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);
+
+      problem.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 {
@@ -36 +37 @@
     IAlgorithm Algorithm { get; }
 
-    IDataAnalysisProblem Problem { get; }
+    ISymbolicDataAnalysisProblem Problem { get; }
 
     IItem ExportAlgorithmOrProblem();

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

@@ -41 +41 @@
   [PluginDependency("HeuristicLab.Problems.DataAnalysis","3.4")]
   [PluginDependency("HeuristicLab.Problems.DataAnalysis.Views","3.4")]
-  [PluginDependency("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding","3.4")]
-  [PluginDependency("HeuristicLab.Parameters","3.4")]
+  [PluginDependency("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding", "3.4")]
+  [PluginDependency("HeuristicLab.Problems.DataAnalysis.Symbolic", "3.4")]
+  [PluginDependency("HeuristicLab.Parameters","3.3")]
   public class HeuristicLabDataPreprocessingPlugin : PluginBase {
   }