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

630 Commits

Author SHA1 Message Date
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
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
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 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 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
Guillaume Damiand 3c88114ab2 Remove dependencies in face graph wrapper. 2019-07-11 11:52:18 +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
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 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
Guillaume Damiand 1dbc088459 Update licences; move undocumented files to internal (both directory and namespace) 2019-06-20 16:51:53 +02:00
Guillaume Damiand f80af5af90 Update to use new version of Polygonal_schema 2019-06-17 14:26:37 +02:00
Guillaume Damiand bf35f049e6 Start to implement Polygonal_schema: nyf 2019-06-14 16:38:47 +02:00
Guillaume Damiand 4e5b74efe8 Bugfix in copy 2019-06-14 13:04:25 +02:00
Guillaume Damiand 14615ea0aa Bug fix in copy method. 2019-06-14 10:47:25 +02:00
Andreas Fabri 1c9dbfcb95 Replace CGAL::Void* with std::nullptr_t 2019-06-05 13:47:00 +02:00
Andreas Fabri 4581f1b7a8 Morte replacements 2019-06-05 08:39:55 +02:00
Mael Rouxel-Labbé 2848158354 Fix typos 2019-05-20 08:54:04 +02:00
Guillaume Damiand 35634bdef3 Add computation of normal for face graphs. 2019-04-05 11:33:47 +02:00
Guillaume Damiand afa2417c16 Update lcc viewer with path to deal with Surface mesh and Polyhedron 2019-04-04 18:47:49 +02:00
Guillaume Damiand 260b3e54e3 Update 2019-04-04 15:51:15 +02:00
Guillaume Damiand 2110a22412 Use property map for face graph wrapper. 2019-04-02 10:33:37 +02:00
Guillaume Damiand 2f046604b6 First working version of Face_graph_wrapper. 2019-04-01 19:26:56 +02:00
Guillaume Damiand 79095e98bc Use method instead of global function. 2019-03-29 17:01:07 +01:00
Guillaume Damiand 5df0d6852c Start face graph wrapper. NYF. 2019-03-29 16:59:33 +01:00
Sébastien Loriot f62624c4f9 replace cpp11::tuple by std::tuple 2019-03-29 13:28:33 +01:00
Sébastien Loriot d60f5645aa replace BOOST_FOREACH by c++ ranged-based for loop 
some of the command used for the replacement:
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\(([a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\((const [a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\((const typename [a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\((typename [<>a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack "boost/foreach.hpp" -l --cpp | xargs sed -i '/boost\/foreach.hpp>/d'
 2019-03-29 13:22:15 +01:00
Sébastien Loriot 6e8e4a4b10 remove variadic template workaround for cmap, gmap, and lcell 2019-03-29 10:41:50 +01:00
Guillaume Damiand bbea8c7889 Add a method to import any HDS model into a CMap and a LCC 2019-03-15 16:53:47 +01:00
Guillaume Damiand 5279a690b3 Add method to import a model of Halfedge graph into a combinatorial map. 2019-03-15 08:13:16 +01:00
Guillaume Damiand 8e649a9d5d Start to add method to import Polyhedron and SM into a CMap. 2019-03-14 21:34:05 +01:00
Guillaume Damiand a211e558ee Copy methods are now able to keep mappings from copy to origin, and from origin to copy. 2018-12-20 08:51:04 +01:00
Guillaume Damiand 14e32aba01 Merge branch 'CMap-path_isotopy-gdamiand-old' into CMap-path_isotopy-gdamiand 2018-12-14 10:01:38 +01:00
Guillaume Damiand 0cc980f059 Update copy constructors and copy methods for CMap, GMap, and LCC to take a CMap/GMap/LCC as parameter and not any type. 2018-12-06 18:01:03 +01:00
Guillaume Damiand 63352c5680 Continue refactoring 2018-11-29 13:14:54 +01:00
Guillaume Damiand fdd08e9287 Create new package Surface_mesh_topology; move related files in this package. 2018-11-28 15:56:10 +01:00
Guillaume Damiand c3f55640ca Bug fix. 2018-11-28 12:47:43 +01:00
Guillaume Damiand 8433205b77 Small updates on path on surfaces. 2018-11-21 21:56:12 +01:00
Guillaume Damiand 094f28fdc9 Small bug fixes; add is_valid method in path with rle. 2018-11-21 12:01:51 +01:00
Guillaume Damiand 702d01e1f7 Start to replace totally the quadratic method by the linear one (nyf). 2018-11-20 16:49:28 +01:00
Guillaume Damiand 4b62197c72 Comment out an assertion which is too long. 2018-11-20 16:30:30 +01:00
Guillaume Damiand dd3309f14f Bugfix for path with 2 darts. 2018-11-20 11:37:28 +01:00
Guillaume Damiand 1c54999d7d Right shift for path with rle done. 2018-11-20 10:41:11 +01:00
Guillaume Damiand 8bc932ce91 Beginning of right shift for path with rle. 2018-11-19 22:15:00 +01:00
Guillaume Damiand c1ef7f334f Bracket flattening for path with rle ok. 2018-11-15 15:31:56 +01:00
Guillaume Damiand 4a9ee63b83 Add a method that allows to add several edges into a current facet. 2018-11-14 16:33:11 +01:00
Guillaume Damiand 828c01a00e Add a cmap builder that allows to build a combinatorial map by giving its edge labels. 2018-11-14 16:29:49 +01:00
Guillaume Damiand df5df7f443 Comment. 2018-11-09 13:40:49 +01:00
Guillaume Damiand 092baf908a Spurs removal is now ok for path with rle. 2018-11-09 13:05:23 +01:00
Guillaume Damiand 919d4714ac Start to work on path with rle, spurs removal. 2018-11-08 16:42:13 +01:00
Guillaume Damiand 4145ddeb0e Path on surface encoded with rle ok. 2018-11-08 12:41:03 +01:00
Guillaume Damiand 69e9ce3494 Start path with rle to optimize isotopy test. 2018-11-07 19:51:03 +01:00
Guillaume Damiand b040c5a983 Return always 0 for positive and negative turns, for spurs. 2018-11-06 17:04:40 +01:00
Guillaume Damiand 63334c3b60 New method to compute turns in constant time. 2018-10-26 16:49:45 +02:00
Guillaume Damiand 4231595110 Change API of Path_on_surface and Combinatorial_map_functionalities to canonize paths. 2018-10-26 15:45:34 +02:00
Guillaume Damiand 77b238c67a Reindent and remove commented code. 2018-09-28 18:26:40 +02:00
Guillaume Damiand 1d0b16f142 Method v2 to update length two pathes is ok. 2018-09-28 17:24:16 +02:00
Guillaume Damiand a8c24d706c Update path v2 big fix (nyf) 2018-09-27 16:34:02 +02:00
Guillaume Damiand 7d96da2dd1 Start method v2 for path updating 2018-09-26 15:13:25 +02:00
Guillaume Damiand a61f2e5091 Bug fix when updating length two pathes for border darts. 2018-09-25 13:36:46 +02:00
Guillaume Damiand 55bbde79a5 Change method for path generator 2018-09-25 13:29:49 +02:00
Guillaume Damiand 4e3e5ac730 Remove debug output 2018-09-25 13:28:59 +02:00
Guillaume Damiand f52676769f Continue isotopy test. 2018-09-18 15:16:40 +02:00