Changeset 10673 for branches

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

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/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.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interfaces/ISymbolicDataAnalysisProblem.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisProblem.cs (modified) (6 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TransformationCollection.cs (added)

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;
@@ -34 +35 @@
     public void Start(IDataAnalysisProblemData problemData, View currentView) {
       IAlgorithm algorithm;
-      IDataAnalysisProblem problem;
+      ISymbolicDataAnalysisProblem problem;
       IItem parentItem = GetMostOuterContent(currentView, out algorithm, out problem);
       var context = new PreprocessingContext(problemData, algorithm, problem);
@@ -40 +41 @@
     }
 
-    private IItem GetMostOuterContent(Control control, out IAlgorithm algorithm, out IDataAnalysisProblem problem) {
+    private IItem GetMostOuterContent(Control control, out IAlgorithm algorithm, out ISymbolicDataAnalysisProblem problem) {
       algorithm = null;
       problem = null;
@@ -51 +52 @@
             algorithm = (IAlgorithm)itemView.Content;
           }
-          if (itemView.Content is IDataAnalysisProblem) {
-            problem = (IDataAnalysisProblem)itemView.Content;
+          if (itemView.Content is ISymbolicDataAnalysisProblem) {
+            problem = (ISymbolicDataAnalysisProblem)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/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 {
   }

branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj

@@ -221 +221 @@
     <Compile Include="Symbols\VariableConditionTreeNode.cs" />
     <Compile Include="Symbols\VariableTreeNode.cs" />
+    <Compile Include="TransformationCollection.cs" />
     <None Include="HeuristicLab.snk" />
     <None Include="Plugin.cs.frame" />

branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interfaces/ISymbolicDataAnalysisProblem.cs

@@ -35 +35 @@
     IFixedValueParameter<IntRange> FitnessCalculationPartitionParameter { get; }
     IFixedValueParameter<IntRange> ValidationPartitionParameter { get; }
+    IFixedValueParameter<TransformationCollection> TransformationsParameter { get; }
 
     ISymbolicDataAnalysisGrammar SymbolicExpressionTreeGrammar { get; set; }

branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisProblem.cs

@@ -54 +54 @@
     private const string ValidationPartitionParameterName = "ValidationPartition";
     private const string ApplyLinearScalingParameterName = "ApplyLinearScaling";
+    private const string TransformationsParameterName = "Transformations";
 
     private const string ProblemDataParameterDescription = "";
@@ -66 +67 @@
     private const string ValidationPartitionParameterDescription = "The partition of the problem data training partition, that should be used to select the best model from (optional).";
     private const string ApplyLinearScalingParameterDescription = "Flag that indicates if the individual should be linearly scaled before evaluating.";
+    private const string TransformationsParameterDescrioption = "The transformations which were applied on the input variables.";
     #endregion
 
@@ -104 +106 @@
     public IFixedValueParameter<BoolValue> ApplyLinearScalingParameter {
       get { return (IFixedValueParameter<BoolValue>)Parameters[ApplyLinearScalingParameterName]; }
+    }
+    public IFixedValueParameter<TransformationCollection> TransformationsParameter {
+      get { return (IFixedValueParameter<TransformationCollection>)Parameters[TransformationsParameterName]; }
     }
     #endregion
@@ -167 +172 @@
         if (GetType().Name.Contains("SymbolicRegression"))
           ApplyLinearScaling.Value = true;
+      }
+
+      if (!Parameters.ContainsKey(TransformationsParameterName)) {
+        Parameters.Add(new FixedValueParameter<TransformationCollection>(TransformationsParameterName, TransformationsParameterDescrioption, new TransformationCollection()));
+        TransformationsParameter.Hidden = true;
       }
 
@@ -189 +199 @@
       Parameters.Add(new FixedValueParameter<PercentValue>(RelativeNumberOfEvaluatedSamplesParameterName, RelativeNumberOfEvaluatedSamplesParameterDescription, new PercentValue(1)));
       Parameters.Add(new FixedValueParameter<BoolValue>(ApplyLinearScalingParameterName, ApplyLinearScalingParameterDescription, new BoolValue(false)));
+      Parameters.Add(new FixedValueParameter<TransformationCollection>(TransformationsParameterName, TransformationsParameterDescrioption, new TransformationCollection()));
 
       SymbolicExpressionTreeInterpreterParameter.Hidden = true;
@@ -194 +205 @@
       MaximumFunctionDefinitionsParameter.Hidden = true;
       ApplyLinearScalingParameter.Hidden = true;
+      TransformationsParameter.Hidden = true;
 
       SymbolicExpressionTreeGrammar = new TypeCoherentExpressionGrammar();