Changeset 13875

Timestamp:

06/06/16 19:31:14 (8 years ago)

Author:

bburlacu

Message:

#1772: Merge trunk changes.

Location:

branches/HeuristicLab.EvolutionTracking

Files:

• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding (modified) (1 prop)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views (modified) (1 prop)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeNode.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/VariableCondition.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TreeMatching/SymbolicExpressionTreeMatching.cs (modified) (1 diff)
• HeuristicLab.Problems.TravelingSalesman (modified) (1 prop)
• HeuristicLab.Problems.TravelingSalesman.Views (modified) (1 prop)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeNode.cs

@@ -110 +110 @@
       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;
       }
@@ -123 +124 @@
       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;
       }

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/VariableCondition.cs

@@ -100 +100 @@
         allVariableNames.Clear();
         allVariableNames.AddRange(value);
-        VariableNames = value;
       }
     }

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/TreeMatching/SymbolicExpressionTreeMatching.cs

@@ -109 +109 @@
         return nodes[0];
 
-      int minLevel = nodes.Min(x => root.GetBranchLevel(x));
+      int minLevel = nodes.Min(root.GetBranchLevel);
 
       // bring the nodes in the nodes to the same level (relative to the root)