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

Timestamp:

11/24/21 13:40:39 (3 years ago)

Author:

chaider

Message:

#3041

• Renaming Constant Symbol to Num, behaves like before
• Adding new Symbol RealConstant (Constant), this symbol behaves now like a real constant, won't be changed by parameter optimization or manipulators
• Refactored classes part1

Location:

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

Files:

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

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

@@ -58 +58 @@
 
       if (@const!=0.0) {
-        ConstantTreeNode cNode = (ConstantTreeNode)new Constant().CreateTreeNode();
+        NumTreeNode cNode = (NumTreeNode)new Num().CreateTreeNode();
         cNode.Value = @const;
         add.AddSubtree(cNode);
@@ -99 +99 @@
 
       if (!@const.IsAlmost(0.0)) {
-        ConstantTreeNode cNode = (ConstantTreeNode)new Constant().CreateTreeNode();
+        NumTreeNode cNode = (NumTreeNode)new Num().CreateTreeNode();
         cNode.Value = @const;
         addition.AddSubtree(cNode);
@@ -130 +130 @@
 
       if (!@const.IsAlmost(0.0)) {
-        ConstantTreeNode cNode = (ConstantTreeNode)new Constant().CreateTreeNode();
+        NumTreeNode cNode = (NumTreeNode)new Num().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 Constant) {
-        initialConstants.Add(((ConstantTreeNode)node).Value);
+      if (node.Symbol is Num) {
+        initialConstants.Add(((NumTreeNode)node).Value);
+        var var = new AutoDiff.Variable();
+        variables.Add(var);
+        return var;
+      }
+
+      if (node.Symbol is RealConstant) {
+        initialConstants.Add(((RealConstantTreeNode)node).Value);
         var var = new AutoDiff.Variable();
         variables.Add(var);
@@ -260 +267 @@
       }
       if (node.Symbol is Power) {
-        var powerNode = node.GetSubtree(1) as ConstantTreeNode;
+        var powerNode = node.GetSubtree(1) as NumTreeNode;
         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.");
@@ -330 +337 @@
           !(n.Symbol is FactorVariable) &&
           !(n.Symbol is LaggedVariable) &&
-          !(n.Symbol is Constant) &&
+          !(n.Symbol is Num) &&
+          !(n.Symbol is RealConstant) &&
           !(n.Symbol is Addition) &&
           !(n.Symbol is Subtraction) &&