Commit Graph

799 Commits

Author SHA1 Message Date
Sébastien Loriot f62624c4f9 replace cpp11::tuple by std::tuple 2019-03-29 13:28:33 +01:00
Sébastien Loriot d60f5645aa replace BOOST_FOREACH by c++ ranged-based for loop
some of the command used for the replacement:
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\(([a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\((const [a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\((const typename [a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack --cpp  BOOST_FOREACH -l  | xargs sed -i -E "s/BOOST_FOREACH\((typename [<>a-zA-Z_:&0-9]+)\s(\w+)\,/for(\1 \2 :/"
ack "boost/foreach.hpp" -l --cpp | xargs sed -i '/boost\/foreach.hpp>/d'
2019-03-29 13:22:15 +01:00
Sébastien Loriot 6e8e4a4b10 remove variadic template workaround for cmap, gmap, and lcell 2019-03-29 10:41:50 +01:00
Guillaume Damiand 379c90420b Merge branch 'CMap-path_isotopy-gdamiand-old' into CMap-path_isotopy-gdamiand 2019-03-27 12:40:33 +01:00
Guillaume Damiand bbea8c7889 Add a method to import any HDS model into a CMap and a LCC 2019-03-15 16:53:47 +01:00
Guillaume Damiand 5279a690b3 Add method to import a model of Halfedge graph into a combinatorial map. 2019-03-15 08:13:16 +01:00
Guillaume Damiand 8e649a9d5d Start to add method to import Polyhedron and SM into a CMap. 2019-03-14 21:34:05 +01:00
Sébastien Loriot 59bc453b42 first batch of replacement for level 1 in classified ref man
command used:
grep -l  "##" */doc/*/PackageDescription.txt | xargs  sed -i  -E 's/\#\#\s*([[:print:]]+[[:alnum:]])\s*\#\#\s*$/\\cgalCRPSection{\1}/'
2019-02-14 10:32:39 +01:00
Sébastien Loriot 90ad079eb4 use macro for subsections
command used:
grep -l  "###" */doc/*/PackageDescription.txt |  xargs sed -i  -E 's/\#\#\#\s*([[:print:]]+[[:alnum:]])\s*\#\#\#\s*$/\\cgalCRPSubsection{\1}/
2019-02-14 10:32:00 +01:00
Guillaume Damiand a211e558ee Copy methods are now able to keep mappings from copy to origin, and from origin to copy. 2018-12-20 08:51:04 +01:00
Guillaume Damiand 14e32aba01 Merge branch 'CMap-path_isotopy-gdamiand-old' into CMap-path_isotopy-gdamiand 2018-12-14 10:01:38 +01:00
Guillaume Damiand 0cc980f059 Update copy constructors and copy methods for CMap, GMap, and LCC to take a CMap/GMap/LCC as parameter and not any type. 2018-12-06 18:01:03 +01:00
Guillaume Damiand 63352c5680 Continue refactoring 2018-11-29 13:14:54 +01:00
Guillaume Damiand fdd08e9287 Create new package Surface_mesh_topology; move related files in this package. 2018-11-28 15:56:10 +01:00
Guillaume Damiand c3f55640ca Bug fix. 2018-11-28 12:47:43 +01:00
Guillaume Damiand 8433205b77 Small updates on path on surfaces. 2018-11-21 21:56:12 +01:00
Guillaume Damiand 094f28fdc9 Small bug fixes; add is_valid method in path with rle. 2018-11-21 12:01:51 +01:00
Guillaume Damiand 702d01e1f7 Start to replace totally the quadratic method by the linear one (nyf). 2018-11-20 16:49:28 +01:00
Guillaume Damiand 4b62197c72 Comment out an assertion which is too long. 2018-11-20 16:30:30 +01:00
Guillaume Damiand dd3309f14f Bugfix for path with 2 darts. 2018-11-20 11:37:28 +01:00
Guillaume Damiand 1c54999d7d Right shift for path with rle done. 2018-11-20 10:41:11 +01:00
Guillaume Damiand 8bc932ce91 Beginning of right shift for path with rle. 2018-11-19 22:15:00 +01:00
Guillaume Damiand c1ef7f334f Bracket flattening for path with rle ok. 2018-11-15 15:31:56 +01:00
Guillaume Damiand 4a9ee63b83 Add a method that allows to add several edges into a current facet. 2018-11-14 16:33:11 +01:00
Guillaume Damiand 828c01a00e Add a cmap builder that allows to build a combinatorial map by giving its edge labels. 2018-11-14 16:29:49 +01:00
Guillaume Damiand df5df7f443 Comment. 2018-11-09 13:40:49 +01:00
Guillaume Damiand 092baf908a Spurs removal is now ok for path with rle. 2018-11-09 13:05:23 +01:00
Guillaume Damiand 919d4714ac Start to work on path with rle, spurs removal. 2018-11-08 16:42:13 +01:00
Guillaume Damiand 4145ddeb0e Path on surface encoded with rle ok. 2018-11-08 12:41:03 +01:00
Guillaume Damiand 69e9ce3494 Start path with rle to optimize isotopy test. 2018-11-07 19:51:03 +01:00
Guillaume Damiand b040c5a983 Return always 0 for positive and negative turns, for spurs. 2018-11-06 17:04:40 +01:00
Guillaume Damiand 7d406fbb9c
Merge branch 'master' into CGAL-cmake_cleanup-gdamiand 2018-11-05 07:32:58 +01:00
Guillaume Damiand 63334c3b60 New method to compute turns in constant time. 2018-10-26 16:49:45 +02:00
Guillaume Damiand 4231595110 Change API of Path_on_surface and Combinatorial_map_functionalities to canonize paths. 2018-10-26 15:45:34 +02:00
Guillaume Damiand 92ba7fa6c9 Update minimum cmake required version in all CMakeLists.txt 2018-10-18 14:49:23 +02:00
Guillaume Damiand 0bd9088b5a Remove all include( ) and include( CGAL_CreateSingleSourceCGALProgram ) in CMakeLists.txt; they are no more required. 2018-10-17 14:17:08 +02:00
Guillaume Damiand 7f09308d33 Remove all include_directories(BEFORE ../../include) in CMakeLists.txt 2018-10-17 13:07:22 +02:00
Sébastien Loriot ea240cfac5 use \PkgXXX instead of \PkgXXXSummary 2018-10-08 10:28:44 +02:00
Sébastien Loriot a2e8a1c68f add the suffix Ref to doxygen link to reference 2018-10-08 10:26:56 +02:00
Guillaume Damiand 77b238c67a Reindent and remove commented code. 2018-09-28 18:26:40 +02:00
Guillaume Damiand 1d0b16f142 Method v2 to update length two pathes is ok. 2018-09-28 17:24:16 +02:00
Guillaume Damiand a8c24d706c Update path v2 big fix (nyf) 2018-09-27 16:34:02 +02:00
Guillaume Damiand 7d96da2dd1 Start method v2 for path updating 2018-09-26 15:13:25 +02:00
Guillaume Damiand a61f2e5091 Bug fix when updating length two pathes for border darts. 2018-09-25 13:36:46 +02:00
Guillaume Damiand 55bbde79a5 Change method for path generator 2018-09-25 13:29:49 +02:00
Guillaume Damiand 4e3e5ac730 Remove debug output 2018-09-25 13:28:59 +02:00
Guillaume Damiand f52676769f Continue isotopy test. 2018-09-18 15:16:40 +02:00
Laurent Rineau fdd824d77f Merge pull request #3312 from sloriot/Doc-no_sgi_links
Do not link to sgi.com (offline)
2018-09-17 11:36:34 +02:00
Guillaume Damiand a13db5f171 Revert "Bugfix in copy functor": this 'fix' is a bug.
This reverts commit adfa032311.
2018-09-13 14:35:03 +02:00
Guillaume Damiand 9437d154dd Add tests of degree and codegree in CMap and GMap 2018-09-05 17:05:40 +02:00
Guillaume Damiand ed81c8491c Add tests. 2018-09-04 18:31:31 +02:00
Guillaume Damiand adfa032311 Bugfix in copy functor 2018-09-04 16:16:44 +02:00
Guillaume Damiand cceb427481 Bugfix in removal operation. 2018-09-04 16:11:35 +02:00
Guillaume Damiand 241a9f3353 Bugfix in degree and codegree 2018-09-04 16:11:22 +02:00
Guillaume Damiand 3f005bbbc4 Add a parameter to the undocumented copy method, that allows to keep an associative array between original and copied darts. 2018-09-04 16:04:20 +02:00
Guillaume Damiand 4fae0480fd Add option to fix the initial random seed; add some debug code. 2018-09-04 14:51:40 +02:00
Sébastien Loriot 196119adbc do not link to sgi.com 2018-09-04 13:17:56 +02:00
Guillaume Damiand 142f36d6b4 New random path generator 2018-07-09 16:29:33 +02:00
Guillaume Damiand bb8fb1a6e9 Start to create a new function to generate random paths. 2018-07-09 12:15:11 +02:00
Guillaume Damiand 30d5118740 Update path generators; start a test with long random paths deformed. 2018-07-06 16:42:23 +02:00
Guillaume Damiand 492a2ffb54 Add a function to close a path. 2018-07-06 12:02:04 +02:00
Guillaume Damiand 53ed894ec7 Update isotopy test; seems to work now; need more tests. 2018-07-04 17:00:28 +02:00
Guillaume Damiand 5a5f754b5a Bug fix in degree, codegree and unmark_cell functions (const correctness) 2018-07-04 16:59:55 +02:00
Laurent Rineau 5ec1b841b7 Merge pull request #3170 from MaelRL/CGAL-Fix_some_STL_extension_namespaces-GF
STL_Extension: move CGAL::iterator and CGAL::unary/binary functions to CGAL::cpp98::
2018-06-20 17:21:01 +02:00
Mael Rouxel-Labbé 26c857a431 Moved unary/binary_function to CGAL::cpp98 2018-06-13 15:58:19 +02:00
Guillaume Damiand 53769e98a7 * Add draw examples in the 5 concerned packages (Polyhedron, Surface_mesh, T2, T3, LCC)
* Update FindQGLViewel to add a target.
2018-05-29 11:11:49 +02:00
Guillaume Damiand 9ed3626366 Add an option to is_valid to not show errors 2018-05-29 11:04:57 +02:00
Mael Rouxel-Labbé b41f1d6272 Various deprecation-related improvements 2018-05-18 16:47:54 +02:00
Laurent Rineau 03e68d8740 Merge pull request #2985 from afabri/CGAL-std_latest-GF
Support C++17 (Replace std::random_shuffle() with CGAL::random_shuffle(), and other adjustments)
2018-04-24 17:32:55 +02:00
Andreas Fabri f0c1d3aab7 more allocator_traits 2018-04-19 14:49:05 +01:00
Laurent Rineau 095c27e2be cosmetic changes 2018-04-17 17:14:19 +02:00
Andreas Fabri 7cbffac35b Deal with deprecated functions allocator<T>::construct/destroy 2018-04-17 13:35:04 +01:00
Laurent Rineau 8397f87455 Merge pull request #2984 from gdamiand/CMap-bugfix-gdamiand
Replace some wrong Dart_handle by Dart_const_handle.
2018-04-06 17:24:28 +02:00
Guillaume Damiand b645b87aa0 Replace some wrong Dart_handle by Dart_const_handle. 2018-04-04 14:24:22 +02:00
Guillaume Damiand 3c79e7a743 Replace CMap logo by a png file instead of a svg one (in order to have the correct 120x120 pixels size) 2018-04-04 13:10:47 +02:00
Guillaume Damiand a52a324262 Continue tests. 2018-03-30 16:42:22 +02:00
Guillaume Damiand ba014bfa3c Update all tests for canonical representation; start tests for isotopy. 2018-03-30 15:03:02 +02:00
Guillaume Damiand 6ec0beba66 Add more test of validity 2018-03-29 17:39:32 +02:00
Guillaume Damiand 122eeb0be8 3 first tests are ok. 2018-03-29 17:23:26 +02:00
Guillaume Damiand 858c81c919 Update tests to remove debug messages. 2018-03-29 10:13:23 +02:00
Guillaume Damiand 8be85817c7 l-shape case 8 OK. 2018-03-28 22:10:53 +02:00
Guillaume Damiand a42a4546ae l-shape case 7 started (nyf) 2018-03-28 17:53:48 +02:00
Guillaume Damiand e4afaf5ea5 l-push cases 5 & 6 ok. 2018-03-28 17:42:34 +02:00
Guillaume Damiand c8cdf75b8b l-push case 4 ok. 2018-03-28 16:36:21 +02:00
Guillaume Damiand b3389488f5 Better test suite for path canonizing. 2018-03-28 12:45:34 +02:00
Guillaume Damiand dec0a55276 Push l-shape ok for cases 1, 2 and 3. 2018-03-28 10:19:41 +02:00
Guillaume Damiand a46424eaec New method for l-shape push 2018-03-27 17:51:30 +02:00
Guillaume Damiand 8132129bc1 Continue l-shape shifting. 2018-03-26 21:13:21 +02:00
Guillaume Damiand 4ee2036093 Update l-shape right shift. 2018-03-26 17:54:10 +02:00
Guillaume Damiand 8248315bd3 Continue l-shape shift. 2018-03-26 14:34:34 +02:00
Guillaume Damiand 6a588856a8 Continue l-shape push 2018-03-26 12:54:27 +02:00
Guillaume Damiand 3b5bb69a29 continue l-shape 2018-03-23 16:41:42 +01:00
Guillaume Damiand d3f1a4c703 Seems ok for bracket flatering and spurs removal. 2018-03-23 16:10:55 +01:00
Guillaume Damiand 1d97d27ba9 Case (1 2^r) is now ok. 2018-03-20 11:30:14 +01:00
Guillaume Damiand 5521f52d96 Add more tests for special cases of bracket reduction 2018-03-20 09:17:09 +01:00
Guillaume Damiand dfc76816b3 Update 2018-03-19 22:19:38 +01:00
Guillaume Damiand b848314336 Improve method 2018-03-19 16:36:03 +01:00
Guillaume Damiand cc0e26f4b1 Update path on surface; right shift method. 2018-03-16 15:17:38 +01:00
Guillaume Damiand 584def3c0f Continue path simplification for homotopy test. 2018-03-14 22:20:53 +01:00
Guillaume Damiand 763edf0030 Update path generator and bracket reduction 2018-03-14 19:43:46 +01:00
Laurent Rineau 0a74393dcf Commit all new dependencies files 2018-03-06 18:44:48 +01:00
Laurent Rineau 51091fd932 Merge pull request #2851 from gdamiand/CMap-copy_bugfix-gdamiand
CMap bug fix in copy
2018-02-23 17:26:16 +01:00
Laurent Rineau 78e7060525 Merge pull request #2712 from afabri/CGAL-VC+warnlevel_4-GF
Deal with VC++ warnings of level /W4
2018-02-19 14:27:06 +01:00
Guillaume Damiand 7b9b04f66c Bug fix when copying attributes of a cmap into another cmap, and both have no info. 2018-02-16 11:32:07 +01:00
Guillaume Damiand 39742b0d32 Continue bracket_flattening 2018-02-11 17:02:54 +01:00
Guillaume Damiand 8e73a49cb4 Start method bracket_flattening() 2018-02-10 10:52:36 +01:00
Guillaume Damiand d68e5d354a Split file in two. 2018-02-09 22:43:42 +01:00
Guillaume Damiand a1e00f967b Computation of path associated with all edges seems ok. 2018-02-09 17:47:47 +01:00
Guillaume Damiand 275c133a2c Continue the homotopy test algorithm. 2018-02-09 11:19:09 +01:00
Guillaume Damiand 740b44c844 Copy methods can now fill an external mapping between copied darts. 2018-02-09 11:18:49 +01:00
Guillaume Damiand f4239cf463 Add comments 2018-02-08 17:57:21 +01:00
Maxime Gimeno 688b5dd06e Move dependencies creation to package_info and add dependencies to git 2018-02-02 12:08:05 +01:00
Maxime Gimeno 8bde832931 Fix METIS headers in BGL 2018-02-02 12:08:05 +01:00
Maxime Gimeno a676d5a60e Try to fix errors in classification checks 2018-02-02 12:08:05 +01:00
Maxime Gimeno acd0a72edf Modify travis script to test dependencies 2018-02-02 12:08:05 +01:00
Maxime Gimeno ae36b452bc Add dependencies of all packages 2018-02-02 12:08:05 +01:00
Andreas Fabri 38b2e57b11 PMP 2018-01-17 17:59:35 +00:00
Sébastien Loriot f6459368aa move fig_src dirs 2018-01-08 20:35:40 +01:00
Guillaume Damiand 7694565cb0 Update new functionalities 2017-12-17 19:01:39 +01:00
Guillaume Damiand 58387e9af4 Add viewer for surface and paths; add function to generate random paths. 2017-12-17 11:31:06 +01:00
Guillaume Damiand 0182a4487f add functions to manage paths 2017-12-16 18:28:07 +01:00
Guillaume Damiand 9998564700 store pair of edges for all edges that do not belong to the tree 2017-12-16 16:07:15 +01:00
Guillaume Damiand 4bb1758a0d Simplification in one vertex uses now also union find trees 2017-12-16 11:53:02 +01:00
Guillaume Damiand 78efb73a75 cmap function cont 2017-12-15 20:51:01 +01:00
Guillaume Damiand 4899969e5a bug fix for removal operation 2017-12-15 20:50:31 +01:00
Guillaume Damiand 8439951b20 add the quadrangulation step 2017-12-15 10:36:12 +01:00
Guillaume Damiand fb1f44ab60 Add a new class for cmap functionalities; plus one example to use it. 2017-12-15 09:52:26 +01:00
Laurent Rineau 0b0b1503ef Merge pull request #2594 from gdamiand/CMap-bugfixes-gdamiand
CMap bugfixes
2017-12-05 18:20:56 +01:00
Sébastien Loriot 19adf3b05e make the doc match struct/class with the implementation 2017-11-17 11:34:55 +01:00
Guillaume Damiand 5f939d33ab Bug fix in CMap/GMap/LCC dart methods 2017-11-13 12:17:03 +01:00
Guillaume Damiand 6c7f384455 Update CMap save/load in order to allow to save/load 2D lcc 2017-11-13 12:14:37 +01:00
Guillaume Damiand 990c05090c Bug fix in CMap operation 2017-11-13 12:02:20 +01:00
Sébastien Loriot 0698f79aff add SPDX identifier for files under the LGPL-3+ license 2017-11-12 10:17:50 +01:00
Laurent Rineau 7e9f756935 Replace all std::unary_function by CGAL::unary_function 2017-10-04 15:57:09 +02:00
Guillaume Damiand 013f447395 Merge branch 'master' into BGL-LCC-gdamiand 2017-06-22 23:21:39 +02:00
Guillaume Damiand c8250c4570 Merge branch 'master' into BGL-LCC-gdamiand 2017-06-15 10:03:53 -04:00
Guillaume Damiand f8fba47ac5 Remove cgalModif in doc 2017-06-15 09:47:30 -04:00
Guillaume Damiand b80315367f Do not return void. 2017-06-14 13:46:03 -04:00
Laurent Rineau 5282ef53da Merge pull request #2120 from gdamiand/patch-2
Update cmap definition
2017-05-19 10:27:09 +02:00
Guillaume Damiand 7cab8ed1bb Remove a warning (unused variable) 2017-05-19 10:03:02 +02:00
Guillaume Damiand 2965ecabea Update cmap definition
Following Mike Bliudze comment on cgal-edboard.
2017-05-12 10:46:05 -04:00
Guillaume Damiand a22a5fbd21 Update BGL LCC examples and tests following the modification of the API (helper class) 2017-05-10 13:27:37 -04:00
Guillaume Damiand 42a1419dbf Document class Cell_attribute_with_id 2017-05-10 08:22:22 -04:00
Guillaume Damiand 8b42545b6e Remove wrong comment 2017-04-19 15:51:49 -04:00
Laurent Rineau 87c9afd486 Fix the compilation of individual headers
- in most cases, that was just adding missing #include
- I have removed the use of <CGAL/basic.h>
2017-04-13 15:56:51 +02:00
Guillaume Damiand 755272148a Cleanup BGL for LCC; add shortcut for item with id to simplify definition. 2017-03-31 17:11:36 -04:00
Guillaume Damiand 54eae7dcd4 Init_id function has two template arguments. 2017-03-29 12:44:33 -04:00
Guillaume Damiand bfbee1701e Now attributes and darts in CMap/GMap/LCC can have id or not depending on a template argument. 2017-03-27 17:16:40 -04:00
Guillaume Damiand 6d8b48a388 Init id for create_dart. 2017-03-27 12:22:20 -04:00
Guillaume Damiand f95a9558b2 Update cmap to use index in attributes/darts for property maps. 2017-03-27 11:58:30 -04:00