Commit Graph

1165 Commits

Author SHA1 Message Date
Sébastien Loriot 8bb22d5b2c extra run of the script to remove tabs and trailing whitespaces
right after the merge of the 5.0 release branch

+ manual fix of the files (indentation was changed in the meantime):
   * Spatial_sorting/include/CGAL/Multiscale_sort.h
   * Spatial_sorting/test/Spatial_sorting/test_multiscale.cpp
2020-03-26 14:26:59 +01:00
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
Sébastien Loriot eb5d1d9a95 Update from master 2020-03-20 08:58:52 +01:00
Mael Rouxel-Labbé 618a72b739 Merge remote-tracking branch 'cgal/master' into PMP-soup_to_mesh_add_vpm 2020-03-17 20:00:31 +01:00
Sebastien Loriot 1454b9903c
Merge pull request #4209 from maxGimeno/PMP-Default_pmap-maxGimeno
PMP: Default Property_maps for Index_maps
2020-03-17 18:27:55 +01:00
Sébastien Loriot 32813dc976 Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch' 2020-03-16 16:32:47 +01:00
Sébastien Loriot f8f369173a remove BOOST_FOREACH introduced by a merge of 4.14 release branch 2020-03-16 16:24:24 +01:00
Sébastien Loriot cf99ea072d Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2020-03-16 16:19:38 +01:00
Sebastien Loriot 075ecbb4d7
Merge pull request #4573 from sloriot/BGL-add_face_border_fix
Fix issue with border vertices in Euler::add_face
2020-03-16 15:52:31 +01:00
Mael Rouxel-Labbé 2cb71708af Use proper index type in automatically-initialized index maps 2020-03-16 09:59:52 +01:00
Mael Rouxel-Labbé f6d994c003 Do not expose internal classes in BGL::FFG's default templates 2020-03-16 09:59:52 +01:00
Sébastien Loriot f454510de7 if a vertex is on a border, its halfedge is not necessarily on the border 2020-03-11 10:36:17 +01:00
Mael Rouxel-Labbé 544dbb441a Add more information about index maps in BGL/PMP's NamedParameters.txt 2020-03-09 10:53:48 +01:00
Mael Rouxel-Labbé e4ff489623 Get rid of GetVertex/FaceIndexMap
GetInitialized... should be used instead.

Complete removal instead of simply doing:
  struct GetVertexIndexMap
    : public GetInitializedVertexIndexMap
  { }

because there will anyway be a need to update code on the right side of
  GetVertexIndexMap fim = ...

and it's more obvious if it breaks on the type directly.
2020-03-09 10:41:04 +01:00
Mael Rouxel-Labbé bc84ca29a2 Remove obsolete comment 2020-03-09 10:18:43 +01:00
Mael Rouxel-Labbé ec30ebb709 Move getter structs and global functions to appropriate BGL file 2020-03-09 10:18:19 +01:00
Mael Rouxel-Labbé fd864b7d99 Add a performance warning when a dynamic property map is used as index map 2020-03-09 10:18:08 +01:00
Mael Rouxel-Labbé 5e0798c88f Add a comment to clarify assertion 2020-03-06 18:16:12 +01:00
Mael Rouxel-Labbé ad62f89a20 Use the new index map initializer functions and fix doc 2020-03-06 15:25:38 +01:00
Mael Rouxel-Labbé 798a476d63 Merge branch 'PMP-Default_pmap-maxGimeno-old' into PMP-Default_pmap-maxGimeno 2020-03-06 13:20:00 +01:00
Sébastien Loriot f0a7a8f92f add missing const 2020-03-06 12:45:26 +01:00
Mael Rouxel-Labbé 0133e9f2f9 Merge branch 'PMP-soup_to_mesh_add_vpm-old' into PMP-soup_to_mesh_add_vpm 2020-03-06 11:41:31 +01:00
Mael Rouxel-Labbé 4334e954c0 Parameter > PropertyTag for clarity 2020-03-05 17:30:15 +01:00
Simon Giraudot feaa8ce598 Merge remote-tracking branch 'necip/gsoc2019-pointmatcher_icp_wrapper-necipfazil' into gsoc2019-pointmatcher_icp_wrapper-necipfazil 2020-03-05 15:58:17 +01:00
Mael Rouxel-Labbé b0cfe5a96d Don't necessarily initialize the halfedge index map in copy_face_graph 2020-03-05 15:31:03 +01:00
Laurent Rineau 79699f9fc2 Merge pull request #4259 from MaelRL/PMP-Snapping_improvements-GF
PMP: Improvements for snapping
2020-03-05 15:06:46 +01:00
Laurent Rineau 192792f524 Merge pull request #4531 from sloriot/BGL-selection_for_removal_BF
Bug fix in selection expansion for removal
2020-03-05 14:52:19 +01:00
Laurent Rineau 952e0d9cb7 Merge pull request #4531 from sloriot/BGL-selection_for_removal_BF
Bug fix in selection expansion for removal
2020-03-05 14:50:52 +01:00
Mael Rouxel-Labbé e6584bd176 Implement initialized_index_map getter with non-const graph 2020-03-05 14:26:20 +01:00
Mael Rouxel-Labbé 18a7c6900f Tiny alignment change 2020-03-05 13:23:41 +01:00
Mael Rouxel-Labbé af47c608fc Add missing & 2020-03-05 13:23:34 +01:00
Mael Rouxel-Labbé 1f7c96a660 Some constructors from () to {} for clarity 2020-03-05 11:42:30 +01:00
Mael Rouxel-Labbé aa331c0f14 Add missing hash value function for Seam_mesh's edges 2020-03-05 11:30:29 +01:00
Mael Rouxel-Labbé 2d1f3266ea Hide error message behind debug macro 2020-03-04 14:35:46 +01:00
Mael Rouxel-Labbé 432d5c724a Improve usages of get_initialized_xxx_index_map 2020-03-04 13:37:09 +01:00
Mael Rouxel-Labbé 889108e253 Update get_initialize_xxx_index_map usages to new API 2020-03-04 12:58:42 +01:00
Mael Rouxel-Labbé d6bbf2bb5f Fix implementation of initialized index map getters 2020-03-04 11:56:50 +01:00
Mael Rouxel-Labbé 7e303f421f Add 'Is_writable_property_map'
Note the following:

'lvalue_pmap_tag' is annoying, because the property map is allowed to be non-mutable,
but boost::lvalue_property_map_tag is !always! defined as:
  struct lvalue_property_map_tag : public read_write_property_map_tag
so we can't just check that 'writable_property_map_tag' is a base of the the pmap's category.

Instead, this struct checks if the reference is non-const, which is not completely correct:
map[key] returning a non-const reference doesn't mean that 'put(map, key, val)' exists,
which is what a writable property map must define.
2020-03-04 09:02:13 +01:00
Mael Rouxel-Labbé e94da7c669 Remove trailing whitespace 2020-03-02 14:00:11 +01:00
Mael Rouxel-Labbé 26463ded7a Update NPs using default constructed default values to new API
+ misc cleaning
2020-02-28 11:55:17 +01:00
Mael Rouxel-Labbé 338089b2a5 Add an overload of choose_parameter with a single parameter
The previous (and only) overload of choose_parameter required two parameters,
with the default parameter often being a default constructed object
of type the type of the object being passed in named parameter.
For example:

typedef typename CGAL::GetPointMap<PointRange, NamedParameters>::type Point_map;
Point_map pm = choose_parameter(get_parameter(np, internal_np::point_map),
				Point_map());

However, this can be unpleasant, for example when passing functors that have
an underlying lambda such (function_property_map, ...) because lambdas
cannot be default constructed.

With the new API:

typedef typename CGAL::GetPointMap<PointRange, NamedParameters>::type Point_map;
Point_map pm = choose_parameter<Point_map>(get_parameter(np, internal_np::point_map));

all is well.
2020-02-28 11:48:41 +01:00
Maxime Gimeno 79c390eb6d fix warning 2020-02-26 16:17:17 +01:00
Maxime Gimeno 9a454ca7e2 Changes after review 2020-02-21 11:43:08 +01:00
Maxime Gimeno 077a129216 Merge remote-tracking branch 'cgal/master' into PMP-Default_pmap-maxGimeno 2020-02-21 10:34:14 +01:00
Maxime Gimeno 195d43bc5e Fix conversion warning 2020-02-20 16:49:54 +01:00
Mael Rouxel-Labbé bcd4f9600f Make GetPointMap work with only a PointRange template 2020-02-20 11:11:51 +01:00
Mael Rouxel-Labbé 3a968a3433 Move GetPointMap to CGAL:: namespace (from CGAL::PSP_3)
Since it'll also be used in PMP
2020-02-19 17:47:43 +01:00