Changeset 18115 for branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Hashing/SymbolicExpressionTreeHash.cs

Timestamp:

12/13/21 17:49:34 (2 years ago)

Author:

gkronber

Message:

#3140: made several more changes for the constant -> number branch

File:

• branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Hashing/SymbolicExpressionTreeHash.cs (modified) (8 diffs)

branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Hashing/SymbolicExpressionTreeHash.cs

@@ -28 +28 @@
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
   public static class SymbolicExpressionTreeHash {
-    private static readonly Addition add = new Addition();
-    private static readonly Subtraction sub = new Subtraction();
-    private static readonly Multiplication mul = new Multiplication();
-    private static readonly Division div = new Division();
-    private static readonly Logarithm log = new Logarithm();
-    private static readonly Exponential exp = new Exponential();
-    private static readonly Sine sin = new Sine();
-    private static readonly Cosine cos = new Cosine();
     private static readonly Number number = new Number();
 
@@ -66 +58 @@
       var symbol = node.Symbol;
       var name = symbol.Name;
-      if (node is NumberTreeNode numNode) {
-        name = strict ? numNode.Value.ToString() : symbol.Name;
+      if (node is INumericTreeNode numNode) {
+        name = strict ? numNode.Value.ToString() : "Number";
       } else if (node is VariableTreeNode variableNode) {
         name = strict ? variableNode.Weight.ToString() + variableNode.VariableName : variableNode.VariableName;
@@ -222 +214 @@
             variableTreeNode.VariableName = variable.VariableName;
             variableTreeNode.Weight = variable.Weight;
-          } else if (node.Data is NumberTreeNode existingNumNode) {
-            var newNumNode = (NumberTreeNode)treeNodes[i];
+          } else if (node.Data is INumericTreeNode existingNumNode) {
+            var newNumNode = (INumericTreeNode)treeNodes[i];
             newNumNode.Value = existingNumNode.Value;
           }
@@ -285 +277 @@
 
         var symbol = child.Data.Symbol;
-        if (child.Data is NumberTreeNode firstNum) {
+        if (child.Data is INumericTreeNode firstNum) {
           // fold sibling number nodes into the first number
           for (int k = j + 1; k < children.Length; ++k) {
             var sibling = nodes[children[k]];
-            if (sibling.Data is NumberTreeNode otherNum) {
+            if (sibling.Data is INumericTreeNode otherNum) {
               sibling.Enabled = false;
               node.Arity--;
@@ -301 +293 @@
           for (int k = j + 1; k < children.Length; ++k) {
             var sibling = nodes[children[k]];
-            if (sibling.Data is NumberTreeNode numNode) {
+            if (sibling.Data is INumericTreeNode numNode) {
               sibling.Enabled = false;
               node.Arity--;
@@ -344 +336 @@
       var tmp = nodes;
 
-      if (children.All(x => tmp[x].Data.Symbol is Number)) {
-        var v = ((NumberTreeNode)nodes[children.First()].Data).Value;
+      if (children.All(x => tmp[x].Data.Symbol is INumericSymbol)) {
+        var v = ((INumericTreeNode)nodes[children.First()].Data).Value;
         if (node.Arity == 1) {
           v = 1 / v;
         } else if (node.Arity > 1) {
           foreach (var j in children.Skip(1)) {
-            v /= ((NumberTreeNode)nodes[j].Data).Value;
+            v /= ((INumericTreeNode)nodes[j].Data).Value;
           }
         }
@@ -383 +375 @@
       var childSymbol = child.Data.Symbol;
 
-      if (childSymbol is Number) {
+      if (childSymbol is INumericSymbol) {
         nodes[i].Enabled = false;
       } else if ((parentSymbol is Exponential && childSymbol is Logarithm) || (parentSymbol is Logarithm && childSymbol is Exponential)) {
@@ -393 +385 @@
       var children = nodes.IterateChildren(i);
       var tmp = nodes;
-      if (children.All(x => tmp[x].Data.Symbol is Number)) {
+      if (children.All(x => tmp[x].Data.Symbol is INumericSymbol)) {
         foreach (var j in children) {
           nodes[j].Enabled = false;