Changeset 15062

Timestamp:

06/25/17 16:32:15 (8 years ago)

Author:

gkronber

Message:

#2581: merged r14135 (made within #2639) from trunk to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis/3.4/MctsSymbolicRegression/Automaton.cs (modified) (1 diff)
• HeuristicLab.Algorithms.DataAnalysis/3.4/MctsSymbolicRegression/Disassembler.cs (modified) (1 diff)
• HeuristicLab.Algorithms.DataAnalysis/3.4/MctsSymbolicRegression/ExpressionEvaluator.cs (modified) (1 diff)
• HeuristicLab.Algorithms.DataAnalysis/3.4/MctsSymbolicRegression/SymbolicExpressionGenerator.cs (modified) (1 diff)

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

@@ -392 +392 @@
         writer.WriteLine("digraph {");
         // writer.WriteLine("rankdir=LR");
+        int[] fs;
+        int nFs;
         for (int s = StartState; s < stateNames.Count; s++) {
           for (int i = 0; i < followStates[s].Count; i++) {

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

@@ -38 +38 @@
           case (byte)OpCodes.LoadVar:
           {
-              short arg = (short)((code[pc] << 8) | code[pc + 1]);
+              short arg = (short)(((short)code[pc] << 8) | (short)code[pc + 1]);
               pc += 2;
             sb.AppendFormat(" var{0} ", arg); break;

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

@@ -512 +512 @@
       s = 0;
       if (op == (byte)OpCodes.LoadVar) {
-        s = (short)((code[pc] << 8) | code[pc + 1]);
+        s = (short)(((short)code[pc] << 8) | (short)code[pc + 1]);
         pc += 2;
       }

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

@@ -176 +176 @@
       s = 0;
       if (op == OpCodes.LoadVar) {
-        s = (short)((code[pc] << 8) | code[pc + 1]);
+        s = (short)(((short)code[pc] << 8) | (short)code[pc + 1]);
         pc += 2;
       }