Changeset 14390 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic

Timestamp:

11/15/16 20:09:41 (7 years ago)

Author:

gkronber

Message:

#2697:

• renaming of folder "Transformation" to "Converters" to distinguish between transformations for variables (from data preprocessing) and classes for transformation of trees.
• renamed SymbolicDataAnalysisExpressionTreeSimplifier -> TreeSimplifier
• Implemented a converter to create a linar model as a symbolic expression tree

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4

Files:

• Converters (added)
• Converters/Convert.cs (added)
• Converters/LinearModelToTreeConverter.cs (added)
• Converters/TreeSimplifier.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Transformation/SymbolicDataAnalysisExpressionTreeSimplifier.cs) (2 diffs)
• Converters/TreeToAutoDiffTermConverter.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Transformation/TreeToAutoDiffTermTransformator.cs) (3 diffs)
• Formatters/SymbolicDataAnalysisExpressionExcelFormatter.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj (modified) (2 diffs)
• SymbolicDataAnalysisExpressionTreeSimplificationOperator.cs (modified) (1 diff)
• Transformations (moved) (moved from trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Transformation)
• Transformations/SymbolicDataAnalysisExpressionTreeSimplifier.cs (deleted)
• Transformations/TreeToAutoDiffTermTransformator.cs (deleted)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Converters/TreeSimplifier.cs

@@ -30 +30 @@
   /// Simplifier for symbolic expressions
   /// </summary>
-  public class SymbolicDataAnalysisExpressionTreeSimplifier {
+  public class TreeSimplifier {
     private Addition addSymbol = new Addition();
     private Subtraction subSymbol = new Subtraction();
@@ -716 +716 @@
         // fold constants
         return MakeConstant(((ConstantTreeNode)a).Value / ((ConstantTreeNode)b).Value);
-      } if (IsConstant(a) && !((ConstantTreeNode)a).Value.IsAlmost(1.0)) {
+      }
+      if (IsConstant(a) && !((ConstantTreeNode)a).Value.IsAlmost(1.0)) {
         return MakeFraction(MakeConstant(1.0), MakeProduct(b, Invert(a)));
       } else if (IsVariable(a) && IsConstant(b)) {

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Converters/TreeToAutoDiffTermConverter.cs

@@ -27 +27 @@
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
-  public class TreeToAutoDiffTermTransformator {
+  public class TreeToAutoDiffTermConverter {
     public delegate double ParametricFunction(double[] vars, double[] @params);
     public delegate Tuple<double[], double> ParametricFunctionGradient(double[] vars, double[] @params);
@@ -60 +60 @@
 
       // use a transformator object which holds the state (variable list, parameter list, ...) for recursive transformation of the tree
-      var transformator = new TreeToAutoDiffTermTransformator(makeVariableWeightsVariable);
+      var transformator = new TreeToAutoDiffTermConverter(makeVariableWeightsVariable);
       AutoDiff.Term term;
       var success = transformator.TryTransformToAutoDiff(tree.Root.GetSubtree(0), out term);
@@ -88 +88 @@
     private readonly bool makeVariableWeightsVariable;
 
-    private TreeToAutoDiffTermTransformator(bool makeVariableWeightsVariable) {
+    private TreeToAutoDiffTermConverter(bool makeVariableWeightsVariable) {
       this.makeVariableWeightsVariable = makeVariableWeightsVariable;
       this.variableNames = new List<string>();

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Formatters/SymbolicDataAnalysisExpressionExcelFormatter.cs

@@ -51 +51 @@
       while (dividend > 0) {
         int modulo = (dividend - 1) % 26;
-        columnName = Convert.ToChar(65 + modulo).ToString() + columnName;
+        columnName = System.Convert.ToChar(65 + modulo).ToString() + columnName;
         dividend = (int)((dividend - modulo) / 26);
       }

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj

@@ -137 +137 @@
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Converters\Convert.cs" />
+    <Compile Include="Converters\LinearModelToTreeConverter.cs" />
+    <Compile Include="Converters\TreeSimplifier.cs" />
+    <Compile Include="Converters\TreeToAutoDiffTermConverter.cs" />
     <Compile Include="Formatters\InfixExpressionFormatter.cs" />
     <Compile Include="Formatters\SymbolicDataAnalysisExpressionMathematicaFormatter.cs" />
@@ -242 +246 @@
     <Compile Include="Symbols\VariableConditionTreeNode.cs" />
     <Compile Include="Symbols\VariableTreeNode.cs" />
-    <Compile Include="Transformation\SymbolicDataAnalysisExpressionTreeSimplifier.cs" />
-    <Compile Include="Transformation\SymbolicExpressionTreeBacktransformator.cs" />
-    <Compile Include="Transformation\TreeToAutoDiffTermTransformator.cs" />
-    <Compile Include="Transformation\TransformationToSymbolicTreeMapper.cs" />
+    <Compile Include="Transformations\SymbolicExpressionTreeBacktransformator.cs" />
+    <Compile Include="Transformations\TransformationToSymbolicTreeMapper.cs" />
     <Compile Include="TreeMatching\SymbolicExpressionTreeBottomUpSimilarityCalculator.cs" />
     <Compile Include="TreeMatching\SymbolicExpressionTreeCanonicalSorter.cs" />

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisExpressionTreeSimplificationOperator.cs

@@ -37 +37 @@
     }
 
-    private readonly SymbolicDataAnalysisExpressionTreeSimplifier simplifier = new SymbolicDataAnalysisExpressionTreeSimplifier();
+    private readonly TreeSimplifier simplifier = new TreeSimplifier();
 
     [StorableConstructor]