Commit Graph

591 Commits

Author SHA1 Message Date
Andreas Fabri 0900971a4f warning was introduced with g++ 5 2016-02-01 12:23:17 +01:00
Andreas Fabri 164c427c0f suppress -Warray-bounds 2016-02-01 11:19:05 +01:00
Guillaume Damiand 7810d3b630 Remove duplicated useless variable null_handle. 2016-01-29 15:08:48 +01:00
Guillaume Damiand e0d31207ba Make the (inner) variable null_handle const 2016-01-28 18:50:39 +01:00
Sebastien Loriot 4e9448cb9e Merge pull request #451 from GilesBathgate/throwing-destructors
Introduces a CGAL_destructor_assertion macro.
2016-01-14 14:08:10 +01:00
Sebastien Loriot db74cf0637 Merge pull request #621 from gdamiand/CMap_bugfix_iterator-gdamiand
CMap bugfix iterator gdamiand
2016-01-13 14:49:58 +01:00
Giles Bathgate f0ac236713 Introduces a GCAL_NO_ASSERTIONS_BOOL macro
This macro is always defined. Its value will be true when assertions are defined
and false when assertions are not defined. This macro can then be used in place
of a true false constant, such as is needed for CGAL_NOEXCEPT.
2016-01-08 20:31:59 +00:00
Guillaume Damiand 60d44ab38b Bug fix in dart iterator with two beta 2016-01-08 06:33:36 +01:00
Guillaume Damiand edfe7f4d10 Add test to be able to detect more bugs in iterators. 2016-01-07 22:24:05 +01:00
Guillaume Damiand 13fec5c8d1 Bug fix in CMap_extend_iterator class.
Do not mark darts when pushing them in the stack of dart; but when they are processed.
2016-01-07 18:45:54 +01:00
Giles Bathgate f6dfeba815 Use CGAL_NO_ASSERTIONS with the CGAL_NOEXCEPT macro.
This avoids penalizing release builds in which assertions are not
made within the destructors, and so no exception can be thrown.
2015-12-19 15:47:16 +00:00
Philipp Möller 71b4e9c515 Use CGAL_FULL_VERSION in all Doxyfile.in 2015-12-17 16:33:28 +01:00
Philipp Möller 81a8f982dc Handle the easy INPUT cases
If INPUT is just PKG/doc/PKG, handle it automatically.
2015-12-10 17:00:26 +01:00
Giles Bathgate 3a725499ad Introduces CGAL_NOEXCEPT macro.
This macro is available for future compatibility with c++11, which
by default marks destructors noexcept(true). Some destructors
in CGAL do throw exceptions an so should be marked noexcept(false).
Since noexcept is not available in c++0x and below the macro is
disabled when CGAL_CXX11 is not defined since it is not required.
2015-11-23 16:47:59 +00:00
Giles Bathgate 9645135ff5 Introduces a CGAL_destructor_assertion macro.
This macro can safely be called from a destructor, even when
the stack is currently unwinding, and thus prevents uncatchable
exceptions.
2015-11-23 16:47:59 +00:00
Guillaume Damiand 237697b7e0 Update Combinatorial_map.txt 2015-11-04 10:20:19 +01:00
Sebastien Loriot 5d9d9d660d Merge pull request #450 from gdamiand/CMap-marks_with_exceptions-sbrandel
C map marks with exceptions sbrandel
2015-11-02 09:12:42 +01:00
Sébastien Loriot db92147837 assert -> CGAL_assertion in header 2015-10-29 13:04:01 +01:00
Guillaume Damiand afeb0eb4d2 Do not use using declaration but a typedef. 2015-10-29 07:41:55 +01:00
Guillaume Damiand f918d36ef6 rename mark in amark. 2015-10-28 13:16:31 +01:00
Guillaume Damiand 06731095ae Add using declaration for Exception_no_more_available_mark. 2015-10-28 11:19:02 +01:00
Guillaume Damiand b8b4b9c545 Remove two unused variables. 2015-10-16 07:19:51 +02:00
Guillaume Damiand 0f7bb719f3 Merge branch 'CMap-marks_with_exceptions-sbrandel-old' into CMap-marks_with_exceptions-sbrandel 2015-10-01 18:31:45 +02:00
Andreas Fabri 6e214c5f4a remove Qt3 demos and empty dontsubmit files 2015-09-30 12:51:40 +02:00
Laurent Rineau 35d63a2fb4 Merge pull request #302 from gdamiand/STL_extension-isused_test-gdamiand
STL Extensions: add test for is_used
2015-09-03 13:48:20 +02:00
Laurent Rineau 69706c7de9 Merge pull request #127 from gdamiand/Combinatorial_map_save_load-gdamiand
Combinatorial_map: add save/load functionality in the LCC demo
2015-09-03 13:43:36 +02:00
Guillaume Damiand 586eb0a266 Update doc of XXX_handle (documentation bug fix). 2015-08-31 17:28:36 +02:00
Guillaume Damiand 2387fcf2a5 Remove is_used from Combinatorial map test. 2015-08-31 08:34:17 +02:00
Guillaume Damiand 600e7b1b30 Start to merge with the new qt5 version of the LCC demo (nyf). 2015-08-28 11:51:48 +02:00
Laurent Rineau 08666dce25 Merge pull request #179 from afabri/CGAL-add_hash-GF
Add boost::hash and std::hash

https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/hash

Conflicts:
	Installation/changes.html
2015-07-17 15:39:18 +02:00
Sébastien Loriot 50595505c4 Merge branch 'Fix_warnings-GF'
Fixes warnings in various packages

Successfully tested in CGAL-4.7-Ic-87
Approved by the release Manager
2015-07-17 14:21:21 +02:00
Sébastien Loriot 10dddcc881 init base class to avoid a warning with clang 2015-07-16 17:45:52 +02:00
Sébastien Loriot 84d82c3a8e fix unused variable warnings 2015-07-16 10:15:33 +02:00
Andreas Fabri 2dea6db3bb Merge branch 'CGAL-add_hash-GF-old' into CGAL-add_hash-GF
Conflicts:
	Surface_mesh/include/CGAL/Surface_mesh/Surface_mesh.h
2015-07-06 10:51:23 +02:00
Guillaume Damiand e94b687022 Add \ after i.e. in doxygen comment 2015-06-24 09:50:20 +02:00
Guillaume Damiand d67542fb59 Add is_xxx_used in cmap for dart and attributes; add tests in CMap and LCC. 2015-06-22 16:50:56 +02:00
Guillaume Damiand a8226e8743 Add sentence about handle that are LessThanComparable and Hashable 2015-06-22 15:45:07 +02:00
Guillaume Damiand a57e127412 Remove warnings 2015-06-17 09:45:59 +02:00
Guillaume Damiand af01f3820c Remove a warning 2015-06-16 12:14:23 +02:00
Guillaume Damiand c0741ed420 Remove warnings 2015-06-16 07:58:02 +02:00
Guillaume Damiand 4bae2612d8 * Modify load to not take into account the typeid of attributes
* Update the demo to draw non convex faces
2015-06-15 21:14:02 +02:00
Guillaume Damiand 1867f5b096 Add save/load in the demo. 2015-06-15 14:53:00 +02:00
Sylvain Brandel 25b2727381 mark type modified from int to size_type, exception thrown in get_new_mark and test added in the test-suite 2015-06-12 15:11:04 +02:00
Guillaume Damiand 1609fbe902 Bug fix 2015-06-11 11:34:24 +02:00
Sylvain Brandel df9340115a wip 2015-06-04 14:52:19 +02:00
Guillaume Damiand 98bbdbfc2d Move functor that detect non void attributes and point in CGAL namespace (before they were in internal); add a missing void typedef. 2015-05-15 19:58:37 +02:00
Guillaume Damiand 539625fe0a Modification of save/load function to use the last api of cmap. Replace the specialization on Point and Info by the use of has_xxx functions. 2015-04-27 14:33:43 +02:00
Sylvain Brandel 41464f142f type of boolean marks modified from int to size_type in both Combinatorial_map and Linear_cell_complex 2015-04-01 15:36:34 +02:00
Sylvain Brandel 040924ad27 wip 2015-03-26 10:03:42 +01:00
Sylvain Brandel d402dddf2f added a new example file to test exceptions 2015-03-26 10:02:37 +01:00
Guillaume Damiand bea5137040 Remove a warning 2015-03-14 21:08:07 +01:00
Guillaume Damiand e4598620a1 Remove warnings 2015-03-12 07:57:04 +01:00
Guillaume Damiand 4660425d40 Bug fix in operator= of one iterator; add tests to test more cases. 2015-03-11 15:07:37 +01:00
Guillaume Damiand 6c09e5918c Add missing #include 2015-03-10 15:48:06 +01:00
Guillaume Damiand fd4162a5a1 Bug fix in size function in ranges 2015-03-03 10:37:37 +01:00
Sylvain Brandel 9a6ed32a15 Merge branch 'Combinatorial_map-update_attributes-sbrandel'
- corresponding to small feature "Combinatorial map update attributes"
   https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Combinatorial_map_update_attributes
- succesfully tested, release number CGAL-4.6-lc-99
- Approved by the Release Manager

Conflicts:
	Installation/changes.html
2015-01-08 14:48:47 +01:00
Guillaume Damiand 31f97645d9 Finalize doc + example. 2015-01-05 18:37:50 +01:00
Guillaume Damiand d851f35651 Remove warnings; wrong use of typename and template in viewer; default argument for example. 2014-12-25 08:20:00 +01:00
Guillaume Damiand bdc0dee6ce Update operations to use are_attributes_automatically_managed 2014-12-23 22:15:49 +01:00
Guillaume Damiand 1ac0e7ea8d add the three new functions in CombinatorialMap concept. 2014-12-23 21:39:33 +01:00
Guillaume Damiand 882c6033df Bug fix; optimize merge volume operations. 2014-12-23 21:07:53 +01:00
Guillaume Damiand 919bf8af74 Cleanup + some optimizations. 2014-12-23 09:34:09 +01:00
Guillaume Damiand 91ede0a444 Bug fix in toposew 2014-12-12 16:09:21 +01:00
Sylvain Brandel 08af113c95 Adding linear_cell_complex_3_attributes_management.cpp example 2014-12-12 15:41:23 +01:00
Sylvain Brandel 1cb63c386b Modification of the names of attributes management functions 2014-12-05 16:03:44 +01:00
Laurent Rineau d63a998759 Attempt to remove more warnings 2014-11-07 18:54:59 +01:00
Guillaume Damiand 8eddea1e5b Add some CGAL_assume functions in functions manipulating marks in combinatorial map class. 2014-11-07 16:42:32 +01: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
Laurent Rineau c8540086d8 Fix CMap with clang -std=c++11
It seems that Boost.Config says std::tuple does not work, even if
variadic templates are usable.

Trivial fix for master.

(cherry picked from commit e60c9ec190611c711fff7bb9a5ffc463f93e31b7)
2014-06-27 16:29:53 +02:00
Sylvain Brandel d62a535fd7 minor addons in the code, not in the API 2014-06-13 16:02:55 +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
Sylvain Brandel ec61d7cdc0 Updating new branch with modified and new files, in accordance with provided features 2014-06-03 11:22:47 +02:00
Sébastien Loriot 2d14739716 additional fixes for Combinatorial map package 2014-05-21 18:47:33 +02:00
Clement Jamin 239b6d0932 Merge branch 'STL_extension-Compact_container_as_vector-cjamin-old' into STL_extension-Compact_container_as_vector-cjamin 2014-04-16 14:14:24 +01:00
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
Sébastien Loriot 9114db9085 restore figure source files removed in 0fa2cacb
| commit 0fa2cacb60
  | Author: Sébastien Loriot <sebastien.loriot@cgal.org>
  | Date:   Tue Dec 3 17:27:02 2013 +0100
  |
  |     remove doc_tex documentation (including developer manual) and old manual tools
2014-02-10 14:54:23 +01:00
Clement Jamin 28c5fde142 Add an increment policy to the Compact_container, and an operator[] 2013-12-20 15:03:37 +01:00
Sébastien Loriot 0fa2cacb60 remove doc_tex documentation (including developer manual) and old manual tools 2013-12-03 17:27:02 +01:00
Guillaume Damiand 375e7a919e no more -> no longer 2013-11-27 18:13:05 +01:00
Guillaume Damiand db7c14cc58 * Document the deprecated function in Dart, CMap concept and LCC class;
* Add paragraph in changes.html;
* Bugfix in Linear_cell_complex_constructors for lcc without 2-attributes.
2013-11-21 10:23:24 +01:00
Guillaume Damiand b35422939a Add Ken as contributer. 2013-11-19 16:35:09 +01:00
Guillaume Damiand c34014bcf7 Doc update. 2013-11-19 16:31:53 +01:00
Guillaume Damiand b3a7330a33 Remove function get_attribute_of_dart which is useless. 2013-11-19 15:42:51 +01:00
Guillaume Damiand a4ec793044 Documentation of modifications in CombinatorialMap and Dart. 2013-11-19 15:29:24 +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 08d5670307 Update the doc of functions one_dart_per_incident_cell(dh), darts_of_cell(dh) and darts_of_orbit(dh) in the concept CombinatorialMap.
(small feature CMap doc first dart of ranges pre-approved 28 June 2013)
2013-09-05 20:30:46 +02:00
Laurent Rineau bc03aaf30b Put doc/ in the global dont_submit file 2013-08-20 10:57:03 +02:00
Sébastien Loriot 9c2f35ed1a using cgalHeading instead of h3 2013-08-07 10:06:49 +02:00
Sébastien Loriot d282ade623 use \cgalCite instead of \cite
using perl -i -pe 's/\\cite\s*{?([a-zA-Z0-9:-]+)}?/\\cgalCite{$1}/g'
2013-08-05 18:25:26 +02:00
Sébastien Loriot 74a1ac055e remove pdf files from doxygen doc include path 2013-07-25 11:15:18 +02:00
Guillaume Damiand 685d595c29 Remove a warning: avoid to compile close<-1>. 2013-07-05 07:12:34 +02:00
Guillaume Damiand d2e409487e Bug fix in close operation. 2013-07-04 16:55:53 +02:00
Guillaume Damiand 374ca0aea8 Add missing doc for reverse orienration functions; correction in the doc of cmap contructor. 2013-06-26 11:11:43 +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 eebf72eb3d Doc for dynamic onsplit/onmerge functors. 2013-06-17 12:37:33 +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 98a4e30f34 Merge branch 'Combinatorial_map_copy2-gdamiand'
Approved by the release manager
2013-06-14 13:33:46 +02:00
Sébastien Loriot 716f87d2d7 rename Hidden_type to unspecified_type and update its description 2013-06-13 18:48:58 +02:00
Guillaume Damiand d1395ba609 Add doc for new constructor, operator= and swap method. 2013-06-13 17:58:31 +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
Philipp Möller fd0a2b46f4 Merge branch 'Documentation-remove-dxyassist-pmoeller' 2013-06-03 20:37:20 +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 db584a8465 Bug fix in doc 2013-05-31 15:05:19 +02:00
Guillaume Damiand 49a19b0b71 End of copy constructor for cmaps. Add tests. 2013-05-31 14:43:56 +02:00
Philipp Möller 895245426a Fix some errors introduced by adding the titles 2013-05-30 18:09:42 +02:00
Ross Hemsley 4d9caf3763 Added names that were missing into the Doxyfile.in entries.
Also modified Installation/CMakeLists.txt to push the version number variable to the parent level
so that it can be accessed by the documentation
2013-05-30 17:55:43 +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
Philipp Möller 4d469821f7 Generated Doxyfile.in and dependencies 2013-05-30 14:13:47 +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
Sébastien Loriot f45c8ccb18 remove todos 2013-05-28 15:26:42 +02:00
Sébastien Loriot 170c619a2d fix places where the <div> added by cgalAdvanced conflicts with other html tags 2013-05-28 09:51:49 +02:00
Sébastien Loriot 7e15467c72 new cgal doxygen advanced macro to put the text inside a div 2013-05-27 19:36:33 +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
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
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
Sébastien Loriot 9c16cafb80 inline DartWrapper concept that did not exist in the original documentation
The page CombinatorialMapItems is now similar to the original one.
2013-01-24 12:37:47 +01:00
Sébastien Loriot af7dcfbe6d using template alias declaration to document class Attribute_handle 2013-01-24 07:03:25 +01:00
Sébastien Loriot 57aae7c7bf using C++11 template alias notation to better document nested template classes
The big advantage compared to nested classes is that is it places in the
desired group and it is inline.
2013-01-21 18:22:05 +01:00
Sébastien Loriot b6c85a19a4 remove linking warning in doxygen doc 2013-01-18 17:36:55 +01:00
Sébastien Loriot c0289881c2 remove extra space 2013-01-07 18:30:25 +01:00
Sébastien Loriot 5ec28b1cf4 replacing the usage of section in user man by \cgalHeading macro call 2013-01-07 18:04:37 +01:00
Philipp Möller 0c62e021ac Remove unused doc in CombinatorialMap 2012-12-21 14:07:03 +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
Philipp Möller 75f69570dc Change the titles of mainpages to "User Manual"
This leads to a slightly odd result in the search for "User Manual",
but makes the pages themselves more consistent.
2012-12-13 14:47:09 +01:00
Guillaume Damiand 703e5d4149 Remove warnings.
Unused typedef, variable; unitialized type.
2012-11-28 10:10:48 +01:00
Guillaume Damiand 9143c7cc08 Merge branch 'Combinatorial_map_improve_iterators-gdamiand'
Approved by the release manager.
2012-11-27 11:16:00 +01:00
Sébastien Loriot 9576be3c3b add doc in dont_submit 2012-11-27 08:42:02 +01:00
Sébastien Loriot 920eb63882 backporting documentation changes of master@9fcc5b57 into doxy-port-pmoeller
Conflicts:
	Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_linear_traits_2.h
	Installation/doc_tex/Installation/usage.tex
	Kernel_23/doc/Kernel_23/CGAL/Projection_traits_xy_3.h
	Mesh_2/doc/Mesh_2/Concepts/ConformingDelaunayTriangulationTraits_2.h
	Spatial_searching/doc/Spatial_searching/CGAL/Incremental_neighbor_search.h
	Spatial_searching/doc/Spatial_searching/CGAL/K_neighbor_search.h
	Spatial_searching/doc/Spatial_searching/CGAL/Orthogonal_incremental_neighbor_search.h
2012-11-23 22:54:31 +01:00
Sébastien Loriot 6cc7d66415 Revert "Replace tex-style quotes with quotes that you would expect, as there"
This reverts commit e65a8028ea.

Conflicts:
	Approximate_min_ellipsoid_d/doc_tex/Bounding_volumes_ref/Approximate_min_ellipsoid_d.tex
	Approximate_min_ellipsoid_d/documentation/mel.tex
	Documentation/doxyassist.xml
	Installation/doc_tex/Installation/usage.tex
	Min_sphere_of_spheres_d/doc_tex/Bounding_volumes_ref/MinSphereOfSpheresTraits.tex
	Optimisation_doc/doc_tex/Bounding_volumes/user_part.tex
	Optimisation_doc/doc_tex/Inscribed_areas/user_part.tex
	Width_3/doc_tex/Polytope_distance_d_ref/Width_3.tex
2012-11-23 18:08:13 +01:00
Sébastien Loriot 61fa49b242 Revert "break apart multi-cites, TO BE UNMERGED"
This reverts commit 5688d58b1b.

Conflicts:
	Matrix_search/doc_tex/Bounding_volumes_ref/spec_rectangular_p_centers.tex
2012-11-23 18:01:10 +01:00
Sébastien Loriot ae8362b7d6 replace \cgalModels ::FOO by \cgalModels `FOO`
using:
 perl  -pi -e 's/\\cgalModels\s+::([A-Za-z0-9_:]+)\s*$/\\cgalModels `$1`\n/'
2012-11-23 09:37:53 +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
Andreas Fabri eb41ac1765 typo 2012-11-22 09:54:22 +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
Sébastien Loriot 0f69c2a512 remove cpp0x namespace from documentation pages 2012-11-14 16:16:15 +01:00
Guillaume Damiand 15e07360a7 Correct a link (and test git commit ;) 2012-11-14 09:00:51 +01:00
Sébastien Loriot 128b02abb8 update CGAL custom doxygen macros
corresponds to a run of the script Documentation/conversion_tools/rename_macros.sh
+manual edit of doxyassist.xml and pkglist_filter.py
2012-11-14 00:31:05 +01:00
Sébastien Loriot 974621b58f start using new figure macros.
For Combinatorial maps, I reintroduced the original anchor names as they
were still in use in the reference manual.
2012-11-08 10:55:09 +00:00
Sébastien Loriot ae159cbdf3 replace markup #, ##, ### by \section, \subsection and \subsubsection
(script replacement)
2012-11-06 22:02:15 +00:00
Andreas Fabri 87c689b35f use \link\endlink 2012-10-31 20:25:04 +00:00
Andreas Fabri 7a6634b5a7 No need for CGAL:: in user manuals 2012-10-31 20:11:16 +00:00
Andreas Fabri 7736798599 linking unlinking 2012-10-30 13:09:46 +00:00
Philipp Möller 31e9eadf8b Fix all PackageDescriptions to a newer layout 2012-10-19 15:52:31 +00:00
Guillaume Damiand 40be2c8ff6 Links in CMap concept; almost finished... 2012-10-19 14:09:01 +00:00
Guillaume Damiand d22b3862de de math 2012-10-19 11:42:09 +00:00
Guillaume Damiand 535a8e4c87 Brief 2012-10-19 09:39:41 +00:00
Guillaume Damiand 2c86697333 Improve brief; remove named instance. 2012-10-19 09:30:43 +00:00
Guillaume Damiand 8153358ae7 Improve brief; remove named instance. 2012-10-19 09:24:51 +00:00
Guillaume Damiand 69034abfbe Correction of some refs. 2012-10-19 08:39:23 +00:00
Guillaume Damiand 9b87fb5db8 Link to LCC in CMap doc is now ok. 2012-10-19 08:09:06 +00:00
Guillaume Damiand 6705d63432 Add group for concept CombinatorialMap. This has no effect on the generated doc but could have if we set the INLINE_GROUPED_CLASSES option. 2012-10-19 08:01:31 +00:00
Guillaume Damiand 09106a3d51 Links in CMap user manual: almost finished (and it is very nice ;) 2012-10-18 19:52:27 +00:00
Guillaume Damiand 145e411fae Add CGAL namespace in example. 2012-10-18 19:37:39 +00:00
Philipp Möller 81c8c662d6 Fix some PkgDependsOn to stay inside the package overview, fix an
off-by-one in hacks.js, add a missing dependency
2012-10-18 16:31:12 +00:00
Philipp Möller 6615bcee09 Fix some minor glitches in headings 2012-10-18 12:55:17 +00:00
Philipp Möller c48ef2954c Small fixes 2012-10-17 08:36:09 +00:00
Guillaume Damiand c79f36cd5d Try to not document nested classes for attributes. 2012-10-12 12:13:28 +00:00