Changeset 18093 for branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/NumTreeNode.cs

Timestamp:

11/24/21 13:40:39 (2 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

File:

• branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/NumTreeNode.cs (moved) (moved from branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/ConstantTreeNode.cs) (3 diffs)

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

@@ -27 +27 @@
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
   [StorableType("247DBD04-18F2-4184-B6F5-6E283BF06FD0")]
-  public sealed class ConstantTreeNode : SymbolicExpressionTreeTerminalNode {
-    public new Constant Symbol {
-      get { return (Constant)base.Symbol; }
+  public sealed class NumTreeNode : SymbolicExpressionTreeTerminalNode {
+    public new Num Symbol {
+      get { return (Num)base.Symbol; }
     }
 
@@ -40 +40 @@
 
     [StorableConstructor]
-    private ConstantTreeNode(StorableConstructorFlag _) : base(_) { }
+    private NumTreeNode(StorableConstructorFlag _) : base(_) { }
 
-    private ConstantTreeNode(ConstantTreeNode original, Cloner cloner)
+    private NumTreeNode(NumTreeNode original, Cloner cloner)
       : base(original, cloner) {
       constantValue = original.constantValue;
     }
 
-    private ConstantTreeNode() : base() { }
-    public ConstantTreeNode(Constant constantSymbol) : base(constantSymbol) { }
+    private NumTreeNode() : base() { }
+    public NumTreeNode(Num numSymbol) : base(numSymbol) { }
 
     public override bool HasLocalParameters {
@@ -74 +74 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new ConstantTreeNode(this, cloner);
+      return new NumTreeNode(this, cloner);
     }
 
     public override string ToString() {
-      return constantValue.ToString("E4");
+      return $"<{constantValue:E4}>";
+      // return constantValue.ToString("E4");
     }
   }