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

62 Commits

Author SHA1 Message Date
Guillaume Damiand 761220f429 Cleanup 2022-04-08 16:27:41 +02:00
Guillaume Damiand 79532a0590 Replace some nullptr by null_handle 2022-04-08 10:16:35 +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
Guillaume Damiand 84ca88f8cc Remove the maxid 2021-10-19 20:16:43 +02:00
Guillaume Damiand f21ab5a1a1 When cells have id, store the max id. 2021-10-14 17:48:43 +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
Sébastien Loriot d1a323c730 extra run of the script to remove tabs and trailing whitespaces 2020-03-26 19:24:14 +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
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
Andreas Fabri 4581f1b7a8 Morte replacements 2019-06-05 08:39:55 +02: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 c8250c4570 Merge branch 'master' into BGL-LCC-gdamiand 2017-06-15 10:03:53 -04:00
Guillaume Damiand 42a1419dbf Document class Cell_attribute_with_id 2017-05-10 08:22:22 -04:00
Laurent Rineau 87c9afd486 Fix the compilation of individual headers 
- in most cases, that was just adding missing #include
- I have removed the use of <CGAL/basic.h>
 2017-04-13 15:56:51 +02:00
Guillaume Damiand 54eae7dcd4 Init_id function has two template arguments. 2017-03-29 12:44:33 -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 f95a9558b2 Update cmap to use index in attributes/darts for property maps. 2017-03-27 11:58:30 -04: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 b43ba70a5f Rename storare class (used internally); update copy constructor calls. 2016-11-29 11:43:34 +01:00
Guillaume Damiand 1e622976fc Factorize dart in CMap and GMap; remove Dart concept and deprecated the use of CGAL::Dart for users; add possibility to define an information associated to each dart. 2016-11-29 11:43:31 +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
Andreas Fabri 4f8572ed44 Fix package Combinatorial_map: include headers 2016-09-30 15:23:14 +02:00
Andreas Fabri 347bd827b5 Fix package Combinatorial_map: include headers 2016-09-30 15:22:29 +02:00
Guillaume Damiand aad53de70e Integrate the index class into the compact container with index: cont. 2014-10-05 14:25:48 +02:00
Guillaume Damiand 7efb4bdbda Start to integrate the index class into the compact container with index. 2014-10-03 17:35:26 +02:00
Guillaume Damiand 6d71a45447 First try with index class. 2014-10-02 20:43:50 +02:00
Guillaume Damiand 54b4e8028f Index version. 2014-09-18 16:59:19 +02:00
Laurent Rineau 3deb8e7910 Merge branch 'Mesh_3-compare_index-GF-old' into Mesh_3-compare_index-GF 
Create an integration branch for 'Mesh_3-compare_index-GF': a new branch
created from 'master', where I merged the previous version of
'Mesh_3-compare_index-GF'.

There was a conflict with two features recently merged into 'master' for
CGAL-4.5:

- the move of two files from include/CGAL/Mesh_3/ to include/CGAL/. See
  the small feature:
    http://cgal.org/wiki/Features/Small_Features/New_constructor_in_Label_mesh_domain_3_and_new_function_wrapper

- parallelism for Triangulation_3 and Mesh_3:
    http://cgal.org/wiki/Features/Parallel_Mesh_3

Conflicts:
	Combinatorial_map/include/CGAL/Cell_attribute.h
	Mesh_3/include/CGAL/Implicit_mesh_domain_3.h
	Mesh_3/include/CGAL/Labeled_image_mesh_domain_3.h
	Mesh_3/include/CGAL/Mesh_3/Sliver_perturber.h
	Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h
	Mesh_3/test/Mesh_3/test_meshing_3D_image.cpp
	Mesh_3/test/Mesh_3/test_meshing_polyhedron.cpp
	Mesh_3/test/Mesh_3/test_meshing_polyhedron_with_features.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_type.h
	STL_Extension/include/CGAL/Compact_container.h
	STL_Extension/test/STL_Extension/test_Compact_container.cpp

I also modified the following files during the conflict resolution:

	Linear_cell_complex/include/CGAL/Cell_attribute_with_point.h
	Mesh_3/include/CGAL/Labeled_mesh_domain_3.h
	Mesh_3/include/CGAL/Polyhedral_mesh_domain_with_features_3.h
 2014-07-18 15:47:14 +02:00
Guillaume Damiand 174dfc336e * bugfix in first_dart: remove null_handle when cmap is empty and not null_dart_handle 
* update friend declarations
* remove useless this->set_current_dart(this->mmap->null_handle) in Dart_iterators.h
* Use inner definition CMap::Dart_of_cell_basic_const_range<i> instead of directly the class CGAL::CMap_dart_const_iterator_basic_of_cell in internal/Combinatorial_map_internal_functors.h (more generic)
 2014-06-13 11:31:32 +02:00
Sébastien Loriot 2d14739716 additional fixes for Combinatorial map package 2014-05-21 18:47:33 +02:00
Clement Jamin 28c5fde142 Add an increment policy to the Compact_container, and an operator[] 2013-12-20 15:03:37 +01:00
Guillaume Damiand 61d6236b60 Use null_handle instead of NULL everywhere internally to simplify the future possible version with index. 2013-11-13 17:32:46 +01:00
Guillaume Damiand dccdec40a5 Combinatorial map with no static dart_null_handle. 
This is a copy from the branch CMap_no_dart-gdamiand by keeping only the part with dart_handle.
The modifications are the ones given in the small feature Combinatorial map dart attribute.
 2013-11-12 22:27:44 +01:00
Guillaume Damiand 37d7b8ef0f Merge branch 'Combinatorial_map-reverse_orientation-kenohori-old' into Combinatorial_map-reverse_orientation-kenohori 2013-06-23 21:02:11 +02:00
Guillaume Damiand 7f7788bd84 Small corrections on reverse orientations; reformating; start to add tests 2013-06-13 11:14:03 +02:00
Guillaume Damiand 035ff356b6 Better solution for lcc copy 2013-06-04 18:27:13 +02:00
Guillaume Damiand 6e7babc14b copy cont 2013-06-04 13:23:43 +02:00
Guillaume Damiand 6fca991923 Copy constructor for cmap cont 2013-06-02 21:07:33 +02:00
Guillaume Damiand 49a19b0b71 End of copy constructor for cmaps. Add tests. 2013-05-31 14:43:56 +02:00
Guillaume Damiand 8510fb2853 Two bugfix: 1) one mark not shared for CMap_cell_iterator 2) use of two least significant bits for Cell_attribute when support of dart is disable. Add tests in test suite for these cases. 2013-04-26 10:57:53 +02:00
Guillaume Damiand f58aa32242 Revert "Cell_attribute::get_nb_refs is public and not protected; CMap_cell_iterator copy contructor and operator= share also mark mmark_number" 
This reverts commit 9aaab1e74a.

(pushed by error in master instead of in my branch)
 2013-04-23 21:00:36 +02:00
Guillaume Damiand 9aaab1e74a Cell_attribute::get_nb_refs is public and not protected; CMap_cell_iterator copy contructor and operator= share also mark mmark_number 2013-04-23 20:53:50 +02:00
Guillaume Damiand 9f0d0ec2a7 Add missing typedef 2013-02-18 10:44:53 +01:00
Guillaume Damiand 450a07786b Ok for group/degroup and operations. 
* clarify all the tests of group/ungroup cases for non void attributes
* create specialized functors allowing to consider all the different cases
  (group two edges along their two extremities, only the first or the second...)
* make many cleanup to move functors in different files, and to comment them
* add namespace before global functions

Still to do: sewable for dim>3 (build the isomorphism); try to improve onsplit
  test by testing only one out of two modified darts; add a parameter to
  operations to do not test group/ungroup; do a functor which updates the
  attributes of all the map (avoid do make many small tests, and do only one
  big test once).
 2013-02-14 16:27:51 +01:00
Guillaume Damiand 173f8bc073 Continue on operations, group and degroup... 2013-02-13 17:57:49 +01:00