Commit Graph

315 Commits

Author SHA1 Message Date
Guillaume Damiand 46a35ff642 Add a test for copy attributes for cmap/gmap, with and without indices. 2023-03-10 13:26:23 +01:00
Guillaume Damiand 8dc54d3c62 Add a reserve before to copy attribute (to solve a bug for index versions) 2023-03-10 13:20:03 +01:00
Guillaume Damiand 72b356d309 Add reserve before the creation of a new attribute, copy of an old one: solve a bug for the index version of CMap/GMap when the underlying vector is reallocated 2023-03-10 11:30:07 +01:00
Sébastien Loriot 9e72361537 All packages depends now on CGAL_Core (like Kernel) 2023-02-20 15:24:16 +01:00
Mael 153c603209
Merge branch 'master' into CGAL-Clean_CMakeLists.txt-GF 2023-01-27 22:09:02 +01:00
Mael 6538b22e06
Merge branch 'master' into CGAL-Clean_CMakeLists.txt-GF 2022-12-05 16:03:41 +01:00
Guillaume Damiand f8b6e2c272 Bug fix in gmap tests, for the second dart given as parameter to the insert_cell_1_in_cell_2 method. 2022-11-30 10:37:54 +01:00
Guillaume Damiand 96873950ee Bug fix for remove and contrat operations for CMap and GMap 2022-11-30 10:36:04 +01:00
Guillaume Damiand d381bfbd44 Add a parameter to group functor to deal with the case where first dart will be deleted 2022-11-30 10:35:16 +01:00
Guillaume Damiand bb263e009e add insert_cell_1_between_two_cells_2 method in CMap and GMap 2022-11-25 13:06:50 +01:00
Sébastien Loriot c5207cb5ad Merge remote-tracking branch 'cgal/master' into HEAD 2022-11-24 09:54:56 +01:00
albert-github 781f9a2943 spelling corrections
After review:
- outputhing -> outputting
- neighbour -> neighbor
2022-11-17 10:25:10 +01:00
albert-github 45478184de spelling corrections
Some spelling corrections (Directories starting with `E`-` L`),
some backward work
some forward work
2022-11-15 13:39:40 +01:00
albert-github 2bcc9ad8c5 Link corrections
- Correcting some permanent redirects
- corrected link for to `max_element`, link was incorrect
2022-11-13 13:19:22 +01:00
Mael Rouxel-Labbé e93b0b28eb Misc trivial cleaning 2022-09-06 16:25:47 +02:00
Mael Rouxel-Labbé 4fc486b195 Purge CMakeLists.txts from obsolete code / noise 2022-09-06 16:19:11 +02:00
Sébastien Loriot 861588abe1 Merge 'sloriot/CGAL-std_type_traits' into master 2022-08-03 20:19:51 +02:00
Sébastien Loriot fbd8b8a75a add out-of-class definition if c++17 is not used 2022-07-27 16:28:59 +02:00
Guillaume Damiand 233f757148 Remove macro used for the reviewing step. 2022-07-21 10:40:45 +02:00
Guillaume Damiand 447728692d use rebind_alloc instead of rebind for std::allocator 2022-07-20 11:31:04 +02:00
Guillaume Damiand f2630fa4b9
Merge branch 'master' into CMap_index-gdamiand 2022-07-19 09:44:16 +02:00
Guillaume Damiand ccec860303 Add example of CMap/GMap with index in user manual 2022-06-27 15:36:07 +02:00
Guillaume Damiand cbc038fff8 Rename upper_bound_XXX_ids by upper_bound_on_XXX_ids 2022-06-27 12:37:49 +02:00
Guillaume Damiand aa91b53297 Add methods in CMap/GMap/LCC to get upper bounds, when indices are used 2022-06-21 14:16:12 +02:00
Guillaume Damiand 38e0d19980
Update Generalized_map/doc/Generalized_map/Generalized_map.txt
Co-authored-by: Sebastien Loriot <sloriot.ml@gmail.com>
2022-06-21 10:21:44 +02:00
Guillaume Damiand 74e53c104e
Update Generalized_map/doc/Generalized_map/Generalized_map.txt
Co-authored-by: Sebastien Loriot <sloriot.ml@gmail.com>
2022-06-21 10:21:27 +02:00
Guillaume Damiand 2825b3fed6
Update Generalized_map/doc/Generalized_map/CGAL/Generalized_map.h
Co-authored-by: Sebastien Loriot <sloriot.ml@gmail.com>
2022-06-21 10:16:12 +02:00
Sébastien Loriot ac8b6d4731 boost::is_same --> std::is_same 2022-06-10 08:18:20 +02:00
Guillaume Damiand a60dd02665 null_descriptor should be public 2022-06-02 20:12:01 +02:00
Guillaume Damiand 731fe75c91 Typo in doc 2022-06-02 17:07:58 +02:00
Guillaume Damiand cfd9ac640a Add tests 2022-06-02 16:41:00 +02:00
Guillaume Damiand 3a25a02723 CC with index; almost done 2022-06-02 13:56:09 +02:00
Guillaume Damiand 514545029d Simplify storages for CMap/GMap/LCC 2022-05-23 14:33:15 +02:00
Guillaume Damiand c25da7a9ba CC with index cont 2022-05-23 13:28:00 +02:00
Guillaume Damiand 8bf242ad34 Update cc with index (almost done...) 2022-05-20 15:06:24 +02:00
Guillaume Damiand d9b433f86b Backward compatibility 2022-05-09 13:22:06 +02:00
Guillaume Damiand 45f437c47c Remove trailing 2022-05-09 12:39:11 +02:00
Guillaume Damiand 0bb1e44eff align typesé 2022-05-06 10:57:50 +02:00
Guillaume Damiand 6cc8d48db1 Doc for Gmaps ok 2022-05-06 10:52:58 +02:00
Laurent Rineau 2288225448 Massive update of CMake policies to version 3.23 2022-05-06 09:34:35 +02:00
Guillaume Damiand 036bdf7c71 dh -> d into examples 2022-05-05 19:18:38 +02:00
Guillaume Damiand f5e3ea281f dh -> d 2022-05-05 19:07:24 +02:00
Guillaume Damiand aca09d6134 doc 2022-05-05 17:54:17 +02:00
Guillaume Damiand 999a813b35 Rename XXX_handle into XXX_descriptor for CMap, GMap, LCC 2022-05-05 13:34:19 +02:00
Guillaume Damiand 81c2c1196a Allow to test cc with index 2 and 3 2022-05-03 08:37:40 +02:00
Guillaume Damiand ad3c488d53 spaces 2022-04-15 13:01:25 +02:00
Guillaume Damiand 5d4a30a9c6 trailing 2022-04-15 12:57:12 +02:00
Guillaume Damiand 08f6efc827 bug fix in dual for gmap 2022-04-15 11:14:20 +02:00
Guillaume Damiand ed3080e2e3 Restart lcc 2022-04-14 13:58:27 +02:00
Guillaume Damiand a6da7bef70 Ok for gmap with index (and hash for indices) 2022-04-14 12:38:23 +02:00
Guillaume Damiand b04d6ebc67 Add hash function to unordered_map; TODO is it possible to do that automaticallY? 2022-04-14 10:10:35 +02:00
Guillaume Damiand 7498a60167 GMap with index: bug to solve in copy. 2022-04-14 08:08:24 +02:00
Guillaume Damiand 80bc1eafce Bugfix in gmap with index 2022-04-13 20:28:43 +02:00
Guillaume Damiand b56e89ca2c Start GMap with index 2022-04-13 19:26:15 +02:00
Guillaume Damiand 3d874e8e1e Storage with index for gmap. 2022-04-12 15:22:01 +02:00
Laurent Rineau 258d704a90 Merge pull request #6209 from sloriot/PMP-std_instead_of_boost
Use features available in std instead of boost
2022-02-24 19:57:17 +01:00
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
Sébastien Loriot 4ffc949199 replace boost::unordered by std::unordered
but in T3, Mesh_3, TDS_3, P3[TM]3
2022-02-03 19:11:12 +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
Andreas Fabri a75a88945d LCC CM GM 2022-01-24 16:43:39 +00:00
Laurent Rineau 921380202b Merge pull request #6055 from gdamiand/LCC_improvements-gdamiand
Lcc improvements
2022-01-12 12:22:00 +01:00
Guillaume Damiand b93aff65ea Do not clear a cmap before to copy it. 2021-11-25 11:16:10 +01:00
Sébastien Loriot ab48f63e30 update latest cmake version tested 2021-11-09 10:58:47 +01:00
Guillaume Damiand 2f5841e179 Use std::unorderd_map everywhere in CMap, GMap and LCC. 2021-10-14 17:53:01 +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
Sébastien Loriot 98e471849b moving files from internal to PKG/internal 2021-08-26 11:33:39 +02:00
Maxime Gimeno e6c767d5c9 Simplify the GNUC versions tests 2021-05-12 15:45:07 +02:00
Sebastien Loriot b7323389c7
Merge pull request #5622 from maxGimeno/CMake-Update_versions_in_scripts-maxGimeno
Update maximum cmake versions
2021-04-17 10:58:14 +02:00
Maxime Gimeno c49152359c update max version of cmake and announce the new minimal in CHANGE.md 2021-04-15 15:08:54 +02:00
Maxime Gimeno b80daff6fb Fixes 2021-02-19 11:31:52 +01:00
Laurent Rineau bbf4a54a9f Merge pull request #5104 from gdamiand/CMap-other_containers-gdamiand
Allow to use compact container or concurrent compact container for CMap, GMap and LCC
2021-01-06 16:11:54 +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
Maxime Gimeno 9c15f2c9dc Use FeatureSummary in the demo, and remove CGAL_FOUND 2020-08-04 12:46:17 +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
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 3fb644e566 Improve basic viewer to draw consistent orientated faces for generalized maps. 2020-04-27 18:55:26 +02:00
Guillaume Damiand daab96982e Bugfix 2020-04-27 18:55:25 +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 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 a03c7539b5 Add function to get a dart handle given its index. 2020-04-27 18:52:22 +02:00
Guillaume Damiand 5e2dbc71ba Bugfix in copy for GMap. 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
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 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
Laurent Rineau 67b1b0e04f Merge pull request #4042 from gdamiand/Surface_mesh_topology-gdamiand
Surface mesh topology (new package)
2020-01-15 17:24:06 +01:00