PMP: Default Property_maps for Index_maps#4209

Merged

sloriot merged 90 commits intoCGAL:masterfrom

maxGimeno:PMP-Default_pmap-maxGimeno

Mar 17, 2020

Contributor

maxGimeno commented Sep 4, 2019 •

edited by sloriot

Loading

Summary of Changes

Introduces a helper class for index maps in PMP, that uses dynamic_property_maps in case there is no internal map for indices in the mesh. Specifies if the map needs initialization or not.

TODO:

Add get_initialized(mesh&)
Tests (is_writable, all get_initialized_...)
check Better handling of the initialization of index map #1918
Rewrite doc
Fix all usages
Add perf warning when the dpmap is selected
Solve remaining todos
Enhance doc in NP.txt

TODO after merge:

PMP: Default Property_maps for Index_maps #4209 (comment)

Release Management

Affected package(s): Polygon_mesh_processing
Issue(s) solved (if any): Fix Better handling of the initialization of index map #1918, Fix Default property maps for named parameters #2814
Feature/Small Feature (if any): Initialized_index_property_maps
Pre-approval date: 2020/03/13

maxGimeno added 3 commits

August 16, 2019 16:01


          WIP map_getter helper

4f0d883


          restore the bool parameter and use ittogether with the `init_XXX_indi…

a8bccc6

…ces` helper functions.


          Fix mechanism and adapt cc test for polyhedron with no id

d285d4a

maxGimeno added the Pkg::PMP label

maxGimeno added this to the 5.1-beta milestone

maxGimeno requested a review from sloriot

September 4, 2019 12:08

maxGimeno self-assigned this

maxGimeno added TODO Work in progress labels

Contributor Author

maxGimeno commented Sep 24, 2019

@sloriot I need your approbation about that mechanism before I integrate it in all incvolved functions.

sloriot reviewed

View reviewed changes

Polygon_mesh_processing/test/Polygon_mesh_processing/connected_component_polyhedron.cpp Show resolved Hide resolved

Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/connected_components.h Outdated Show resolved Hide resolved

BGL/include/CGAL/boost/graph/named_params_helper.h Outdated Show resolved Hide resolved

BGL/include/CGAL/boost/graph/named_params_helper.h Outdated Show resolved Hide resolved


          rename helper and add detect if map is writable (need_init is true in…

d18191d

… that case)

maxGimeno commented

View reviewed changes

Polygon_mesh_processing/test/Polygon_mesh_processing/connected_component_polyhedron.cpp Show resolved Hide resolved

maxGimeno added 2 commits

September 24, 2019 15:39


          blah

5a4dc77


          Incorporate the initialization of the map to the helpers.

bf0e52c

sloriot reviewed

View reviewed changes

BGL/include/CGAL/boost/graph/named_params_helper.h Outdated Show resolved Hide resolved

Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/connected_components.h Outdated Show resolved Hide resolved

BGL/include/CGAL/boost/graph/named_params_helper.h Outdated Show resolved Hide resolved

BGL/include/CGAL/boost/graph/named_params_helper.h Outdated Show resolved Hide resolved

BGL/include/CGAL/boost/graph/named_params_helper.h Outdated Show resolved Hide resolved

maxGimeno force-pushed the PMP-Default_pmap-maxGimeno branch 2 times, most recently from ce5f9ae to 4879795 Compare

September 26, 2019 10:03


          Wrap the mechanism in 3 functions with 3 types to reduce the number o…

97a3390

…f template parameters to 2.

maxGimeno force-pushed the PMP-Default_pmap-maxGimeno branch from 4879795 to 97a3390 Compare

September 26, 2019 14:31

sloriot reviewed

View reviewed changes

BGL/include/CGAL/boost/graph/named_params_helper.h Outdated Show resolved Hide resolved

maxGimeno added 2 commits

September 27, 2019 08:52


          Update comment

fe78af0


          Use the functions where possible

Member

sloriot commented Sep 27, 2019

The doc of the updated functions needs to be updated I think.

maxGimeno force-pushed the PMP-Default_pmap-maxGimeno branch from a0b0077 to df4e446 Compare

September 27, 2019 12:39


          update doc

3bcd881

maxGimeno force-pushed the PMP-Default_pmap-maxGimeno branch from df4e446 to 3bcd881 Compare

September 27, 2019 12:40

MaelRL added the Conflicts label

sloriot reviewed

View reviewed changes

BGL/include/CGAL/boost/graph/named_params_helper.h Outdated Show resolved Hide resolved

BGL/include/CGAL/boost/graph/named_params_helper.h Outdated Show resolved Hide resolved

MaelRL reviewed

View reviewed changes

Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/border.h Outdated Show resolved Hide resolved


          Fix typo (PMP)

d94dace

Co-Authored-By: Sebastien Loriot <sloriot.ml@gmail.com>

MaelRL added TODO and removed Ready to be tested Under Testing labels

MaelRL added 2 commits

March 16, 2020 09:59


          Do not expose internal classes in BGL::FFG's default templates

f6d994c


          Use proper index type in automatically-initialized index maps

2cb7170

MaelRL added Ready to be tested and removed TODO labels

MaelRL mentioned this pull request

Volume segmentation and derecursification #4201

Merged

maxGimeno added the Under Testing label

Contributor Author

maxGimeno commented Mar 17, 2020

Successfully tested in https://cgal.geometryfactory.com/CGAL/testsuite/results-5.1-Ic-100.shtml

maxGimeno added the Tested label


          Update CHANGES.md

7406e48

MaelRL removed the CHANGES.md not updated label

sloriot removed the Not yet approved label

sloriot self-assigned this

Member

sloriot commented Mar 17, 2020

As this feature is central for almost all PRs around PMP/BGL I'm merging it now without waiting the 2 weeks approval delay as I don't see somebody complaining that we are removing a constraint.

sloriot merged commit 1454b99 into CGAL:master

sloriot deleted the PMP-Default_pmap-maxGimeno branch

March 17, 2020 17:28

sloriot mentioned this pull request

5.1 release check list #4352

Closed

79 tasks

Member

sloriot commented Mar 17, 2020

After merge TODO mentioned in the 5.1 release check list

lrineau removed Ready to be tested Under Testing labels

MaelRL added Accepted small feature and removed pre-approved labels

lrineau added the Merged_in_5.1 label

Member

lrineau commented Dec 4, 2020 •

edited

Loading

@MaelRL @sloriot Has the TODO-after-merge been done?

Member

sloriot commented Dec 7, 2020 •

edited by lrineau

Loading

Yes and it works: https://doc.cgal.org/5.1.1/BGL/group__PkgBGLHelper.html will redirect you to https://doc.cgal.org/5.1.1/BGL/group__BGLGraphExternalIndices.html.

lrineau removed the TODO after merge label

This comment was marked as off-topic.

Sign in to view

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Accepted small feature Merged_in_5.1 Pkg::BGL Pkg::PMP Small feature Tested