Changeset 10673 for branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4

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.Problems.DataAnalysis.Symbolic/3.4

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj (modified) (1 diff)
• Interfaces/ISymbolicDataAnalysisProblem.cs (modified) (1 diff)
• SymbolicDataAnalysisProblem.cs (modified) (6 diffs)
• TransformationCollection.cs (added)

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();