Changeset 14798

Timestamp:

03/30/17 16:47:03 (8 years ago)

Author:

mkommend

Message:

#2647: Merged r14221, r14223, r14224 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)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeNode.cs (modified) (2 diffs)

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

@@ -111 +111 @@
       } else {
         var selectedBranch = SelectRandomBranch(random, allowedBranches, internalCrossoverPointProbability);
+        if (selectedBranch != null)
+          selectedBranch = (ISymbolicExpressionTreeNode)selectedBranch.Clone();
 
         if (crossoverPoint0.Child != null) {

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

@@ -43 +43 @@
     }
 
-    // parent relation is not persisted or cloned (will be set on AddSubtree or RemoveSubtree)
+    [Storable]
     private ISymbolicExpressionTreeNode parent;
     public ISymbolicExpressionTreeNode Parent {
@@ -87 +87 @@
       if (subtrees != null) {
         foreach (var subtree in subtrees)
-          subtree.Parent = this;
+          if (subtree.Parent == null)
+            subtree.Parent = this;
       }
     }