Changeset 16267

Timestamp:

11/01/18 19:33:45 (6 years ago)

Author:

bburlacu

Message:

#2950: Rename HashNode.IsChild property to IsLeaf

Location:

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Hashing

Files:

• HashExtensions.cs (modified) (6 diffs)
• SymbolicExpressionTreeHash.cs (modified) (2 diffs)

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Hashing/HashExtensions.cs

@@ -38 +38 @@
       public IComparer<T> Comparer;
 
-      public bool IsChild => Arity == 0;
+      public bool IsLeaf => Arity == 0;
 
       public HashNode(IComparer<T> comparer) {
@@ -95 +95 @@
       for (int i = 0; i < reduced.Length; ++i) {
         var node = reduced[i];
-        if (node.IsChild) {
+        if (node.IsLeaf) {
           continue;
         }
@@ -125 +125 @@
         var node = nodes[i];
 
-        if (node.IsChild) {
+        if (node.IsLeaf) {
           continue;
         }
@@ -146 +146 @@
             foreach (var j in indices) {
               var child = nodes[j];
-              if (!child.IsChild) { // must copy complete subtree
+              if (!child.IsLeaf) { // must copy complete subtree
                 Array.Copy(nodes, j - child.Size, sorted, idx, child.Size);
                 idx += child.Size;
@@ -182 +182 @@
       for (int i = 0; i < nodes.Length; ++i) {
         var node = nodes[i];
-        if (node.IsChild) {
+        if (node.IsLeaf) {
           node.Size = 0;
           continue;
@@ -199 +199 @@
       for (int i = 0; i < nodes.Length; ++i) {
         var node = nodes[i];
-        if (node.IsChild || !node.IsCommutative) {
+        if (node.IsLeaf || !node.IsCommutative) {
           continue;
         }

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Hashing/SymbolicExpressionTreeHash.cs

@@ -50 +50 @@
 
       for (int i = 0; i < nodes.Length; ++i) {
-        if (nodes[i].IsChild)
+        if (nodes[i].IsLeaf)
           continue;
         nodes[i].CalculatedHashValue = nodes.ComputeHash(i);
@@ -121 +121 @@
         var node = nodes[i];
 
-        if (node.IsChild) {
+        if (node.IsLeaf) {
           if (node.Data is VariableTreeNode variable) {
             var variableTreeNode = (VariableTreeNode)treeNodes[i];