Ignore:
Timestamp:
06/25/17 15:59:39 (2 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:
3 edited
1 copied

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Algorithms.DataAnalysis

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

    r13645 r15060  
    22/* HeuristicLab
    33 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    4  * and the BEACON Center for the Study of Evolution in Action.
    54 *
    65 * This file is part of HeuristicLab.
     
    114113            break;
    115114          case OpCodes.Add: {
    116               var t1 = stack[topOfStack];
    117               var t2 = stack[topOfStack - 1];
     115              var t1 = stack[topOfStack - 1];
     116              var t2 = stack[topOfStack];
    118117              topOfStack--;
    119               if (t2.Symbol is Addition) {
    120                 t2.AddSubtree(t1);
     118              if (t1.Symbol is Addition) {
     119                t1.AddSubtree(t2);
    121120              } else {
    122121                var addNode = addSy.CreateTreeNode();
     
    128127            }
    129128          case OpCodes.Mul: {
    130               var t1 = stack[topOfStack];
    131               var t2 = stack[topOfStack - 1];
     129              var t1 = stack[topOfStack - 1];
     130              var t2 = stack[topOfStack];
    132131              topOfStack--;
    133               if (t2.Symbol is Multiplication) {
    134                 t2.AddSubtree(t1);
     132              if (t1.Symbol is Multiplication) {
     133                t1.AddSubtree(t2);
    135134              } else {
    136135                var mulNode = mulSy.CreateTreeNode();
     
    177176      s = 0;
    178177      if (op == OpCodes.LoadVar) {
    179         s = (short)(((short)code[pc] << 8) | (short)code[pc + 1]);
     178        s = (short)((code[pc] << 8) | code[pc + 1]);
    180179        pc += 2;
    181180      }
Note: See TracChangeset for help on using the changeset viewer.