Changeset 16351

Timestamp:

12/08/18 07:43:41 (6 years ago)

Author:

gkronber

Message:

#2915: fixed compile error after merge and made another change to native interpreter trying to resolve the differences when using abs and sqrt(). No success

Location:

branches/2915-AbsoluteSymbol/HeuristicLab.ExtLibs/HeuristicLab.NativeInterpreter/0.1

Files:

• HeuristicLab.NativeInterpreter-0.1/hl-native-interpreter-msvc-x64.dll (modified) (previous)
• HeuristicLab.NativeInterpreter-0.1/hl-native-interpreter-msvc-x86.dll (modified) (previous)
• NativeInterpreter-0.1/src/interpreter.h (modified) (4 diffs)
• NativeInterpreter-0.1/src/vector_operations.h (modified) (2 diffs)

branches/2915-AbsoluteSymbol/HeuristicLab.ExtLibs/HeuristicLab.NativeInterpreter/0.1/NativeInterpreter-0.1/src/interpreter.h

@@ -101 +101 @@
                     break;
                 }
+            case OpCodes::Sqrt:
+                {
+                    in.value = std::pow(code[in.childIndex].value, 1./2.);
+                    break;
+                }
             case OpCodes::Square:
                 {
@@ -106 +111 @@
                     break;
                 }
-            case OpCodes::Sqrt:
-                {
-                    in.value = std::sqrt(code[in.childIndex].value);
-                    break;
-                }
-            case OpCodes::Square:
-                {
-                    in.value = std::pow(code[in.childIndex].value, 2.);
-                    break;
-                }
             case OpCodes::CubeRoot:
                 {
@@ -128 +123 @@
             case OpCodes::Absolute:
                 {
-                    in.value = std::abs(code[in.childIndex].value);
+                    in.value = std::fabs(code[in.childIndex].value);
                     break;
                 }
@@ -262 +257 @@
             case OpCodes::Sqrt:
                 {
-                    sqrt(in.buf, code[in.childIndex].buf);
+                    pow(in.buf, code[in.childIndex].buf, 1./2.);
                     break;
                 }

branches/2915-AbsoluteSymbol/HeuristicLab.ExtLibs/HeuristicLab.NativeInterpreter/0.1/NativeInterpreter-0.1/src/vector_operations.h

@@ -53 +53 @@
 inline void inv(double* __restrict a, double const * __restrict b) noexcept { FOR(i) a[i] = 1. / b[i]; }
 inline void neg(double* __restrict a, double const * __restrict b) noexcept { FOR(i) a[i] = -b[i]; }
-inline void abs(double* __restrict a, double const * __restrict b) noexcept { FOR(i) a[i] = std::abs(b[i]); }
+inline void abs(double* __restrict a, double const * __restrict b) noexcept { FOR(i) a[i] = std::fabs(b[i]); }
 inline void analytical_quotient(double* __restrict a, double const * __restrict b) noexcept { FOR(i) a[i] /= hl_sqrt(b[i]*b[i] + 1.); }
 
@@ -71 +71 @@
 inline void sin(double* __restrict a) noexcept { FOR(i) a[i] = hl_sin(a[i]); }
 inline void cos(double* __restrict a) noexcept { FOR(i) a[i] = hl_cos(a[i]); }
-inline void sqrt(double* __restrict a) noexcept { FOR(i) a[i] = hl_sqrt(a[i]); }
 inline void round(double* __restrict a) noexcept { FOR(i) a[i] = hl_round(a[i]); }
 inline void square(double* __restrict a) noexcept { FOR(i) a[i] = hl_pow(a[i], 2.); }