moved outer_trapezoid to trapezoid.cpp and added test for it

Signed-off-by: Konstantin Läufer <[email protected]>

integration/f.h

@@ -1,7 +1,6 @@
 #ifndef F_H_
 #define F_H_
 
-
 // {{UnoAPI:f-interface:begin}}
 #include <sycl/sycl.hpp>
 

integration/main.cpp

@@ -23,26 +23,6 @@ template <class Indexable> void print_function_values(const Indexable & values,
 }
 // {{UnoAPI:main-print-function-values:end}}
 
-// {{UnoAPI:main-compute-outer-trapezoid:begin}}
-// common function to compute a single outer trapezoid
-// from as many inner trapezoids as the grain size
-double outer_trapezoid(
-    const int grain_size,
-    const double x_pos,
-    const double dx_inner,
-    const double half_dx_inner
-) {
-    auto area{0.0};
-    auto y_left{f(x_pos)};
-    for (auto j{0UL}; j < grain_size; j++) {
-        auto y_right{f(x_pos + (j + 1) * dx_inner)};
-        area += single_trapezoid(y_left, y_right, half_dx_inner);
-        y_left = y_right;
-    }
-    return area;
-}
-// {{UnoAPI:main-compute-outer-trapezoid:end}}
-
 int main(const int argc, const char * const argv[]) {
     // {{UnoAPI:main-declarations:begin}}
     size_t total_workload{1000};

integration/test.cpp

@@ -19,7 +19,6 @@ class IntegrationTest : public testing::Test {
 };
 // {{UnoAPI:integration-test-scaffolding:end}}
 
-
 // {{UnoAPI:integration-test-simple1:begin}}
 TEST_F(IntegrationTest, Simple1) {
     EXPECT_NEAR(single_trapezoid(1, 1, 0.5), 1, EPS);
@@ -43,3 +42,16 @@ TEST_F(IntegrationTest, F1) {
     EXPECT_NEAR(f(0.5), 0.75, EPS);
 }
 // {{UnoAPI:integration-test-f1:end}}
+
+// double outer_trapezoid(
+//     const int grain_size,
+//     const double x_pos,
+//     const double dx_inner,
+//     const double half_dx_inner
+// )
+
+// {{UnoAPI:integration-test-outer1:begin}}
+TEST_F(IntegrationTest, Outer1) {
+    EXPECT_NEAR(outer_trapezoid(1000, 0.0, 0.001, 0.0005), 1, EPS);
+}
+// {{UnoAPI:integration-test-outer1:end}}

integration/trapezoid.cpp

@@ -1,7 +1,28 @@
 #include "trapezoid.h"
+#include "f.h"
 
 // {{UnoAPI:trapezoid-implementation:begin}}
 double single_trapezoid(const double f1, const double f2, const double half_dx) {
   return (f1 + f2) * half_dx;
 }
 // {{UnoAPI:trapezoid-implementation:end}}
+
+// {{UnoAPI:main-compute-outer-trapezoid:begin}}
+// common function to compute a single outer trapezoid
+// from as many inner trapezoids as the grain size
+double outer_trapezoid(
+    const int grain_size,
+    const double x_pos,
+    const double dx_inner,
+    const double half_dx_inner
+) {
+    auto area{0.0};
+    auto y_left{f(x_pos)};
+    for (auto j{0UL}; j < grain_size; j++) {
+        auto y_right{f(x_pos + (j + 1) * dx_inner)};
+        area += single_trapezoid(y_left, y_right, half_dx_inner);
+        y_left = y_right;
+    }
+    return area;
+}
+// {{UnoAPI:main-compute-outer-trapezoid:end}}

integration/trapezoid.h

@@ -7,4 +7,11 @@
 SYCL_EXTERNAL double single_trapezoid(double f1, double f2, double dx);
 // {{UnoAPI:trapezoid-interface:end}}
 
+SYCL_EXTERNAL double outer_trapezoid(
+    const int grain_size,
+    const double x_pos,
+    const double dx_inner,
+    const double half_dx_inner
+);
+
 #endif // INTEGRATION_H_