Changeset 18100 for branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Converters

Timestamp:

12/01/21 13:40:55 (3 years ago)

Author:

chaider

Message:

#3140

• some more refactoring
• added possibility to set value of num nodes in infix parser
• changed displaying style of number

Location:

branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Converters

Files:

• LinearModelToTreeConverter.cs (modified) (3 diffs)
• TreeToAutoDiffTermConverter.cs (modified) (4 diffs)

branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Converters/LinearModelToTreeConverter.cs

@@ -58 +58 @@
 
       if (@const!=0.0) {
-        NumTreeNode cNode = (NumTreeNode)new Num().CreateTreeNode();
+        NumberTreeNode cNode = (NumberTreeNode)new Number().CreateTreeNode();
         cNode.Value = @const;
         add.AddSubtree(cNode);
@@ -99 +99 @@
 
       if (!@const.IsAlmost(0.0)) {
-        NumTreeNode cNode = (NumTreeNode)new Num().CreateTreeNode();
+        NumberTreeNode cNode = (NumberTreeNode)new Number().CreateTreeNode();
         cNode.Value = @const;
         addition.AddSubtree(cNode);
@@ -130 +130 @@
 
       if (!@const.IsAlmost(0.0)) {
-        NumTreeNode cNode = (NumTreeNode)new Num().CreateTreeNode();
+        NumberTreeNode cNode = (NumberTreeNode)new Number().CreateTreeNode();
         cNode.Value = @const;
         addition.AddSubtree(cNode);

branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Converters/TreeToAutoDiffTermConverter.cs

@@ -145 +145 @@
 
     private AutoDiff.Term ConvertToAutoDiff(ISymbolicExpressionTreeNode node) {
-      if (node.Symbol is Num) {
-        initialConstants.Add(((NumTreeNode)node).Value);
+      if (node.Symbol is Number) {
+        initialConstants.Add(((NumberTreeNode)node).Value);
         var var = new AutoDiff.Variable();
         variables.Add(var);
@@ -152 +152 @@
       }
 
-      if (node.Symbol is RealConstant) {
-        initialConstants.Add(((RealConstantTreeNode)node).Value);
+      if (node.Symbol is Constant) {
+        initialConstants.Add(((ConstantTreeNode)node).Value);
         var var = new AutoDiff.Variable();
         variables.Add(var);
@@ -267 +267 @@
       }
       if (node.Symbol is Power) {
-        var powerNode = node.GetSubtree(1) as NumTreeNode;
+        var powerNode = node.GetSubtree(1) as NumberTreeNode;
         if (powerNode == null)
           throw new NotSupportedException("Only integer powers are allowed in parameter optimization. Try to use exp() and log() instead of the power symbol.");
@@ -337 +337 @@
           !(n.Symbol is FactorVariable) &&
           !(n.Symbol is LaggedVariable) &&
-          !(n.Symbol is Num) &&
-          !(n.Symbol is RealConstant) &&
+          !(n.Symbol is Number) &&
+          !(n.Symbol is Constant) &&
           !(n.Symbol is Addition) &&
           !(n.Symbol is Subtraction) &&