Commit Graph

248 Commits

Author SHA1 Message Date
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
Laurent Rineau b6ffa7c425 Merge branch 'CGAL-fix_warnings-GF'
That branch was successfully tested in CGAL-4.2-Ic-205.
2013-03-27 12:23:31 +01: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
Sébastien Loriot 9fcf46e11a replace CGAL_[kernel/qpe/triangulation/]_assertion by assert in tests
this should be the case, following our guidelines.

using:
find */test/* -name '*.[hc]*' | xargs sed -i 's/CGAL_assertion/assert/g'
2013-03-21 10:50:55 +01:00
Alexandros Konstantinakis-Karmis 3b1d281efb Abbreviations trigger end of \brief description
Fixes bug #15482:
https://gforge.inria.fr/tracker/index.php?func=detail&aid=15482&group_id=52&atid=13845
2013-03-13 11:58:56 +01:00
Sébastien Loriot 7d2903e230 add classified reference manual pages 2013-03-12 14:51:52 +01:00
Guillaume Damiand 0fb7b0d390 Remove warnings in CMap 2013-03-11 12:43:31 +01:00
Laurent Rineau 9f5458f288 Merge branch 'CGAL-fix_warnings-GF' 2013-03-07 12:58:19 +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 b1d65019c1 Doxygen LCC ok. 2013-03-01 16:30:48 +01:00
Guillaume Damiand 2a04b964cd * More links in CMap doc.
* Add tag in doxyassist for LCC.
* Ok for LCC user manual.
2013-03-01 13:45:52 +01:00
Guillaume Damiand 74b589c466 Correct some links; add #include for operations. 2013-03-01 11:11:58 +01:00
Guillaume Damiand f3c4f7a319 * Create a group for classes in CMap doc doxygen version.
* Move figure pdf and xfig versions in subdir.
2013-02-28 20:55:35 +01:00
Guillaume Damiand 8734f2cf51 Doxygen version of the CMap doc. 2013-02-28 17:19:11 +01:00
Guillaume Damiand 5def71590e Merge branch 'Combinatorial_map_contractions_v2-gdamiand'
Several bug fixes; modification of the way onsplit/onmerge are tested as all the cases were not considered before; update all the operations to use this new tests.

Merge approved by Laurent (released manager).
2013-02-20 17:43:06 +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
Laurent Rineau 26a7e70785 New license.txt files (eol changes)
The new version 2.13.0 of licensecheck has changed the spaces at eol.
2013-02-19 16:46:39 +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 d61ec5bdca Move tests in LCC, add more tests (nyf) 2013-02-08 17:22:13 +01:00
Guillaume Damiand 2912913964 add tests for contraction<3> 2013-02-08 14:11:05 +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 a384bebac3 End of test for contraction<1>. 2013-02-05 12:57:55 +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