Commit Graph

1906 Commits

Author SHA1 Message Date
Mael Rouxel-Labbé 1dc0ba2c3a Merge remote-tracking branch 'cgal/master' into AW3-Resume_aw3-GF 2023-11-29 16:53:37 +01:00
Sven Oesau b26e22bca8 Merge remote-tracking branch 'remotes/orth/orthtree-generalization' into Kinetic_shape_reconstruction-new_package-soesau 2023-11-08 08:58:25 +01:00
Sébastien Loriot 6383bf9676 revert changes to not block the integration of new Orthtree 2023-11-07 08:35:37 +01:00
Sébastien Loriot 999ad9b787 Merge remote-tracking branch 'cgal/master' into HEAD 2023-11-07 08:19:19 +01:00
Laurent Rineau bdfe153cd9 Merge pull request #7784 from janetournois/BGL-warning_fixed-jtournois
BGL - no need to workaround boost 1.54 anymore
2023-11-06 12:52:24 +01:00
Sébastien Loriot 3176178224 fix compilation issues 2023-11-06 11:43:29 +01:00
Mael Rouxel-Labbé 318258963f Add a generic, empty collect_garbage(Graph) 2023-10-13 10:53:11 +02:00
Jane Tournois 6e6598cd5e no need to workaround boost 1.54 anymore
because CGAL now requires boost 1.66 or higher
2023-10-10 19:32:59 +02:00
Sven Oesau 10cda49c66 Merge remote-tracking branch 'remotes/orth/orthtree-generalization' into Kinetic_shape_reconstruction-new_package-soesau 2023-09-25 12:37:38 +02:00
Sébastien Loriot 8700394122 boost::mpl::if_ -> std::conditional 2023-09-24 22:57:20 +02:00
JacksonCampolattaro f021c0c941 Use optional vpm for all property maps 2023-09-24 16:52:09 +02:00
JacksonCampolattaro aced88517a More optional non-nullable maps 2023-09-24 16:33:59 +02:00
JacksonCampolattaro c67bec24cc More optionals for non-nullable maps 2023-09-16 18:38:32 +02:00
Sébastien Loriot da33014535 Merge remote-tracking branch 'cgal/master' 2023-09-14 09:07:00 +02:00
Laurent Rineau 46923342ad Merge pull request #7576 from albert-github/feature/issue_7395
issue #7395 Improvement of layout of model relations

# Conflicts:
#	Kernel_23/doc/Kernel_23/CGAL/Vector_2.h
2023-09-07 10:48:34 +02:00
Laurent Rineau cdd4b2cc75 Merge pull request #7595 from MaelRL/BGL-Generalize_FFG_doc-GF
Generalize documentation of Face_filtered_graph
2023-09-07 10:46:35 +02:00
Mael Rouxel-Labbé 5425d089da Merge remote-tracking branch 'cgal/master' into PMP-Remove_degen_faces-no-clear-GF 2023-09-05 14:52:16 +02:00
Sébastien Loriot 28dc304676 Merge branch 'cgal/master' 2023-09-01 13:03:05 +02:00
albert-github 93001308f4 Merge branch 'master' into feature/issue_7395
# Conflicts:
#	Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementPointLocation_2.h
#	Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementVerticalRayShoot_2.h
2023-08-18 11:10:42 +02:00
Sébastien Loriot eada3ee8ca Merge branch 'master' into 'sloriot/CGAL-using_c++17_stl' 2023-08-14 14:19:25 +02:00
Mael Rouxel-Labbé 7f85651e82 Merge remote-tracking branch 'cgal/master' into PMP-Remove_degen_faces-no-clear-GF 2023-07-19 13:55:35 +02:00
Mael Rouxel-Labbé 146f9ecb21 Add specializations for Surface_mesh and Polyhedron_3 2023-07-19 13:48:34 +02:00
Mael Rouxel-Labbé 178d063536 Improve the doc of Face_filtered_graph: patch IDs can be more than size_t 2023-07-18 11:46:42 +02:00
albert-github a0320dd7b4 Merge branch 'master' into feature/issue_7395
# Conflicts:
#	Polyhedron/doc/Polyhedron/Concepts/PolyhedronItems_3.h
2023-07-13 10:33:18 +02:00
Mael Rouxel-Labbé 5cc57d4c58 Minor doc fix 2023-07-12 14:45:29 +02:00
Mael Rouxel-Labbé 6fbbb70b20 Generalize FFG doc: the selection's value_type needs not be faces_size_type 2023-07-12 14:39:03 +02:00
albert-github 301728a8a9 issue #7395 Improvement of layout of model relations
- Completed the cgalModels part
2023-07-09 12:43:36 +02:00
albert-github 5673ccfc71 Spelling corrections
Spelling correction `a edge` to `an edge`
2023-07-06 18:04:38 +02:00
Sébastien Loriot b66afab814 Merge remote-tracking branch 'sloriot/CGAL-using_c++17_stl' into HEAD 2023-07-05 11:29:35 +02:00
Sébastien Loriot 3e4120c81d Merge branch 'master' into orthtree-generalization 2023-07-03 17:15:55 +02:00
Sébastien Loriot dfc386d65b Merge branch 'master' into HEAD 2023-06-22 14:05:45 +02:00
Sébastien Loriot 0ee31a5d4f remove extra parenthesis 2023-06-19 19:17:49 +02:00
Sébastien Loriot f936680600 Merge remote-tracking branch 'cgal/master' into HEAD 2023-06-15 18:48:39 +02:00
Sébastien Loriot 11a5b394b8 use Range::size() 2023-06-15 18:44:20 +02:00
Sébastien Loriot 9cdfe70abb Merge remote-tracking branch 'sloriot/CGAL-toward_6.0' 2023-06-15 11:34:09 +02:00
Sébastien Loriot 604dcdc435 boost::optional => std::optional 2023-06-15 10:57:09 +02:00
Sébastien Loriot bbc4d08ee0 Merge remote-tracking branch 'cgal/master' into HEAD 2023-06-15 10:47:07 +02:00
Sébastien Loriot c8a88b9014 remove CGAL_static_assertion* 2023-06-15 10:42:10 +02:00
Sébastien Loriot 852b3b664b expand -CGAL_CPP17_INLINE macro 2023-06-15 10:40:54 +02:00
Sébastien Loriot b724def918 Merge pull request #6605 from sloriot/PMP-snap_no_deg_faces_created
Avoid creating degenerate faces in snap
2023-05-30 19:15:30 +02:00
JacksonCampolattaro c066a18fe2 Fix issues with the simpler unit tests 2023-05-18 11:36:06 +02:00
Sébastien Loriot 02b126d961 maps are not necessarily default constructible 2023-05-17 17:08:01 +02:00
JacksonCampolattaro ac6fbf0467 Add partly-working adaptation of Surface_mesh to use the new Property map system 2023-05-17 16:49:46 +02:00
Mael Rouxel-Labbé a69a2f54c6 Rename to avoid conflict with STL 2023-05-16 14:21:27 +02:00
Mael Rouxel-Labbé 7a2e5412e9 Clarify that empty() does not clean garbage or remove property maps 2023-05-15 12:42:42 +02:00
Mael Rouxel-Labbé 34a9756836 Use BGL API instead of assuming graph.clear() exists 2023-05-15 12:42:13 +02:00
Mael Rouxel-Labbé 931270b66d Introduce CGAL::empty(), which only clears combinatorial information
And leaves everything else like internal property maps and garbage.
2023-05-15 12:35:52 +02:00
Laurent Rineau 1b84329710 Merge pull request #7229 from GilesBathgate/General-safe_bool_idiom-GilesBathgate
Remove use of the safe-bool idiom, replace with explicit operator bool
2023-05-03 15:05:45 +02:00
Sébastien Loriot af337edf4d boost::reference_wrapper ---> std::reference_wrapper 2023-04-29 08:35:13 +02:00
Sébastien Loriot 4fb4ca2b53 std::empty needs c++17
remove this commit before merging in 6.0
2023-04-28 23:39:37 +02:00
Sébastien Loriot 2f7d150531 boost::begin/end/empty/size -> std::begin/end/empty/size 2023-04-23 23:01:35 +02:00
Sébastien Loriot a04035879d boost::is_const -> std::is_const 2023-04-23 22:37:07 +02:00
Sébastien Loriot d4d2225801 boost::is_reference -> std::is_reference 2023-04-23 22:37:07 +02:00
Sébastien Loriot 8740b244a2 boost::distance -> std::distance
boost's version is working on std::pair but we decided to no longer
consider iterator pairs as ranges
2023-04-23 22:37:07 +02:00
Sébastien Loriot 61834d5a26 boost::remove_const -> std::remove_const_t 2023-04-23 19:07:54 +02:00
Sébastien Loriot fc034c6a5d boost::unit -> std::uint 2023-04-23 18:40:39 +02:00
Laurent Rineau ad30839e6b Merge pull request #7370 from sloriot/PMP-soup_self_intersections
Add self-intersection test and report functions for triangle soups
2023-04-21 11:20:52 +02:00
Andreas Fabri c330beb504 Add operator!=(void*) 2023-04-14 17:04:02 +01:00
Sébastien Loriot 28c97d293f fix warnings 2023-04-11 09:25:29 +02:00
Sébastien Loriot fb7d892e36 add help for geom traits for function dealing with polygon soups 2023-04-06 19:24:04 +02:00
Sébastien Loriot 3262b21ed7 do not evaluate other options if the parameter is provided 2023-04-06 19:24:04 +02:00
Sébastien Loriot cb672d4d90 Merge remote-tracking branch 'cgal/master' into PMP-decimation 2023-04-04 14:25:17 +02:00
Sébastien Loriot 39b84d0433 fix specialization 2023-03-31 14:39:33 +02:00
Sébastien Loriot 5e4e9a9001 fix warning 2023-03-31 14:39:33 +02:00
Laurent Rineau 41f0e07022 Merge pull request #7343 from afabri/Surface_mesh-points-GF
Surface_mesh: Add example for accessing points
2023-03-31 11:10:39 +02:00
Laurent Rineau e96fbafac2 Merge pull request #7308 from afabri/BGL-document_use_binary_mode-GF
BGL: Document use_binary_mode
2023-03-21 16:14:16 +01:00
Andreas Fabri fcef17c918 Surface_mesh: Add example for accessing points 2023-03-21 09:44:49 +01:00
Sven Oesau c9a7b79530 Merge remote-tracking branch 'remotes/origin/master' into Kinetic_shape_reconstruction-new_package-soesau 2023-03-08 19:26:07 +01:00
Sven Oesau 1db6c553fa removed unused variables 2023-03-08 15:40:27 +01:00
Andreas Fabri 2d203cae0c BGL: Document use_binary_mode 2023-03-06 21:27:04 +00:00
Sébastien Loriot b1d2744821 Merge branch 'master' into PMP-decimation 2023-03-02 14:24:27 +01:00
Sébastien Loriot c587df44a6 fix correspondance between faces 2023-02-24 14:45:01 +01:00
Sébastien Loriot 9242a810c4 Merge remote-tracking branch 'cgal/master' into Region_growing-revision-soesau 2023-02-07 11:31:55 +01:00
Sébastien Loriot dbccebf7df clean up doc and API of new property maps 2023-02-06 18:32:41 +01:00
Giles Bathgate 679ee1f870 Remove use of the safe-bool idiom, replace with explicit operator bool 2023-01-30 19:39:42 +00:00
Sébastien Loriot ee246c87c5 fix function name and add missing constructor 2023-01-25 17:08:27 +01:00
Sven Oesau ddb155fb94 removed Event.h
added documentation
2023-01-18 17:44:20 +01:00
Sven Oesau 4b87b331e7 Merge remote-tracking branch 'master/master' into Kinetic_shape_reconstruction-new_package-soesau 2023-01-18 14:44:02 +01:00
Sven Oesau d4ed95d7ab bugfix to prevent infinite loop in alpha expansion 2023-01-18 14:31:04 +01:00
Sébastien Loriot cd76994056 rename property map and deprecated old name 2023-01-18 13:45:37 +01:00
Sven Oesau b66cacad24 working on the reconstruction
using energy terms from the publication/reference implementation
adding min_cut for binary labeling instead of alpha_expansion_graphcut
removal of hybrid mode
2023-01-18 12:03:08 +01:00
Mael 4d22c90474
Merge branch 'master' into feature/bug_documentation_spell_20221113 2023-01-04 10:06:45 +01:00
Sebastien Loriot f5c41bd712
Merge pull request #7022 from MaelRL/Weights-v2.0-GF-master
Weights fixes (master)
2022-12-08 15:22:19 +01:00
Sebastien Loriot b9a87af07e
Merge pull request #7023 from MaelRL/Weights-v2.0-GF-5.5.x
Weights fixes (5.5.x)
2022-12-08 15:21:58 +01:00
Mael Rouxel-Labbé 28663265c6 Merge remote-tracking branch 'cgal/master' into PMP-snap_no_deg_faces_created 2022-12-08 14:35:48 +01:00
Mael 0ff7882997
Merge branch 'master' into feature/bug_documentation_spell_20221113 2022-12-06 22:21:06 +01:00
Sébastien Loriot d3b13fb11c Merge branch 'cgal/5.5.x-branch' 2022-12-05 19:00:39 +01:00
Sebastien Loriot 887e175361
Merge pull request #6984 from janetournois/PSP-fix_has_normal_map-GF
Point_set_3 - `NP_helper::has_normal_map()` should not always return true
2022-12-05 18:59:42 +01:00
Laurent Rineau 67b5c791e9 Merge pull request #7075 from MaelRL/CGAL-Fix_some_links-GF
Update some links + https
2022-12-05 12:22:06 +01:00
Laurent Rineau 2f59b23d30 Merge pull request #7056 from MaelRL/BGL-Clarify_pmap_value_type-GF
Fix implicit conversion from `std::size_t` to `bool` creating ambiguous calls
2022-11-25 10:15:02 +01:00
Laurent Rineau 4ef4f036af Merge pull request #7056 from MaelRL/BGL-Clarify_pmap_value_type-GF
Fix implicit conversion from `std::size_t` to `bool` creating ambiguous calls
2022-11-25 10:14:16 +01:00
Mael Rouxel-Labbé ec8ec2f97a Merge branch 'Weights-v2.0-GF-5.5.x' into Weights-v2.0-GF-master 2022-11-24 11:59:24 +01:00
Mael Rouxel-Labbé 841373df6d Merge branch 'Weights-v2.0-GF' into Weights-v2.0-GF-5.5.x 2022-11-24 11:58:53 +01:00
Mael Rouxel-Labbé 0ecffe2913 Avoid conflicts between 'OpenMesh' as a mesh template parameter and namespace 2022-11-24 11:50:06 +01:00
Mael Rouxel-Labbé b5c21e1f5d Http -> https + update some dead links 2022-11-23 18:54:37 +01:00
Mael Rouxel-Labbé 181344f6cd Merge branch 'Weights-v2.0-GF-5.5.x' into Weights-v2.0-GF-master 2022-11-22 18:35:18 +01:00
Mael Rouxel-Labbé e5cb2f8225 Merge branch 'Weights-v2.0-GF' into Weights-v2.0-GF-5.5.x 2022-11-22 18:35:06 +01:00
Mael Rouxel-Labbé 613ae0d564 Proper fix after botched fix (adb10155fc) 2022-11-22 18:33:43 +01:00
Mael Rouxel-Labbé 491a77397c Merge branch 'Weights-v2.0-GF-5.5.x' into Weights-v2.0-GF-master 2022-11-22 17:53:26 +01:00
Mael Rouxel-Labbé f6ac98882a Merge remote-tracking branch 'mine/Weights-v2.0-GF' into Weights-v2.0-GF-5.5.x 2022-11-22 17:51:36 +01:00