Changeset 17071 for stable/HeuristicLab.ExtLibs/HeuristicLab.NativeInterpreter/0.1/NativeInterpreter-0.1/src/interpreter.h

Timestamp:

07/04/19 16:03:48 (5 years ago)

Author:

mkommend

Message:

#2958: Merged 16266, 16269, 16274, 16276, 16277, 16285, 16286, 16287, 16289, 16293, 16296, 16297, 16298, 16333, 16334 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.ExtLibs (modified) (1 prop)
• HeuristicLab.ExtLibs/HeuristicLab.NativeInterpreter (copied) (copied from trunk/HeuristicLab.ExtLibs/HeuristicLab.NativeInterpreter)
• HeuristicLab.ExtLibs/HeuristicLab.NativeInterpreter/0.1/NativeInterpreter-0.1 (copied) (copied from trunk/HeuristicLab.ExtLibs/HeuristicLab.NativeInterpreter/0.1/NativeInterpreter-0.1)
• HeuristicLab.ExtLibs/HeuristicLab.NativeInterpreter/0.1/NativeInterpreter-0.1/src/interpreter.h (modified) (5 diffs)

stable/HeuristicLab.ExtLibs/HeuristicLab.NativeInterpreter/0.1/NativeInterpreter-0.1/src/interpreter.h

@@ -2 +2 @@
 #define NATIVE_TREE_INTERPRETER_CLANG_H
 
-#include <cstring>
-#include <vector>
-#include <algorithm>
-
+#include "vector_operations.h"
 #include "instruction.h"
-#include "vector_operations.h"
 
 inline double evaluate(instruction *code, int len, int row) noexcept
@@ -104 +100 @@
                     break;
                 }
+            case OpCodes::Square:
+                {
+                    in.value = std::pow(code[in.childIndex].value, 2.);
+                    break;
+                }
             case OpCodes::Sqrt:
                 {
@@ -146 +147 @@
             case OpCodes::Sub:
                 {
-                    load(in.buf, code[in.childIndex].buf);
-                    for (int j = 1; j < in.narg; ++j)
-                    {
-                        sub(in.buf, code[in.childIndex + j].buf);
-                    }
-                    if (in.narg == 1)
-                    {
-                        neg(in.buf);
+                    if (in.narg == 1)
+                    {
+                        neg(in.buf, code[in.childIndex].buf);
+                        break;
+                    }
+                    else
+                    {
+                        load(in.buf, code[in.childIndex].buf);
+                        for (int j = 1; j < in.narg; ++j)
+                        {
+                            sub(in.buf, code[in.childIndex + j].buf);
+                        }
                     }
                     break;
@@ -168 +173 @@
             case OpCodes::Div:
                 {
-                    load(in.buf, code[in.childIndex].buf);
-                    for (int j = 1; j < in.narg; ++j)
-                    {
-                        div(in.buf, code[in.childIndex + j].buf);
-                    }
-                    if (in.narg == 1)
-                    {
-                        inv(in.buf);
+                    if (in.narg == 1)
+                    {
+                        inv(in.buf, code[in.childIndex].buf);
+                        break;
+                    }
+                    else
+                    {
+                        load(in.buf, code[in.childIndex].buf);
+                        for (int j = 1; j < in.narg; ++j)
+                        {
+                            div(in.buf, code[in.childIndex + j].buf);
+                        }
                     }
                     break;
@@ -219 +228 @@
                 {
                     square(in.buf, code[in.childIndex].buf);
+                    break;
+                }
+            case OpCodes::Sqrt:
+                {
+                    sqrt(in.buf, code[in.childIndex].buf);
                     break;
                 }