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

504 Commits

Author SHA1 Message Date
Guillaume Damiand 3ab46250db Reinit always ref counting when creating attribute. VC12 does not use the specialized version for copy constructor but always the generic one. 2014-04-07 19:53:06 +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 b3a7330a33 Remove function get_attribute_of_dart which is useless. 2013-11-19 15:42:51 +01:00
Guillaume Damiand 96f3835d0a Remove null vector in traits (pb with Kernel_d ?) 2013-11-19 07:30:43 +01:00
Guillaume Damiand 305b6a4ba0 Add debug message 2013-11-18 19:47:27 +01:00
Guillaume Damiand 2b6bf9fbe7 Remove a warning 2013-11-15 08:05:22 +01:00
Guillaume Damiand 42959d525f Add missing typedef 2013-11-14 13:25:45 +01:00
Guillaume Damiand 6592ca0bc7 Remove warning 2013-11-14 09:36:53 +01:00
Guillaume Damiand ddefa1f60c Remove warning 2013-11-14 08:39:34 +01:00
Guillaume Damiand 8d560a5661 Bugfix in dart functions with c++11. 2013-11-14 08:34:36 +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 53f02ea00d Add storage classes (forgotten in the previous commit) 2013-11-13 13:49:59 +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
Andreas Fabri 6c547e5663 Mainly added includes 2013-09-13 22:24:30 +02:00
Guillaume Damiand d2e409487e Bug fix in close operation. 2013-07-04 16:55:53 +02:00
Guillaume Damiand b3ad1c44c4 Merge branch 'Combinatorial_map-reverse_orientation-kenohori' 
Approved by the release manager.
 2013-06-25 12:17:36 +02:00
Guillaume Damiand 6653320136 Tests for reverse orientation. 
Bugfix: initialization of internal::Test_is_same_attribute_functor<Self, Map2>::value.
Add text in changes.html.
 2013-06-24 10:27:26 +02: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 1018501173 Replace t.get<i>() by CGAL::cpp11::get<i>(t) for tuples. 2013-06-18 09:33:37 +02:00
Guillaume Damiand 867cf4767e Example for dynamic functor. 2013-06-17 10:14:04 +02:00
Guillaume Damiand 444ba939a8 Dynamic attributes for onmerge and onsplit. 
Copy of master, and integrations of modifs done in the branch Combinatorial_map_dynamic_onxxxfunctors-gdamiand. Add an example in  map_3_dynamic_onmerge.cpp.
 2013-06-16 20:48:01 +02:00
Guillaume Damiand 50fd54b5f1 Patch for compiler gcc4.3 
(Sebastien is the best, even it is not fair because I don't have access to the compiler. But I will pay my beer ;)
 2013-06-13 14:53:04 +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 67756fd5d3 Add missing template keywords 2013-06-13 10:21:09 +02:00
Guillaume Damiand ff8b4686d9 Remove a warning 2013-06-07 08:46:25 +02:00
Guillaume Damiand 23e8a540f7 Small corrections after first results of testsuite 2013-06-06 08:18:13 +02:00
Guillaume Damiand a4e392b552 Copy of CMap: ok for code and test suite. 2013-06-05 16:16:02 +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 6cc05e3920 wip copy 2013-06-03 18:50:35 +02:00
Guillaume Damiand 182e524200 cont tests for copy 2013-06-03 15:37:43 +02:00
Guillaume Damiand 7ce76b0d82 Merge branch 'Combinatorial_map_copy2-gdamiand' of ssh://scm.cgal.org/var/git/cgal into Combinatorial_map_copy2-gdamiand 2013-06-03 13:58:48 +02:00
Guillaume Damiand 2fcd25ad13 copy cont... 2013-06-03 13:58:31 +02:00
Guillaume Damiand 13a1bf5903 cont... 2013-06-03 09:10:44 +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 82136efdfa Start tests for copy of cmap 2013-05-30 16:26:27 +02:00
Guillaume Damiand bac62f48fc Add constructor in derived cmap and lcc classes 2013-05-30 14:38:53 +02:00
Guillaume Damiand 6f5e400039 Add copy constructor, operator= and swap operations. 
(Copied from Combinatorial_map_copy-gdamiand, to start from a fresh copy of master)
 2013-05-30 14:05:16 +02:00
Ken Arroyo Ohori 0ac3e69120 Changed names of methods and functors 
Signed-off-by: Ken Arroyo Ohori <g.a.k.arroyoohori@tudelft.nl>
 2013-05-07 11:20:38 +02:00
Ken Arroyo Ohori d53f347e2d New name and description for reversing the orientation of part of a combinatorial map 
Signed-off-by: Ken Arroyo Ohori <g.a.k.arroyoohori@tudelft.nl>
 2013-05-06 13:48:18 +02:00
Ken Arroyo Ohori 8c610eb299 Changes for reversing the orientation of a combinatorial map 
Signed-off-by: Ken Arroyo Ohori <g.a.k.arroyoohori@tudelft.nl>
 2013-05-03 17:46:23 +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
Laurent Rineau 89c38bdd49 Merge remote-tracking branch 'origin/Combinatorial_map_bugfix_for_dll-gdamiand' 
That branch was successfully tested in CGAL-4.2-Ic-213, and fixes a bug
about that static variable null_dart_handle, on Windows, when several
compilation DLLs using the CMap API are used in the same executable. That
fix is supposed to be temporary, for CGAL-4.2.
 2013-04-09 12:02:54 +02:00
Guillaume Damiand 4e5dfe4690 Add test null_dart_handle!=NULL 2013-03-22 22:18:54 +01:00
Guillaume Damiand 7508beab19 wip 2013-03-22 21:38:02 +01:00
Guillaume Damiand 44ad97ee0e Add tests in iterator to avoid to test mark of null_dart_handle. 
These tests are normally not necessary if null_dart_handle is correctly initialized. However there is a problem on windows when we instantiate cmap in dll.

TODO: modify the api to use a null_dart_handle non static; but this requires to remove all member functions for dart concept. Perhaps for cgal 4.3.
 2013-03-22 20:43:51 +01:00
Guillaume Damiand 0fb7b0d390 Remove warnings in CMap 2013-03-11 12:43:31 +01:00
Laurent Rineau 12bb506fcf Disable -Warray-bounds with g++>=4.3 
The pitty is that there is no way to disable the warning only for that
header. The pragma disables the warning for everything that is included
after <CGAL/Combinatorial_map.h>.
 2013-03-05 14:00:00 +01:00
Guillaume Damiand 55a4a143b3 Bugfix for call_attribute, when user defines operator() with different const (and add tests in the testsuite). 2013-02-19 17:36:56 +01:00
Guillaume Damiand 6b9eadaf80 Remove unused variables 2013-02-19 07:29:58 +01:00
Guillaume Damiand b8eef9c6b3 cpp0x -> cpp11 2013-02-18 15:53:53 +01:00
Guillaume Damiand 43848090e6 Internal functions for attributes 2013-02-18 12:14:35 +01:00
Guillaume Damiand 9f0d0ec2a7 Add missing typedef 2013-02-18 10:44:53 +01:00
Guillaume Damiand 35509487a9 On split can now be called with a cmap as parameter. 2013-02-17 21:19:17 +01:00
Guillaume Damiand bf70c5b8e5 * Bug fix in is_sewable for i>3. 
* replace some assert by CGAL_assertion.
* add composition of beta, static version when no c++11.
 2013-02-15 13:25:51 +01:00
Guillaume Damiand f6cc273d7f add template keyword 2013-02-15 09:20:31 +01:00
Guillaume Damiand 3a55c3ea3f Remove unused local typedef; replace two assert with CGAL_assertion 2013-02-15 08:51:43 +01:00
Guillaume Damiand fbb39f99ec Remove two unused variables 2013-02-15 08:37:03 +01:00
Guillaume Damiand 7ff4e8f690 Bugfix is_sewable for dim>3 2013-02-14 21:58:18 +01:00
Guillaume Damiand 481908df1f * Re-add set_attribute method in CMap class (was removed by error). 
* Make functors Is_removable_functor and Is_contractible_functor to avoid a warning.
 2013-02-14 17:21:36 +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 6035180c7a cont... 2013-02-13 22:17:09 +01:00
Guillaume Damiand 173f8bc073 Continue on operations, group and degroup... 2013-02-13 17:57:49 +01:00
Guillaume Damiand 550518a13f Cont degroup/group and operations 2013-02-12 22:21:57 +01:00
Guillaume Damiand 599d700c65 Wip group/degroup and operations 2013-02-12 17:34:25 +01:00
Guillaume Damiand 0778e0b166 Wip group/degroup 2013-02-11 22:22:14 +01:00
Guillaume Damiand fbe2a506d7 Continue on group/ungroup: nyf 2013-02-11 22:03:18 +01:00
Guillaume Damiand 6678832c7a Wip on group/degroup 2013-02-11 17:57:10 +01:00
Guillaume Damiand af1c3f25fa Wip 2013-02-11 15:31:43 +01:00
Guillaume Damiand 0558f60b09 Start some cleanup in group/degroup methods. 2013-02-11 13:49:39 +01:00
Guillaume Damiand 9a0b1d17e9 Add test for contraction<3> 2013-02-08 21:36:41 +01:00
Guillaume Damiand 1db1ddb8c5 Add tests for contraction<2> 2013-02-08 11:25:54 +01:00
Guillaume Damiand c9a783a74a Add contraction<i> for i>1 2013-02-05 16:50:22 +01:00
Guillaume Damiand 5be11826cb Onsplit: it seems ok now. 2013-01-30 22:01:36 +01:00
Guillaume Damiand 29039d2fde wip split... 2013-01-29 16:30:43 +01:00
Guillaume Damiand bde3be7571 Onsplit, another version 2013-01-29 08:17:38 +01:00
Guillaume Damiand 7f6cf79490 Onsplit again... 2013-01-28 22:13:56 +01:00
Guillaume Damiand 2f19803fb8 Wip 2013-01-28 17:54:28 +01:00
Guillaume Damiand 18aa10a293 Split for removal, special cases. 2013-01-28 15:36:08 +01:00
Guillaume Damiand e7049ef7e6 Solve conflict with myself. 
Conflicts:
	Combinatorial_map/include/CGAL/Combinatorial_map_operations.h
 2013-01-28 13:48:50 +01:00
Guillaume Damiand ba0e0858ea Degroup when remove is now ok 2013-01-28 13:34:49 +01:00
Guillaume Damiand 5b36822e76 Bug fix: can be improve later 2013-01-25 21:48:39 +01:00
Guillaume Damiand 78d2ebf342 small correction 2013-01-25 20:41:21 +01:00
Guillaume Damiand 54a27a09c9 Contraction v2 to start a new proper branch. 2013-01-25 17:29:34 +01:00
Philipp Möller 0f34f2a89e Merge branch 'Maintenance-include-less-boost-pmoeller' 2012-12-21 09:44:18 +01:00
Sébastien Loriot 82b2ebc865 apply the cpp0x namespace renaming in all files 2012-12-19 11:33:17 +01:00
Philipp Möller 7bb310767c Fix type_traits includes in Combinatorial_map 
Make sure every header is complete and only brings in the minimal
requirements.
 2012-12-17 17:32:49 +01:00
Guillaume Damiand d28bf9d655 Bugfix: On_merge -> On_split (!) 2012-12-17 08:07:45 +01:00
Guillaume Damiand 703e5d4149 Remove warnings. 
Unused typedef, variable; unitialized type.
 2012-11-28 10:10:48 +01:00
Guillaume Damiand bf573f35d3 End of modifs of iterators that use marks. 2012-11-22 20:33:45 +01:00
Guillaume Damiand 3d0d6817e0 Update iterators: mark null_dart to use it as sentinel. 2012-11-22 19:12:55 +01:00
Guillaume Damiand 5ac344ec48 Use null_dart as sentinel durint interators. 2012-11-21 16:47:24 +01:00
Guillaume Damiand e5e1bec620 Improve iterator which use mark. 2012-11-20 10:20:53 +01:00
Guillaume Damiand 9a20e0e0c7 Modify iterators that use marks. 
Mark darts when they are push in the stack instead of when they are pop. This avoid to push a same dart several times in the stack.
 2012-11-19 21:40:25 +01:00
Guillaume Damiand c871aa06b4 * Add generic beta in CMap (small feature); 
* Add generic create_dart and create_attribute in CMap (small feature);
* Add generic create_vertex_attribute in LCC (small feature);
* BugFix in LCC doc (wrong concept for item class).
 2012-09-06 11:42:50 +00:00
Guillaume Damiand 44d29a5c8f * Add a second subdvision method in LCC demo 
* Add two basic usefull functions (internal as undocumented)
* Add an example showing how to customize the type of point used in LCC
 2012-07-02 09:20:14 +00:00
Philipp Möller d8270400a2 Added some missing 'template' keywords to member function calls, that 
gcc and MSVC silently swallowed.
 2012-06-20 11:05:59 +00:00
Guillaume Damiand 1041faed99 More warnings 2012-05-09 11:25:38 +00:00
Guillaume Damiand 084dc9e99c Small errors and warning 2012-05-09 10:45:32 +00:00
Guillaume Damiand bdb8619c5a Bug fix in some asserts; update some comments; replace some static_assert by assert. 2012-05-04 11:53:07 +00:00
Guillaume Damiand 78baede34b continue 2012-05-04 09:14:09 +00:00
Guillaume Damiand 8da05e315f Replace functor by if: cont... 2012-05-04 07:18:54 +00:00
Guillaume Damiand 0e03d6b824 Restore the previous commit in my branch. 2012-05-03 20:20:51 +00:00
Guillaume Damiand 1ed058b105 Add a condition in is_valid method => update the code of insert vertex operation 2012-03-27 12:31:08 +00:00
Guillaume Damiand cce01ff0c6 Bug fix. 2012-03-26 20:11:32 +00:00
Guillaume Damiand b10d4766fc Bug fix in removal operation 2012-03-26 11:44:37 +00:00
Guillaume Damiand e5a6f3705f add test on degroup darts 2012-03-26 10:16:44 +00:00
Laurent Rineau 5b5dd33848 merge changes from next 2012-01-09 12:33:39 +00:00
Guillaume Damiand f07f987030 Move the assert before the use. 2011-12-20 14:52:14 +00:00
Guillaume Damiand 01e12fd082 Split dual in two parts (combinatorial and geometrical parts). 2011-12-19 19:40:55 +00:00
Guillaume Damiand 13edaf302b private -> protected. 2011-11-25 14:54:08 +00:00
Guillaume Damiand 75afba4df1 Revert Combinatorial_map.h to r66434: there was a problem during the reintegrate... 2011-11-23 21:33:45 +00:00
Guillaume Damiand 95ef49628f Merge with next. 2011-11-23 16:35:45 +00:00
Guillaume Damiand a34448f6b8 End of modifs of copy of iterator with mark. 2011-11-18 10:53:21 +00:00
Guillaume Damiand 1473c3e382 Start of modifications of copy constructor and operator= for iterators that use marks. 2011-11-17 20:56:59 +00:00
Guillaume Damiand ed877946ce Replace the bitset of reserved marks by an array of number of times each mark is reserved. 2011-11-17 20:27:11 +00:00
Guillaume Damiand 7414673b78 Remove two unused variables. 2011-11-09 06:36:07 +00:00
Guillaume Damiand ed25a632bf Merge with branches/candidate-packages/Combinatorial_map. 2011-11-08 09:56:54 +00:00
Guillaume Damiand 94cdfc234a Bug fix 2011-11-03 20:51:13 +00:00
Guillaume Damiand ba47a434c9 Re-Indent the modified part. 2011-11-03 11:48:51 +00:00
Guillaume Damiand 18557e5fda Merge with next 2011-11-03 11:43:41 +00:00
Guillaume Damiand 79001c1cc5 Re-indent 2011-11-03 11:04:36 +00:00
Guillaume Damiand e6dc52038a Bug fix 2011-11-02 19:36:54 +00:00
Guillaume Damiand e584d175a3 Bug fix. 2011-11-02 08:23:25 +00:00
Guillaume Damiand 38c3af20d8 Bug fix 2011-11-01 19:06:16 +00:00
Guillaume Damiand 2a3e4429d4 Add a method counting all the cells. 2011-10-31 08:28:59 +00:00
Guillaume Damiand 81b14d2012 Bug fix in unsew functors. 2011-10-31 08:07:51 +00:00
Guillaume Damiand 2924685e71 Add a missing friend 2011-10-31 08:07:01 +00:00
Laurent Rineau fcd1bc0677 merge from next 
And modify the licenses to LGPLv3+ for the following new files:
  include/CGAL/Combinatorial_map_iterators_base.h
  include/CGAL/internal/Combinatorial_map_utility_novariadic.h
 2011-10-11 12:54:32 +00:00
Guillaume Damiand f26fe49316 Licence for Combinatorial_map 2011-10-10 14:39:37 +00:00
Sébastien Loriot 5d420a9c2c undo license change in Cmap package 2011-10-10 14:06:06 +00:00
Sébastien Loriot 91a5327fa8 change LGPLv2 -> LGPLv3 2011-10-10 13:48:25 +00:00
Guillaume Damiand 151d87d83a Copyright. 2011-10-10 10:56:46 +00:00
Guillaume Damiand 721c337de6 Add missing file. 2011-10-10 10:43:34 +00:00
Guillaume Damiand f871da7c99 * replace some assert by static_assert; 
* add all the ranges and refactoring of code to clarify it.
 2011-10-07 15:10:30 +00:00
Guillaume Damiand 867a8733cf * replace some assertion by static_assertion 
* refactoring of Combinatorial_map_utility.h => move all novariadic struct in Combinatorial_map_utility_novariadic. The file can now be read easier.
 2011-10-07 14:15:06 +00:00
Guillaume Damiand a29c905ee0 Replace BOOST_STATIC_ASSERT by CGAL_static_assertion. 2011-08-31 14:30:07 +00:00
Guillaume Damiand 5c3caa4351 Copyright final version ;) 2011-06-14 12:27:16 +00:00
Guillaume Damiand a36e3907e7 cleanup (merge from candidate package) 2011-06-09 14:54:42 +00:00
Guillaume Damiand 7edb0c49d8 copyright 2010-2011 2011-06-09 13:25:19 +00:00
Guillaume Damiand b1eeda2b2f replace CGAL::Disabled by CGAL::Void 
modification of copyright
 2011-06-09 12:28:54 +00:00
Guillaume Damiand 7dc61a7446 merge with candidate package 2011-05-31 08:25:07 +00:00
Guillaume Damiand ba245d9d51 merge with candidate package 2011-05-30 11:14:30 +00:00
Guillaume Damiand 9b8a6d456c merge from candidate package 2011-05-27 15:23:35 +00:00
Guillaume Damiand e7a3dbe504 Update of copyright 2011-05-27 12:39:40 +00:00
Guillaume Damiand 6dbb62caee same modif than r63563 - branches/candidate-packages/Combinatorial_map/include/CGAL 2011-05-20 07:43:01 +00:00
Guillaume Damiand 0bac9ece26 Try to fix compiler error for g++-3.4 2011-05-12 14:02:58 +00:00
Guillaume Damiand c283ac6689 Backport of modifs made in Linear_cell_complex-gdamiand branch. 2011-05-10 07:14:42 +00:00
Guillaume Damiand 046cc5a048 merge from next and from candidates/Combinatorial_map 2011-05-05 12:29:06 +00:00
Guillaume Damiand d1411b354f typo 2011-04-21 11:54:42 +00:00
Guillaume Damiand 5c630c7f39 Move Combinatorial_map package from candidate-packages to its own branch 2011-04-20 16:54:10 +00:00