Commit Graph

614 Commits

Author SHA1 Message Date
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
Guillaume Damiand b8b419f3b9 Update graph traits: now source, target and halfedge are ok. 2017-03-23 09:19:57 -04:00
Guillaume Damiand e886578bbd Remove duplicated code (probably due to rebase) 2017-03-22 17:44:25 -04:00
Guillaume Damiand 06f73990f4 Small modifs to minimize diff with master. 2017-03-22 17:41:58 -04:00
Guillaume Damiand ff61b85322 update after rebase 2017-03-22 17:39:33 -04:00
Guillaume Damiand acad419a9a Update after rebase with master. 2017-03-22 17:33:05 -04:00
Guillaume Damiand f3a6a80382 Remove my previous trick to change the orientation. 2017-03-22 16:37:24 -04:00
Guillaume Damiand 48db4e157b Ok for graph_traits_Linear_cell_complex.h for test_Euler_operations. 2017-03-22 16:36:01 -04:00
Guillaume Damiand 98fe7cb77c 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...
2017-03-22 16:33:39 -04:00
Sébastien Loriot aec5d6a60c clean up after rebase 2016-11-29 11:43:47 +01:00
Guillaume Damiand 98e0ec06f1 Test for LCC et CMap. 2016-11-29 11:43:47 +01:00
Guillaume Damiand 269dcaf78d Remove a warning 2016-11-29 11:43:47 +01:00
Guillaume Damiand 353dd551f8 Add a parameter to reverse orientation function to not unmark the reversed cc if used. 2016-11-29 11:43:46 +01:00
Guillaume Damiand efae67d339 Add beta_inv macro 2016-11-29 11:43:45 +01:00
Guillaume Damiand e752f7d3b0 Update CMap and GMap examples (cosmetic) 2016-11-29 11:43:44 +01:00
Guillaume Damiand da3b1551ec Replace unsigned int -> size_type to avoid a warning. 2016-11-29 11:43:44 +01:00
Guillaume Damiand c1415e05f2 Add cgal_use for a unused variable warning 2016-11-29 11:43:44 +01:00
Guillaume Damiand 98cba35a39 Add missing template argument when calling Copy_dart_info_functor; plus a cast for dual in order to get the correct type. 2016-11-29 11:43:43 +01:00
Guillaume Damiand 9731a1a51e Correction of copy dart info functor. 2016-11-29 11:43:43 +01:00
Guillaume Damiand 70155e27ad Correct functors for non variadic case. 2016-11-29 11:43:42 +01:00
Guillaume Damiand 2939b8ea8f Remove red text in doc; that was used for reviewing process. 2016-11-29 11:43:42 +01:00
Guillaume Damiand 220bf51f93 Bug fix in close and insert_cell_2_in_cell_3 functions: both for CMap and GMap. 2016-11-29 11:43:40 +01:00
Guillaume Damiand d4d788837e Correct isomorphism functions to process correctly empty maps. 2016-11-29 11:43:40 +01:00
Guillaume Damiand 8203bb929e Update examples 2016-11-29 11:43:39 +01:00
Guillaume Damiand b655c8df82 Update test CMap and LCC. 2016-11-29 11:43:38 +01:00
Guillaume Damiand 12328929b2 Update LCC tests: now they are done both for CMap and GMap. 2016-11-29 11:43:38 +01:00
Guillaume Damiand 588ba4f527 Allow isomorphism to test dartinfo and/or point and/or attribute independently; use this in LCC test. 2016-11-29 11:43:37 +01:00
Guillaume Damiand 80ffced770 Update lcc test 2016-11-29 11:43:37 +01:00
Guillaume Damiand f00f6f71f4 Not need to link in both directions; this is done automatically. 2016-11-29 11:43:36 +01:00
Guillaume Damiand 2ab268965f LCC for CMap and GMap; incremental builder; save and load; test. 2016-11-29 11:43:36 +01:00
Guillaume Damiand df3b2a4850 LCC constructors compile now both for CMap and GMap (need tests) 2016-11-29 11:43:36 +01:00
Guillaume Damiand 7618192d21 Start incremental builder 2016-11-29 11:43:36 +01:00
Guillaume Damiand 1a357d5519 Now sew3 same facets works for both CMap and GMap. 2016-11-29 11:43:35 +01:00
Guillaume Damiand 4bacc7a25a Remove some useless include; set constructor of Dart and attribute protected; check for friend directives. 2016-11-29 11:43:35 +01:00
Guillaume Damiand e571639c94 Continue to work on LCC operations for CMap and GMap... 2016-11-29 11:43:35 +01:00
Guillaume Damiand 8d577b35da Modif of copy contructors in GMap; bugfix in copy function. 2016-11-29 11:43:34 +01:00
Guillaume Damiand b43ba70a5f Rename storare class (used internally); update copy constructor calls. 2016-11-29 11:43:34 +01:00
Guillaume Damiand 1d963f4ce7 Update copy between map to copy also dart_info; update also isomorphism function; start to update test (nyf) 2016-11-29 11:43:34 +01:00
Guillaume Damiand 5c3047ae4e Remove deprecated class from the list of class in the ref manual. 2016-11-29 11:43:33 +01:00
Guillaume Damiand 57e4ff3abd * replace CGAL_CMAP_DEPRECATED macro by CGAL_CMAP_DART_DEPRECATED
* protect deprecated code with #ifndef CGAL_NO_DEPRECATED_CODE
2016-11-29 11:43:33 +01:00
Guillaume Damiand 21a121019a * Update names for next, previous and opposite functions (following the ref manual);
* update GMap examples.
2016-11-29 11:43:33 +01:00
Guillaume Damiand 233840ffc5 Replace pointer by reference in all functions.
This allows to use non const reference in Foreach_static functor (why this is not possible with pointers ? there is some black magic under tuple and variadic template...).

Thanks to this possibility, remove static variables used to return value in two functors.
2016-11-29 11:43:33 +01:00
Guillaume Damiand f30f0ef1f8 Remove a tred 2016-11-29 11:43:33 +01:00
Guillaume Damiand 788e680ecb Use index in debug functions instead of adress of elements. 2016-11-29 11:43:32 +01:00
Guillaume Damiand 2aff4068b5 Allow to not define Dart_info and Attributes type in item class. 2016-11-29 11:43:32 +01:00
Guillaume Damiand 676b547a93 Doc of CMap, GMap and LCC is now ok for rev 4 2016-11-29 11:43:31 +01:00
Guillaume Damiand 1e622976fc Factorize dart in CMap and GMap; remove Dart concept and deprecated the use of CGAL::Dart for users; add possibility to define an information associated to each dart. 2016-11-29 11:43:31 +01:00
Guillaume Damiand 4624a0b97b Factorize dart between CMap and GMap.
Now we use the same class in both packages.
TODO: modify the doc accordingly.
2016-11-29 11:43:31 +01:00
Guillaume Damiand d277576b15 Keep deprecated classes in the doc. 2016-11-29 11:43:31 +01:00
Guillaume Damiand 268036a088 Keep old names in the doc, marked deprecated. 2016-11-29 11:43:30 +01:00
Guillaume Damiand 084c2c8c19 Add a test; add deprecated class Dart 2016-11-29 11:43:29 +01:00
Sébastien Loriot 47d1475412 force linking to dimension in the doc 2016-11-29 11:43:29 +01:00
Guillaume Damiand bd805cd44f Modif doc CMap, GMap, LCC 2016-11-29 11:43:28 +01:00
Guillaume Damiand d0539bbd5b Doc for CMap, GMap and LCC ok after review 2 2016-11-29 11:43:28 +01:00
Guillaume Damiand 4ed3d3318f Add spaces <= 2016-11-29 11:43:28 +01:00
Guillaume Damiand e7cc0b707d Doc combinatorial map ok. 2016-11-29 11:43:28 +01:00
Guillaume Damiand 954c7c2800 Doc CMap, GMap, LCC 2016-11-29 11:43:27 +01:00
Guillaume Damiand 7a552e9617 Doc for CMap and GMap 2016-11-29 11:43:27 +01:00
Guillaume Damiand ae55b10e8b Update doc of CMap and GMap (cont) 2016-11-29 11:43:27 +01:00
Guillaume Damiand 65569a9ff0 Start to rename Dart -> Combinatorial_map_dart and GMap_dart -> Generalized_map_dart 2016-11-29 11:43:27 +01:00
Guillaume Damiand 69115dd960 Doc of CMap and GMap following Sebastien review (nyf) 2016-11-29 11:43:27 +01:00
Guillaume Damiand c88fd4fd1c Corrections following Sebastien review (nyf) 2016-11-29 11:43:26 +01:00
Guillaume Damiand 20979072cb Small modifs following Sebastien review. 2016-11-29 11:43:26 +01:00
Guillaume Damiand ecb0bcc8a5 Correct bib for gmap; replace application -> function in doc. 2016-11-29 11:43:25 +01:00
Guillaume Damiand 686c850e11 Small typo following Andreas review 2016-11-29 11:43:25 +01:00
Guillaume Damiand 288313128e End of doc for LCC. 2016-11-29 11:43:25 +01:00
Guillaume Damiand dc8e555e3e Small corrections in CMap and GMap doc. 2016-11-29 11:43:25 +01:00
Guillaume Damiand 9400797e49 Add missing tparam 2016-11-29 11:43:24 +01:00
Guillaume Damiand 2807bbb47e Ok for CMap and GMap doc 2016-11-29 11:43:24 +01:00
Guillaume Damiand da7ca2e22a Ok for CMap doc 2016-11-29 11:43:23 +01:00
Guillaume Damiand 4921361cbe Continue the doc for GMap: add new concepts of BasicXXX to factorize doc between CMap and GMap. 2016-11-29 11:43:23 +01:00
Guillaume Damiand 25f51ac30c Add missing this-> 2016-11-29 11:43:22 +01:00
Guillaume Damiand de634dbd87 Doc of GMap and LCC. 2016-11-29 11:43:21 +01:00
Guillaume Damiand 091ae2ab8e GMap doc and homogenization of references in cmap and gmap. 2016-11-29 11:43:20 +01:00
Guillaume Damiand 9c798d6f23 Update doc for darts (there is no more method to access directly information of a dart) 2016-11-29 11:43:20 +01:00
Guillaume Damiand 417ddaa469 Continue doc of GMap for operations. 2016-11-29 11:43:19 +01:00
Guillaume Damiand e7a8d85652 Update insertion examples in CMap and add precision in the doc. 2016-11-29 11:43:19 +01:00
Guillaume Damiand faffe50656 Update doc for examples dynamic_onmerge (both CMap and GMap) 2016-11-29 11:43:18 +01:00
Guillaume Damiand fcccd7ddb8 Small correction in map dynamic onmerge example. 2016-11-29 11:43:18 +01:00
Guillaume Damiand 9b8eb9e785 Correction for make_tetrahedron and make_quadrangle for gmaps; modify corresponding methods in LCC to be able to work both for CMaps and GMaps. 2016-11-29 11:43:17 +01:00
Guillaume Damiand 6656ab9f4e Update doc in header files for make_xxx function in LCC. 2016-11-29 11:43:17 +01:00
Guillaume Damiand a7cef53494 Use the macro tred 2016-11-29 11:43:16 +01:00
Guillaume Damiand 5c417c2cf2 Improve the tred macro to allow to be used itself with macro 2016-11-29 11:43:16 +01:00
Guillaume Damiand 213ae2c87b Add some links to the GMap package. 2016-11-29 11:43:16 +01:00
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