Changeset 18093 for branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/IntervalInterpreter.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/Interpreter/IntervalInterpreter.cs (modified) (3 diffs)

branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/IntervalInterpreter.cs

@@ -186 +186 @@
             break;
           }
+        case OpCodes.Number: {
+            var constTreeNode = (NumTreeNode)currentInstr.dynamicNode;
+            result = new Interval(constTreeNode.Value, constTreeNode.Value);
+            break;
+          }
         case OpCodes.Constant: {
-            var constTreeNode = (ConstantTreeNode)currentInstr.dynamicNode;
-            result = new Interval(constTreeNode.Value, constTreeNode.Value);
-            break;
+          var constTreeNode = (RealConstantTreeNode)currentInstr.dynamicNode;
+          result = new Interval(constTreeNode.Value, constTreeNode.Value);
+          break;
           }
         case OpCodes.Add: {
@@ -324 +329 @@
         if (
           !(n.Symbol is Variable) &&
-          !(n.Symbol is Constant) &&
+          !(n.Symbol is Num) &&
           !(n.Symbol is StartSymbol) &&
           !(n.Symbol is Addition) &&
@@ -346 +351 @@
         else if (n.Symbol is Power) {
           // only integer exponents are supported
-          var exp = n.GetSubtree(1) as ConstantTreeNode;
+          var exp = n.GetSubtree(1) as NumTreeNode;
           if (exp == null || exp.Value != Math.Truncate(exp.Value)) return false;
         }