Commit Graph

73 Commits

Author SHA1 Message Date
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 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 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 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 2fcd25ad13 copy cont... 2013-06-03 13:58:31 +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
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 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 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 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 fbb39f99ec Remove two unused variables 2013-02-15 08:37:03 +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 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 2f19803fb8 Wip 2013-01-28 17:54:28 +01:00
Guillaume Damiand ba0e0858ea Degroup when remove is now ok 2013-01-28 13:34:49 +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 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 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 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