Commit Graph

1027 Commits

Author SHA1 Message Date
Guillaume Damiand 2cea03ee19
Update Combinatorial_map/include/CGAL/Compact_container_with_index.h
Co-authored-by: Sebastien Loriot <sloriot.ml@gmail.com>
2022-07-19 09:42:50 +02:00
Guillaume Damiand 337cdf3490
Update Combinatorial_map/include/CGAL/Compact_container_with_index.h
Co-authored-by: Sebastien Loriot <sloriot.ml@gmail.com>
2022-07-19 09:42:44 +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 df37baa8d3 trailing 2022-06-27 14:29:00 +02:00
Guillaume Damiand f53c61a6e5 Example for map with index 2022-06-27 14:22:07 +02:00
Guillaume Damiand 9b44e0ae66 Add an example for cmap with indices. 2022-06-27 13:57:27 +02:00
Guillaume Damiand daf79c8070 Realign cmap examples 2022-06-27 13:57:08 +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 ec96ff853c
Update Combinatorial_map/doc/Combinatorial_map/Concepts/GenericMapItems.h
Co-authored-by: Sebastien Loriot <sloriot.ml@gmail.com>
2022-06-21 10:15:08 +02:00
Guillaume Damiand 46e64077af
Update Combinatorial_map/doc/Combinatorial_map/Combinatorial_map.txt
Co-authored-by: Sebastien Loriot <sloriot.ml@gmail.com>
2022-06-21 10:11:47 +02:00
Guillaume Damiand 38eab599ee
Update Combinatorial_map/doc/Combinatorial_map/Combinatorial_map.txt
Co-authored-by: Sebastien Loriot <sloriot.ml@gmail.com>
2022-06-21 10:11:25 +02:00
Guillaume Damiand bcbb6c296e Update begin operator for cc with index 2022-06-17 10:47:55 +02:00
Guillaume Damiand 1e0adffc21 Add is_used method 2022-06-10 18:57:53 +02:00
Guillaume Damiand ed747f4c46 Change type of iterator for attributes 2022-06-10 18:41:59 +02:00
Sébastien Loriot ac8b6d4731 boost::is_same --> std::is_same 2022-06-10 08:18:20 +02:00
Guillaume Damiand b2474405ad Templace class index to differentiate the indices used for different cc with index (TODO) 2022-06-08 18:38:26 +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 828a1a9dcc Update cc with index iterator comparators 2022-06-02 16:24:24 +02:00
Guillaume Damiand 83b095dc13 CC with index bugfix 2022-06-02 15:05:09 +02:00
Guillaume Damiand 05601c65b4 tab 2022-06-02 14:58:02 +02:00
Guillaume Damiand eec4cad774 tab 2022-06-02 14:34:39 +02:00
Guillaume Damiand 3a25a02723 CC with index; almost done 2022-06-02 13:56:09 +02:00
Guillaume Damiand 106d8c029b CC with index bug fix; ok for v1 and v2. 2022-06-01 19:15:58 +02:00
Guillaume Damiand d4879f3dc6 Bugfix in correct invalid attribute functor 2022-06-01 14:24:29 +02:00
Guillaume Damiand da3e359504 bug fix in cc with index v1 2022-05-27 15:03:31 +02:00
Guillaume Damiand 14073bbba5 Ok for cc with index version 2 2022-05-27 14:35:07 +02:00
Guillaume Damiand c6b6c80145 Bug fix in cc with index 2022-05-25 16:37:51 +02:00
Guillaume Damiand 94cd1b4df8 continue to debug cc with index 2022-05-25 11:07:44 +02:00
Guillaume Damiand 59b861df8f Modify free list for cc with index 2022-05-24 19:10:15 +02:00
Guillaume Damiand 79021272ff trailing 2022-05-23 15:04:27 +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 974b4ea3b0 Continue cc with index 2022-05-20 07:45:18 +02:00
Guillaume Damiand 39a0dbcf25 Update cc with index 2022-05-19 15:06:05 +02:00
Guillaume Damiand 6b59886840 Remove old cc with index 2022-05-19 15:05:46 +02:00
Guillaume Damiand fe0b518082 Continue clean cc with index 2022-05-13 17:37:10 +02:00
Guillaume Damiand 4ce2233f44 CC with index cleanup (one class with 3 variants) 2022-05-13 13:56:33 +02:00
Guillaume Damiand df16d0685f Start to clean compact container with index 2022-05-11 11:24:50 +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 ed490a70e6 spaces 2022-05-06 10:54:01 +02:00
Guillaume Damiand 6cc8d48db1 Doc for Gmaps ok 2022-05-06 10:52:58 +02:00
Guillaume Damiand edd6c93e41 Doc cmap ok 2022-05-06 10:38:12 +02:00
Guillaume Damiand a73f9ca58d Update generic map items 2022-05-06 10:12:45 +02:00
Guillaume Damiand 0a65ef32d6 Handle -> descriptor in doc 2022-05-06 10:12:18 +02:00
Guillaume Damiand 4784c50bf9 Handle -> descriptor in doc 2022-05-06 09:44:26 +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 2ad0872613 dh -> d 2022-05-05 19:06:46 +02:00
Guillaume Damiand aca09d6134 doc 2022-05-05 17:54:17 +02:00
Guillaume Damiand 0ffcad1b0a Start the doc for the index version 2022-05-05 15:29:58 +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 7cc420381e white space 2022-05-03 08:42:35 +02:00
Guillaume Damiand 81c2c1196a Allow to test cc with index 2 and 3 2022-05-03 08:37:40 +02:00
Guillaume Damiand 7ac6780bb4 Separate the containers 2022-05-02 14:20:49 +02:00
Guillaume Damiand c7a8299712 start a new container for index 2022-05-02 10:08:31 +02:00
Guillaume Damiand 49046f364b init 2022-04-28 10:10:11 +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 f1199c2fda spdx 2022-04-15 11:11:26 +02:00
Guillaume Damiand 54b42b0d36 Bug fix in dual 2022-04-15 11:05:21 +02:00
Guillaume Damiand 2c4c73c6b9 Bug fix in dual for lcc 2022-04-15 08:49:49 +02:00
Guillaume Damiand 836ac4ac72 update index 2022-04-15 07:44:49 +02:00
Guillaume Damiand 60dfb09449 Continue lcc with index 2022-04-14 17:15:42 +02:00
Guillaume Damiand 0baba876ee Continue LCC with index 2022-04-14 16:23:06 +02:00
Guillaume Damiand c8883602b0 LCC index 2022-04-14 15:26:49 +02:00
Guillaume Damiand ed3080e2e3 Restart lcc 2022-04-14 13:58:27 +02:00
Guillaume Damiand 409ba827ef restore old code 2022-04-14 13:42:44 +02:00
Guillaume Damiand a6da7bef70 Ok for gmap with index (and hash for indices) 2022-04-14 12:38:23 +02:00
Guillaume Damiand 7498a60167 GMap with index: bug to solve in copy. 2022-04-14 08:08:24 +02:00
Guillaume Damiand 418db7686e nullptr 2022-04-13 20:39:45 +02:00
Guillaume Damiand b56e89ca2c Start GMap with index 2022-04-13 19:26:15 +02:00
Guillaume Damiand 382db4acbd Ok for Index version for cmap 2022-04-13 16:59:51 +02:00
Guillaume Damiand 097c6704e1 Start refactoring for index, using tag defined in item class 2022-04-13 12:57:04 +02:00
Guillaume Damiand 3d874e8e1e Storage with index for gmap. 2022-04-12 15:22:01 +02:00
Guillaume Damiand 2e076fa6f3 Corrections in LCC for cmap 2022-04-11 15:08:35 +02:00
Guillaume Damiand abd93465a4 Start LCC with index. 2022-04-11 14:59:02 +02:00
Guillaume Damiand aa654901b5 Bugfix in CC with index 2022-04-11 12:27:03 +02:00
Guillaume Damiand cfad15f7c1 bugfix in cc with index 2022-04-08 19:39:29 +02:00
Guillaume Damiand 761220f429 Cleanup 2022-04-08 16:27:41 +02:00
Guillaume Damiand 144051e0af Update cc 2022-04-08 15:31:38 +02:00
Guillaume Damiand 490d0e52aa Add a test for CMap with index; bugfix in compact container with index 2022-04-08 14:37:47 +02:00
Guillaume Damiand 79532a0590 Replace some nullptr by null_handle 2022-04-08 10:16:35 +02:00
Guillaume Damiand aefe5fb123 First version of cmap with index ok. 2022-04-08 09:36:58 +02:00
Guillaume Damiand 75b8fda2a4 update 2022-04-07 17:19:25 +02:00
Guillaume Damiand c4090eb218 Update 2022-04-07 17:13:06 +02:00
Guillaume Damiand d95ed10d76 update 2022-04-07 12:41:42 +02:00
Guillaume Damiand eb39602066 update 2022-04-07 10:24:15 +02:00
Guillaume Damiand 138be31cba Merge branch 'master' into CMap_index-gdamiand 2022-04-07 09:44:20 +02:00
Laurent Rineau 95b6bf33a7 Merge pull request #6395 from afabri/TDS-better_initialization_of_Unique_hash_map-GF
TDS: Initialize the size of Unique_hash_map
2022-03-18 15:58:28 +01:00
Andreas Fabri f3db661acb Deal a little bit with Linear_cell_complex and Combinatorial_map 2022-03-09 14:13:31 +00: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
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
Laurent Rineau f9c05a0ba1 Merge pull request #6253 from afabri/P2T2-assert-GF
CGAL:   In testcode do not use CGAL_assertion  but assert
2022-02-02 16:38:22 +01:00
Laurent Rineau 5b42a501cc Merge pull request #6266 from afabri/CGAL-assertions_in_examples-GF
CGAL Examples: CGAL_assertion ->  assert

# Conflicts:
#	HalfedgeDS/examples/HalfedgeDS/hds_prog_compact2.cpp
#	Triangulation_2/examples/Triangulation_2/triangulation_print_OFF.h
2022-02-02 16:38:01 +01: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
Andreas Fabri 8e5b5cdc3f untabify 2022-01-24 17:03:43 +00:00
Andreas Fabri a75a88945d LCC CM GM 2022-01-24 16:43:39 +00:00
Andreas Fabri a7435e7367 Deal with Combinatorial_map 2022-01-19 07:21:46 +00: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
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 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
Laurent Rineau f581ff74d3 Merge pull request #5427 from sloriot/CGAL_data-moving_files
Regroup data: moving files

# Conflicts:
#	Nef_3/archive/triangulation/include/CGAL/partition_is_valid_2.h
2021-10-07 14:44:01 +02:00
Mael Rouxel-Labbé 625848e629 Fix missing ':' in various namespaces 2021-10-04 13:21:47 +02:00
Sébastien Loriot 47028cd184 automatically move data files in data dir + update paths
Done for OFF/OBJ/STL/XYZ/PWN/PLY
2021-10-04 09:42:49 +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
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
Maxime Gimeno 5948bc846e Try to remove Filtered_kernel from the dependencies of BGL 2021-01-11 14:11:30 +01:00
Maxime Gimeno 3d1c41fd14 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2021-01-07 15:05:28 +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
Maxime Gimeno 3b70343590 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-11-16 16:19:43 +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
Maxime Gimeno 9c15f2c9dc Use FeatureSummary in the demo, and remove CGAL_FOUND 2020-08-04 12:46: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