Commit Graph

566 Commits

Author SHA1 Message Date
Guillaume Damiand 1163ee6ab0 Update the name and label of figures in order to have the same naming convention for cmap and gmap. 2016-11-29 11:43:14 +01:00
Guillaume Damiand 0e80ecf8c0 Work to be able to use LCC with GMap as underlying DS (nyf) 2016-11-29 11:43:13 +01:00
Guillaume Damiand fe9420c078 Comments. 2016-11-29 11:43:12 +01:00
Guillaume Damiand 90efe83e91 Name of project in cmake; indent 2016-11-29 11:43:12 +01:00
Guillaume Damiand e8180ff4ae Update following Andreas first review. 2016-11-29 11:43:12 +01:00
Guillaume Damiand 75ee34d7ea Update doc of Gmap to highlight differences 2016-11-29 11:43:12 +01:00
Guillaume Damiand a23ee58d91 Bug fix for global function that are removed 2016-11-29 11:43:11 +01:00
Guillaume Damiand 098f87db0d Remove new line in the doc to simplify the comparison 2016-11-29 11:43:11 +01:00
Guillaume Damiand 1de9bb136b Add a note about GMap for non orientable objects. 2016-11-29 11:43:11 +01:00
Guillaume Damiand b5843faa1b Combinatorial map ref manual to add the fact that dart and attribute concerns combinatorial map. 2016-11-29 11:43:10 +01:00
Guillaume Damiand 47fe19a13a Cleanup fig in CMap. 2016-11-29 11:43:10 +01:00
Guillaume Damiand d81b732761 Update 2 figs; plus remove unused pdf files. 2016-11-29 11:43:08 +01:00
Guillaume Damiand 261586d660 Update comments in Combinatorial map to add the possibility of using generalized maps. 2016-11-29 11:43:08 +01:00
Guillaume Damiand 515fd7ef8e Correct some wrong comments. 2016-11-29 11:43:07 +01:00
Guillaume Damiand e65882ead7 Update generalized maps to follow the last modifications of combinatorial maps (nyf). 2016-11-29 11:43:07 +01:00
Guillaume Damiand 79febdd8a3 All figures of CMap and LCC are now in svg. 2016-11-29 11:43:00 +01:00
Guillaume Damiand 55f0b69fdf Remove my previous trick to change the orientation. 2016-11-01 14:33:24 -04:00
Laurent Rineau 3044d512f2 Merge pull request #1511 from gdamiand/CMap_LCC-bugfixes-gdamiand
Some bugfixes in CMap and LCC
2016-10-17 10:01:36 +02:00
Laurent Rineau 7a84cbceea Merge pull request #1509 from gdamiand/Compact_container-add_debug_function-gdamiand
Add index function in Compact container
2016-10-17 10:01:27 +02:00
Guillaume Damiand 9aae106124 Add explicit call to base contructor to avoid warning. 2016-10-12 08:22:37 -04:00
Guillaume Damiand 7620635cfe * Bugfix in correct_invalid_attributes in LCC
* Remove deprecated code in LCC (that should be removed for CGAL 4.9)
2016-10-06 08:19:04 -04:00
Guillaume Damiand 0073b85d7e Some bug fixes in CMap and LCC:
* Bugfix in Combinatorial_map::copy and Combinatorial_map::swap
* Bugfix in erase dart if automatic attribute are disabled
* Add missing operator= in Linear_cell_complex
* Remove deprecated code in Linear_cell_complex storage (code which was already removed in Combinatorial_map_storage and not in LCC)
* add const for isomorphic function
2016-10-06 08:11:14 -04:00
Laurent Rineau 223c1cf5a4 Merge pull request #1530 from lrineau/Installation-compute_dependencies-GF
Compute and fix packages dependencies
2016-10-05 13:11:04 +02:00
Laurent Rineau 9a0bb54922 Merge pull request #1438 from sloriot/CGAL-clean_up_projects_name_cmake
Clean up projects name in cmake scripts
2016-10-05 13:02:25 +02:00
Andreas Fabri 9110c92590 Forward declaration of a struct must not declare it as class 2016-10-03 09:35:49 +02:00
Andreas Fabri 4f8572ed44 Fix package Combinatorial_map: include headers 2016-09-30 15:23:14 +02:00
Andreas Fabri c45730530c Fix package Surface_mesh_simplification: include headers 2016-09-30 15:23:14 +02:00
Andreas Fabri 347bd827b5 Fix package Combinatorial_map: include headers 2016-09-30 15:22:29 +02:00
Sébastien Loriot a9840bf87c doc bugfix
remove an extra }
2016-09-29 08:57:26 +02:00
Guillaume Damiand 0cf192cd44 Add index function in Compact container (usefull to debug) 2016-09-28 17:14:07 -04:00
Sébastien Loriot 7e2ee496de update project name of cmake scripts of tests 2016-09-08 00:26:37 +02:00
Sébastien Loriot 6b338eeb1f improve the name of projects in cmake scripts of examples 2016-09-08 00:02:55 +02:00
Sébastien Loriot 7f350f7507 remove old API deprecated since CGAL 4.4 2016-07-21 11:51:11 +02:00
Guillaume Damiand dd2d5bb551 Remove array-bounds warning also in Combinatorial_map.h 2016-05-20 14:22:40 +02:00
Sebastien Loriot 4d56e3ef51 Merge pull request #971 from gdamiand/CMap-global_functions-gdamiand
Combinatorial map: remove global functions
2016-05-10 09:26:58 +02:00
Guillaume Damiand d44b75d192 Update version of boost_gcc 2016-05-10 09:13:32 +02:00
Guillaume Damiand a06ec250eb Correct version of gcc to ignore array buffer warnings 2016-05-09 10:16:35 +02:00
Guillaume Damiand f8823fd689 remove array-bounds warning for gcc >= 4.9 2016-05-02 17:18:14 +02:00
Guillaume Damiand 46a7eabc68 add include for EXIT_SUCCESS 2016-04-22 20:28:33 +02:00
Guillaume Damiand 8d5743ba24 Do not use template for function calls outside template class. 2016-04-21 07:20:08 +02:00
Guillaume Damiand 900f5efe4b Correct link in doc 2016-04-11 18:34:51 +02:00
Guillaume Damiand efdd6c5a26 Remove warnings and errors 2016-04-11 18:31:38 +02:00
Guillaume Damiand 964a69676f Add #ifndef CGAL_NO_DEPRECATED_CODE to allow to run the test in test suite that remove deprecated code. 2016-04-04 16:18:19 +02:00
Guillaume Damiand afb03a8ae4 Remove the use of deprecated functions. 2016-04-01 22:44:29 +02:00
Guillaume Damiand 4991ccf197 Add test of deprecated functions. 2016-04-01 22:34:25 +02:00
Guillaume Damiand 056e0d66fe add a missing deprecated function; use non deprecated version in assert. 2016-04-01 22:27:50 +02:00
Guillaume Damiand c99d0f3223 Bug fix in belong_to_same_cell calls; add const for is_xxx functions. 2016-04-01 22:27:36 +02:00
Guillaume Damiand 3b642fede8 Splif functor in two parts (functor_nonvoid and functor) to avoid ambiguous template specialization. 2016-04-01 22:26:34 +02:00
Guillaume Damiand de89d2ecad Ok for graph_traits_Linear_cell_complex.h for test_Euler_operations. 2016-03-28 22:08:21 +02:00
Guillaume Damiand d8c6439eb8 Some progress for graph traits for linear cell complex.
* graph_concept_Linear_cell_complex compile and run correctly.
* simplification_Linear_cell_complex compile and start to run; make some Euler modifications, then segmentation fault... I am working to debug...
2016-03-25 17:10:08 +01:00
Sébastien Loriot 4c29bf1b44 CMAKE_SOURCE_DIR -> CMAKE_CURRENT_SOURCE_DIR 2016-03-24 16:33:46 +01:00
Guillaume Damiand 406a2d4f1c Update user manual 2016-03-10 16:47:55 +01:00
Guillaume Damiand 2367827151 Update the doc to deprecate all global operations. 2016-03-10 16:37:00 +01:00
Guillaume Damiand 37e95ca593 Remove trailling whitespaces. 2016-03-10 10:47:24 +01:00
Guillaume Damiand 7741e0accb Update bug in doc of CMap. 2016-03-10 10:47:06 +01:00
Guillaume Damiand 4a5ee86271 examples and tests updating for CMap after deprecation of global functions. 2016-03-09 18:47:23 +01:00
Guillaume Damiand b73e3293ae Add this->template when calling templated member functions 2016-03-09 17:24:31 +01:00
Guillaume Damiand 1493fa7e63 Modification of tests following the removal of global functions (nyf) 2016-03-09 09:43:25 +01:00
Guillaume Damiand 68ed581ee3 Modification of tests following the removal of global functions (nyf) 2016-03-09 08:48:32 +01:00
Guillaume Damiand f348cc634a Bug fix 2016-03-08 19:02:27 +01:00
Guillaume Damiand dec4d3a732 Deprecated construction operations. 2016-03-08 19:01:37 +01:00
Guillaume Damiand f3ee141223 Update example following the code deprecated. 2016-03-08 19:01:19 +01:00
Guillaume Damiand 6a171dcc77 Deprecate global modification functions. 2016-03-08 18:45:55 +01:00
Sébastien Loriot 881e4d3199 request Core only in examples, tests and demos when really needed 2016-03-07 22:36:57 +01:00
Sébastien Loriot 2d191d6651 commit CMakeLists.txt for all examples and tests 2016-03-07 17:39:36 +01:00
Andreas Fabri b926bfc21d Update PackageDescription.txt 2016-02-26 20:53:46 +01:00
Philipp Möller 0a04a3a48f Use CGAL_DOC_VERSION 2016-02-11 15:37:54 +01:00
Sebastien Loriot 09159fe5de Merge pull request #721 from afabri/CMap-intel_warning-GF
Disable a warning on the Intel  compiler
2016-02-07 18:39:35 +01:00
Andreas Fabri 73213c45ed Remove the : 2016-02-05 14:31:47 +01:00
Andreas Fabri 337197b237 Just suppress the warning. At least on the icl we have push/pop does not work 2016-02-05 11:50:30 +01:00
Sébastien Loriot 72863bfe44 fix doxygen warnings 2016-02-04 21:19:36 +01:00
Andreas Fabri 7c5be6417e explain what the workaround is for 2016-02-03 15:19:08 +01:00
Andreas Fabri d2ec7ef392 disable a warning 2016-02-03 12:34:00 +01:00
Sebastien Loriot 40671f88aa Merge pull request #703 from afabri/Cmap-bound_warning-GF
Suppress warning in Combinatorial  Map for g++ >= 5
2016-02-02 20:57:16 +01:00
Andreas Fabri 244c285257 4080 -> 5000 2016-02-01 13:22:17 +01:00
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