Commit Graph

81619 Commits

Author SHA1 Message Date
Mael Rouxel-Labbé 208eebe9f9 Fixed doc 2018-09-11 17:11:34 +02:00
Mael Rouxel-Labbé 1719b94f76 minor (re-)indentation fix 2018-09-11 15:59:18 +02:00
Mael Rouxel-Labbé 33050eff79 Generalized snap() to vertex ranges 2018-09-11 15:40:15 +02:00
Mael Rouxel-Labbé a35506cfe0 Removed useless struct member 2018-09-04 15:33:29 +02:00
Mael Rouxel-Labbé 6d01f4f951 Snap what is snappable rather than rejecting everything 2018-09-04 15:30:52 +02:00
Mael Rouxel-Labbé a618c94dbd Removed tolerance map from named parameters 2018-09-03 18:37:06 +02:00
Mael Rouxel-Labbé f93c18afa0 Fixed using max() with GMP 2018-08-14 14:30:59 +02:00
Mael Rouxel-Labbé b5b10bdb2f Added testing data 2018-08-01 08:45:56 +02:00
Mael Rouxel-Labbé 21873890a2 Fixed concept name 2018-08-01 08:45:18 +02:00
Mael Rouxel-Labbé 359aea3686 Added a test for snapping functions 2018-08-01 08:45:04 +02:00
Mael Rouxel-Labbé 0aabaf3025 Added some functions to snap mesh borders onto another mesh 2018-08-01 08:44:30 +02:00
Laurent Rineau 7180fe5bb3 Merge branch 'releases/CGAL-4.12-branch' 2018-07-26 17:33:32 +02:00
Laurent Rineau 7bb709f200 Merge branch 'releases/CGAL-4.11-branch' into releases/CGAL-4.12-branch
# Conflicts:
#	Maintenance/release_building/BUGFIX_NUMBER
#	Maintenance/release_building/public_release_name
2018-07-26 17:33:03 +02:00
Laurent Rineau f3b9d03ccf Merge pull request #3234 from sloriot/BGL-fix_copy_fg_with_garbage
Fix copy_face_graph with target mesh having garbage
2018-07-26 17:31:15 +02:00
Laurent Rineau 464491a3a1 Merge pull request #3243 from sloriot/BGL-clear_fix
Fix CGAL::clear
2018-07-26 17:31:12 +02:00
Laurent Rineau 6b15737c68 Merge pull request #3254 from lrineau/Mesh_3-fix__add_stop_with_TBB_for_4.12-GF
Mesh 3 fix: add the possibility to stop the algorithm, when Parallel_tag is used (for CGAL-4.12-branch)
2018-07-26 17:31:09 +02:00
Sébastien Loriot c5f7a18c8b Merge pull request #3254 from lrineau/Mesh_3-fix__add_stop_with_TBB_for_4.12-GF
Mesh 3 fix: add the possibility to stop the algorithm, when Parallel_tag is used (for CGAL-4.12-branch)
2018-07-25 19:01:36 +02:00
Sébastien Loriot 62a8391fde Merge pull request #3242 from lrineau/Mesh_3-fix__add_stop_with_TBB-GF
Mesh 3 fix: add the possibility to stop the algorithm, when Parallel_tag is used
2018-07-25 18:59:46 +02:00
Sébastien Loriot 168d684ef1 Merge pull request #3255 from sloriot/PMP-rm_unused_file
Remove unused file
2018-07-25 18:57:15 +02:00
Sébastien Loriot 597d80ccbc Merge pull request #3251 from maxGimeno/Demo-Fix_removeAll-GF
Polyhedron Demo: Fix snapshot and erase all
2018-07-25 18:56:52 +02:00
Sébastien Loriot dbf18230d7 Merge pull request #3245 from MaelRL/SMP-Improve_demo-GF
SMP: demo improvements
2018-07-25 18:56:45 +02:00
Sébastien Loriot b0d012fe01 Merge pull request #3243 from sloriot/BGL-clear_fix
Fix CGAL::clear
2018-07-25 18:56:39 +02:00
Sébastien Loriot 46024d2d05 Merge pull request #3241 from maxGimeno/Demo-Hide_ids_after_mesh_modif-GF
Polyhedron Demo: Hide ids when modifying the mesh
2018-07-25 18:55:33 +02:00
Sébastien Loriot c8c1c11c9c Merge pull request #3234 from sloriot/BGL-fix_copy_fg_with_garbage
Fix copy_face_graph with target mesh having garbage
2018-07-25 18:55:26 +02:00
Sébastien Loriot 864ef08dd4 Merge pull request #3154 from afabri/Polyhedron_demo-less_includes-GF
Polyhedron demo:  fewer includes
2018-07-25 18:55:19 +02:00
Sébastien Loriot d05df530b3 Merge pull request #2658 from MaelRL/Periodic_3_mesh_3-Feature-MBogdanov
Periodic_3_mesh_3, new package
2018-07-25 18:55:12 +02:00
Sébastien Loriot 3f9e22994c Merge pull request #3252 from sloriot/PMP-autorefine_bugfixes
Autorefine bug-fix
2018-07-25 18:53:57 +02:00
Sébastien Loriot 302cebf325 check iterator is valid before dereferencing it 2018-07-25 17:04:40 +02:00
Sébastien Loriot 52eeebda0e fix windows warning 2018-07-25 14:43:14 +02:00
Laurent Rineau 3aa615dc92
Merge branch 'master' into Polyhedron_demo-less_includes-GF 2018-07-24 13:46:57 +02:00
Sébastien Loriot d8518d5c80 remove unused file 2018-07-24 13:18:06 +02:00
Laurent Rineau 777bfab1d0 Fix use of tbb::atomic
I misread the TBB documentation: the constructor of `tbb::atomic` is
only available since C++11. Otherwise, it has to be
default-initialized, and then assigned.
2018-07-24 12:41:47 +02:00
Laurent Rineau 98bf6284fd Fix the issue with the preprocessor 2018-07-24 12:40:19 +02:00
Laurent Rineau 95f93026f2 Fix Concurrent_compact_container::merge
The bug was detected by the testsuite.
2018-07-24 12:40:19 +02:00
Laurent Rineau bac90efde0 Fix for CGAL_NO_ATOMIC (with old Boost and C++<=03) 2018-07-24 12:40:19 +02:00
Laurent Rineau 7713e790e9 Fix warnings 2018-07-24 12:40:19 +02:00
Laurent Rineau ea47dcfd70 support Mesher_3<C3T3,MC,MD>::status() with TBB 2018-07-24 12:40:19 +02:00
Laurent Rineau bcce26f2b5 Access to the "current" size of the compact container 2018-07-24 12:40:18 +02:00
Laurent Rineau a96e69af29 Add the possibility to stop Mesh_3 with TBB 2018-07-24 12:40:18 +02:00
Laurent Rineau 3022ceb198 Fix use of tbb::atomic
I misread the TBB documentation: the constructor of `tbb::atomic` is
only available since C++11. Otherwise, it has to be
default-initialized, and then assigned.
2018-07-24 12:06:53 +02:00
Sébastien Loriot da76851f75 handle special case when intersection segments shares a common endpoint 2018-07-23 17:13:58 +02:00
Laurent Rineau 4710e1f93d Fix the conflict between <CGAL/atomic.h> and <CGAL/thread.h>
Before this commit, they were both defining
`CGAL::cpp11::atomic`. Now, `<CGAL/thread.h>` includes
`<CGAL/atomic.h>`, and it only defined `CGAL::cpp11::atomic`, using
the TBB implementation, if `CGAL_NO_ATOMIC` was defined by
`<CGAL/atomic.h>`.

@sgiraudot Please have a look.
2018-07-23 15:45:44 +02:00
Maxime Gimeno f76f7ae0f8 Fix snapshot 2018-07-23 12:11:31 +02:00
Laurent Rineau ae1e1439cf Fix the issue with the preprocessor 2018-07-23 11:15:26 +02:00
Laurent Rineau ed034a53be Fix Concurrent_compact_container::merge
The bug was detected by the testsuite.
2018-07-23 10:23:28 +02:00
Sébastien Loriot fdec8a2285 print real vertex counts 2018-07-23 10:11:51 +02:00
Laurent Rineau 332249432f I forgot to change those numbers 2018-07-23 09:49:52 +02:00
Maxime Gimeno 5f7276be67 Skip the already removed items in erase(list); 2018-07-23 09:46:25 +02:00
Laurent Rineau 29f80375f4 Merge branch 'releases/CGAL-4.12-branch' 2018-07-20 17:46:58 +02:00
Laurent Rineau 908311e903 Merge branch 'releases/CGAL-4.11-branch' into releases/CGAL-4.12-branch 2018-07-20 17:34:47 +02:00