Changeset 16293

Timestamp:

11/12/18 14:54:12 (6 years ago)

Author:

bburlacu

Message:

#2958: Support additional symbols in the SymbolicDataAnalysisExpressionTreeBatchInterpreter

Location:

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter

Files:

• BatchOperations.cs (modified) (1 diff)
• SymbolicDataAnalysisExpressionTreeBatchInterpreter.cs (modified) (7 diffs)

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/BatchOperations.cs

@@ -64 +64 @@
         a[i] = Math.Cos(b[i]);
     }
+
+    public static void Tan(double[] a, double[] b) {
+      for (int i = 0; i < BATCHSIZE; ++i)
+        a[i] = Math.Tan(b[i]);
+    }
+
+    public static void Pow(double[] a, double[] b) {
+      for (int i = 0; i < BATCHSIZE; ++i)
+        a[i] = Math.Pow(a[i], Math.Round(b[i]));
+    }
+
+    public static void Root(double[] a, double[] b) {
+      for (int i = 0; i < BATCHSIZE; ++i)
+        a[i] = Math.Pow(a[i], 1 / Math.Round(b[i]));
+    }
+
+    public static void Square(double[] a, double[] b) {
+      for (int i = 0; i < BATCHSIZE; ++i)
+        a[i] = Math.Pow(b[i], 2d);
+    }
+
+    public static void Sqrt(double[] a, double[] b) {
+      for (int i = 0; i < BATCHSIZE; ++i)
+        a[i] = Math.Sqrt(b[i]);
+    }
   }
 }

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeBatchInterpreter.cs

@@ -65 +65 @@
               break;
             }
+
           case OpCodes.Add: {
               Load(instr.buf, code[c].buf);
@@ -76 +77 @@
               if (n == 1) {
                 Neg(instr.buf, code[c].buf);
-                break;
               } else {
                 Load(instr.buf, code[c].buf);
@@ -82 +82 @@
                   Sub(instr.buf, code[c + j].buf);
                 }
-                break;
-              }
+              }
+              break;
             }
 
@@ -97 +97 @@
               if (n == 1) {
                 Inv(instr.buf, code[c].buf);
-                break;
               } else {
                 Load(instr.buf, code[c].buf);
@@ -103 +102 @@
                   Div(instr.buf, code[c + j].buf);
                 }
-                break;
-              }
+              }
+              break;
+            }
+
+          case OpCodes.Square: {
+              Square(instr.buf, code[c].buf);
+              break;
+            }
+
+          case OpCodes.Root: {
+              Root(instr.buf, code[c].buf);
+              break;
+            }
+
+          case OpCodes.SquareRoot: {
+              Sqrt(instr.buf, code[c].buf);
+              break;
+            }
+
+          case OpCodes.Power: {
+              Pow(instr.buf, code[c].buf);
+              break;
             }
 
@@ -114 +133 @@
           case OpCodes.Log: {
               Log(instr.buf, code[c].buf);
+              break;
+            }
+
+          case OpCodes.Sin: {
+              Sin(instr.buf, code[c].buf);
+              break;
+            }
+
+          case OpCodes.Cos: {
+              Cos(instr.buf, code[c].buf);
+              break;
+            }
+
+          case OpCodes.Tan: {
+              Tan(instr.buf, code[c].buf);
               break;
             }
@@ -139 +173 @@
 
       return result;
+    }
+
+    public IEnumerable<double> GetSymbolicExpressionTreeValues(ISymbolicExpressionTree tree, IDataset dataset, int[] rows) {
+      return GetValues(tree, dataset, rows);
     }