Skip to content

Fix issues in AW3 debug code #9391

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

Open
MaelRL wants to merge 4 commits into
base: main
Choose a base branch
from
+26 −19
Open

Fix issues in AW3 debug code #9391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f882fb0
Fix _AW2_ macros that should be _AW3_
MaelRL Mar 20, 2026
fbc800c
Make sure we do not try to compute Steiner points with infinite neigh…
MaelRL Mar 20, 2026
649581a
Fix typo in enum class member
MaelRL Mar 20, 2026
87d4cd7
Enable some debug code in test
MaelRL Mar 20, 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
13 changes: 8 additions & 5 deletions Alpha_wrap_2/include/CGAL/Alpha_wrap_2/internal/Alpha_wrap_2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1114,11 +1114,14 @@ class Alpha_wrapper_2
#endif

#ifdef CGAL_AW2_COMPUTE_AND_STORE_STEINER_INFO_AT_GATE_CREATION
Point_2 steiner_point;
Steiner_status steiner_status = compute_steiner_point(new_gate, steiner_point);
new_gate.m_steiner_status = steiner_status;
if (steiner_status == Steiner_status::RULE_1 || steiner_status == Steiner_status::RULE_2)
new_gate.m_steiner_point = steiner_point;
if(status != Edge_status::HAS_INFINITE_NEIGHBOR)
{
Point_2 steiner_point;
Steiner_status steiner_status = compute_steiner_point(new_gate, steiner_point);
new_gate.m_steiner_status = steiner_status;
if (steiner_status == Steiner_status::RULE_1 || steiner_status == Steiner_status::RULE_2)
new_gate.m_steiner_point = steiner_point;
}
#endif

#ifdef CGAL_AW2_USE_SORTED_PRIORITY_QUEUE
Expand Down
15 changes: 9 additions & 6 deletions Alpha_wrap_3/include/CGAL/Alpha_wrap_3/internal/Alpha_wrap_3.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1141,12 +1141,15 @@ class Alpha_wrapper_3
Gate new_gate(f, m_tr);
#endif

#ifdef CGAL_AW2_COMPUTE_AND_STORE_STEINER_INFO_AT_GATE_CREATION
Point_3 steiner_point;
Steiner_status steiner_status = compute_steiner_point(new_gate, steiner_point);
new_gate.m_steiner_status = steiner_status;
if(steiner_status == Steiner_status::RULE_1 || steiner_status == Steiner_status::RULE_2)
new_gate.m_steiner_point = steiner_point;
#ifdef CGAL_AW3_COMPUTE_AND_STORE_STEINER_INFO_AT_GATE_CREATION
if(status != Facet_status::HAS_INFINITE_NEIGHBOR)
{
Point_3 steiner_point;
Steiner_status steiner_status = compute_steiner_point(new_gate, steiner_point);
new_gate.m_steiner_status = steiner_status;
if(steiner_status == Steiner_status::RULE_1 || steiner_status == Steiner_status::RULE_2)
new_gate.m_steiner_point = steiner_point;
}
#endif

#ifdef CGAL_AW3_USE_SORTED_PRIORITY_QUEUE
Expand Down
4 changes: 2 additions & 2 deletions Alpha_wrap_3/include/CGAL/Alpha_wrap_3/internal/Point_set_oracle.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,11 +130,11 @@ class Point_set_oracle
// So if one wanted to bench the flood fill runtime, it would be skewed by the time it takes
// to accelerate the tree.
this->tree().accelerate_distance_queries();
}

#ifdef CGAL_AW2_DEBUG
#ifdef CGAL_AW3_DEBUG
std::cout << "PS Tree: " << this->tree().size() << " primitives" << std::endl;
#endif
}
};

} // namespace internal
Expand Down
8 changes: 4 additions & 4 deletions Alpha_wrap_3/include/CGAL/Alpha_wrap_3/internal/gate_priority_queue.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ namespace internal {

enum class Steiner_status
{
UNKONWN = 0,
UNKNOWN = 0,
NO_STEINER_POINT,
RULE_1,
RULE_2
};

#ifdef CGAL_AW2_COMPUTE_AND_STORE_STEINER_INFO_AT_GATE_CREATION
#ifdef CGAL_AW3_COMPUTE_AND_STORE_STEINER_INFO_AT_GATE_CREATION
template <typename Tr>
struct Gate_steiner_info
{
Expand All @@ -60,7 +60,7 @@ struct Gate_steiner_info
// Represents an alpha-traversable facet in the mutable priority queue
template <typename Tr>
class Gate
#ifdef CGAL_AW2_COMPUTE_AND_STORE_STEINER_INFO_AT_GATE_CREATION
#ifdef CGAL_AW3_COMPUTE_AND_STORE_STEINER_INFO_AT_GATE_CREATION
: public Gate_steiner_info<Tr>
#endif
{
Expand Down Expand Up @@ -128,7 +128,7 @@ struct Less_gate
// Represents an alpha-traversable facet in the mutable priority queue
template <typename Tr>
class Gate
#ifdef CGAL_AW2_COMPUTE_AND_STORE_STEINER_INFO_AT_GATE_CREATION
#ifdef CGAL_AW3_COMPUTE_AND_STORE_STEINER_INFO_AT_GATE_CREATION
: public Gate_steiner_info<Tr>
#endif
{
Expand Down
4 changes: 2 additions & 2 deletions Alpha_wrap_3/include/CGAL/Alpha_wrap_3/internal/offset_intersection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ class Offset_intersection
const Point_3& t,
Point_3& output_pt)
{
#ifdef CGAL_AW2_DEBUG_SPHERE_MARCHING
#ifdef CGAL_AW3_DEBUG_SPHERE_MARCHING
std::cout << "Sphere march between " << s << " and " << t << std::endl;
#endif

Expand All @@ -240,7 +240,7 @@ class Offset_intersection

for(;;)
{
#ifdef CGAL_AW2_DEBUG_SPHERE_MARCHING
#ifdef CGAL_AW3_DEBUG_SPHERE_MARCHING
std::cout << "current point " << current_pt << std::endl;
std::cout << "current dist " << current_dist << std::endl;
#endif
Expand Down
1 change: 1 addition & 0 deletions Alpha_wrap_3/test/Alpha_wrap_3/test_AW3_manifoldness.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
//#define CGAL_AW3_DEBUG_STEINER_COMPUTATION
//#define CGAL_AW3_DEBUG_INITIALIZATION
//#define CGAL_AW3_DEBUG_QUEUE
#define CGAL_AW3_COMPUTE_AND_STORE_STEINER_INFO_AT_GATE_CREATION

#include <CGAL/alpha_wrap_3.h>
#include <CGAL/Alpha_wrap_3/internal/validation.h>
Expand Down
Loading