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

Timestamp:

04/11/17 15:55:44 (8 years ago)

Author:

gkronber

Message:

#2697: applied r14390, r14391, r14393, r14394, r14396 again (resolving conflicts)

Location:

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

Files:

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

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) + columnName;
+        columnName = System.Convert.ToChar(65 + modulo) + 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" />
@@ -250 +254 @@
     <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]