Commit Graph

531 Commits

Author SHA1 Message Date
Laurent Rineau c025d392fb Merge pull request #1960 from sloriot/BGL-fix_split_graph
Fix bug in split_graph_into_polylines
2017-03-29 11:58:38 +02:00
Sébastien Loriot 3da1729ea4 restore the order on nodes and do not remove an edge before a terminal node
The order was relying on the vertex connectivity so no edge incident to a
node in the set should be removed, otherwise the set is no longer sorted
2017-03-21 16:54:49 +01:00
Sébastien Loriot 6d3d570239 Merge remote-tracking branch 'cgal/releases/CGAL-4.9-branch' into HEAD 2017-03-16 09:57:17 +01:00
Andreas Fabri 58b4b81ccd fix in_edges() and out_edges() 2017-03-13 17:12:37 +01:00
Andreas Fabri 426ab99df7 BGL: Fix Dual 2017-03-13 14:01:19 +01:00
Sébastien Loriot 3fa06c2cc8 remove buggy and useless custom less for vertex descriptors
the order was not correct and in some cases, std::set::erase
was picking the wrong vertex_descriptor. The default less
is fine since no vertices is removed from the adjacency_list,
thus descriptors remain valid
2017-03-09 09:25:18 +01:00
Sébastien Loriot e9395aba6f move enum for named parameters inside internal_np namespace 2017-02-13 10:25:28 +01:00
Sébastien Loriot 9b8f910cee move edge_index that is not defined in boost 2017-02-10 17:24:33 +01:00
Sébastien Loriot 47e8f6167f add doc in the interface file and files using it 2017-02-10 17:23:45 +01:00
Sébastien Loriot 2fee4affdd rename macro to be independant of any package 2017-02-10 17:00:38 +01:00
Sébastien Loriot e2e277ad83 fix the list of inherited named parameters and remove special cases 2017-02-10 16:55:56 +01:00
Sébastien Loriot 2068ba14ce remove non used named parameter 2017-02-10 16:45:18 +01:00
Maxime Gimeno 3d8aaf0a6e Add license headers 2017-02-09 15:46:01 +01:00
Maxime Gimeno 0f9c102516 Move the enums in a namespace parameters to clean-up the namespace CGAL. 2017-02-09 15:29:18 +01:00
Maxime Gimeno 21f305db27 Use an include system to factorize the macro calls in PMP and BGL. 2017-02-09 14:14:11 +01:00
Laurent Rineau 1a2f617d89 Merge pull request #1843 from afabri/BGL_accelerate_copy_face_graph-GF
Accelerate copy_face_graph
2017-02-08 17:32:47 +01:00
Laurent Rineau 13e420732c Merge pull request #1840 from afabri/BGL-reserve-GF
BGL: Add helper function reserve(G,nv,ne,nf)
2017-02-08 17:32:22 +01:00
Sébastien Loriot 758e403d02 remove uninitialized variable warning 2017-01-25 08:52:56 +01:00
Sébastien Loriot df886a0904 add missing include directive 2017-01-19 16:46:52 +01:00
Sébastien Loriot 6926578b15 add reserve to MutableFaceGraph 2017-01-18 18:19:25 +01:00
Sébastien Loriot f5044492c7 remove old implementation and benchmark using it 2017-01-18 16:44:21 +01:00
Sébastien Loriot 3fa4abe869 move function to init index maps to BGL 2017-01-18 16:37:34 +01:00
Sébastien Loriot b3340608cc move property map binders to property_map.h 2017-01-18 16:37:24 +01:00
Sébastien Loriot 35394ccebf update reserve and add test 2017-01-17 11:18:07 +01:00
Andreas Fabri 725a658dad Add reserve(G, nv, ne, nf) 2017-01-17 09:44:06 +01:00
Sébastien Loriot e437f1d7e7 WIP add a new copy_face_graph implementation using halfedge_index_map when possible 2017-01-16 18:35:11 +01:00
Sébastien Loriot a99a406d7f set the bucket size of hash maps 2017-01-16 15:58:06 +01:00
Andreas Fabri 7af02ade63 Add a benchmark 2017-01-16 15:15:27 +01:00
Sébastien Loriot 5557ce17fd add another version of copy_face_graph 2017-01-16 14:33:46 +01:00
Sébastien Loriot e3f9ffa6f8 workaround for named parameters with old boost version (<1.51)
handle the renaming of a struct and move get_param overloads
in the boost namespace (to match qualified call boost::get_param)
2017-01-13 12:05:51 +01:00
Sébastien Loriot 9ae7b37845 Merge pull request #1745 from sloriot/Polyhedra_corefinement-enhancements-sloriot
Add corefinement operations in PMP
2017-01-12 12:05:18 +01:00
Laurent Rineau e9d9cc5100 Merge pull request #1793 from lrineau/Mesh_3-various_improvements-lrineau
Improvements for Mesh_3
2017-01-12 11:09:45 +01:00
Laurent Rineau 4ce2e8e416 Reduce the width of lines with `using boost::graph_traits` 2017-01-05 11:59:25 +01:00
Laurent Rineau b7c07effa9 Simplify split_graph_into_polylines
Two tests `it = v2vmap.find(vs)) == v2vmap.end()` were useless because
it is guaranteed that the map does contain the vertices.
2017-01-05 11:56:30 +01:00
Laurent Rineau 47dbde4ace Merge pull request #1753 from maxGimeno/BGL_descriptor_with_graph-GF
BGL descriptor with graph
2017-01-05 10:56:02 +01:00
Sébastien Loriot 9981bcfa27 Merge pull request #1757 from afabri/BGL-reorient_make_tetrahedron-GF
BGL reorient make_tetrahedron() and make_hexahedron()
2017-01-02 19:10:20 +01:00
Laurent Rineau ca0fac22e7 Merge branch 'Mesh_3-improve_detect_features-GF' into Mesh_3-various_improvements-lrineau 2016-12-30 17:33:16 +01:00
Sébastien Loriot fe5e925367 Merge pull request #1701 from afabri/Convex_hull_3-FaceGraph-GF
Convex_hull_3: Switch to FaceGraph
2016-12-30 15:14:34 +01:00
Sébastien Loriot 81f4714b1b mimic what is done for Has_clear
typeof is an gcc extension
2016-12-30 14:51:50 +01:00
Laurent Rineau e5807d17ef Add visitor.add_edge, optional 2016-12-30 14:51:50 +01:00
Laurent Rineau 7776720ca9 Merge pull request #1752 from lrineau/Mesh_3-various_fixes_and_improvements-lrineau
Fix the patch from #1524
2016-12-28 16:12:14 +01:00
Andreas Fabri cbcfbc0259 Remove typedefs; put make_quad for vertices in namespace internal 2016-12-23 16:28:50 +01:00
Laurent Rineau f6bfae0324 Remove an assertion: bug in Boost filtered_graph::out_degree 2016-12-16 17:32:45 +01:00
Andreas Fabri fde59886ba Concept check GWdwg 2016-12-13 15:25:54 +01:00
Andreas Fabri 4a323718e3 Use CGAL_assertion; test that the assertion gets triggered 2016-12-09 17:33:25 +01:00
Andreas Fabri c058ae9bcc deacronymize header file name 2016-12-09 17:01:11 +01:00
Andreas Fabri d3a286d111 Gwdwg may be mutable 2016-12-09 16:52:47 +01:00
Laurent Rineau f8833fbec5 Fix a bug with isolated vertices in the graph 2016-12-09 15:47:19 +01:00
Andreas Fabri 98b5ae02f7 reorient make_hexahedron 2016-12-09 15:16:39 +01:00
Sébastien Loriot d1a00c9ab4 add missing overload 2016-12-09 13:44:41 +01:00
Andreas Fabri a32e75646f reorient make_tetrahedron 2016-12-09 12:49:06 +01:00
Maxime Gimeno d7c8f598a1 Fix doc 2016-12-08 10:12:10 +01:00
Sébastien Loriot a066f8c01b use different overloads even in c++11
The default value for the point map cannot be set
2016-12-07 17:08:30 +01:00
Maxime Gimeno 8569e8fb9a Add an example. 2016-12-07 16:46:49 +01:00
Laurent Rineau 65d67329fc Fix the patch from #1524
When the `less` operator was added to `split_graph_into_polylines`, it
was wrong: as we duplicate vertices, that is not sufficient to compare
the points at vertices.
2016-12-07 11:24:28 +01:00
Sébastien Loriot b4da56f408 remove extra comma 2016-12-07 09:02:36 +01:00
Maxime Gimeno 50e4b04d51 Restore graph_has_property() 2016-12-06 14:13:18 +01:00
Maxime Gimeno 5141f55efe Make doc 2016-12-06 12:59:56 +01:00
Sébastien Loriot f82fce23fd remove trailing whitespaces 2016-12-06 12:59:56 +01:00
Sébastien Loriot b1f6d0c1dd add assertion and graph_has_property specialization 2016-12-06 12:59:56 +01:00
Sébastien Loriot 2355c5b871 fix compilation issues 2016-12-06 12:59:55 +01:00
Sébastien Loriot 5a51e9bc98 allow comparision with null descriptors 2016-12-06 12:59:55 +01:00
Sébastien Loriot b1a481db5c disable the copy-constructor 2016-12-06 12:59:55 +01:00
Sébastien Loriot 4d67fcc08f the base property_map must be copied 2016-12-06 12:59:55 +01:00
Sébastien Loriot 51bed6153e add missing const 2016-12-06 12:59:55 +01:00
Sébastien Loriot b0e5c90eae various fixes 2016-12-06 12:59:55 +01:00
Andreas Fabri 3703683761 Add put 2016-12-06 12:59:55 +01:00
Andreas Fabri 211fcb4107 Partial support for propery maps 2016-12-06 12:59:55 +01:00
Andreas Fabri c9b53a1989 Add null_vertex() etc. 2016-12-06 12:59:55 +01:00
Sébastien Loriot 7f25b7af56 add missing typename and fix typo 2016-12-06 12:59:55 +01:00
Andreas Fabri 5f18b0738c First version of a graph class that stores a pointer to the graph in the descriptor (for debugging) 2016-12-06 12:59:55 +01:00
Sébastien Loriot c3e1309181 update from master branch 2016-12-05 14:37:29 +01:00
Andreas Fabri 3fc151b0dd polish, e.g. P -> pm 2016-11-30 10:32:40 +01:00
Andreas Fabri e0484d4988 Remove Graph_geometry.h 2016-11-28 08:39:51 +01:00
Sébastien Loriot 20fa78081c add property maps as parameter for copy_face_graph 2016-11-23 15:31:29 +01:00
Sébastien Loriot 5c94f7d8ac avoid documenting internal and non-intended classes and functions 2016-10-21 11:11:00 +02:00
Sébastien Loriot e4ba7e0c70 add missing include directive 2016-10-20 18:12:54 +02:00
Laurent Rineau 5ab5825013 Merge pull request #1466 from sloriot/BGL-add_nef_to_pm
Add a function to convert a Nef polyhedron to a polygon mesh
2016-10-17 10:03:24 +02:00
Laurent Rineau d43015c0ef Merge pull request #1543 from afabri/BGL_remove_graph_traits_CMap-GF
Remove files that are here accidentally according to Guillaume
2016-10-17 09:59:17 +02:00
Sébastien Loriot 14030d4c49 remove unused variable 2016-10-12 10:52:02 +02:00
Sébastien Loriot 5d9edb5670 fix license 2016-10-06 09:33:32 +02:00
Andreas Fabri 74a72a4749 Remove files that are here accidentally according to Guillaume 2016-10-05 16:22:26 +02:00
Sébastien Loriot d9413be399 add function convert_nef_polyhedron_to_polygon_mesh and document it 2016-10-05 15:28:12 +02:00
Laurent Rineau 223c1cf5a4 Merge pull request #1530 from lrineau/Installation-compute_dependencies-GF
Compute and fix packages dependencies
2016-10-05 13:11:04 +02:00
Laurent Rineau 745cdaeba5 Merge pull request #1524 from lrineau/Mesh_3-split_graph_into_polylines_determinism-lrineau
Make split_graph_into_polylines deterministic
2016-10-05 13:03:36 +02:00
Laurent Rineau 7b6addbb55 Merge pull request #1519 from lrineau/Mesh_3-fix_conversion_warnings-lrineau
Mesh_3: fix conversion warnings
2016-10-05 13:03:15 +02:00
Laurent Rineau 1c19028e5b Merge pull request #1267 from maxGimeno/Random_generator-GF
Random generator
2016-10-05 13:02:29 +02:00
Laurent Rineau eb21f2ed3b Fix a compilation error 2016-09-30 19:52:20 +02:00
Andreas Fabri 40e9c6f735 Move specializations of graph_traits the packages that are concerned 2016-09-30 15:22:29 +02:00
Andreas Fabri ca1f19b392 Package BGL: Add includes 2016-09-30 15:22:29 +02:00
Laurent Rineau 5bd65fba58 Make split_graph_into_polylines deterministic
- There is a new argument, `Less`, that allows to sort the `std::set` of
  vertex descriptors with a deterministic sort functor.

- The header `<CGAL/Mesh_3/polylines_to_protect.h>` defines and use such
  a functor.
2016-09-29 17:41:32 +02:00
Laurent Rineau 0221c3727a Fix a typo in the doc of the internal function 2016-09-29 14:48:29 +02:00
Maxime Gimeno cf0d78da34 Use const references in the generators instead of simple references. 2016-09-28 10:59:11 +02:00
Maxime Gimeno 4754094f5f Make working tests. 2016-09-28 10:48:07 +02:00
Maxime Gimeno 8469c45336 Enhance Prevent_deref API and use it. 2016-09-28 10:48:07 +02:00
Sébastien Loriot b899dc4549 add default parameters 2016-09-28 10:46:42 +02:00
Maxime Gimeno 3eb1f4ca69 Clean-up
- Clean-up
- Moved Prevent_deref to CGAL/iterator.h
2016-09-28 10:45:46 +02:00
Sébastien Loriot e2f7efa58a clean up 2016-09-28 10:45:45 +02:00
Maxime Gimeno 35a328b1bf Move Halfedge_and_face_graph_property_maps.h to BGL. 2016-09-28 10:45:45 +02:00
Jane Tournois b475497db2 add missing graph_has_property for edge_weight_t 2016-09-22 12:10:06 +02:00