Commit Graph

289 Commits

Author SHA1 Message Date
Sébastien Loriot 8b153fb495 Merge branch 'cgal/releases/CGAL-5.0-branch'
whitespace+tab removal, merged with option -Xignore-space-change
2020-03-26 14:22:32 +01:00
Sébastien Loriot 0779373835 extra run of the script to remove tabs and trailing whitespaces
right after the  merge of 4.14 release branch

+ manual fix on one line in:
    * Arrangement_on_surface_2/include/CGAL/IO/Arr_text_formatter.h
    * .travis/generate_travis.sh
2020-03-26 14:16:06 +01:00
Sébastien Loriot 0a46621dc6 Merge branch 'cgal/releases/CGAL-4.14-branch'
whitespace+tab removal, merged with option -Xignore-all-space
2020-03-26 13:28:46 +01:00
Sébastien Loriot 590612a563 run the script to remove tabs and trailing whitespaces 2020-03-26 13:25:16 +01:00
Mael 855003baa1
Merge branch 'master' into BGL-Alpha_expansion_graphcut-GF 2020-03-24 08:18:23 +01:00
Mael Rouxel-Labbé 30d4754a04 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-03-17 09:03:12 +01:00
Mael Rouxel-Labbé 100304667d Remove CGAL::internal::boost_::function_property_map
This file was duplicated from BOOST 1.64 because it appeared in a boost
release that was younger than the oldest boost release supported by CGAL
when the file was first required.

The minimum boost version (1.57) now required by CGAL is younger
than the version in which the file appeared in boost (1.51)
and it can thus be removed.
2020-03-12 20:58:44 +01:00
Mael Rouxel-Labbé 41271b67f6 Improvements to CGAL i/o across the board 2020-01-29 10:00:07 +01:00
Maxime Gimeno dd6cf454dc add precision(17) to most examples involving surface_mesh or polyhedron. 2020-01-17 09:58:44 +01:00
Simon Giraudot 944c034620 Fix name of project in CMakeLists 2020-01-16 11:59:05 +01:00
Simon Giraudot 9ae5663f3e Use named parameters 2020-01-15 14:18:01 +01:00
Simon Giraudot 1b900e8b86 Update with reviews 2020-01-15 12:46:53 +01:00
Mael Rouxel-Labbé f68141a6d3 Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF 2019-07-01 11:28:25 +02:00
Laurent Rineau 4fbf00fb8a CMake>=3.13: opt for for new policies up to 3.15 2019-06-19 14:34:59 +02:00
Mael Rouxel-Labbé e614fc43e1 Simplify/Clean all BGL T2 examples (can now get rid of Finite_filter stuff) 2019-04-29 15:47:43 +02:00
Sébastien Loriot 0ce7fc09b5 turns iterator pairs into iterable ranges 2019-03-29 13:28:22 +01:00
Sébastien Loriot d60f5645aa replace BOOST_FOREACH by c++ ranged-based for loop
some of the command used for the replacement:
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\(([a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\((const [a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\((const typename [a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\((typename [<>a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack "boost/foreach.hpp" -l --cpp | xargs sed -i '/boost\/foreach.hpp>/d'
2019-03-29 13:22:15 +01:00
Sébastien Loriot 6e8e4a4b10 remove variadic template workaround for cmap, gmap, and lcell 2019-03-29 10:41:50 +01:00
Andreas Fabri e08d85f3e3 Set precision of the ostream when writing a point set or face graph. Add a \note in the manual 2019-03-04 15:50:18 +01:00
Andreas Fabri d0ba5e40a9 AABB_tree, BGL 2019-02-14 09:44:18 +01:00
Maxime Gimeno 20899df7a7 Make the hexahedron creation clearer and fix examples and tests 2018-12-04 11:46:48 +01:00
Guillaume Damiand 92ba7fa6c9 Update minimum cmake required version in all CMakeLists.txt 2018-10-18 14:49:23 +02:00
Guillaume Damiand a1474a74d2 Add a default argument for BGL tests and examples, used when no command line argument in given. 2018-10-18 11:04:14 +02:00
Guillaume Damiand 0bd9088b5a Remove all include( ) and include( CGAL_CreateSingleSourceCGALProgram ) in CMakeLists.txt; they are no more required. 2018-10-17 14:17:08 +02:00
Guillaume Damiand 7f09308d33 Remove all include_directories(BEFORE ../../include) in CMakeLists.txt 2018-10-17 13:07:22 +02:00
Laurent Rineau 9404b60ca7 change of name of the header 2018-09-20 10:02:53 +02:00
Maxime Gimeno f58dcc6a7e trigger travis 2018-05-22 09:55:32 +02:00
Maxime Gimeno 4b90bca4e3 Clean-up and fixes 2018-05-17 11:49:31 +02:00
Maxime Gimeno cd6ffdc12a Add property maps for simplex mapping.
Also adds an operator()(const T&){} to Emptyset_iterator so it can be used by boost::function_output_iterator().
2018-05-17 10:49:58 +02:00
Maxime Gimeno 6623d3633f Clean-up and fixes 2018-05-17 10:49:58 +02:00
Maxime Gimeno 5fc0022d92 make copy_face_graph use NamedParameters 2018-05-17 10:49:58 +02:00
Andreas Fabri 991f3847e8 Do not include graph_traits_Polyhedron.h, properties_polyhedron.h and Polyhedron_iostream.h 2018-05-03 13:23:50 +02:00
Mael Rouxel-Labbé 8057838793 Fixed partition warnings 2018-02-19 14:30:20 +01:00
Laurent Rineau f310fc588d
Merge pull request #2690 from sgiraudot/Classification-ETHZ_random_forest-GF
Classification: ETHZ Random Forest
2018-02-01 17:35:30 +01:00
Simon Giraudot 6269309d86 Use CGAL include for boost counting/transform iterators everywhere 2018-01-23 11:09:52 +01:00
Mael Rouxel-Labbé 17e46dab7d Added partition operations to BGL 2018-01-09 18:06:02 +01:00
Sébastien Loriot 4269a2386c remove workaround for an old boost bug 2018-01-02 13:45:51 +01:00
Laurent Rineau 7df26c594b
Merge branch 'master' into BGL-generic_property_map-GF 2017-12-14 09:46:01 +01:00
Jane Tournois 2feb79a16b Add example for dynamic_property_map 2017-11-27 16:35:30 +00:00
Laurent Rineau c6068691fa Merge pull request #2547 from lrineau/CMake-parse_CTest_XML_output-lrineau
CGAL testsuite implemented with CTest plus Python (part.1)
2017-11-13 11:13:54 +01:00
Jane Tournois 811455f2a0 fix unused variable warnings 2017-10-03 10:33:51 +02:00
Andreas Fabri 7156427220 Add write_inp() 2017-09-22 08:16:50 +01:00
Sébastien Loriot 6de162faae add missing NOTICE 2017-08-09 12:44:07 +02:00
Jane Tournois e7dfea8268 this script is useless when OpenMesh is not present 2017-08-07 16:53:52 +02:00
Laurent Rineau 89acad2d14 Merge pull request #2101 from afabri/BGL-read_write_off-GF
BGL: Add generic functions read_off() and write_off()
2017-07-17 12:45:07 +02:00
Andreas Fabri 1b8a5b5f22 fix compilation error of example 2017-07-10 16:53:10 +02:00
Laurent Rineau 80829925b7 Merge pull request #2174 from gdamiand/BGL-LCC-gdamiand
BGL version for Linear_cell_complex_for_combinatorial_map
2017-07-10 15:38:21 +02:00
Laurent Rineau d878561809 Merge pull request #2102 from afabri/Kernel_Weighted_point_without_conversion-GF
Remove implicit conversions between points and weighted points
2017-07-03 12:08:57 +02:00
Andreas Fabri 59bdacde2c fix the example 2017-06-30 18:12:16 +02:00
Andreas Fabri 5098e546c1 Add CGAL::read_off() and CGAL::write_off() to OpenMesh 2017-06-30 18:12:16 +02:00
Guillaume Damiand 4c9bbc06af Merge branch 'master' into BGL-LCC-gdamiand 2017-06-30 17:18:53 +02:00
Mael Rouxel-Labbé 8c7bda5f2d Changed from boost::function_property_map to CGAL::internal::boost_'s
This is so it's always available, even if using an old version of boost
2017-06-28 10:17:14 +02:00
Mael Rouxel-Labbé c88cbb137c EMST based on regular uses edges weighted with the power distance
Assuming an EMST based on a regular triangulation makes sense, it should be
coherent in its distance: in the Delaunay version, we use the Euclidean
distance, so the power distance should be used for the regular triangulation
version.
2017-06-28 10:15:30 +02:00
Mael Rouxel-Labbé 5bc0f242da Regular_triangulations are built using weighted points 2017-06-28 10:15:30 +02:00
Mael Rouxel-Labbé 3307561dd7 Cleaned off #1 in example 2017-06-22 16:17:13 +02:00
Andreas Fabri 531496b72f Use CGAL_SEAM_MESH_INSERT_OPERATOR in example 2017-06-22 16:17:13 +02:00
Mael Rouxel-Labbé c71d8285d0 Updated the examples of the SMP to work with the new Seam mesh
Also a small change in the Polyhedron demo
2017-06-22 16:14:55 +02:00
Andreas Fabri a6a62bc4f6 index vertices inside parameterize() 2017-06-22 16:11:38 +02:00
Andreas Fabri e1089a9168 WIP: Add vertex_descriptor which is a kind of canonical halfede_descriptor 2017-06-22 16:11:38 +02:00
Andreas Fabri c746425f8c Authalic parametrization works with a Surface_mesh with border 2017-06-22 16:11:38 +02:00
Andreas Fabri e00500fe5c a shy beginning of a graph with edges marked as seam edges 2017-06-22 16:11:38 +02:00
Guillaume Damiand c8250c4570 Merge branch 'master' into BGL-LCC-gdamiand 2017-06-15 10:03:53 -04:00
Guillaume Damiand 954a2fe2c5 Remove command files to use same names than cpp files 2017-06-15 09:50:00 -04:00
Guillaume Damiand f5a94891bb Update examples and demo that use BGL for LCC. 2017-06-14 11:42:15 -04:00
Laurent Rineau 358ad97730 Merge pull request #2106 from gdamiand/patch-1
Bugfix in copy face graph example
2017-05-19 10:30:07 +02:00
Guillaume Damiand 66f3bdcb58 Bugfix in copy face graph example
Here we need to write S (and not T1 as in the current example).
2017-05-10 17:15:20 -04:00
Guillaume Damiand a22a5fbd21 Update BGL LCC examples and tests following the modification of the API (helper class) 2017-05-10 13:27:37 -04:00
Andreas Fabri c81b707bfb Do not include graph_traits_{Polyhedron | Surface_mesh}.h 2017-04-24 19:17:43 +02:00
Guillaume Damiand b1e2d4bb81 Add examples for BGL LCC 2017-04-19 15:17:50 -04:00
Andreas Fabri e64884da90 Also add support for Regular_triangulation_2 2017-03-31 12:38:17 +02:00
Andreas Fabri c97223b933 Add an example for a triangulation hierarchy of a constrained Delaunay triangulation plus 2017-03-31 11:20:47 +02:00
Laurent Rineau eb5f52869f Use the new API of target_link_libraries
... otherwise CMake warns about mixing old and new usages of that CMake
command.
2017-03-27 18:04:54 +02: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
Laurent Rineau 3f4bcabe13 Merge pull request #1756 from MaelRL/Arrangement_2-Fix_typos
Fixed some typos in Arrangement_2
2016-12-22 17:11:08 +01:00
Andreas Fabri c058ae9bcc deacronymize header file name 2016-12-09 17:01:11 +01:00
Mael Rouxel-Labbé 2038e558b2 Fixed typos in doc and comments 2016-12-09 11:27:17 +01:00
Maxime Gimeno 8569e8fb9a Add an example. 2016-12-07 16:46:49 +01:00
Andreas Fabri 6df8b711cc cleanup CMakeLists.txt 2016-11-16 08:16:00 +01:00
Andreas Fabri 44d0fa4d6f fix the 2D triangulations 2016-11-03 13:08:31 +01:00
Sébastien Loriot 6b338eeb1f improve the name of projects in cmake scripts of examples 2016-09-08 00:02:55 +02:00
Sébastien Loriot 21664faf6f Commit example cmake scripts forgotten 2016-09-07 23:41:11 +02:00
Andreas Fabri 0c817cdbc5 chmod -x points.xy 2016-08-29 12:31:26 +02:00
Andreas Fabri 4897008e43 All examples now read from a file 2016-08-20 20:11:36 +02:00
Sebastien Loriot b2fa6fe115 Merge pull request #957 from janetournois/PMP_Epec-GF
PMP : make it work with Epeck
2016-06-15 17:39:28 +02:00
Andreas Fabri 20c97edb12 The edge_weight must be the lenth, and not the squared length 2016-06-14 14:17:14 +02:00
Andreas Fabri fb7c859554 Switch to edge_descriptor as boost::filtered_graph has no halfedge_descriptor 2016-06-14 09:27:34 +02:00
Andreas Fabri 4c78fb44bc Add specializations for the OM handle classes 2016-06-08 10:42:45 +02:00
Andreas Fabri d84be563f8 Add hash_value and specialization of hash for OpenMesh 2016-06-06 19:10:58 +02:00
Philipp Möller 72b2269958 Use Cartesian_converter for point property 2016-04-15 10:04:43 +02:00
Philipp Möller 03192c13e8 Add some difference 2016-04-15 10:04:39 +02:00
Philipp Möller 5bea05c9ac Use correct inserters 2016-04-15 10:04:37 +02:00
Philipp Möller e398acd624 Clean up the example 2016-04-15 10:04:35 +02:00
Philipp Möller e7b1325e2a Improve dual example
Remove it from dont_submit, improve formatting and messages
2016-02-02 16:00:31 +01:00
Andreas Fabri 567f027484 Fix macro name 2016-01-21 11:32:48 +01:00
Andreas Fabri 66e0abc87e fixes: add missing typename; use graph_traits; read from a file 2015-11-16 10:05:58 +01:00
Jane Tournois 2a47fd5c0b Merge remote-tracking branch 'remotes/cgal-dev/BGL-OpenTriMesh-GF' into BGL-SurfaceMesh2SurfaceMesh-GF 2015-09-22 12:21:31 +02:00
Andreas Fabri bb208ab2d6 Fix halfedge(v, PolyMesh) + fixes for conversion from OpenMesh to Polyhedron 2015-09-21 16:41:24 +02:00
Andreas Fabri 1eb87f5a9d #ifdef to switch between TriMesh and PolyMesh 2015-09-21 16:05:46 +02:00
Andreas Fabri cff5745e3d Duplicate the graph traits from PolyMesh to TriMesh 2015-09-21 14:53:42 +02:00
Andreas Fabri 66b3d24af3 Add converter between models of FaceGraph 2015-09-21 12:00:11 +02:00
Sébastien Loriot a25297a5c9 add missing filename in test 2015-07-16 08:48:59 +02:00
Andreas Fabri 8d86bebcaf Merge remote-tracking branch 'cgal-dev/Polygon_mesh_processing-GF' into Polygon_mesh_processing-GF 2015-07-01 17:25:13 +02:00
Andreas Fabri 20c1b1a1f6 Merge branch 'Polygon_mesh_processing-GF-old' into Polygon_mesh_processing-GF
Conflicts:
	BGL/include/CGAL/boost/graph/Euler_operations.h
	BGL/include/CGAL/boost/graph/iterator.h
	Documentation/doc/Documentation/Doxyfile.in
	Documentation/doc/Documentation/dependencies
	Polyhedron/demo/Polyhedron/Polyhedron_demo_point_inside_polyhedron_plugin.cpp
	Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
	Polyhedron/demo/Polyhedron/Selection_widget.ui
2015-07-01 13:52:44 +02:00
Jane Tournois ed9f4b8233 rename dual.cpp 2015-07-01 10:24:44 +02:00
Jane Tournois abec5f1c88 rename dual example 2015-07-01 10:18:21 +02:00
Andreas Fabri cc953a0ac7 remove warning in example, and improve output 2015-02-12 15:40:44 +01:00
Andreas Fabri 0d67ba64df improve example for connected_components of a graph and its dual 2015-02-12 15:34:05 +01:00
Andreas Fabri a41f54cc54 Add property map for Dual<> 2015-02-12 11:14:57 +01:00
Andreas Fabri b538707892 Add a Dual<Graph> class 2015-02-11 18:33:23 +01:00
Andreas Fabri dc0687dc26 Use iterator_adaptor instead derivation from transform_iterator
With transform iterator we would have to rewrite operator++
as it does not return the derived class.
This led to a compilation bug when using connected_components.
2015-02-11 17:24:08 +01:00
Andreas Fabri 6ce17b3460 chmod -x 2015-01-07 18:44:05 +01:00
Andreas Fabri 3a75fb45a0 iterator_range -> Iterator_range 2014-12-23 14:25:29 +01:00
Andreas Fabri 28dc50fdfc point property map must be passed as argument 2014-12-23 14:24:51 +01:00
Sébastien Loriot 7e0b5a3fe6 skip comments while reading off files 2014-12-18 08:42:49 +01:00
Andreas Fabri 2ccc5e5b59 clean up example of face_graph.cpp 2014-12-18 08:26:00 +01:00
Andreas Fabri 9f6807b005 Add Tds_2::collapse_edge() 2014-12-18 08:25:57 +01:00
Andreas Fabri 46fe0501b8 add .sm_do_intersect.cmd file and data 2014-12-10 20:32:47 +01:00
Sébastien Loriot ad1954afc4 fix warnings and compilation issues 2014-12-10 17:34:51 +01:00
Andreas Fabri 43e967a72e remove property map after use 2014-12-10 15:18:25 +01:00
Andreas Fabri 3ba095eb97 Add data and .cmd files 2014-12-09 15:18:25 +01:00
Andreas Fabri f597b12c37 simplify the example 2014-12-08 22:04:56 +01:00
Andreas Fabri facbc98636 Add documentation about the BGL API of Surface_mesh 2014-12-08 21:35:42 +01:00
Andreas Fabri 419d332bfe Add more BGL functions for Triangulation_2; errouneously try to do simplification 2014-11-21 18:45:24 +01:00
Andreas Fabri 6899d73e71 Use vertex_around_target (and add halfedge(vertex_descriptor) 2014-11-20 21:10:38 +01:00
Andreas Fabri 3e6a99b327 Add property map for vertex_point_t 2014-11-20 17:30:44 +01:00
Andreas Fabri 42a1c49066 The class Triangulation_2 (but neither TDS2 nor DT_2) should now be a model of FaceListGraph (but not Mutable) 2014-11-20 15:39:56 +01:00
Andreas Fabri 8ab546b25f move the functions from namespace boost to CGAL as they should be found with Koenig lookup 2014-11-20 11:56:51 +01:00
Andreas Fabri 2005988c4c Add halfedge_descriptor, halfedge(FD), face(HD) 2014-11-19 15:35:17 +01:00
Andreas Fabri 0eccab2cce Add face_descriptor/iterator and faces() 2014-11-19 15:13:07 +01:00
Andreas Fabri 15bfc64808 We must run kruskal on the filtered graph to ignore the infinite vertex
Approved by the release manager
2014-10-24 11:30:16 +02:00
Sébastien Loriot bc8e1f399d workaround a bug in dijsktra algorithm in boost 1.54 affecting normal estimation 2014-07-19 12:20:29 +02:00
Sébastien Loriot 8b7af3a397 vector_property_map include is done by CGAL/property_map.h 2014-07-19 11:36:33 +02:00
Sébastien Loriot 5f4813b64d properties_Polyhedron_3.h is now included by graph_traits_Polyhedron_3.h 2014-07-04 17:24:05 +02:00
Andreas Fabri c726cedbbb As BOOST_NO_CXX11_RANGE_BASED_FOR has been introduced with Boost 1.51
we need a CGAL macro
2014-07-03 09:24:20 +02:00
Andreas Fabri 31cbcd5544 less warnings 2014-07-01 14:45:28 +02:00
Andreas Fabri b18acb6097 fix example 2014-06-24 18:33:42 +02:00
Andreas Fabri 5da08ce426 #include <ifstream> 2014-06-19 08:57:57 +02:00
Andreas Fabri e7b0528ff8 Add a CGAL::iterator_range 2014-06-18 13:17:43 +02:00
Andreas Fabri ded507212d Add a CGAL::iterator_range 2014-06-13 12:29:18 +02:00
Andreas Fabri 9170b0a866 use argc/argv to pass the argument 2014-06-13 09:51:31 +02:00
Andreas Fabri f531ee2fa9 include property_map header file wrapper 2014-06-13 08:54:43 +02:00
Andreas Fabri 074c6aab2e read from a file so that the testsuite passes 2014-06-11 09:51:54 +02:00
Andreas Fabri b1b4b05fe6 changes such that the testsuite compiles 2014-05-22 12:21:29 +02:00
Andreas Fabri 3ad8f65d28 small fixes 2014-05-22 10:36:50 +02:00
Andreas Fabri 46ee658eb7 Cartesian -> Simple_cartesian 2013-08-26 16:36:02 +02:00
Andreas Fabri 950e858555 remove unused parameters 2013-03-12 09:50:46 +01:00
Andreas Fabri 5bd509bd70 constructor of boost::vector_property_map expects an unsigned int 2013-02-13 16:25:56 +01:00
Ophir Setter 16cf477c27 Copying examples from Arr_2 package. So that examples here match 2012-10-10 22:04:40 +00:00
Andreas Fabri a9e13a61c2 No need for a compare functor as the inplace list now provides comparison operators 2011-03-01 13:25:24 +00:00
Guillaume Damiand 8cb6de003c Use a functor instead of the global operator< to define a std::map.
TODO: remove the functor and use directly the new operator< defined in In_place_list
2011-02-15 12:22:51 +00:00