Changeset 18113 for branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Hashing

Timestamp:

12/11/21 12:26:27 (3 years ago)

Author:

chaider

Message:

#3140

• Refactored ConstantOptimization ==> ParameterOptimization

File:

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

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

@@ -36 +36 @@
     private static readonly Sine sin = new Sine();
     private static readonly Cosine cos = new Cosine();
-    private static readonly Num Num = new Num();
+    private static readonly Number number = new Number();
 
     private static ISymbolicExpressionTreeNode ActualRoot(this ISymbolicExpressionTree tree) => tree.Root.GetSubtree(0).GetSubtree(0);
@@ -66 +66 @@
       var symbol = node.Symbol;
       var name = symbol.Name;
-      if (node is NumTreeNode constantNode) {
+      if (node is NumberTreeNode constantNode) {
         name = strict ? constantNode.Value.ToString() : symbol.Name;
       } else if (node is VariableTreeNode variableNode) {
@@ -222 +222 @@
             variableTreeNode.VariableName = variable.VariableName;
             variableTreeNode.Weight = variable.Weight;
-          } else if (node.Data is NumTreeNode @const) {
-            var constantTreeNode = (NumTreeNode)treeNodes[i];
+          } else if (node.Data is NumberTreeNode @const) {
+            var constantTreeNode = (NumberTreeNode)treeNodes[i];
             constantTreeNode.Value = @const.Value;
           }
@@ -285 +285 @@
 
         var symbol = child.Data.Symbol;
-        if (child.Data is NumTreeNode firstConst) {
+        if (child.Data is NumberTreeNode firstConst) {
           // fold sibling constant nodes into the first constant
           for (int k = j + 1; k < children.Length; ++k) {
             var sibling = nodes[children[k]];
-            if (sibling.Data is NumTreeNode otherConst) {
+            if (sibling.Data is NumberTreeNode otherConst) {
               sibling.Enabled = false;
               node.Arity--;
@@ -301 +301 @@
           for (int k = j + 1; k < children.Length; ++k) {
             var sibling = nodes[children[k]];
-            if (sibling.Data is NumTreeNode constantNode) {
+            if (sibling.Data is NumberTreeNode constantNode) {
               sibling.Enabled = false;
               node.Arity--;
@@ -329 +329 @@
 
         if (node.Arity == 0) { // if everything is simplified this node becomes constant
-          var constantTreeNode = Num.CreateTreeNode<NumTreeNode>();
+          var constantTreeNode = number.CreateTreeNode<NumberTreeNode>();
           constantTreeNode.Value = 1;
           nodes[i] = constantTreeNode.ToHashNode();
@@ -344 +344 @@
       var tmp = nodes;
 
-      if (children.All(x => tmp[x].Data.Symbol is Num)) {
-        var v = ((NumTreeNode)nodes[children.First()].Data).Value;
+      if (children.All(x => tmp[x].Data.Symbol is Number)) {
+        var v = ((NumberTreeNode)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 /= ((NumTreeNode)nodes[j].Data).Value;
+            v /= ((NumberTreeNode)nodes[j].Data).Value;
           }
         }
-        var constantTreeNode = Num.CreateTreeNode<NumTreeNode>();
+        var constantTreeNode = number.CreateTreeNode<NumberTreeNode>();
         constantTreeNode.Value = v;
         nodes[i] = constantTreeNode.ToHashNode();
@@ -368 +368 @@
         }
         if (node.Arity == 0) {
-          var constantTreeNode = Num.CreateTreeNode<NumTreeNode>();
+          var constantTreeNode = number.CreateTreeNode<NumberTreeNode>();
           constantTreeNode.Value = 1; // x / x = 1
           nodes[i] = constantTreeNode.ToHashNode();
@@ -383 +383 @@
       var childSymbol = child.Data.Symbol;
 
-      if (childSymbol is Num) {
+      if (childSymbol is Number) {
         nodes[i].Enabled = false;
       } else if ((parentSymbol is Exponential && childSymbol is Logarithm) || (parentSymbol is Logarithm && childSymbol is Exponential)) {
@@ -393 +393 @@
       var children = nodes.IterateChildren(i);
       var tmp = nodes;
-      if (children.All(x => tmp[x].Data.Symbol is Num)) {
+      if (children.All(x => tmp[x].Data.Symbol is Number)) {
         foreach (var j in children) {
           nodes[j].Enabled = false;
         }
-        nodes[i] = Num.CreateTreeNode().ToHashNode();
+        nodes[i] = number.CreateTreeNode().ToHashNode();
       }
     }