Changeset 15060 for stable/HeuristicLab.Algorithms.DataAnalysis/3.4/MctsSymbolicRegression/SymbolicExpressionGenerator.cs

Timestamp:

06/25/17 15:59:39 (7 years ago)

Author:

gkronber

Message:

#2581: merged r13645,r13648,r13650,r13651,r13652,r13654,r13657,r13658,r13659,r13661,r13662,r13669,r13708,r14142 from trunk to stable (to be deleted in the next commit)

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis/3.4/MctsSymbolicRegression (copied) (copied from trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/MctsSymbolicRegression)
• HeuristicLab.Algorithms.DataAnalysis/3.4/MctsSymbolicRegression/SymbolicExpressionGenerator.cs (modified) (4 diffs)

stable/HeuristicLab.Algorithms.DataAnalysis/3.4/MctsSymbolicRegression/SymbolicExpressionGenerator.cs

@@ -2 +2 @@
 /* HeuristicLab
  * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
- * and the BEACON Center for the Study of Evolution in Action.
  * 
  * This file is part of HeuristicLab.
@@ -114 +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();
@@ -128 +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();
@@ -177 +176 @@
       s = 0;
       if (op == OpCodes.LoadVar) {
-        s = (short)(((short)code[pc] << 8) | (short)code[pc + 1]);
+        s = (short)((code[pc] << 8) | code[pc + 1]);
         pc += 2;
       }