Changeset 13652 for trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/MctsSymbolicRegression/SymbolicExpressionGenerator.cs

Timestamp:

03/05/16 19:41:24 (8 years ago)

Author:

gkronber

Message:

#2581:

• removed simplification of trees (temporarily for better debugging)
• renamed MaxSize parameter
• fixed a small bug in MCTS
• changed SymbolicExpressionGenerator to produce trees in the correct order

File:

• trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/MctsSymbolicRegression/SymbolicExpressionGenerator.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/MctsSymbolicRegression/SymbolicExpressionGenerator.cs

@@ -113 +113 @@
             break;
           case OpCodes.Add: {
-              var t1 = stack[topOfStack];
-              var t2 = stack[topOfStack - 1];
+              var t1 = stack[topOfStack - 1];
+              var t2 = stack[topOfStack];
               topOfStack--;
-              if (t2.Symbol is Addition) {
-                t2.AddSubtree(t1);
+              if (t1.Symbol is Addition) {
+                t1.AddSubtree(t2);
               } else {
                 var addNode = addSy.CreateTreeNode();
@@ -127 +127 @@
             }
           case OpCodes.Mul: {
-              var t1 = stack[topOfStack];
-              var t2 = stack[topOfStack - 1];
+              var t1 = stack[topOfStack - 1];
+              var t2 = stack[topOfStack];
               topOfStack--;
-              if (t2.Symbol is Multiplication) {
-                t2.AddSubtree(t1);
+              if (t1.Symbol is Multiplication) {
+                t1.AddSubtree(t2);
               } else {
                 var mulNode = mulSy.CreateTreeNode();