songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
91,579 Commits 3 Branches 156 Tags 959 MiB
Commit Graph

1371 Commits

Author SHA1 Message Date
Mael 84bcb8ac05
Merge branch 'master' into PMP-Regularize_selection_borders-GF 2020-04-03 09:11:52 +02:00
Simon Giraudot abc0a578c3 Fix unused typedef 2020-04-02 15:33:06 +02:00
Sébastien Loriot 8795725dba fix no link issue 2020-04-02 15:25:32 +02:00
Sébastien Loriot b0a1e84c07 Merge pull request #4104 from sgiraudot/BGL-Alpha_expansion_graphcut-GF 
BGL: Alpha Expansion Graphcut
 2020-04-02 14:00:16 +02:00
Simon Giraudot bb95599ae2 Remove trailing whitespace 2020-04-02 13:45:25 +02:00
Simon Giraudot 238d5e7c54 Update from latest remarks 2020-04-02 13:45:03 +02:00
Simon Giraudot f64d2c4585 Add missing geom_trait parameters 2020-04-02 13:45:03 +02:00
Sébastien Loriot dba7c3eb73 extra run of the script to remove tabs and trailing whitespaces 2020-04-02 13:45:03 +02:00
Simon Giraudot 3b8c8f200e Fix capitalization 2020-04-02 13:45:03 +02:00
Simon Giraudot 7792514a32 Fix missing word 2020-04-02 13:45:02 +02:00
Simon Giraudot 06999247de Fix typo 2020-04-02 13:45:02 +02:00
Simon Giraudot c1259c8408 Fix facets -> faces 2020-04-02 13:45:02 +02:00
Simon Giraudot abae12955b Fix type 2020-04-02 13:45:01 +02:00
Simon Giraudot eba52f2a70 Finalize doc 2020-04-02 13:45:01 +02:00
Simon Giraudot c2a7dd51f3 Use named parameters 2020-04-02 13:45:01 +02:00
Simon Giraudot 5afc4bbc59 Update with new alpha expansion API 2020-04-02 13:45:01 +02:00
Simon Giraudot 86d5788480 Improve vertex label map 2020-04-02 13:45:01 +02:00
Simon Giraudot 80a4b95f01 Use identity face map 2020-04-02 13:45:01 +02:00
Simon Giraudot bdbd360490 Change weights normalization if deselection is not prevented 2020-04-02 13:45:01 +02:00
Simon Giraudot dc54b326f4 Separate regularization functions 2020-04-02 13:45:01 +02:00
Simon Giraudot 1c5bc70b7b Start working on public API for alpha expansion 2020-04-02 13:45:00 +02:00
Simon Giraudot 461bb19e2d Use BGL API in regularize_selection 2020-04-02 13:45:00 +02:00
Simon Giraudot 6b79764dbb Add alternative algorithm for regularization using local minimization 2020-04-02 13:45:00 +02:00
Simon Giraudot f64702e640 Make API weight between 0 and 1 2020-04-02 13:45:00 +02:00
Simon Giraudot 8bcbc8ea5e Remove useless parameter 2020-04-02 13:45:00 +02:00
Simon Giraudot 67ac0d80b1 Normalize weights 2020-04-02 13:45:00 +02:00
Simon Giraudot d505837264 First version of selection regularization via graphcut 2020-04-02 13:45:00 +02:00
Simon Giraudot 8089907795 Remove trailing whitespace 2020-04-02 13:44:17 +02:00
Jane Tournois dca97faad6 Merge remote-tracking branch 'cgal/master' into Tetrahedral_remeshing-new-jtournois 2020-04-01 12:25:59 +01:00
Jane Tournois e0171c2f24 Merge branch 'master' into Tetrahedral_remeshing-new-jtournois 2020-04-01 07:07:46 +01:00
Sébastien Loriot fa163a5be1 remove unused type 2020-03-31 09:11:12 +02:00
Simon Giraudot 3350f9d05e Fix warnings 2020-03-30 08:10:23 +02:00
Mael Rouxel-Labbé e7d52999a8 Update PMP NPs to new macros 2020-03-29 17:16:50 +02:00
Maxime Gimeno 5ff8d88151 Merge remote-tracking branch 'cgal/master' into PMP-new_functions-GF 2020-03-27 16:15:38 +01:00
Maxime Gimeno b13e863065 Merge remote-tracking branch 'cgal/master' into PMP-new_functions-GF 2020-03-27 16:12:19 +01:00
Maxime Gimeno 4e6fb685c6 Merge remote-tracking branch 'mine/CGAL_IO-maxGimeno' into HEAD 2020-03-27 11:11:10 +01:00
Maxime Gimeno 9c0648a004 Merge tag 'master_before_no_tws_nor_tabs' into CGAL_IO-maxGimeno 2020-03-27 11:05:43 +01:00
Sébastien Loriot 620dfa40fc extra run of the script to remove tabs and trailing whitespaces 2020-03-27 08:37:32 +01:00
Sébastien Loriot ba42fcb6ca Update branch from master after trailing whitespaces and tabs removal 2020-03-27 08:36:40 +01:00
Sébastien Loriot 1cfd991f4b extra run of the script to remove tabs and trailing whitespaces 2020-03-26 19:34:32 +01:00
Sébastien Loriot df0e632c65 Update branch from master after trailing whitespaces and tabs removal 2020-03-26 19:34:12 +01:00
Sébastien Loriot 9f2eafd06e extra run of the script to remove tabs and trailing whitespaces 2020-03-26 19:17:02 +01:00
Sébastien Loriot 35b83deffd Update branch from master after trailing whitespaces and tabs removal 2020-03-26 19:16:25 +01:00
Sébastien Loriot 92f5f0242e Update branch from master after trailing whitespaces and tabs removal 2020-03-26 19:04:33 +01:00
Sébastien Loriot 47027d6f5b extra run of the script to remove tabs and trailing whitespaces 2020-03-26 18:59:19 +01:00
Sébastien Loriot 4421fff65f Update branch from master after trailing whitespaces and tabs removal 2020-03-26 18:58:50 +01:00
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
Simon Giraudot 1c3176468e Use real tags to select implementation 2020-03-26 11:08:12 +01:00
Simon Giraudot 522a8b2e49 Fix implementation getter 2020-03-25 16:17:01 +01:00
Simon Giraudot c4597c74a1 Fix unused arg warning 2020-03-25 15:13:36 +01:00
Simon Giraudot b77e138438 Fix capitalization 2020-03-24 16:30:01 +01:00
Simon Giraudot 6ffc79eca6 Fix comparison warning 2020-03-24 16:09:00 +01:00
Mael Rouxel-Labbé 54d41c816b Merge remote-tracking branch 'cgal/master' into CGAL-Optimal_bounding_box-GF 2020-03-24 12:03:07 +01:00
Sébastien Loriot 13f19889c3 doc 2020-03-24 11:03:17 +01:00
Sébastien Loriot bd3f47c16e fix 3 args put for open mesh 2020-03-24 11:02:57 +01:00
Sébastien Loriot 179c89803b use default initialzed vertex index map 
there is no named param in Euler so do not introduce it here
 2020-03-24 10:48:54 +01:00
Mael Rouxel-Labbé 9cfe453995 Tiny indentation fix 2020-03-24 10:25:16 +01:00
Simon Giraudot d303a1cd2b Fix mismatch class/struct declaration 2020-03-24 10:06:54 +01:00
Sébastien Loriot b79422c140 tm -> pm 2020-03-24 09:26:30 +01:00
Sébastien Loriot 3171d23804 handle hand fans attached to non-manifold vertices affected by the insertion of faces 2020-03-24 09:18:47 +01:00
Mael Rouxel-Labbé 8a8b5e3765 Fix assuming a descriptor range is a range 
Concepts (BGL's and CGAL's) say it's an iterator pair
 2020-03-24 08:35:23 +01:00
Mael Rouxel-Labbé 6b67e0b350 Use the new API for initialized index maps 2020-03-24 08:34:41 +01:00
Mael 855003baa1
Merge branch 'master' into BGL-Alpha_expansion_graphcut-GF 2020-03-24 08:18:23 +01:00
Mael Rouxel-Labbé 2556196dad Merge remote-tracking branch 'cgal/master' into CGAL-Optimal_bounding_box-GF 2020-03-23 08:59:49 +01:00
Sébastien Loriot 0212619875 fix special case when a patch is appended 2020-03-23 07:16:28 +01:00
Sébastien Loriot 397601460e add first version of function add_faces 2020-03-23 07:16:28 +01:00
Sébastien Loriot 400ca78690 restrict properties for Dual 
I totally removed the generic put as I don't see any
generic usage
 2020-03-20 15:43:01 +01:00
Sébastien Loriot 437dec193e fix ambiguity 2020-03-20 15:42:48 +01:00
Sébastien Loriot eb5d1d9a95 Update from master 2020-03-20 08:58:52 +01:00
Mael de563e9844
Merge branch 'master' into PMP-new_functions-GF 2020-03-20 08:48:39 +01:00
Maxime Gimeno 0f56294ebc fix read_PLY and add a test to bgl for the ply writing 2020-03-18 17:29:02 +01:00
Maxime Gimeno 340623febd Clean-up 2020-03-18 16:30:25 +01:00
Maxime Gimeno 82bee3fd55 Add some doc for the PLY_writer 2020-03-18 16:07:24 +01:00
Maxime Gimeno f3dfd786e5 remove the UV parts of the BGL write_PLY and add NPs for the vpm and vimap. Missing doc. Also fix the STL_ASCII reader. 2020-03-18 15:52:15 +01:00
Sébastien Loriot 8eeee9c9a8 Update from master after default initialized index maps 
Merge-commit + default map fixes
 2020-03-18 08:10:54 +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
Simon Giraudot 7cba1cc1aa Document cluster_point_set() 2020-03-17 12:04:44 +01:00
Simon Giraudot 74070d3356 First version of clustering algorithm 2020-03-17 12:04:44 +01:00
Mael Rouxel-Labbé c33e8b60d7 Merge remote-tracking branch 'maxgimeno/PMP-Default_pmap-maxGimeno' into CGAL_IO-maxGimeno 2020-03-17 09:33:19 +01:00
Mael Rouxel-Labbé 30d4754a04 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-03-17 09:03:12 +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 1040a5f1e4 workaround to update the vertex of non-manifold umbrellas 2020-03-13 12:30:20 +01:00
Sébastien Loriot f37aedf7ba use dynamic maps instead of "old" workaround 2020-03-13 06:27:47 +01:00
Sébastien Loriot 2782bf0816 add better overloads matching to avoid ambiguity with dynamic tags 2020-03-13 06:01:10 +01:00
Mael Rouxel-Labbé 3864f6da9d Add an overload of choose_parameter to avoid needless constructions 2020-03-12 22:20:06 +01:00
Maxime Gimeno 2424d54e30 Merge remote-tracking branch 'cgal/master' into PMP-new_functions-GF 2020-03-12 12:10:44 +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é 3e365756ca Merge branch 'CGAL-Optimal_bounding_box-GF-old' into CGAL-Optimal_bounding_box-GF 2020-03-09 16:54:25 +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é 285829361b Merge branch 'PMP-Halfedge_comparer_for_stitch_borders-GF-old' into PMP-Halfedge_comparer_for_stitch_borders-GF 2020-03-06 12:41:13 +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
Simon Giraudot d9c9b6e536 Update from reviews 2020-03-02 10:46:36 +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
Maxime Gimeno c999ce144f Add the missing spe for Seam_mesh and dynamic_property_map 2020-02-19 10:07:53 +01:00
Maxime Gimeno 928f2bd2bb Remove unused typedef 2020-02-19 09:16:55 +01:00
Maxime Gimeno cf6fec2bbb move using 2020-02-18 16:36:05 +01:00
Maxime Gimeno aeb44510f1 Fix doc about boost/CGAL property tags 2020-02-18 15:27:34 +01:00
Maxime Gimeno 7ec84ae69c replace the functor by overloads of a free function 2020-02-18 14:42:53 +01:00
Maxime Gimeno 7d11c830e4 add some typedefs to get_ndi_map 2020-02-18 11:38:08 +01:00
Maxime Gimeno 9459df666d fix after review 2020-02-18 11:26:09 +01:00
Sébastien Loriot e759011cb5 handle cases when the traversed faces is split by a border 
a non-manifold vertex might be created in this case
 2020-02-17 19:11:13 +01:00
Maxime Gimeno b9a8d50b66 add missing include 2020-02-17 11:18:42 +01:00
Maxime Gimeno 5538786eff Merge remote-tracking branch 'cgal/master' into PMP-Default_pmap-maxGimeno 2020-02-14 15:00:54 +01:00
Laurent Rineau d872e134b2 Merge pull request #4508 from MaelRL/BGL-Fix_graph_has_property_doc-GF 
BGL: fix doc of graph_has_property
 2020-02-14 14:46:29 +01:00
Laurent Rineau 141eed441c Merge pull request #4508 from MaelRL/BGL-Fix_graph_has_property_doc-GF 
BGL: fix doc of graph_has_property
 2020-02-14 14:39:16 +01:00
Maxime Gimeno 249eb85060 fixes 2020-02-14 14:25:28 +01:00
Maxime Gimeno 002a3ac218 refines the Is_pmap_writable to take the reference constness into account 2020-02-14 13:40:57 +01:00
Mael Rouxel-Labbé 754cf35342 Fix graph_has_property not showing up in documentation 
Consequence of the doc being split between doc/CGAL and include/CGAL...
 2020-02-07 16:11:22 +01:00