Skip to content

Dev #266

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fontanf merged 2 commits into from
Oct 8, 2025
Merged

Dev #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
efb1a53
Fix JSON search tree export in rectangleguillotine
fontanf Oct 8, 2025
9ad38af
Update shape dependency
fontanf Oct 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion extern/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ set(SHAPE_BUILD_TEST OFF)
FetchContent_Declare(
shape
GIT_REPOSITORY https://github.com/fontanf/shape.git
GIT_TAG 816f1d31a107dff8d0734ac869ad97dbbdc19d83
GIT_TAG 60c1ee2cdde807ff5d89b034ded3d458e3a34cf7
#SOURCE_DIR "${PROJECT_SOURCE_DIR}/../shape/"
EXCLUDE_FROM_ALL)
FetchContent_MakeAvailable(shape)
Expand Down
2 changes: 1 addition & 1 deletion src/rectangleguillotine/branching_scheme.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1879,7 +1879,7 @@ nlohmann::json BranchingScheme::json_export(
Solution solution = to_solution(node, true);

auto parent = node->parent;
while (parent != nullptr
while (parent->parent != nullptr
&& parent->item_type_id_1 == -1
&& parent->item_type_id_2 == -1) {
parent = parent->parent;
Expand Down
Loading