Commit Graph

199 Commits

Author SHA1 Message Date
Guillaume Damiand 5089b05ace Add local version of read and write off for bgl; to remove when small feature generic read/write off will be integrated. 2017-06-14 11:41:25 -04:00
Guillaume Damiand f816adc18e Remove file Linear_cell_complex_incremental_builder_for_bgl.h which is no more used thanks to the generic read_off function. 2017-06-14 10:54:47 -04:00
Guillaume Damiand 4b196e686b Some cleanup 2017-05-12 08:37:11 -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 8799b904b6 Add classes Linear_cell_complex_for_bgl_combinatorial_map_helper and Linear_cell_complex_bgl_min_items in separated files. 2017-05-10 10:06:55 -04:00
Guillaume Damiand 09f82093a3 Update doc of BGL for LCC, following Sebastien comments. 2017-05-10 10:06:17 -04:00
Guillaume Damiand 1bb0a3dda3 Document class Cell_attribute_with_point_and_id 2017-05-10 08:24:40 -04:00
Guillaume Damiand 42a1419dbf Document class Cell_attribute_with_id 2017-05-10 08:22:22 -04:00
Guillaume Damiand 977876ca48 Replace class by template alias. 2017-04-19 14:12:39 -04:00
Guillaume Damiand 5e5868418b Add reserve function. 2017-04-19 14:12:23 -04:00
Guillaume Damiand 8a5828dbd5 Update licence header 2017-04-19 08:42:17 -04:00
Guillaume Damiand d343811416 One more example compile. 2017-04-18 16:51:40 -04:00
Guillaume Damiand f8f2506a38 add graph_has_property for lcc 2017-04-18 16:18:03 -04: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 5030a424f3 Remove unused parameter 2017-03-29 12:47:37 -04:00
Guillaume Damiand af7a401afd Bug fix in operator++ for edge; we need to test that we are not on the end before to do a second ++ 2017-03-29 12:47:01 -04:00
Guillaume Damiand 13ed16043b Update BGL for LCC and continue on examples/tests 2017-03-29 14:22:27 -04:00
Guillaume Damiand 3f382fe6b4 Add more examples for LCC BGL 2017-03-28 12:52:31 -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 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 daf726166c Update source/target one more time. 2017-03-22 16:37:24 -04:00
Guillaume Damiand a232565907 Debug (nyf) 2017-03-22 16:37:24 -04:00
Guillaume Damiand f3a6a80382 Remove my previous trick to change the orientation. 2017-03-22 16:37:24 -04:00
Guillaume Damiand fbf23b4173 Add Kernel as inner type of Linear cell complex class. 2017-03-22 16:37:01 -04:00
Guillaume Damiand 89645b3797 Add missing include 2017-03-22 16:36:01 -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 ebd54153ea Add a second incremental builder which works as Polyhedron and Surface mesh for surface with boundaries. 2017-03-22 16:33:39 -04:00
Guillaume Damiand 533bb318cc Update source/target one more time. 2017-03-22 14:59:27 -04:00
Guillaume Damiand 97ad6e35ce Debug (nyf) 2017-03-22 14:08:25 -04:00
Guillaume Damiand 5509ec0227 Remove space 2016-11-29 11:43:43 +01:00
Guillaume Damiand 04e6e0f73b Remove unused variable 2016-11-29 11:43:43 +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 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 a0fb8e0a26 Update LCC operations to work with CMap and GMap 2016-11-29 11:43:35 +01:00
Guillaume Damiand 8d22d7e7dc Update LCC to be compatible both for CMap and GMap. 2016-11-29 11:43:34 +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 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 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 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 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 b12b490e12 Rename classes. 2016-11-29 11:43:29 +01:00
Guillaume Damiand c0e903a106 Update copyright headers 2016-11-29 11:43:25 +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 3737af7a44 Add linear cell complex storage for GMaps. 2016-11-29 11:43:15 +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 55f0b69fdf Remove my previous trick to change the orientation. 2016-11-01 14:33:24 -04: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
Andreas Fabri cf8c1a6cdf Dispatch import functions to Polyhedron, T2, T3 2016-09-30 15:23:15 +02:00
Andreas Fabri d95e7301da Fix package Linear_cell_complex: include headers 2016-09-30 15:23:14 +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 0adfd4d380 Add Kernel as inner type of Linear cell complex class. 2016-03-29 22:20:19 +02:00
Guillaume Damiand ad5a9ee2ed Add missing include 2016-03-29 22:19:32 +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 66fd1789b5 Add a second incremental builder which works as Polyhedron and Surface mesh for surface with boundaries. 2016-03-25 18:32:17 +01:00
Guillaume Damiand fb4bc44829 examples and tests updating for LCC after deprecation of global functions. 2016-03-09 18:48:29 +01:00
Guillaume Damiand 7f45f5faea Update LCC following the deprecated global functions of CMap 2016-03-09 17:25:10 +01:00
Guillaume Damiand 86ebce9b78 end_XXX now return one dart in incremental builder. 2016-02-26 16:28:14 +01:00
Andreas Fabri 244c285257 4080 -> 5000 2016-02-01 13:22:17 +01:00
Andreas Fabri 3a36c7f34b the same lor LCC 2016-02-01 12:38:13 +01:00
Guillaume Damiand afeb0eb4d2 Do not use using declaration but a typedef. 2015-10-29 07:41:55 +01:00
Guillaume Damiand 06731095ae Add using declaration for Exception_no_more_available_mark. 2015-10-28 11:19:02 +01:00
Guillaume Damiand 38a28fd78c Bug fix: reserve a mark before to use it. 2015-10-16 07:28:43 +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
Sébastien Loriot 10dddcc881 init base class to avoid a warning with clang 2015-07-16 17:45:52 +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 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
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
Pranav 0310953938 undo a redundant change in import_from_triangulation_3 2015-04-01 11:02:47 +05:30
Pranav 78dd583dac fixes issue of infinite vertex in import_from_triangulation_3 2015-03-31 14:18:41 +05:30
Guillaume Damiand fd4162a5a1 Bug fix in size function in ranges 2015-03-03 10:37:37 +01:00
Guillaume Damiand 2ee8f25ba6 Update the undocumented function write_off to allow the export of mesh with dimension higher than 2 2015-02-27 13:57:52 +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 e2c433bd7e One more remove^Crailing whitespace. 2015-01-06 15:53:51 +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 919bf8af74 Cleanup + some optimizations. 2014-12-23 09:34:09 +01:00
Sylvain Brandel 1cb63c386b Modification of the names of attributes management functions 2014-12-05 16:03:44 +01:00
Andreas Fabri 2916850771 use iformat for reading doubles 2014-11-26 16:53:50 +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
Sylvain Brandel d62a535fd7 minor addons in the code, not in the API 2014-06-13 16:02:55 +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
Clement Jamin 28c5fde142 Add an increment policy to the Compact_container, and an operator[] 2013-12-20 15:03:37 +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 b3a7330a33 Remove function get_attribute_of_dart which is useless. 2013-11-19 15:42:51 +01:00
Guillaume Damiand 96f3835d0a Remove null vector in traits (pb with Kernel_d ?) 2013-11-19 07:30:43 +01:00