3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-31 20:51:12 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Group test targets into logical "tests" directory. Disable DJDHeuristic

Browse source
This commit is contained in:
tamasmeszaros 2019-10-14 14:58:07 +02:00
parent cdc9fb0d8f
commit 05431c0e6d
6 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
tests/libnest2d/CMakeLists.txt
View file

@ -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")

5
tests/libnest2d/libnest2d_tests_main.cpp
View file

@ -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());