Changeset 12461 for trunk

Timestamp:

06/17/15 21:44:37 (9 years ago)

Author:

bburlacu

Message:

#2398: Skip root and start symbols when calculating impacts and replacement values in the pruning operators.

Location:

trunk/sources

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SymbolicClassificationPruningOperator.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SymbolicRegressionPruningOperator.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SymbolicClassificationPruningOperator.cs

@@ -85 +85 @@
       var model = modelCreator.CreateSymbolicClassificationModel(clonedTree, interpreter, estimationLimits.Lower, estimationLimits.Upper);
 
-      var nodes = clonedTree.IterateNodesPrefix().ToList();
+      var nodes = clonedTree.Root.GetSubtree(0).GetSubtree(0).IterateNodesPrefix().ToList();
       double quality = Evaluate(model, problemData, rows);
 

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SymbolicRegressionPruningOperator.cs

@@ -71 +71 @@
       var clonedTree = (ISymbolicExpressionTree)tree.Clone();
       var model = new SymbolicRegressionModel(clonedTree, interpreter, estimationLimits.Lower, estimationLimits.Upper);
-      var nodes = clonedTree.IterateNodesPrefix().ToList();
+      var nodes = clonedTree.Root.GetSubtree(0).GetSubtree(0).IterateNodesPrefix().ToList(); // skip the nodes corresponding to the ProgramRootSymbol and the StartSymbol
       double quality = Evaluate(model, problemData, rows);