Guillaume Damiand
849b477654
Merge branch 'master' into LCC_update-gdamiand
2022-02-11 07:38:46 +01:00
Laurent Rineau
d78a7b9255
Merge pull request #6302 from afabri/P2T2-assert-GF
...
CGAL: In testcode do not use CGAL_assertion but assert
2022-02-08 23:44:24 +01:00
Andreas Fabri
440a8dfb7b
Fix file name
2022-02-03 08:41:04 +00:00
Andreas Fabri
735752bec9
Do the remaining changes after Laurent's check
2022-02-03 08:02:11 +00:00
Guillaume Damiand
54142fd2a1
Update generic copy to proper copy marks and add an option to enable/disable this copy. Add move constructors.
2022-01-27 15:16:16 +01:00
Guillaume Damiand
c5c6098226
Replace assertion(is_valid) by expensive_assertion since these assert increase the complexity.
2022-01-27 11:02:17 +01:00
Guillaume Damiand
46f5325c1b
Remove deprecated code in CMap and LCC (deprecated since CGAL 4.9)
2022-01-27 10:36:22 +01:00
Guillaume Damiand
d909084223
Remove a warning
2022-01-18 14:30:21 +01:00
Guillaume Damiand
28f685c2b1
Remove a warning
2022-01-18 13:04:39 +01:00
Guillaume Damiand
b93aff65ea
Do not clear a cmap before to copy it.
2021-11-25 11:16:10 +01:00
Guillaume Damiand
84ca88f8cc
Remove the maxid
2021-10-19 20:16:43 +02:00
Guillaume Damiand
ffca80cf6e
Cannot use an unordered_map here.
2021-10-14 18:00:07 +02:00
Guillaume Damiand
2f5841e179
Use std::unorderd_map everywhere in CMap, GMap and LCC.
2021-10-14 17:53:01 +02:00
Guillaume Damiand
f21ab5a1a1
When cells have id, store the max id.
2021-10-14 17:48:43 +02:00
Guillaume Damiand
5c57f83fda
Replace std::map by std::unordered_map for save/load of CMap/GMap.
2021-10-14 17:19:33 +02:00
Guillaume Damiand
26322683d7
Modify save of cmap/gmap to deal with the case of attributes that do not store darts.
2021-10-14 17:06:41 +02:00
Sébastien Loriot
98e471849b
moving files from internal to PKG/internal
2021-08-26 11:33:39 +02:00
Maxime Gimeno
a3d1765ab4
Merge remote-tracking branch 'cgal/master' into CGAL-Clean_up_boost_versions-maxGimeno
2021-07-19 14:18:40 +02:00
Maxime Gimeno
e6c767d5c9
Simplify the GNUC versions tests
2021-05-12 15:45:07 +02:00
Giles Bathgate
5ecd85248a
Fix capitalisation of macro name.
2021-04-28 21:03:45 +01:00
Giles Bathgate
0ef8127c71
The CGAL_NOEXCEPT macro is no longer needed
2021-04-28 21:03:00 +01:00
Maxime Gimeno
3d1c41fd14
Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno
2021-01-07 15:05:28 +01:00
Guillaume Damiand
70bf9038ed
Whitespaces
2020-10-22 15:42:15 +02:00
Guillaume Damiand
d6306bebcb
Add a tag in storages (CMap, GMap, LCC) allowing to chose between compact container and concurrent compact container as underlying container.
2020-10-22 10:30:38 +02:00
Mael Rouxel-Labbé
8682f9bafb
Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno
2020-08-24 11:45:17 +02:00
Mael Rouxel-Labbé
461156c566
Fix [[deprecated]] placement in combinatorial maps
2020-07-17 18:06:47 +02:00
Laurent Rineau
e6536aaf63
Remove cpp11::(tuple|get)
...
And use `#ifdef CGAL_NO_DEPRECATED_CODE` around the backward
compatibility code in `<CGAL/config.h>`.
2020-06-09 20:15:16 +02:00
Laurent Rineau
dcc4fb1cc1
Merge remote-tracking branch 'cgal/master' into CGAL-move_semantic_for_triangulations-GF
...
# Conflicts:
# STL_Extension/include/CGAL/Compact_container.h
2020-05-20 09:46:26 +02:00
Guillaume Damiand
9838b9debc
Use two different names for copy, const and non const version, to avoid ambiguity on windows (internal undocumented methods)
2020-04-27 18:55:26 +02:00
Guillaume Damiand
a09b8b10fc
Warnings
2020-04-27 18:55:26 +02:00
Guillaume Damiand
ec15dbfa9e
Bugfix
2020-04-27 18:55:26 +02:00
Guillaume Damiand
3fb644e566
Improve basic viewer to draw consistent orientated faces for generalized maps.
2020-04-27 18:55:26 +02:00
Guillaume Damiand
303d579941
Bug fix
2020-04-27 18:52:23 +02:00
Guillaume Damiand
16be3009ca
Add a missing call to base constructor
2020-04-27 18:52:23 +02:00
Guillaume Damiand
6a2052b68e
Copy do not copy marks anymore.
2020-04-27 18:52:23 +02:00
Guillaume Damiand
2018367261
Improve face width computation; move face graph wrapper into surface mesh topology package.
2020-04-27 18:52:23 +02:00
Guillaume Damiand
f3098fc3f7
More trailling whitespaces...
2020-04-27 18:52:23 +02:00
Guillaume Damiand
8cddcdd045
Update copy methods of CMap and GMap to deal with model of map having perforated faces.
...
Following this modification, copy does not update anymore the reserved marks.
2020-04-27 18:52:22 +02:00
Guillaume Damiand
5c0d9aaa22
Change parameter orders for copy methods in CMap, GMap
2020-04-27 18:52:22 +02:00
Guillaume Damiand
0308d1a1bb
Add forward declaration files for CMap, GMap, LCC, Polygonal_schema. Improve copy methods for CMap and GMap to deal with const and non const cases.
2020-04-27 18:52:22 +02:00
Sébastien Loriot
bfecbf55a1
Update from master (done during rebasing)
...
Original commit:
commit 573f9f3224939fb2cd74d9a82bd5b1c0e471edc7
Merge: c824946ef60 16fc8d1fe2
Author: Guillaume Damiand <guillaume.damiand@liris.cnrs.fr>
Date: Fri Mar 27 10:38:38 2020 +0100
Merge remote-tracking branch 'cgal/master' into gsoc2019-nccycles-thien
2020-04-27 18:42:57 +02:00
Guillaume Damiand
50aa13998f
Face graph wrapper now uses a lazy initialization of its marks.
2020-04-27 18:37:58 +02:00
Sébastien Loriot
24f684092d
Update from master (while rebasing)
...
Original merge commit:
commit 2e4a18e3e6f73c41d4935aed22330adf83f99f28 (HEAD)
Merge: b91b6cab3a1 29f973a616
Author: Guillaume Damiand <guillaume.damiand@liris.cnrs.fr>
Date: Thu Mar 12 18:05:22 2020 +0100
Merge master; NYF
2020-04-27 18:34:34 +02:00
Sébastien Loriot
e4d63837fd
Merge remote-tracking branch 'gsoc2019-nccycles-thien' into Surface_mesh_topology-gdamiand
...
This is a merge done after the rebase of Surface_mesh_topology-gdamiand
Original commit id:
commit 5459085b7da44946a834ce155fcc4e9c83ad14b2 (HEAD)
Merge: 8138ac72694 349759a0547
Author: Thien Hoang <thienvhoang99@gmail.com>
Date: Sat Jul 13 02:46:50 2019 +0700
2020-04-27 18:07:48 +02:00
Sébastien Loriot
d1a323c730
extra run of the script to remove tabs and trailing whitespaces
2020-03-26 19:24:14 +01:00
Sébastien Loriot
86e25f7e71
Update branch from master after trailing whitespaces and tabs removal
2020-03-26 19:23:54 +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
Laurent Rineau
378554e5a7
Change the API of `for_compact_container`/`Compact_container_traits`
...
Now, we have a proper pair of getter/setter, and the `void` pointer is
get by a `reinterpret_cast`, instead of a union.
Cc: @mglisse
2020-03-09 17:19:58 +01:00