Add do_snap parameter to PMP::autorefine_triangle_soup #8744

LeoValque · 2025-02-17T14:57:21Z

Summary of Changes

The PR adds the do_snap parameter to autorefine_triangle_soup(). When set to true, the coordinates are rounded to fit in double with additional subdivisions, preventing any self-intersections from occurring.

Todo

Add to change log

Release Management

Affected package(s): PMP
Issue(s) solved (if any):
Feature/Small Feature (if any): link
Link to compiled documentation (obligatory for small feature) wrong link name to be changed
License and copyright ownership: GeometryFactory

…umber type; tested with EPECK et EPICK

sloriot · 2025-02-17T16:35:25Z

What do you think of apply_iterative_snap_rounding() ? cc @MaelRL

LeoValque · 2025-02-17T16:47:14Z

do you suggest to create a new function apply_iterative_snap_rounding() or simply to rename the parameter do_snap to apply_iterative_snap_rounding ?

sloriot · 2025-02-17T16:55:35Z

do you suggest to create a new function apply_iterative_snap_rounding() or simply to rename the parameter do_snap to apply_iterative_snap_rounding ?

renaming the named parameter, provided Mael thinks it is a better name too.

…espace

afabri · 2025-02-17T17:29:34Z

What do you think of apply_iterative_snap_rounding() ? cc @MaelRL

I do not like an apply_ prefix. Did you have a look at the existing function for 2D

sloriot · 2025-02-17T17:33:52Z

What do you think of apply_iterative_snap_rounding() ? cc @MaelRL

I do not like an apply_ prefix. Did you have a look at the existing function for 2D

note that's a named parameter, not a free function

sloriot · 2025-02-17T17:35:24Z

What do you think of apply_iterative_snap_rounding() ? cc @MaelRL

I do not like an apply_ prefix. Did you have a look at the existing function for 2D

note that's a named parameter, not a free function

there is already the named parameter : apply_per_connected_component()

MaelRL · 2025-02-18T07:45:16Z

What do you think of apply_iterative_snap_rounding() ? cc @MaelRL

OK, but I also meant the function snap_polygon_soup(): even if it's internal, best to still avoid naming similarities.

sloriot · 2025-02-18T18:14:45Z

What do you think of apply_iterative_snap_rounding() ? cc @MaelRL

OK, but I also meant the function snap_polygon_soup(): even if it's internal, best to still avoid naming similarities.

for that one it could be internal::polygon_soup_snap_rounding()

sloriot · 2025-02-19T06:36:46Z

/Users/magritte/cgal_root/CGAL-6.1-Ic-91/include/CGAL/Polygon_mesh_processing/internal/snap_polygon_soup.h:138:13: warning: unused variable 'pm' [-Wunused-variable]
/Users/magritte/cgal_root/CGAL-6.1-Ic-91/include/CGAL/Polygon_mesh_processing/internal/snap_polygon_soup.h:136:9: warning: unused type alias 'GT' [-Wunused-local-typedef]
/mnt/testsuite/include/CGAL/Polygon_mesh_processing/internal/snap_polygon_soup.h:223:5: warning: this 'else' clause does not guard... [-Wmisleading-indentation]

and PMP examples fully red https://cgal.geometryfactory.com/CGAL/testsuite/summary-6.1-Ic-91.html?package=Polygon_mesh_processing_Examples

…n snap_polygon_soup.cpp

afabri · 2025-03-19T09:02:16Z

Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/autorefinement.h

-void autorefine_triangle_soup(PointRange& soup_points,
-                              TriangleRange& soup_triangles,
-                              const NamedParameters& np = parameters::default_values())
+bool autorefine_triangle_soup_(PointRange& soup_points,


Why does the function name end with an underscore ?

I need to find another name; I did that temporarily. I added a front function, autorefine_triangle_soup, that dispatches execution between this function and snap_triangle_soup because the mutual calling between them posed difficulties. Is autorefine_triangle_soup_internal a good name?

Putting it in an internal namespace?

It is already the case

afabri · 2025-03-19T09:17:54Z

..._mesh_processing/include/CGAL/Polygon_mesh_processing/internal/triangle_soup_snap_rounding.h

+  }
+};
+
+CGAL_MUTEX map_mutex;


Can we really have such a global variable?

I moved it inside the class that is using it

sloriot

We need to schedule a meeting about the visitor wrapper to discuss it + we need a test ensuring that it works as expected.

Polygon_mesh_processing/doc/Polygon_mesh_processing/Polygon_mesh_processing.txt

sloriot · 2025-04-01T15:17:45Z

Polygon_mesh_processing/examples/Polygon_mesh_processing/snap_polygon_soup.cpp

+#define PMP_ROUNDING_VERTICES_IN_POLYGON_SOUP_VERBOSE
+// #define CGAL_PMP_AUTOREFINE_USE_DEFAULT_VERBOSE


Suggested change

#define PMP_ROUNDING_VERTICES_IN_POLYGON_SOUP_VERBOSE

// #define CGAL_PMP_AUTOREFINE_USE_DEFAULT_VERBOSE

sloriot · 2025-04-01T15:18:27Z

Polygon_mesh_processing/examples/Polygon_mesh_processing/snap_polygon_soup.cpp

+
+namespace PMP = CGAL::Polygon_mesh_processing;
+
+struct Track_visitor


Please move the visitor to a test. The example is meant to be minimalistic

Actually it seems that a lot of stuff from this example should be in a test.

Polygon_mesh_processing/doc/Polygon_mesh_processing/Concepts/PMPAutorefinementVisitor.h

sloriot · 2025-04-01T19:03:44Z

..._mesh_processing/include/CGAL/Polygon_mesh_processing/internal/triangle_soup_snap_rounding.h

+    size_t id=0;
+    for(typename PolygonRange::iterator it=soup_triangles.begin(); it!=soup_triangles.end(); ++it)
+      indexes_soup_triangles.emplace_back((*it), id++);
+    std::cout << "Test 0" << std::endl;


debug that should be hidden

sloriot · 2025-04-01T19:04:40Z

..._mesh_processing/include/CGAL/Polygon_mesh_processing/internal/triangle_soup_snap_rounding.h

+    bool res=polygon_soup_snap_rounding_impl(soup_points, indexes_soup_triangles, np);
+
+    soup_triangles.clear();
+    for(const Indexes_range<Triangle> &t: indexes_soup_triangles)


missing soup_triangles.reserve(indexes_soup_triangles.size())

sloriot · 2025-04-01T19:07:23Z

..._mesh_processing/include/CGAL/Polygon_mesh_processing/internal/triangle_soup_snap_rounding.h

+};
+
+template <typename PolygonRange,typename Map>
+struct Wrapp_id_visitor


If you inherit from the default visitor, you can only define function you'd like to override.

sloriot · 2025-04-01T19:17:08Z

..._mesh_processing/include/CGAL/Polygon_mesh_processing/internal/triangle_soup_snap_rounding.h

+  inline void verbatim_triangle_copy(std::size_t /*tgt_id*/, std::size_t /*src_id*/) {}
+  inline void new_subtriangle(std::size_t tgt_id, std::size_t src_id)
+  {
+    CGAL_SCOPED_LOCK(map_mutex);


should only be used if TBB is used

sloriot · 2025-04-01T19:17:23Z

..._mesh_processing/include/CGAL/Polygon_mesh_processing/internal/triangle_soup_snap_rounding.h

+private:
+  PolygonRange* triangles;
+  Map* map_newtriangles;
+  inline static CGAL_MUTEX map_mutex;


same remark here

…e wrapp_visitor of snap_rounding

…rounding

…MPAutorefinementVisitor.h Co-authored-by: Sebastien Loriot <[email protected]>

…sh_processing.txt Co-authored-by: Sebastien Loriot <[email protected]>

LeoValque added 11 commits February 4, 2025 11:26

Add snap polygon soup to PMP

3787d4b

Doc, verbose and named parameter of snap_polygon_soup

14ccffc

add number_of_iterations as a named parameter for snap_polygon_soup

3a64fe3

add more verbose in snap_polygon_soup

3811271

New alternative version of snap_polygon_soup for testing

3dc12cd

Fig a bug when the scaling have a negative exponent

4d4763f

Write a generic ceil function to use snap_polygon_soup with various n…

aef30f0

…umber type; tested with EPECK et EPICK

ceil for negative rational and comments

64c4fd2

Add some parallellisation

8079f69

made snap polygon soup an option of autorefine_triangle_soup

d4e6675

Doc modification of autorefine and Polygon mesh processing

ac7bf3c

LeoValque added 2 commits February 17, 2025 18:09

rename do_snap to apply_iterative_snap_rounding, remove trailing whit…

9b84d4c

…espace

remove trailing whitespace

139e047

MaelRL added the Pkg::PMP label Feb 18, 2025

MaelRL added Not yet approved The feature or pull-request has not yet been approved. Small feature labels Feb 18, 2025

MaelRL added this to the 6.1-beta milestone Feb 18, 2025

sloriot added the Under Testing label Feb 18, 2025

LeoValque added 3 commits February 19, 2025 11:36

rename snap_polygon_soup to triangle_soup_snap_rounding and fix bug i…

09239da

…n snap_polygon_soup.cpp

replace #ifdef CGAL_LINED_WITH_TBB by constexpr

0bbaa2a

reintroduced #ifdef CGAL_LINKED_WITH_TBB

20e54eb

add delete_triangle function to the visitor of test_autorefinement

16da2a2

LeoValque closed this Mar 18, 2025

LeoValque force-pushed the PMP_triangle_soup_rounding-GF branch from a8c3c28 to ab56f76 Compare March 18, 2025 14:54

sloriot reopened this Mar 18, 2025

Debug the visitor of triangle_soup_snap_rounding

dc6d7b1

afabri reviewed Mar 19, 2025

View reviewed changes

LeoValque added 2 commits March 19, 2025 11:12

Move the mutex inside the class Indexes_range who using it

3e884c8

Change name of internal functions

8c59129

MaelRL modified the milestones: 6.1-beta, 6.2-beta Mar 31, 2025

sloriot requested changes Apr 1, 2025

View reviewed changes

LeoValque and others added 18 commits April 3, 2025 10:26

Solve bug with macro that skip repair_polygon_soup

bfc9f5b

factorize snap_polygon_soup

f81f5ab

add zhou and naive version

290610f

add internal_new_subtriangle to Visistor of autorefinement

7cb154f

use the new internal function of the visitor of autorefinement for th…

4995634

…e wrapp_visitor of snap_rounding

clone test_autorefinement.cmd to test_snap_rounding.cpp to test snap_…

da86f44

…rounding

Update Polygon_mesh_processing/doc/Polygon_mesh_processing/Concepts/P…

625299b

…MPAutorefinementVisitor.h Co-authored-by: Sebastien Loriot <[email protected]>

Update Polygon_mesh_processing/doc/Polygon_mesh_processing/Polygon_me…

5126371

…sh_processing.txt Co-authored-by: Sebastien Loriot <[email protected]>

Update Polygon_mesh_processing/doc/Polygon_mesh_processing/Polygon_me…

cc32efa

…sh_processing.txt Co-authored-by: Sebastien Loriot <[email protected]>

use macro to define snap version

5b4e02b

add missing reserve for the visitor

06951ab

Experiment with iterative rotated around x cubes

f3abba4

Experiment with iterative rotated along all axis cubes

e44ffbf

remove visitor of example snap_polygon_soup

465183f

add data for snap rounding test

b8a0ab4

Test for snap rounding

2e24464

update cmakelist to compile examples with rotated cubes

f4d46b8

Solve mistake in test_snap_rounding.cmd

3409446

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add do_snap parameter to PMP::autorefine_triangle_soup #8744

Add do_snap parameter to PMP::autorefine_triangle_soup #8744

LeoValque commented Feb 17, 2025 •

edited by afabri

Loading

sloriot commented Feb 17, 2025

LeoValque commented Feb 17, 2025

sloriot commented Feb 17, 2025

afabri commented Feb 17, 2025

sloriot commented Feb 17, 2025

sloriot commented Feb 17, 2025

MaelRL commented Feb 18, 2025 •

edited

Loading

sloriot commented Feb 18, 2025

sloriot commented Feb 19, 2025

afabri Mar 19, 2025

LeoValque Mar 19, 2025

afabri Mar 19, 2025

LeoValque Mar 19, 2025

afabri Mar 19, 2025

LeoValque Mar 19, 2025

sloriot left a comment

sloriot Apr 1, 2025

sloriot Apr 1, 2025

sloriot Apr 1, 2025

sloriot Apr 1, 2025

sloriot Apr 1, 2025

sloriot Apr 1, 2025

sloriot Apr 1, 2025

sloriot Apr 1, 2025

		#define PMP_ROUNDING_VERTICES_IN_POLYGON_SOUP_VERBOSE
		// #define CGAL_PMP_AUTOREFINE_USE_DEFAULT_VERBOSE


		namespace PMP = CGAL::Polygon_mesh_processing;

		struct Track_visitor

Add do_snap parameter to PMP::autorefine_triangle_soup #8744

Are you sure you want to change the base?

Add do_snap parameter to PMP::autorefine_triangle_soup #8744

Conversation

LeoValque commented Feb 17, 2025 • edited by afabri Loading

Summary of Changes

Todo

Release Management

sloriot commented Feb 17, 2025

LeoValque commented Feb 17, 2025

sloriot commented Feb 17, 2025

afabri commented Feb 17, 2025

sloriot commented Feb 17, 2025

sloriot commented Feb 17, 2025

MaelRL commented Feb 18, 2025 • edited Loading

sloriot commented Feb 18, 2025

sloriot commented Feb 19, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sloriot left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

LeoValque commented Feb 17, 2025 •

edited by afabri

Loading

MaelRL commented Feb 18, 2025 •

edited

Loading