-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Add parallelization to PMP_boolean_operation #9544
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.
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
LeoValque
wants to merge
88
commits into
CGAL:main
Choose a base branch
from
LeoValque:PMP-bool_ops_parallellization
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 36 commits
Commits
Show all changes
88 commits
Select commit
Hold shift + click to select a range
3076b28
Combine two orientation tests in one with only the third point being …
afabri 613c369
fix and timer
afabri 34e8912
Deal correctly with underflow/overflow
afabri 01c0d1b
Add #include
afabri 4680634
Add operator to Homogeneous
afabri 5e6ff98
Add operator to Homogeneous
afabri 94aa198
Fix determinants()
afabri 2dafa20
Add documentation
afabri 1167c30
Naive parallellization of corefine
LeoValque 02656bf
Merge remote-tracking branch 'afabri/Kernel-combine_orientation-GF' i…
LeoValque c6f560e
Parallellized build of AABB_tree
LeoValque 5fadfb6
alternative version of PMP::self_intersections using AABB
LeoValque abca24c
Merge remote-tracking branch 'afabri/Kernel-combine_orientation-GF' i…
LeoValque a1fafcf
add example and benchmark of AABB_self_intersections
LeoValque 11100ee
add AABB_meshes_intersections of two different meshes
LeoValque 13b741f
Add two tree traversal intersection detection
LeoValque 9274515
Two tree intersection of meshes and mixed AABB box_intersection for i…
LeoValque 572bb8e
Benchmark meshes intersection
LeoValque d570a86
Improvement of AABB two tree traversals
LeoValque 0e175fb
Solved fusion conflict
LeoValque 9dbe1ae
Make intersection_callback more generic
LeoValque 2bbe6b5
Create a intersection meshes fonction using a callback instead of an …
LeoValque a560f0e
Merge branch 'AABB-add_parallellization' into PMP-boolops_enhancement
LeoValque 68af801
Reorganize two_tree_traversal and AABB_two_tree_traversal_traits
LeoValque 2cebb83
Make API and Documentation of intersection of two AABB trees
LeoValque 233d5d3
Change traversal strategy to traverse biggest bbox first
LeoValque 6d958a3
Doc update
LeoValque 1fa9eb5
Add benchmark code in PMP
LeoValque c9e7a5a
remove benchmark code of two tree traversal in AABB_tree
LeoValque 65a76ee
Add test for AABB_trees::do_intersect and AABB_trees::all_pair_of_int…
LeoValque bb309c6
Merge branch 'AABB-add_parallellization' into PMP-boolops_enhancement
LeoValque 13a1d3d
Replace box_d by AABB_tree and collect all edge-face intersection thr…
LeoValque 2a71ce4
clean unused comment code
LeoValque e89dcc7
Rewrite construction of the output of boolean operations, write a spe…
LeoValque 0389251
Parallelisation of fill_new_triangle_mesh
LeoValque 91d2bb3
Add corefinement_mesh_union_bench
LeoValque 827401b
Tree construction benchmarks
LeoValque 17aaeb3
Parallelization of kd-tree construction in AABB-tree
LeoValque 38b4eb9
Update performance in the user manual and apply first patch of sugges…
LeoValque 6c8a889
Second patch of suggestion from the review
LeoValque d4a984e
Solve a unused warning when not link with TBB
LeoValque b533687
Update documentation
LeoValque c1cec3c
Add figure of documentation
LeoValque 7349667
Add transformation parameter to CGALL::AABB_trees::do_intersect()
LeoValque 6021eba
Various cleanup
LeoValque ca78bf8
aabb_two_trees_intersection.cpp
LeoValque 9ed3515
Solve check headers error
LeoValque a8f5d08
<CGAL/Bbox_3.h> in Primive_helper.h
LeoValque 7e992cb
Use Aff_transformation_repC3 instead of Aff_transformation_3 in CGAL:…
LeoValque 91af779
Apply suggestions from the review
LeoValque 2e7ada2
Merge remote-tracking branch 'origin/main' into AABB-add_parallelliza…
LeoValque 89b449b
Solved aabb_two_trees_intersection error
LeoValque ec68ced
Solved warnings and errors in the testsuite
LeoValque 13618f2
Add primitives for AABB tree on a triangkle soup
LeoValque 66db995
Solved unused warning in the testsuite
LeoValque 5159e56
Add AABB_tree_build_helper
LeoValque b9bdd23
parallel_call of connected components
LeoValque 72cb79b
Apply suggestions from the review
LeoValque ebdaa83
Clean Aff_transformation in intersection of AABB trees
LeoValque 2fef643
Add squared_diagonal_length to Bbox_2
LeoValque e1a8132
Correct compilation error when using AABB_segment_primitive_2 with Po…
LeoValque 036de9c
Remove aabb_tree_with_join
LeoValque d0d280f
Correct compilation error when using AABB_segment_primitive_2 with Po…
LeoValque 7aeca73
Merge branch 'AABB-add_parallellization' of github.com:LeoValque/cgal…
LeoValque b5ad15a
Remove unwanted modification of cmakelist
LeoValque 530e06f
Add rounding mode protection to traversal with transformation
LeoValque b6b2b49
Merge branch 'AABB-add_parallellization' into PMP-boolops_enhancement
LeoValque 18e497d
Merge branch 'Minkowski2-replace_AABB_tree_with_join' into AABB-add_p…
LeoValque 5144b77
Remove outdating asserts
LeoValque 6a9a7f8
Solved a compile bug with Protect_FPU_rounding
LeoValque f6222ed
Correct result error in a test
LeoValque 1d4dc30
Remove Protect_FPU_rounding and simply used interval_nt<true>
LeoValque 8b1d4f4
Solved a memory issue when gettint the transformation from the parameter
LeoValque 188e642
add missing dep
sloriot 7fecb19
Merge branch 'AABB-add_parallellization' into PMP-boolops_enhancement
LeoValque 257cb5c
Solved a mismatch bug between a defined type and the type return by t…
LeoValque 60e351a
Merge branch 'AABB-add_parallellization' of github.com:LeoValque/cgal…
LeoValque 75c8a56
Revert unwanted local change in test_minkoswki_sum
LeoValque acfbe78
Solved a compilation error with not default constructible PointMap
LeoValque 41019f9
Add test that produces VC warning
afabri 83cef1e
untabify
afabri 8fe54d2
assign to a reference and output
afabri 6b14899
Solved a bug of a dereference a temporary after construct_source_2
LeoValque 13e46fd
Merge branch 'AABB-add_parallellization' of github.com:LeoValque/cgal…
LeoValque 068035a
Add missing const in AABB_segment_primitive_2 and add a test on vecto…
LeoValque 3bbd97c
Avoid unused warnings
LeoValque 0926ddf
Solved a bug when using AABB_trees::do_intersect() with primitive tha…
LeoValque 97e6580
Merge branch 'AABB-add_parallellization' into PMP-boolops_enhancement
LeoValque File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
59 changes: 59 additions & 0 deletions
59
AABB_tree/examples/AABB_tree/AABB_intersection_example.cpp
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| #include <CGAL/Exact_predicates_inexact_constructions_kernel.h> | ||
|
|
||
| #include <CGAL/AABB_tree.h> | ||
| #include <CGAL/AABB_traits_3.h> | ||
| #include <CGAL/AABB_triangle_primitive_3.h> | ||
| #include <CGAL/AABB_trees/intersection.h> | ||
|
|
||
| #include <iostream> | ||
| #include <fstream> | ||
|
|
||
| typedef CGAL::Exact_predicates_inexact_constructions_kernel K; | ||
|
|
||
| typedef K::Point_3 Point; | ||
| typedef K::Triangle_3 Triangle; | ||
|
|
||
| typedef std::vector<Triangle>::iterator Iterator; | ||
| typedef CGAL::AABB_triangle_primitive_3<K, Iterator> Primitive; | ||
| typedef CGAL::AABB_traits_3<K, Primitive> AABB_triangle_traits; | ||
| typedef CGAL::AABB_tree<AABB_triangle_traits> Tree; | ||
|
|
||
| int main() | ||
| { | ||
| Point a(1.0, 0.0, 0.0); | ||
| Point b(0.0, 1.0, 0.0); | ||
| Point c(0.0, 0.0, 1.0); | ||
| Point d(0.0, 0.0, 0.0); | ||
|
|
||
| Point e(1.2, 0.2, 0.2); | ||
| Point f(0.2, 1.2, 0.2); | ||
| Point g(0.2, 0.2, 1.2); | ||
| Point h(0.2, 0.2, 0.2); | ||
|
|
||
| std::vector<Triangle> tetra1; | ||
| tetra1.push_back(Triangle(a,b,c)); | ||
| tetra1.push_back(Triangle(a,b,d)); | ||
| tetra1.push_back(Triangle(a,d,c)); | ||
| tetra1.push_back(Triangle(b,c,d)); | ||
|
|
||
| std::vector<Triangle> tetra2; | ||
| tetra2.push_back(Triangle(e,f,g)); | ||
| tetra2.push_back(Triangle(e,f,h)); | ||
| tetra2.push_back(Triangle(e,h,g)); | ||
| tetra2.push_back(Triangle(f,g,h)); | ||
|
|
||
| // constructs AABB tree | ||
| Tree tree1(tetra1.begin(),tetra1.end()); | ||
| Tree tree2(tetra2.begin(),tetra2.end()); | ||
|
|
||
| // do intersect | ||
| std::cout << "Tetrahedrons do intersect: " << CGAL::AABB_trees::do_intersect(tree1, tree2) << std::endl; | ||
|
|
||
| std::vector< std::pair<Iterator, Iterator> > intersections; | ||
| CGAL::AABB_trees::all_pairs_of_intersecting_primitives(tree1, tree2, std::back_inserter(intersections)); | ||
|
|
||
| for(auto [id1, id2]: intersections) | ||
| std::cout << "ids: " << std::distance(tetra1.begin(), id1) << " " << std::distance(tetra2.begin(), id2) << std::endl; | ||
|
|
||
| return EXIT_SUCCESS; | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.