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

140 Commits

Author SHA1 Message Date
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
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 9a50c0f830 Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-11-26 13:22:03 +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 e44fef7d0b Update polygonal schema to allow to perforate faces; impact on face graph wrapper. 2019-09-17 16:04:38 +02:00
Guillaume Damiand 7fd376c2d7 Update compute turns to deal with surfaces with boundaries 2019-09-05 17:50:06 +02:00
Sébastien Loriot c0edb5ecaa remove CGAL_CXX11 macro usage 2019-07-08 11:42:17 +02:00
Guillaume Damiand 56abe3c367 Merge branch 'master' into Surface_mesh_topology-gdamiand 2019-06-28 13:28:50 +02:00
Guillaume Damiand f80af5af90 Update to use new version of Polygonal_schema 2019-06-17 14:26:37 +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 78055c1394 Fix LCC and Generalized_map 2019-06-05 23:36:42 +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 260b3e54e3 Update 2019-04-04 15:51:15 +02:00
Guillaume Damiand 79095e98bc Use method instead of global function. 2019-03-29 17:01:07 +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 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 94559ab4c1 Add #include in GMap_operation so that users of GMap can use degree and codegree without needed to include CMap file. 2018-09-05 17:06:13 +02:00
Guillaume Damiand 899136507a Add also the additional parameter for GMap::copy method. 2018-09-04 16:55:21 +02:00
Andreas Fabri f0c1d3aab7 more allocator_traits 2018-04-19 14:49:05 +01:00
Laurent Rineau 095c27e2be cosmetic changes 2018-04-17 17:14:19 +02:00
Andreas Fabri 7cbffac35b Deal with deprecated functions allocator<T>::construct/destroy 2018-04-17 13:35:04 +01:00
Laurent Rineau 0b0b1503ef Merge pull request #2594 from gdamiand/CMap-bugfixes-gdamiand 
CMap bugfixes
 2017-12-05 18:20:56 +01:00
Guillaume Damiand 5f939d33ab Bug fix in CMap/GMap/LCC dart methods 2017-11-13 12:17:03 +01:00
Sébastien Loriot 0698f79aff add SPDX identifier for files under the LGPL-3+ license 2017-11-12 10:17:50 +01:00
Guillaume Damiand 013f447395 Merge branch 'master' into BGL-LCC-gdamiand 2017-06-22 23:21:39 +02:00
Guillaume Damiand b80315367f Do not return void. 2017-06-14 13:46:03 -04:00
Guillaume Damiand bfbee1701e Now attributes and darts in CMap/GMap/LCC can have id or not depending on a template argument. 2017-03-27 17:16:40 -04:00
Guillaume Damiand 2bc3a9ee2e Bug fix in GMap iterator 2016-11-29 11:43:45 +01:00
Guillaume Damiand 20a6e9ebc9 Variadic version of iterator starts with 3 template arguments to avoid several specialization match. 2016-11-29 11:43:45 +01:00
Guillaume Damiand 98cba35a39 Add missing template argument when calling Copy_dart_info_functor; plus a cast for dual in order to get the correct type. 2016-11-29 11:43:43 +01:00
Guillaume Damiand 9731a1a51e Correction of copy dart info functor. 2016-11-29 11:43:43 +01:00
Guillaume Damiand 220bf51f93 Bug fix in close and insert_cell_2_in_cell_3 functions: both for CMap and GMap. 2016-11-29 11:43:40 +01:00
Guillaume Damiand d4d788837e Correct isomorphism functions to process correctly empty maps. 2016-11-29 11:43:40 +01:00
Guillaume Damiand 12328929b2 Update LCC tests: now they are done both for CMap and GMap. 2016-11-29 11:43:38 +01:00
Guillaume Damiand 588ba4f527 Allow isomorphism to test dartinfo and/or point and/or attribute independently; use this in LCC test. 2016-11-29 11:43:37 +01:00
Guillaume Damiand 02e1eb7e96 Add is_orientable function in GMap. 2016-11-29 11:43:37 +01:00
Guillaume Damiand f00f6f71f4 Not need to link in both directions; this is done automatically. 2016-11-29 11:43:36 +01:00
Guillaume Damiand 2ab268965f LCC for CMap and GMap; incremental builder; save and load; test. 2016-11-29 11:43:36 +01:00
Guillaume Damiand df3b2a4850 LCC constructors compile now both for CMap and GMap (need tests) 2016-11-29 11:43:36 +01:00
Guillaume Damiand 7618192d21 Start incremental builder 2016-11-29 11:43:36 +01:00
Guillaume Damiand 1a357d5519 Now sew3 same facets works for both CMap and GMap. 2016-11-29 11:43:35 +01:00
Guillaume Damiand 4bacc7a25a Remove some useless include; set constructor of Dart and attribute protected; check for friend directives. 2016-11-29 11:43:35 +01:00
Guillaume Damiand e571639c94 Continue to work on LCC operations for CMap and GMap... 2016-11-29 11:43:35 +01:00
Guillaume Damiand 8d577b35da Modif of copy contructors in GMap; bugfix in copy function. 2016-11-29 11:43:34 +01:00
Guillaume Damiand 21a121019a * Update names for next, previous and opposite functions (following the ref manual); 
* update GMap examples.
 2016-11-29 11:43:33 +01:00
Guillaume Damiand 233840ffc5 Replace pointer by reference in all functions. 
This allows to use non const reference in Foreach_static functor (why this is not possible with pointers ? there is some black magic under tuple and variadic template...).

Thanks to this possibility, remove static variables used to return value in two functors.
 2016-11-29 11:43:33 +01:00
Guillaume Damiand 788e680ecb Use index in debug functions instead of adress of elements. 2016-11-29 11:43:32 +01:00
Guillaume Damiand 2aff4068b5 Allow to not define Dart_info and Attributes type in item class. 2016-11-29 11:43:32 +01:00
Guillaume Damiand 3dbdc43b11 Doc of GMap is now ok for rev 4 2016-11-29 11:43:32 +01:00
Guillaume Damiand 4624a0b97b Factorize dart between CMap and GMap. 
Now we use the same class in both packages.
TODO: modify the doc accordingly.
 2016-11-29 11:43:31 +01:00
Guillaume Damiand 8473efc694 Face insertion for GMap, plus test. 2016-11-29 11:43:29 +01:00
Guillaume Damiand 5e41ec79c4 Ok for edge insertion in GMap. 2016-11-29 11:43:29 +01:00
Guillaume Damiand 65569a9ff0 Start to rename Dart -> Combinatorial_map_dart and GMap_dart -> Generalized_map_dart 2016-11-29 11:43:27 +01:00
Guillaume Damiand c88fd4fd1c Corrections following Sebastien review (nyf) 2016-11-29 11:43:26 +01:00
Guillaume Damiand 7cd227fd08 Start test suite for insertion in GMap 2016-11-29 11:43:26 +01:00
Guillaume Damiand c0e903a106 Update copyright headers 2016-11-29 11:43:25 +01:00
Guillaume Damiand 25f51ac30c Add missing this-> 2016-11-29 11:43:22 +01:00
Guillaume Damiand 9cfefbd4aa Continue with operations for GMap. 2016-11-29 11:43:20 +01:00
Guillaume Damiand 181efb29c4 Correction of method insert_cell_0_in_cell_2 for GMaps 2016-11-29 11:43:18 +01:00
Guillaume Damiand 1e5e4e74bb Correction in insert cell 0 in cell 1 function for GMap. 2016-11-29 11:43:18 +01:00
Guillaume Damiand 9b8eb9e785 Correction for make_tetrahedron and make_quadrangle for gmaps; modify corresponding methods in LCC to be able to work both for CMaps and GMaps. 2016-11-29 11:43:17 +01:00
Guillaume Damiand 6656ab9f4e Update doc in header files for make_xxx function in LCC. 2016-11-29 11:43:17 +01:00
Guillaume Damiand 0e80ecf8c0 Work to be able to use LCC with GMap as underlying DS (nyf) 2016-11-29 11:43:13 +01:00
Guillaume Damiand 258b8af5a7 Bugfix: uint -> int to consider correctly the case i==0 2016-11-29 11:43:13 +01:00
Guillaume Damiand 6cf55c7544 Update code after removal of global operations 2016-11-29 11:43:13 +01:00
Guillaume Damiand 8175041481 Update GMap and examples and tests to remove global function (following similar modif in CMap) 2016-11-29 11:43:12 +01:00
Guillaume Damiand 05f054c5e2 Rename internal functors to avoid conflicts with same functor for CMap. 2016-11-29 11:43:11 +01:00
Guillaume Damiand d0d87a0be2 Add missing typedef 2016-11-29 11:43:10 +01:00
Guillaume Damiand 84518582f4 Update generalized maps. 2016-11-29 11:43:07 +01:00
Guillaume Damiand 96e3ded2a5 Update generalized maps to follow the last modifications of combinatorial maps (nyf). 2016-11-29 11:43:07 +01:00
Guillaume Damiand e65882ead7 Update generalized maps to follow the last modifications of combinatorial maps (nyf). 2016-11-29 11:43:07 +01:00
Guillaume Damiand 16f490251a Reintroduce package Generalized map 2016-11-18 08:35:36 +01:00