Changeset 14399 for branches/symbreg-factors-2650/HeuristicLab.Algorithms.DataAnalysis

Timestamp:

11/17/16 15:30:11 (7 years ago)

Author:

gkronber

Message:

#2650: merged r14352:14376 from trunk to branch (resolving conflicts in SymbolicDataAnalysisExpressionLatexFormatter

Location:

branches/symbreg-factors-2650

Files:

• . (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis/3.4/RandomForest/RandomForestModel.cs (modified) (3 diffs)

branches/symbreg-factors-2650/HeuristicLab.Algorithms.DataAnalysis/3.4/RandomForest/RandomForestModel.cs

@@ -202 +202 @@
 
     public ISymbolicExpressionTree ExtractTree(int treeIdx) {
+      var rf = RandomForest;
       // hoping that the internal representation of alglib is stable
 
@@ -214 +215 @@
       int offset = 0;
       for (int i = 0; i < treeIdx - 1; i++) {
-        offset = offset + (int)Math.Round(randomForest.innerobj.trees[offset]);
+        offset = offset + (int)Math.Round(rf.innerobj.trees[offset]);
       }
 
@@ -220 +221 @@
       var varCondSy = new VariableCondition() { IgnoreSlope = true };
 
-      var node = CreateRegressionTreeRec(randomForest.innerobj.trees, offset, offset + 1, constSy, varCondSy);
+      var node = CreateRegressionTreeRec(rf.innerobj.trees, offset, offset + 1, constSy, varCondSy);
 
       var startNode = new StartSymbol().CreateTreeNode();