diff options
| author | tamasmeszaros <meszaros.q@gmail.com> | 2019-10-14 15:58:07 +0300 |
|---|---|---|
| committer | tamasmeszaros <meszaros.q@gmail.com> | 2019-10-14 15:58:07 +0300 |
| commit | 05431c0e6d2278e680ce4590a13e4b7e304c83ab (patch) | |
| tree | 5b577b24a5b89839635dd12b7fc9c40f4b88748b /tests/libnest2d | |
| parent | cdc9fb0d8fd0901b7171887f24b435499a6476a4 (diff) | |
Group test targets into logical "tests" directory. Disable DJDHeuristic
Diffstat (limited to 'tests/libnest2d')
| -rw-r--r-- | tests/libnest2d/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/libnest2d/libnest2d_tests_main.cpp | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/libnest2d/CMakeLists.txt b/tests/libnest2d/CMakeLists.txt index 6b2cbd194..91a2e7852 100644 --- a/tests/libnest2d/CMakeLists.txt +++ b/tests/libnest2d/CMakeLists.txt @@ -1,6 +1,7 @@ get_filename_component(_TEST_NAME ${CMAKE_CURRENT_LIST_DIR} NAME) add_executable(${_TEST_NAME}_tests ${_TEST_NAME}_tests_main.cpp printer_parts.cpp printer_parts.hpp) target_link_libraries(${_TEST_NAME}_tests test_common libnest2d ) +set_property(TARGET ${_TEST_NAME}_tests PROPERTY FOLDER "tests") # catch_discover_tests(${_TEST_NAME}_tests TEST_PREFIX "${_TEST_NAME}: ") add_test(${_TEST_NAME}_tests ${_TEST_NAME}_tests "--durations yes") diff --git a/tests/libnest2d/libnest2d_tests_main.cpp b/tests/libnest2d/libnest2d_tests_main.cpp index 4eecb7e58..252bea47f 100644 --- a/tests/libnest2d/libnest2d_tests_main.cpp +++ b/tests/libnest2d/libnest2d_tests_main.cpp @@ -3,6 +3,7 @@ #include <fstream> + #include <libnest2d/libnest2d.hpp> #include "printer_parts.hpp" //#include <libnest2d/geometry_traits_nfp.hpp> @@ -371,7 +372,7 @@ TEST_CASE("ArrangeRectanglesTight", "[Nesting]") REQUIRE(getX(bin.center()) == 105); REQUIRE(getY(bin.center()) == 125); - _Nester<BottomLeftPlacer, DJDHeuristic> arrange(bin); + _Nester<BottomLeftPlacer, FirstFitSelection> arrange(bin); arrange.execute(rects.begin(), rects.end()); @@ -439,7 +440,7 @@ TEST_CASE("ArrangeRectanglesLoose", "[Nesting]") Coord min_obj_distance = 5; - _Nester<BottomLeftPlacer, DJDHeuristic> arrange(bin, min_obj_distance); + _Nester<BottomLeftPlacer, FirstFitSelection> arrange(bin, min_obj_distance); arrange.execute(rects.begin(), rects.end()); |