Changeset 16274 for trunk/HeuristicLab.ExtLibs/HeuristicLab.NativeInterpreter/0.1/NativeInterpreter-0.1/src/interpreter.h

Timestamp:

11/04/18 11:05:31 (5 years ago)

Author:

bburlacu

Message:

#2958: Update dll files and C++ source code to the latest version.

File:

• trunk/HeuristicLab.ExtLibs/HeuristicLab.NativeInterpreter/0.1/NativeInterpreter-0.1/src/interpreter.h (modified) (3 diffs)

trunk/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
@@ -146 +142 @@
             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 +168 @@
             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;