Changeset 8207 for branches/GP-MoveOperators/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/ReplaceBranchMoveEvaluator.cs

Timestamp:

07/03/12 17:36:20 (12 years ago)

Author:

gkronber

Message:

#1847: fixed some bugs

File:

• branches/GP-MoveOperators/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/ReplaceBranchMoveEvaluator.cs (modified) (3 diffs)

branches/GP-MoveOperators/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/ReplaceBranchMoveEvaluator.cs

@@ -78 +78 @@
     public override IOperation Apply() {
       var evaluator = EvaluatorParameter.ActualValue;
-      var move = (ReplaceBranchMove)MoveParameter.ActualValue.Clone();
+
+      var move = MoveParameter.ActualValue;
 
       // calculate linear scaling
@@ -88 +89 @@
       move.Beta = beta;
 
-      move.Parent.RemoveSubtree(move.SubtreeIndex);
-      move.Parent.InsertSubtree(move.SubtreeIndex, Scale(move.NewBranch, alpha, beta));
+      // clone tree and parent
+      var cloner = new Cloner();
+      var clonedTree = cloner.Clone(move.Tree);
+      var clonedParent = cloner.Clone(move.Parent);
+      var clonedBranch = cloner.Clone(move.NewBranch);
+
+      clonedParent.RemoveSubtree(move.SubtreeIndex);
+      clonedParent.InsertSubtree(move.SubtreeIndex, Scale(clonedBranch, alpha, beta));
 
       var problemData = ProblemDataParameter.ActualValue;
@@ -96 +103 @@
       var fitnessPartition = FitnessCalculationPartitionParameter.ActualValue;
       var rows = Enumerable.Range(fitnessPartition.Start, fitnessPartition.End - fitnessPartition.Start);
-      var quality = evaluator.Evaluate(childContext, move.Tree, problemData, rows);
+      var quality = evaluator.Evaluate(childContext, clonedTree, problemData, rows);
 
       MoveQualityParameter.ActualValue = new DoubleValue(quality);