Changeset 18114 for branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter

Timestamp:

12/13/21 10:25:35 (2 years ago)

Author:

gkronber

Message:

#3140: made several more changes while reviewing the branch.

Location:

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

Files:

• BatchInstruction.cs (modified) (1 diff)
• IntervalArithBoundsEstimator.cs (modified) (1 diff)
• IntervalArithCompiledExpressionBoundsEstimator.cs (modified) (1 diff)
• IntervalInterpreter.cs (modified) (1 diff)
• SymbolicDataAnalysisExpressionCompiledTreeInterpreter.cs (modified) (1 diff)
• SymbolicDataAnalysisExpressionTreeILEmittingInterpreter.cs (modified) (1 diff)
• SymbolicDataAnalysisExpressionTreeInterpreter.cs (modified) (1 diff)
• SymbolicDataAnalysisExpressionTreeLinearInterpreter.cs (modified) (1 diff)

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

@@ -5 +5 @@
     public int childIndex;
 
-    public double value; // for constants
+    public double value; // for numbers and constants
     public double weight; // for variables
     public double[] buf;

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

@@ -126 +126 @@
             break;
           }
-        case OpCodes.Constant: {
-            var constTreeNode = (ConstantTreeNode)currentInstr.dynamicNode;
-            result = new Interval(constTreeNode.Value, constTreeNode.Value);
-            break;
-          }
+        case OpCodes.Constant: // fall through
         case OpCodes.Number: {
-            var numberTreeNode = (NumberTreeNode)currentInstr.dynamicNode;
-            result = new Interval(numberTreeNode.Value, numberTreeNode.Value);
+            var numericTreeNode = (INumericTreeNode)currentInstr.dynamicNode;
+            result = new Interval(numericTreeNode.Value, numericTreeNode.Value);
             break;
           }

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

@@ -154 +154 @@
             );
           }
-        case OpCodes.Constant: {
-            var v = (node as NumberTreeNode).Value;
-            // we have to make an interval out of the constant because this may be the root of the tree (and we are expected to return an Interval)
-            return Expression.Constant(new Interval(v, v), typeof(Interval));
-          }
+        case OpCodes.Constant: // fall through
         case OpCodes.Number: {
-            var v = (node as NumberTreeNode).Value;
-            // we have to make an interval out of the constant because this may be the root of the tree (and we are expected to return an Interval)
+            var v = (node as INumericTreeNode).Value;
+            // we have to make an interval out of the number because this may be the root of the tree (and we are expected to return an Interval)
             return Expression.Constant(new Interval(v, v), typeof(Interval));
           }

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

@@ -186 +186 @@
             break;
           }
-        case OpCodes.Number: {
-            var numberTreeNode = (NumberTreeNode)currentInstr.dynamicNode;
-            result = new Interval(numberTreeNode.Value, numberTreeNode.Value);
-            break;
-          }
+        case OpCodes.Number: // fall through
         case OpCodes.Constant: {
-          var constTreeNode = (ConstantTreeNode)currentInstr.dynamicNode;
-          result = new Interval(constTreeNode.Value, constTreeNode.Value);
+          var numericTreeNode = (INumericTreeNode)currentInstr.dynamicNode;
+          result = new Interval(numericTreeNode.Value, numericTreeNode.Value);
           break;
           }

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

@@ -157 +157 @@
       #region switch opcode
       switch (opcode) {
-        case OpCodes.Constant: {
-            var constantTreeNode = (ConstantTreeNode)node;
-            return Expression.Constant(constantTreeNode.Value);
-          }
+        case OpCodes.Constant: // fall through
         case OpCodes.Number: {
-          var numberTreeNode = (NumberTreeNode)node;
+          var numberTreeNode = (INumericTreeNode)node;
           return Expression.Constant(numberTreeNode.Value);
           }

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

@@ -711 +711 @@
             return;
           }
-        case OpCodes.Number: {
-            NumberTreeNode numberNode = (NumberTreeNode)currentInstr.dynamicNode;
-            il.Emit(System.Reflection.Emit.OpCodes.Ldc_R8, numberNode.Value);
-            return;
-          }
+        case OpCodes.Number: // fall through
         case OpCodes.Constant: {
-          ConstantTreeNode constNode = (ConstantTreeNode) currentInstr.dynamicNode;
+          var constNode = (INumericTreeNode) currentInstr.dynamicNode;
           il.Emit(System.Reflection.Emit.OpCodes.Ldc_R8, constNode.Value);
           return;

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

@@ -496 +496 @@
             return ((IList<double>)currentInstr.data)[actualRow] * laggedVariableTreeNode.Weight;
           }
-        case OpCodes.Constant: {
-            var constTreeNode = (ConstantTreeNode)currentInstr.dynamicNode;
-            return constTreeNode.Value;
-          }
+        case OpCodes.Constant:  // fall through
         case OpCodes.Number: {
-          var numberTreeNode = (NumberTreeNode) currentInstr.dynamicNode;
-          return numberTreeNode.Value;
+          var numericTreeNode = (INumericTreeNode) currentInstr.dynamicNode;
+          return numericTreeNode.Value;
         }
 

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

@@ -416 +416 @@
         #region opcode switch
         switch (instr.opCode) {
-          case OpCodes.Number: {
-              var numberTreeNode = (NumberTreeNode)instr.dynamicNode;
-              instr.value = numberTreeNode.Value;
-              instr.skip = true; // the value is already set so this instruction should be skipped in the evaluation phase
-            }
-            break;
+          case OpCodes.Number: // fall through
           case OpCodes.Constant: {
-            var constTreeNode = (ConstantTreeNode)instr.dynamicNode;
-            instr.value = constTreeNode.Value;
+            var numericTreeNode = (INumericTreeNode)instr.dynamicNode;
+            instr.value = numericTreeNode.Value;
             instr.skip = true; // the value is already set so this instruction should be skipped in the evaluation phase
             }