Changeset 18147

Timestamp:

12/16/21 14:43:31 (3 years ago)

Author:

chaider

Message:

#3140

• Added NumberTreeNode const which takes a double
• Added converter to Convert all Constants to Numbers
• Modified SimplifierAxiomsTests to convert all constants to numbers to check the simplification rules

Location:

branches/3140_NumberSymbol

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Converters/ConstantsToNumberConverter.cs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/NumberTreeNode.cs (modified) (1 diff)
• HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/SymbolicDataAnalysisExpressionTreeSimplifierTest.cs (modified) (1 diff)

branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj

@@ -153 +153 @@
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Converters\ConstantsToNumberConverter.cs" />
     <Compile Include="Converters\LinearModelToTreeConverter.cs" />
     <Compile Include="Converters\TreeSimplifier.cs" />

branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/NumberTreeNode.cs

@@ -44 +44 @@
     public NumberTreeNode(Number numberSymbol) : base(numberSymbol) { }
 
+    public NumberTreeNode(double value) : this(new Number()) {
+      Value = value;
+    }
+
     public override bool HasLocalParameters => true;
 

branches/3140_NumberSymbol/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/SymbolicDataAnalysisExpressionTreeSimplifierTest.cs

@@ -287 +287 @@
       var formatter = new SymbolicExpressionTreeStringFormatter();
       var importer = new SymbolicExpressionImporter();
-      var actualTree = TreeSimplifier.Simplify(importer.Import(original));
+      var originalTree = importer.Import(original);
+      originalTree = ConstantsToNumberConverter.Convert(originalTree);
+      var actualTree = TreeSimplifier.Simplify(originalTree);
       var expectedTree = importer.Import(expected);
       Assert.AreEqual(formatter.Format(expectedTree), formatter.Format(actualTree));