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

974 Commits

Author SHA1 Message Date
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
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
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 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
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
Guillaume Damiand 6125c866e9 Copy of CMap and GMap returns now handle instead of const_handle. 2020-01-07 18:04:33 +01:00
Andreas Fabri 48fedbae06 Typos: splitted -> split 2019-12-11 16:57:34 +01:00
Guillaume Damiand 751b74acb8 Remove unused variable warning 2019-12-07 08:33:54 +01:00
Guillaume Damiand 9d2107b3a8 Update tests 2019-12-03 15:17:43 +01:00
Guillaume Damiand ca753748a3 is_border -> is_perforated 2019-12-03 15:17:29 +01:00
Guillaume Damiand 8be7c183b4 Remove warnings (thanks @sloriot) 2019-11-29 15:51:34 +01:00
Guillaume Damiand e3f2ee87b6 Update dependencies (why ??) 2019-11-26 21:25:35 +01:00
Guillaume Damiand 44df084049 Update licence 2019-11-26 20:08:01 +01:00
Guillaume Damiand 4e1363463c Update licences 2019-11-26 14:10:03 +01:00
Guillaume Damiand 9a50c0f830 Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-11-26 13:22:03 +01:00
Guillaume Damiand 7d6b31e670 Add test for surface mesh topology 2019-11-24 20:49:15 +01:00
Guillaume Damiand a11e377561 Add comments; cut line > 80 car; some cleanup. 2019-11-22 09:59:55 +01:00
Sébastien Loriot 52164b1fba First pass on removing license notice in header for LGPL files 2019-10-19 15:40:30 +02:00
Sébastien Loriot 7356421d80 introduce Commercial license SPDX tag 2019-10-19 12:15:19 +02:00
Sébastien Loriot 9bd9c68b83 update LGPL[23]+ and GPL[23]+ SPDX tags 
ack -l --no-svg "SPDX-License-Identifier: GPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-3.0+/SPDX-License-Identifier: GPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-3.0+/SPDX-License-Identifier: LGPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: GPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-2.0+/SPDX-License-Identifier: GPL-2.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.0+/SPDX-License-Identifier: LGPL-2.0-or-later/"
 2019-10-18 21:57:54 +02:00
Guillaume Damiand 140eed70ab Bugfix 2019-09-18 16:31:38 +02:00
Guillaume Damiand e44fef7d0b Update polygonal schema to allow to perforate faces; impact on face graph wrapper. 2019-09-17 16:04:38 +02:00
Guillaume Damiand bd2a504af6 Bug fixes; improve face graph wrapper 2019-09-17 11:41:45 +02:00
Guillaume Damiand 7fd376c2d7 Update compute turns to deal with surfaces with boundaries 2019-09-05 17:50:06 +02:00
Guillaume Damiand 99d960c613 Update face graph wrapper 2019-08-28 15:35:57 +02:00
Sebastien Loriot 2a426bb1e1
Merge pull request #4063 from sloriot/CGAL-NO_CXX11 
Remove CGAL_CXX11 macro usage
 2019-07-19 16:16:22 +02:00
Guillaume Damiand 3c88114ab2 Remove dependencies in face graph wrapper. 2019-07-11 11:52:18 +02:00
Guillaume Damiand e44ca7bb71 Update (again) dependencies 2019-07-11 11:46:38 +02:00
Guillaume Damiand 7cd85f845b Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-07-10 15:32:21 +02:00
Guillaume Damiand d16bca7b4e More update of dependencies... 2019-07-10 15:28:19 +02:00
Sébastien Loriot fbafb9d06f fix remaining mismatches and fix bugs 2019-07-10 11:40:45 +02:00
Guillaume Damiand fb58a84bf3 Wrong number of cells used in CMap test. 2019-07-09 15:45:06 +02:00
Guillaume Damiand e9e149fcff Add missing #include 2019-07-09 15:12:51 +02:00
Guillaume Damiand dcc78e85d2 Replace #include by forward declarations. 2019-07-09 12:08:49 +02:00
Sébastien Loriot c0edb5ecaa remove CGAL_CXX11 macro usage 2019-07-08 11:42:17 +02:00
Guillaume Damiand 10c2be0c6d Add test file for CMap 2019-07-05 11:06:07 +02:00
Laurent Rineau 41626a9a7b Force calls by ADL in import_from_halfedge_graph 
The member function `next` and `opposite` of the class prevent the
call of functions with the same name by ADL. For the BGL API, one has
to call by ADL. This commit adds two auxiliary functions, external to
the class, to enable to call  `next` and `opposite` by ADL.

The commit also adds a test with OpenMesh, to prove the correctness of
the modification.
 2019-07-05 10:42:03 +02:00
Guillaume Damiand bd8a4d8326 Commit all dependencies, result of make packages_dependencies 2019-07-03 09:09:36 +02:00
Guillaume Damiand 341b9943e5 Add missing #include 2019-07-02 11:32:01 +02:00
Guillaume Damiand 5b078e5bbf Merge branch 'Surface_mesh_topology-gdamiand' of github.com:gdamiand/cgal into Surface_mesh_topology-gdamiand 2019-06-28 14:41:49 +02:00
Guillaume Damiand 4ca4fc248d Remove warning 2019-06-28 14:40:24 +02:00
Guillaume Damiand 56abe3c367 Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-06-28 13:28:50 +02:00