Changeset 13641 for stable

Timestamp:

03/02/16 14:48:38 (9 years ago)

Author:

mkommend

Message:

#2570: Merged r13579 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding (modified) (1 prop)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeNode.cs (modified) (2 diffs)

stable/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeNode.cs

@@ -106 +106 @@
       if (length > 0) return length;
       else {
-        length = 1;
+        ushort l = 1;
         if (subtrees != null) {
           for (int i = 0; i < subtrees.Count; i++) {
-            checked { length += (ushort)subtrees[i].GetLength(); }
+            checked { l += (ushort)subtrees[i].GetLength(); }
           }
         }
+        length = l;
         return length;
       }
@@ -119 +120 @@
       if (depth > 0) return depth;
       else {
+        ushort d = 0;
         if (subtrees != null) {
-          for (int i = 0; i < subtrees.Count; i++) depth = Math.Max(depth, (ushort)subtrees[i].GetDepth());
-        }
-        depth++;
+          for (int i = 0; i < subtrees.Count; i++) d = Math.Max(d, (ushort)subtrees[i].GetDepth());
+        }
+        d++;
+        depth = d;
         return depth;
       }