Changeset 8207

Timestamp:

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

Author:

gkronber

Message:

#1847: fixed some bugs

Location:

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

Files:

• ReplaceBranchMoveEvaluator.cs (modified) (3 diffs)
• ReplaceBranchMoveMaker.cs (modified) (1 diff)
• ReplaceBranchMultiMoveGenerator.cs (modified) (5 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);

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

@@ -74 +74 @@
 
       quality.Value = moveQuality.Value;
+      // update solution
+      SymbolicExpressionTreeParameter.ActualValue = move.Tree;
 
       return base.Apply();

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

@@ -112 +112 @@
       base.ClearState();
     }
+    public override void InitializeState() {
+      trees = null;
+      treeOutput = null;
+      base.InitializeState();
+    }
 
     public override IOperation Apply() {
@@ -149 +154 @@
       var interpreter = SymbolicDataAnalysisTreeInterpreterParameter.ActualValue;
       var ds = ProblemDataParameter.ActualValue.Dataset;
-      var rows = ProblemDataParameter.ActualValue.TrainingIndizes;
+      var rows = ProblemDataParameter.ActualValue.TrainingIndices;
 
       while (count < n) {
@@ -160 +165 @@
 
         var bestTrees = new SortedList<double, Tuple<ISymbolicExpressionTree, double[]>>();
-        double bestSimilarity = 0.0;
+        double bestSimilarity = 0;
         // iterate over the whole pool of branches for replacement
         for (int i = 0; i < trees.Count; i++) {
@@ -175 +180 @@
               bestTrees.Add(similarity, Tuple.Create(trees[i], treeOutput[i]));
               if (bestTrees.Count > 30)
-                bestTrees.RemoveAt(bestTrees.Count - 1);
+                bestTrees.RemoveAt(0); // remove moves with small R² at the beginning
+
             }
           }
@@ -206 +212 @@
       var interpreter = SymbolicDataAnalysisTreeInterpreterParameter.ActualValue;
       var ds = ProblemDataParameter.ActualValue.Dataset;
-      var rows = ProblemDataParameter.ActualValue.TrainingIndizes;
+      var rows = ProblemDataParameter.ActualValue.TrainingIndices;
       // create pool of random branches for replacement (no constants)
       // and evaluate the output