Commit Graph

140 Commits

Author SHA1 Message Date
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