Skip to content

Dev #13

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 3 commits into from
Jan 17, 2026
Merged

Dev #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d02d252
Fix backtracks in union
fontanf Jan 17, 2026
b98c64a
Use strict comparisons for jets
fontanf Jan 17, 2026
d9cb6be
Move checks in clean_extreme_slopes_*
fontanf Jan 17, 2026
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
7,395 changes: 7,395 additions & 0 deletions data/tests/clean/clean_extreme_slopes_outer/0.json
View file
Open in desktop

Large diffs are not rendered by default.

180 changes: 0 additions & 180 deletions data/tests/offset/inflate/012.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13187,186 +13187,6 @@
"is_path": false,
"type": "general"
},
{
"elements": [
{
"end": {
"x": 8.143047483065775,
"y": 8.166330500857494
},
"start": {
"x": 8.142866312292316,
"y": 8.165733260557133
},
"type": "LineSegment"
}
],
"is_path": false,
"type": "general"
},
{
"elements": [
{
"end": {
"x": 8.146329434233428,
"y": 8.172984659290218
},
"start": {
"x": 8.146328343246331,
"y": 8.172983136819942
},
"type": "LineSegment"
},
{
"end": {
"x": 8.146691168477217,
"y": 8.173489749196456
},
"start": {
"x": 8.146329434233428,
"y": 8.172984659290218
},
"type": "LineSegment"
}
],
"is_path": false,
"type": "general"
},
{
"elements": [
{
"end": {
"x": 8.14983684743224,
"y": 8.17649164100589
},
"start": {
"x": 8.14933072729011,
"y": 8.17612896033297
},
"type": "LineSegment"
}
],
"is_path": false,
"type": "general"
},
{
"elements": [
{
"end": {
"x": 8.14983884738681,
"y": 8.176493282325826
},
"start": {
"x": 8.14983684743224,
"y": 8.17649164100589
},
"type": "LineSegment"
},
{
"end": {
"x": 8.150319381476857,
"y": 8.176887804846032
},
"start": {
"x": 8.14983884738681,
"y": 8.176493282325826
},
"type": "LineSegment"
}
],
"is_path": false,
"type": "general"
},
{
"elements": [
{
"end": {
"x": 8.16633050085814,
"y": 8.179772501186452
},
"start": {
"x": 8.165733260557728,
"y": 8.179953671959924
},
"type": "LineSegment"
}
],
"is_path": false,
"type": "general"
},
{
"elements": [
{
"end": {
"x": 8.172984659290714,
"y": 8.17649055001884
},
"start": {
"x": 8.172983136820545,
"y": 8.17649164100585
},
"type": "LineSegment"
},
{
"end": {
"x": 8.173489749196841,
"y": 8.176128815775145
},
"start": {
"x": 8.172984659290714,
"y": 8.17649055001884
},
"type": "LineSegment"
}
],
"is_path": false,
"type": "general"
},
{
"elements": [
{
"end": {
"x": 8.176491641006338,
"y": 8.172983136820056
},
"start": {
"x": 8.17612896033341,
"y": 8.173489256962172
},
"type": "LineSegment"
}
],
"is_path": false,
"type": "general"
},
{
"elements": [
{
"end": {
"x": 8.176493282326293,
"y": 8.172981136865454
},
"start": {
"x": 8.176491641006338,
"y": 8.172983136820056
},
"type": "LineSegment"
},
{
"end": {
"x": 8.176887804846427,
"y": 8.172500602775521
},
"start": {
"x": 8.176493282326293,
"y": 8.172981136865454
},
"type": "LineSegment"
}
],
"is_path": false,
"type": "general"
},
{
"elements": [
{
Expand Down
3 changes: 3 additions & 0 deletions include/shape/clean.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ std::pair<bool, Shape> remove_redundant_vertices(
std::pair<bool, ShapeWithHoles> remove_redundant_vertices(
const ShapeWithHoles& shape);

Shape remove_backtracks(
const Shape& shape);


std::pair<bool, Shape> remove_aligned_vertices(
const Shape& shape);
Expand Down
8 changes: 2 additions & 6 deletions include/shape/shape.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,15 +645,11 @@ bool operator==(
const Jet& jet_1,
const Jet& jet_2);

bool equal(
const Jet& jet_1,
const Jet& jet_2);

bool strictly_greater(
bool operator<(
const Jet& jet_1,
const Jet& jet_2);

bool strictly_lesser(
bool operator>(
const Jet& jet_1,
const Jet& jet_2);

Expand Down
98 changes: 43 additions & 55 deletions src/boolean_operations.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,41 +481,6 @@ std::vector<ShapeWithHoles> compute_boolean_operation_component(

IntersectionTree intersection_tree(shapes, {}, {});

std::vector<uint8_t> element_is_processed(splitted_elements.size(), 0);
for (NodeId node_id = 0;
node_id < (NodeId)graph.nodes.size();
++node_id) {
NodeId node_cur_id = node_id;
for (;;) {
const BooleanOperationNode& node = graph.nodes[node_cur_id];
ElementPos node_degree = 0;
ElementPos element_next_pos = -1;
for (ElementPos element_pos: node.successors) {
if (element_is_processed[element_pos] == 0) {
node_degree++;
element_next_pos = element_pos;
}
}
//std::cout << "node " << node_id
// << " degree " << node_degree << std::endl;
if (node_degree != 1)
break;
//std::cout << "fix element " << element_next_pos << std::endl;
element_is_processed[element_next_pos] = 1;
// Find the reverse arc to fix.
const BooleanOperationArc& arc_next = graph.arcs[element_next_pos];
for (ElementPos element_pos: graph.nodes[arc_next.end_node_id].successors) {
const BooleanOperationArc& arc = graph.arcs[element_pos];
if (arc.end_node_id == node_cur_id) {
//std::cout << "fix element " << element_pos << std::endl;
element_is_processed[element_pos] = 1;
break;
}
}
node_cur_id = graph.arcs[element_next_pos].end_node_id;
}
}

// Find an element from the outline.
// To do so find, all elements from the original elements with the leftest
// point.
Expand All @@ -528,8 +493,6 @@ std::vector<ShapeWithHoles> compute_boolean_operation_component(
for (ElementPos element_pos = 0;
element_pos < (ElementPos)splitted_elements.size();
++element_pos) {
if (element_is_processed[element_pos])
continue;
const SplittedElement& element = splitted_elements[element_pos];
if (element.original_direction)
continue;
Expand Down Expand Up @@ -615,6 +578,7 @@ std::vector<ShapeWithHoles> compute_boolean_operation_component(

// Find outer loop.
//std::cout << "find outer loop..." << std::endl;
std::vector<uint8_t> element_is_processed(splitted_elements.size(), 0);
ElementPos element_cur_pos = element_start_pos;
Shape outline;
for (int i = 0;; ++i) {
Expand Down Expand Up @@ -646,25 +610,14 @@ std::vector<ShapeWithHoles> compute_boolean_operation_component(
const ShapeElement& element_next = splitted_elements[element_pos_next].element;
Jet jet = element_next.jet(element_next.start, false) - current_jet;
if (largest_jet_element_pos == -1
|| strictly_lesser(largest_jet, jet)) {
|| largest_jet < jet) {
largest_jet_element_pos = element_pos_next;
largest_jet = jet;
}
}
if (largest_jet_element_pos == -1) {
//nlohmann::json json;
//for (ElementPos pos = 0;
// pos < (ElementPos)splitted_elements.size();
// ++pos) {
// json["elements"][pos] = splitted_elements[pos].element.to_json();
//}
//std::string file_path = "overlay.json";
//std::ofstream file{file_path};
//if (!file.good()) {
// throw std::runtime_error(
// "Unable to open file \"" + file_path + "\".");
//}
//file << std::setw(4) << json << std::endl;
//compute_union_export_inputs("compute_union_input.json", shapes);
//Writer().add_shapes_with_holes(shapes).write_json("shape.json");
throw std::logic_error(
FUNC_SIGNATURE + ": "
"largest_jet_element_pos is '-1' in outline.");
Expand Down Expand Up @@ -755,20 +708,33 @@ std::vector<ShapeWithHoles> compute_boolean_operation_component(
ElementPos largest_jet_element_pos = -1;
Jet largest_jet;
Jet current_jet = element_cur.jet(element_cur.end, true);
//std::cout << "element_cur_pos " << element_cur_pos
// << " element_cur " << element_cur.to_string() << std::endl;
for (ElementPos element_pos_next: node.successors) {
const SplittedElement& splitted_element_next = splitted_elements[element_pos_next];
const ShapeElement& element_next = splitted_element_next.element;
Jet jet = element_next.jet(element_next.start, false) - current_jet;
if (equal(jet, {0, 0}))
continue;
//std::cout << "element_next_pos " << element_pos_next
// << " element_next " << element_next.to_string()
// << " jet " << jet.to_string()
// << std::endl;
if (largest_jet_element_pos == -1
|| strictly_lesser(largest_jet, jet)) {
|| largest_jet < jet) {
largest_jet_element_pos = element_pos_next;
largest_jet = jet;
}
}
//std::cout << "largest_angle_element_pos " << largest_angle_element_pos << std::endl;
//std::cout << "largest_jet_element_pos " << largest_jet_element_pos << std::endl;
if (largest_jet_element_pos == -1) {
//compute_union_export_inputs("compute_union_input.json", shapes);
//Writer().add_shapes_with_holes(shapes).write_json("shape.json");

//std::vector<ShapeElement> elements;
//Writer writer;
//for (const auto& splitted_element: splitted_elements)
// writer.add_element(splitted_element.element);
//writer.write_json("overlay.json");

throw std::logic_error(
FUNC_SIGNATURE + ": "
"largest_jet_element_pos is '-1'");
Expand All @@ -784,6 +750,25 @@ std::vector<ShapeWithHoles> compute_boolean_operation_component(

//std::cout << "face finished size " << face.elements.size() << std::endl;
//std::cout << face.to_string(0) << std::endl;

// Check if the face is valid.
if (!equal(face.elements.back().end, face.elements.front().start)) {
//std::cout << face.to_string(0) << std::endl;
//std::vector<ShapeElement> elements;
//Writer writer;
//for (const auto& splitted_element: splitted_elements) {
// //auto mm = splitted_element.element.min_max();
// //if (mm.first.x < 8.10 || mm.second. x > 8.20
// // || mm.first.y < 8.10 || mm.second.y > 8.20)
// // continue;
// writer.add_element(splitted_element.element);
//writer.write_json("overlay.json");
//Writer().add_shapes_with_holes(shapes).write_json("shape.json");
throw std::logic_error(
FUNC_SIGNATURE + ": "
"face is not closed.");
}

switch (boolean_operation) {
case BooleanOperation::Union: {
// Fast check.
Expand All @@ -800,6 +785,9 @@ std::vector<ShapeWithHoles> compute_boolean_operation_component(
if (ok)
break;

// Fix backtracks caused by numerical issues.
face = remove_backtracks(face);

// Real check.
IntersectionTree::IntersectOutput intersection_output = intersection_tree.intersect(
face.find_point_strictly_inside(),
Expand Down
Loading
Loading