Changeset 8207 for branches/GP-MoveOperators/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/ReplaceBranchMultiMoveGenerator.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/ReplaceBranchMultiMoveGenerator.cs (modified) (5 diffs)

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