Changeset 14182 for stable

Timestamp:

07/22/16 15:16:40 (8 years ago)

Author:

mkommend

Message:

#2643: Merged r14181 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding (modified) (1 prop)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Crossovers/SubtreeCrossover.cs (modified) (1 diff)

stable/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Crossovers/SubtreeCrossover.cs

@@ -95 +95 @@
       int childLength = crossoverPoint0.Child != null ? crossoverPoint0.Child.GetLength() : 0;
       // calculate the max length and depth that the inserted branch can have 
-      int maxInsertedBranchLength = maxTreeLength - (parent0.Length - childLength);
-      int maxInsertedBranchDepth = maxTreeDepth - parent0.Root.GetBranchLevel(crossoverPoint0.Parent);
+      int maxInsertedBranchLength = Math.Max(1, maxTreeLength - (parent0.Length - childLength));
+      int maxInsertedBranchDepth = Math.Max(1, maxTreeDepth - parent0.Root.GetBranchLevel(crossoverPoint0.Parent));
 
       List<ISymbolicExpressionTreeNode> allowedBranches = new List<ISymbolicExpressionTreeNode>();