move utils

Author: delfrrr

bench/run.cpp

@@ -1,22 +1,24 @@
 #include <benchmark/benchmark.h>
 #include <string>
 #include <delaunator.hpp>
-#include "../test/test_utils.hpp"
+#include "../examples/utils.hpp"
 
-static void BM_simple(benchmark::State& state) // NOLINT google-runtime-references
-{
-    std::string points_str = test_utils::read_file("./test/test-files/osm-nodes-45331-epsg-3857.geojson");
-    std::vector<double> coords = test_utils::get_geo_json_points(points_str);
-    
-    while (state.KeepRunning())
+namespace {
+    void BM_simple(benchmark::State& state)
     {
-        delaunator::Delaunator delaunator(coords);
+        std::string points_str = utils::read_file("./test/test-files/osm-nodes-45331-epsg-3857.geojson");
+        std::vector<double> coords = utils::get_geo_json_points(points_str);
+
+        while (state.KeepRunning())
+        {
+            delaunator::Delaunator delaunator(coords);
+        }
     }
 }
 
 int main(int argc, char* argv[])
 {
-    benchmark::RegisterBenchmark("BM_simple", BM_simple);      // NOLINT clang-analyzer-cplusplus.NewDeleteLeaks
+    benchmark::RegisterBenchmark("BM_simple", BM_simple);
     benchmark::Initialize(&argc, argv);
     benchmark::RunSpecifiedBenchmarks();
 

examples/triangulate/main.cpp

@@ -1,7 +1,7 @@
 #include "rapidjson/document.h"
 #include "rapidjson/prettywriter.h"
 #include <delaunator.hpp>
-#include "../../test/test_utils.hpp"
+#include "../utils.hpp"
 #include <cstdio>
 #include <fstream>
 #include <vector>
@@ -62,8 +62,8 @@ std::string serialize_to_json(delaunator::Delaunator const& delaunator) {
 int main(int, char* argv[]) {
     const char* filename = argv[1];
     const char* output = argv[2];
-    std::string json = test_utils::read_file(filename);
-    std::vector<double> coords = test_utils::get_geo_json_points(json);
+    std::string json = utils::read_file(filename);
+    std::vector<double> coords = utils::get_geo_json_points(json);
     delaunator::Delaunator delaunator(coords);
     const char* out_json = serialize_to_json(delaunator).c_str();
 

test/test_utils.hpp renamed to examples/utils.hpp

@@ -2,7 +2,7 @@
 #include <stdexcept>
 #include "rapidjson/document.h"
 
-namespace test_utils {
+namespace utils {
 
 std::string read_file(const char* filename) {
     std::ifstream input_file(filename);
@@ -53,4 +53,4 @@ std::vector<double> get_array_points(std::string const& json) {
 
 }
 
-} // end ns test_utils
+} // end ns utils

test/test_json_validate.cpp renamed to test/delaunator.test.cpp

@@ -1,6 +1,6 @@
 #include <delaunator.hpp>
 #include <catch.hpp>
-#include "test_utils.hpp"
+#include "../examples/utils.hpp"
 
 namespace {
     void validate(const std::vector<double> &coords) {
@@ -19,18 +19,18 @@ namespace {
 }
 
 TEST_CASE("triangles match JS version ouput", "[Delaunator]") {
-    std::string points_str = test_utils::read_file("./test/test-files/playgrounds-1356-epsg-3857.geojson");
-    std::string triangles_str = test_utils::read_file("./test/test-files/playgrounds-1356-triangles.json");
-    std::vector<double> coords = test_utils::get_geo_json_points(points_str);
-    std::vector<double> triangles = test_utils::get_array_points(triangles_str);
+    std::string points_str = utils::read_file("./test/test-files/playgrounds-1356-epsg-3857.geojson");
+    std::string triangles_str = utils::read_file("./test/test-files/playgrounds-1356-triangles.json");
+    std::vector<double> coords = utils::get_geo_json_points(points_str);
+    std::vector<double> triangles = utils::get_array_points(triangles_str);
     delaunator::Delaunator delaunator(coords);
 
     SECTION("length of triangles is the same") {
         REQUIRE(delaunator.triangles.size() == triangles.size());
     }
 
     SECTION("values are the same") {
-        for(size_t i = 0; i < triangles.size(); i++)
+        for(std::size_t i = 0; i < triangles.size(); i++)
         {
             REQUIRE(delaunator.triangles[i] == Approx(triangles[i]));
         }