Skip to content
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

Jump to bottom

Mesh 3 : initial_points_generator parameter for make_mesh_3 point initialization #7798

Open
wants to merge 108 commits into
base: master
Choose a base branch
from
Open

Mesh 3 : initial_points_generator parameter for make_mesh_3 point initialization #7798

wants to merge 108 commits into from

Conversation

ange-clement
Copy link
Member

@ange-clement ange-clement commented Oct 13, 2023 •
edited by janetournois
Loading

Summary of Changes

Added a initial_points_generator parameter in make_mesh_3.
With this parameter, we can use a custom functor when initializing the C3t3 complex.
This functor must follow the Initial_points_generator concept.

Tasks:

  • Add initial_points_generator parameter in make_mesh_3
  • Make an example
  • Write Construct_initial_points_labeled_image into a header
  • Make initialize_triangulation_from_labeled_image use Construct_initial_points_labeled_image
  • Change definition of concept InitialPointsGenerator to output std::tuple<MeshDomain::Point_3, int dimension, MeshDomain::Index> (instead of std::pair<MeshDomain::Point_3, MeshDomain::Index>)
  • Make it pass checks
  • Document initial_points_generator parameter in make_mesh_3
  • Document Construct_initial_points_labeled_image header
  • Document example
  • Delete initialize_triangulation_from_labeled_image and initialize_triangulation_from_gray_image
  • Make an example of labelled and gray image initialisation with the parameter or the old custom initialization.
  • Make small feature page
  • add Construct_initial_points_gray_image.h, similar to Construct_initial_points_labeled_image.h
  • Maybe add a test ?
  • announce in CHANGES.md, see Mesh 3 : initial_points_generator parameter for make_mesh_3 point initialization #7798 (comment)

Release Management

@ange-clement
Implemented make_mesh_3 param :
3937c5d 
initial_points_generator
@ange-clement ange-clement mentioned this pull request Oct 13, 2023
Closed
13 tasks
@janetournois janetournois added this to the 6.0-beta milestone Oct 13, 2023
@ange-clement
Copy link
Member Author

/build:v0

@github-actions
Copy link

There was an error while building the doc:

/home/runner/work/cgal/cgal/Mesh_3/doc/Mesh_3/Mesh_3.txt:775: warning: unable to resolve reference to 'CGAL/Mesh_3/Construct_initial_points_labeled_image.h' for \ref command
/home/runner/work/cgal/cgal/Mesh_3/doc/Mesh_3/Mesh_3.txt:779: warning: included file CGAL/Mesh_3/Construct_initial_points_labeled_image.h is not found. Check your EXAMPLE_PATH

https://github.com/CGAL/cgal/actions/runs/6558298316

@ange-clement
Copy link
Member Author

/build:v0

@ange-clement ange-clement removed their assignment Oct 18, 2023
@ange-clement
Copy link
Member Author

@ange-clement ange-clement removed their assignment Oct 18, 2023
That is an error, oops

@github-actions
Copy link

There was an error while building the doc:

/home/runner/work/cgal/cgal/Mesh_3/doc/Mesh_3/examples.txt:16: warning: included file CGAL/Mesh_3/Construct_initial_points_labeled_image.h is not found. Check your EXAMPLE_PATH
/home/runner/work/cgal/cgal/Mesh_3/doc/Mesh_3/Mesh_3.txt:779: warning: included file CGAL/Mesh_3/Construct_initial_points_labeled_image.h is not found. Check your EXAMPLE_PATH

https://github.com/CGAL/cgal/actions/runs/6558364305

@ange-clement
Copy link
Member Author

/build:v0

@github-actions
Copy link

The documentation is built. It will be available, after a few minutes, here: https://cgal.github.io/7798/v0/Manual/index.html

@ange-clement
Updated doc example snippets +
23af3eb 
Added group "Mesh Initialization Functions" +
Added concept "InitialPointsGenerator" +
Documented model "Construct_initial_points_labeled_image" +
Updated demo parametters +
Fix reneming errors
@ange-clement
Copy link
Member Author

/force-build:v0

@github-actions
Copy link

There was an error while building the doc:

/home/runner/work/cgal/cgal/Mesh_3/include/CGAL/make_mesh_3.h:610: warning: Reached end of file while still inside a (nested) comment. Nesting level 1 (probable line reference: 298)
/home/runner/work/cgal/cgal/Mesh_3/include/CGAL/make_mesh_3.h:418: warning: expected <li> tag but found TK_COMMAND_BS token instead!
/home/runner/work/cgal/cgal/Mesh_3/include/CGAL/make_mesh_3.h:425: warning: Found unknown command '\cgalParamDefault'
/home/runner/work/cgal/cgal/Mesh_3/include/CGAL/make_mesh_3.h:426: warning: Found unknown command '\cgalParamSectionEnd'
/home/runner/work/cgal/cgal/Mesh_3/include/CGAL/make_mesh_3.h:427: warning: Found unknown command '\cgalNamedParamsEnd'
/home/runner/work/cgal/cgal/Mesh_3/include/CGAL/make_mesh_3.h:448: warning: unexpected end of comment while inside <dl> block
/home/runner/work/cgal/cgal/Mesh_3/doc/Mesh_3/Mesh_3.txt:775: warning: unable to resolve reference to 'CGAL/Mesh_3/Construct_initial_points_labeled_image.h' for \ref command

https://github.com/CGAL/cgal/actions/runs/6559707571

@janetournois
Copy link
Member

Branch merged in integration for tonight's testsuite

@janetournois
Copy link
Member

Test results in results-6.1-Ic-55

@sloriot
Copy link
Member

sloriot commented Jan 9, 2025

Successfully tested in CGAL-6.1-Ic-59

lrineau
lrineau approved these changes Jan 17, 2025
View reviewed changes
Copy link
Member

@lrineau lrineau left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I pre-approve this small feature, with comments.

Mesh_3/doc/Mesh_3/CGAL/Mesh_3/parameters.h Outdated Show resolved Hide resolved
Mesh_3/doc/Mesh_3/Mesh_3.txt Outdated Show resolved Hide resolved
@lrineau lrineau added pre-approved For pre-approved small features. After 15 days the feature will be accepted. and removed Not yet approved The feature or pull-request has not yet been approved. labels Jan 17, 2025
@github-actions github-actions bot removed the Tested label Jan 17, 2025
@github-actions GitHub Actions
Copy link

This pull-request was previously marked with the label Tested, but has been modified with new commits. That label has been removed.

@lrineau
Copy link
Member

lrineau commented Jan 20, 2025

/build:final_doc

@github-actions GitHub Actions
Copy link

There was an error while building the doc:

/home/runner/work/cgal/cgal/Mesh_3/doc/Mesh_3/Mesh_3.txt:763: warning: End of list marker found without any preceding list items

https://github.com/CGAL/cgal/actions/runs/12870615167

@janetournois
Copy link
Member

/build:final_doc

@github-actions GitHub Actions
Copy link

The documentation is built. It will be available, after a few minutes, here: https://cgal.github.io/7798/final_doc/Manual/index.html

lrineau
lrineau approved these changes Jan 20, 2025
View reviewed changes
Copy link
Member

@lrineau lrineau left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Full approval. Thanks for the last changes.

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

@janetournois janetournois janetournois left review comments

@albert-github albert-github albert-github left review comments

@MaelRL MaelRL MaelRL left review comments

@afabri afabri afabri left review comments

@sloriot sloriot sloriot left review comments

@lrineau lrineau lrineau approved these changes

Assignees

@lrineau lrineau

@ange-clement ange-clement

Labels
Pkg::Mesh_3 pre-approved For pre-approved small features. After 15 days the feature will be accepted. Small feature Under Testing
Projects
None yet
Milestone
6.1-beta
7 participants
@ange-clement @janetournois @afabri @sloriot @lrineau @albert-github @MaelRL