Changeset 16899 for branches/2988_ModelsOfModels2/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeBatchInterpreter.cs

Timestamp:

05/06/19 14:20:06 (6 years ago)

Author:

msemenki

Message:

#2988: New version of class structure.

Location:

branches/2988_ModelsOfModels2/HeuristicLab.Problems.DataAnalysis.Symbolic

Files:

• . (modified) (1 prop)
• 3.4/Interpreter/SymbolicDataAnalysisExpressionTreeBatchInterpreter.cs (modified) (8 diffs)

branches/2988_ModelsOfModels2/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeBatchInterpreter.cs

@@ -64 +64 @@
 
         switch (instr.opcode) {
-          case OpCodes.Variable: {
+          case OpCode.Variable: {
               LoadData(instr, rows, rowIndex, batchSize);
               break;
             }
-          case OpCodes.TreeModel: {
+          case OpCode.TreeModel: {
               SubTreeEvoluate(instr, rows, rowIndex, batchSize);
               break;
             }
 
-          case OpCodes.Add: {
+          case OpCode.Add: {
               Load(instr.buf, code[c].buf);
               for (int j = 1; j < n; ++j) {
@@ -81 +81 @@
             }
 
-          case OpCodes.Sub: {
+          case OpCode.Sub: {
               if (n == 1) {
                 Neg(instr.buf, code[c].buf);
@@ -93 +93 @@
             }
 
-          case OpCodes.Mul: {
+          case OpCode.Mul: {
               Load(instr.buf, code[c].buf);
               for (int j = 1; j < n; ++j) {
@@ -101 +101 @@
             }
 
-          case OpCodes.Div: {
+          case OpCode.Div: {
               if (n == 1) {
                 Inv(instr.buf, code[c].buf);
@@ -113 +113 @@
             }
 
-          case OpCodes.Square: {
+          case OpCode.Square: {
               Square(instr.buf, code[c].buf);
               break;
             }
 
-          case OpCodes.Root: {
+          case OpCode.Root: {
               Load(instr.buf, code[c].buf);
               Root(instr.buf, code[c + 1].buf);
@@ -124 +124 @@
             }
 
-          case OpCodes.SquareRoot: {
+          case OpCode.SquareRoot: {
               Sqrt(instr.buf, code[c].buf);
               break;
             }
 
-          case OpCodes.Cube: {
+          case OpCode.Cube: {
               Cube(instr.buf, code[c].buf);
               break;
             }
-          case OpCodes.CubeRoot: {
+          case OpCode.CubeRoot: {
               CubeRoot(instr.buf, code[c].buf);
               break;
             }
 
-          case OpCodes.Power: {
+          case OpCode.Power: {
               Load(instr.buf, code[c].buf);
               Pow(instr.buf, code[c + 1].buf);
@@ -144 +144 @@
             }
 
-          case OpCodes.Exp: {
+          case OpCode.Exp: {
               Exp(instr.buf, code[c].buf);
               break;
             }
 
-          case OpCodes.Log: {
+          case OpCode.Log: {
               Log(instr.buf, code[c].buf);
               break;
             }
 
-          case OpCodes.Sin: {
+          case OpCode.Sin: {
               Sin(instr.buf, code[c].buf);
               break;
             }
 
-          case OpCodes.Cos: {
+          case OpCode.Cos: {
               Cos(instr.buf, code[c].buf);
               break;
             }
 
-          case OpCodes.Tan: {
+          case OpCode.Tan: {
               Tan(instr.buf, code[c].buf);
               break;
             }
-          case OpCodes.Tanh: {
+          case OpCode.Tanh: {
               Tanh(instr.buf, code[c].buf);
               break;
             }
-          case OpCodes.Absolute: {
+          case OpCode.Absolute: {
               Absolute(instr.buf, code[c].buf);
               break;
             }
 
-          case OpCodes.AnalyticQuotient: {
+          case OpCode.AnalyticQuotient: {
               Load(instr.buf, code[c].buf);
               AnalyticQuotient(instr.buf, code[c + 1].buf);
@@ -213 +213 @@
       }
 
-      var code = Compile(tree, dataset, OpCodes.MapSymbolToOpCode, rows);
+      var code = Compile(tree, dataset, OpCode.MapSymbolToOpCode, rows);
       var remainingRows = rows.Length % BATCHSIZE;
       var roundedTotal = rows.Length - remainingRows;