parity with js version

.travis.yml

@@ -5,4 +5,4 @@ os: linux
 install:
 - cmake -DCMAKE_BUILD_TYPE=Release
 - VERBOSE=1 make
-script: ./delaunator-test
+script: ./test/src/delaunator-test

CMakeLists.txt

@@ -5,34 +5,32 @@ if (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/includes")
     execute_process(COMMAND bash "-c" "(cd ${CMAKE_CURRENT_SOURCE_DIR} && ./fetch-includes.sh)")
 endif()
 
+
 #delaunator
-add_library(delaunator src/delaunator.cpp)
+add_library(delaunator
+    src/delaunator.cpp
+    src/delaunator.h
+)
 target_include_directories (delaunator PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/includes/rapidjson/include")
 target_include_directories (delaunator PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/includes/prettyprint")
 
 #delaunator
 add_library(json-helpers src/json-helpers.cpp)
 target_include_directories (json-helpers PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/includes/rapidjson/include")
 
-#delaunator-test
-add_executable(delaunator-test src/delaunator-test.cpp)
-target_link_libraries(delaunator-test delaunator)
-target_include_directories (delaunator-test PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/includes/catch/single_include/catch2")
-target_link_libraries(delaunator-test json-helpers)
-
 #benchmark
 add_executable(benchmark src/benchmark.cpp)
 target_link_libraries(benchmark delaunator)
 target_link_libraries(benchmark json-helpers)
 
-
 #triangulate
 add_executable(triangulate src/triangulate.cpp)
 target_include_directories (triangulate PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/includes/rapidjson/include")
 target_include_directories (triangulate PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/includes/prettyprint")
 target_link_libraries(triangulate delaunator)
 target_link_libraries(triangulate json-helpers)
 
+add_subdirectory(test)
 
 set(CPACK_PROJECT_NAME ${PROJECT_NAME})
 set(CPACK_PROJECT_VERSION ${PROJECT_VERSION})

src/benchmark.cpp

@@ -11,7 +11,7 @@ int main(int, char* argv[]) {
     const vector<double> coords = json_helpers::get_geo_json_points(points_str);
 
     auto t_start = chrono::high_resolution_clock::now();
-    Delaunator delaunator(move(coords));
+    Delaunator delaunator(coords);
     auto t_end = chrono::high_resolution_clock::now();
 
     auto milliseconds = chrono::duration_cast<chrono::milliseconds>(t_end - t_start).count();
@@ -21,4 +21,4 @@ int main(int, char* argv[]) {
     printf("triangles=%lu \n", delaunator.triangles.size());
 
     return 0;
-}
+}