songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
112,593 Commits 3 Branches 156 Tags 959 MiB
Commit Graph

419 Commits

Author SHA1 Message Date
Andreas Fabri 0496d840ff Fix arrangement and lcc 2019-01-18 10:05:48 +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 12ae925f31 Some more unused variables. 2018-12-03 20:11:19 +01:00
Guillaume Damiand c2665415cd Remove warning in lcc viewers. 2018-11-30 08:03:31 +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 edfdc8d346 Readd the random face color option for lcc viewer. 2018-11-27 17:02:38 +01:00
Guillaume Damiand 111eb4ee21 Demo of LCC is now ok 2018-11-27 16:07:52 +01:00
Guillaume Damiand 162a4b5593 Continue to update the lcc demo and the basic viewer. 2018-11-27 15:45:05 +01:00
Guillaume Damiand a5e1edd698 Continue to update the lcc demo and the basic viewer. 2018-11-27 11:59:29 +01:00
Guillaume Damiand 5d7723af4a Update LCC demo 2018-11-27 09:10:03 +01:00
Guillaume Damiand 8297e2b849 Start to update the LCC demo, in order to re-use LCC basic viewer. 2018-11-26 16:33:39 +01:00
Guillaume Damiand ae5b6e00ad Bug fix in basic viewers when using EPEK. 
For polyhedron, surface mesh and LCC viewers, we compute face and vertex normals in the basic viewers. These normals should be computed in a Vector_3 of a non exact kernel.
 2018-10-15 14:58:52 +02:00
Guillaume Damiand 2e910371fb Add the possibility to visualize marked darts 2018-09-25 13:29:24 +02:00
Guillaume Damiand ddd7f8fa3b Add an option to disable viewer when running ctest. 2018-09-07 13:29:38 +02:00
Guillaume Damiand 2c8af2ebcc Update all draw_XXX functions to use specialized version, allowing to use different draw in a same program. 2018-09-06 18:43:32 +02:00
Guillaume Damiand c9a80f75ea Return a bool in undocumented read and write off functions 2018-09-04 16:17:33 +02:00
Guillaume Damiand 542d94dcdb Add default value for update attribute parameter 2018-09-04 16:17:11 +02:00
Guillaume Damiand f6fd8cae4c Remove a warning; when using test suite, compile all the code but run nothing. 2018-06-13 09:14:18 +02:00
Guillaume Damiand 59f797f066 Update the 5 basic viewers to remove factorized functions, and to define different versions in order to remove default template parameters. 2018-06-11 13:09:50 +02:00
Maxime Gimeno 10c277ea2d Use special args if running testsuite to avoid execution errors. 2018-06-07 13:35:28 +02:00
Maxime Gimeno 6e878c4f66 Fix LCC example 2018-05-29 11:38:48 +02:00
Guillaume Damiand c62fb2b01e Move include iostream. 2018-05-29 11:11:49 +02:00
Guillaume Damiand b361e78a99 Add missing include 2018-05-29 11:11:49 +02:00
Guillaume Damiand d8a62aa2c8 Update licence headers of new files. 2018-05-29 11:11:49 +02:00
Guillaume Damiand dba44f48a1 Harmonize the 5 basic viewers. 2018-05-29 11:11:49 +02:00
Guillaume Damiand 6e83b034dc Rename file for basic viewers. 2018-05-29 11:06:07 +02:00
Guillaume Damiand 82179b45a4 Some more replace of display by draw; for lcc basic viewer. 2018-05-29 11:06:07 +02:00
Guillaume Damiand 73905ce8dd Avoid to run the viewer for the CGAL test suite. 2018-05-29 11:06:07 +02:00
Guillaume Damiand c7a4236281 Update CMakeLists.txt to allow drawing of lcc example 2018-05-29 11:06:07 +02:00
Guillaume Damiand 5e5a9611db Protect the code of the basic viewers; rename display into draw; add a draw function that display an error message if the basic viewer is not defined. 2018-05-29 11:04:57 +02:00
Guillaume Damiand a59c5f6398 Update all basic viewers to allow to have a color functor as parameter. 2018-05-29 11:04:57 +02:00
Guillaume Damiand d881a203e2 Update LCC, Polyhedron and Surface mesh viewers to follow last modification of basic viewer. 2018-05-29 11:02:00 +02:00
Guillaume Damiand f70c6fed86 Update basic viewer to: (1) use a generic class that can maybe be used also in demos; (2) use same name to add mono/colored objects. 2018-05-29 11:02:00 +02:00
Guillaume Damiand 8870e304a3 Update basic viewer; now it works for LCC, Polyhedron and Surface_mesh. 2018-05-29 11:01:59 +02:00
Guillaume Damiand 0e6eded6b7 Update basic viewer. 2018-05-29 11:01:59 +02:00
Guillaume Damiand cc3410a729 Bugfix in basic viewer. 2018-05-29 11:01:59 +02:00
Guillaume Damiand 374da8b55d Update basic viewer. 2018-05-29 11:01:59 +02:00
Guillaume Damiand 9e4f2870b8 Work on generic display function. 2018-05-29 11:01:59 +02: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
Guillaume Damiand c8cdf75b8b l-push case 4 ok. 2018-03-28 16:36:21 +02:00
Andreas Fabri b918ab4ba7 Move internal class from Polyhedron to BGL 2018-03-24 11:41:30 +01:00
Guillaume Damiand 8f8cbbc84e Remove one useless dependency in LCC to Polyhedron. 2018-03-23 16:46:38 +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 dfc76816b3 Update 2018-03-19 22:19:38 +01:00
Guillaume Damiand b848314336 Improve method 2018-03-19 16:36:03 +01:00
Laurent Rineau 9d227d0fba Merge pull request #2758 from maxGimeno/BGL-Document_graph_has_property-GF 
BGL: Document graph_has_property
 2018-02-19 14:26:33 +01:00
Maxime Gimeno 7fa4b380d2 fixes in includes logic. 2018-02-02 12:08:05 +01:00
Maxime Gimeno c3215b9331 Move graph_has_property from namespace boost to namespace CGAL and provide some doc for it. 2018-01-22 12:43:29 +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 e3b6a38adf Add default value for insertion operation in lcc 2017-12-15 10:35:35 +01:00
Guillaume Damiand 425a330f68 load/write fct now return bool 2017-12-15 09:52:45 +01:00
Laurent Rineau 4e91d4d768 Merge pull request #2595 from gdamiand/BGL_LCC-use_generic_load-gdamiand 
BGL/LCC: use generic load

# Conflicts:
#	BGL/test/BGL/CMakeLists.txt
 2017-12-05 18:23:58 +01:00
Laurent Rineau 0b0b1503ef Merge pull request #2594 from gdamiand/CMap-bugfixes-gdamiand 
CMap bugfixes
 2017-12-05 18:20:56 +01:00
Guillaume Damiand 34b1e620c1 Remove my copy of cgal/bgl/graph/io.h 2017-11-24 11:18:01 +01:00
Guillaume Damiand a189c1b1cc Use generic load_off function (in cgal/bgl/graph/) instead of my own copy. For that, add the degree function that takes a face descriptor as parameter. 2017-11-24 11:16:55 +01:00
Guillaume Damiand 5f939d33ab Bug fix in CMap/GMap/LCC dart methods 2017-11-13 12:17:03 +01:00
Sébastien Loriot 0698f79aff add SPDX identifier for files under the LGPL-3+ license 2017-11-12 10:17:50 +01:00
Martial Tola 6ce7afb6e0 fix bug -> 2x 2 missing "inline" to prevent duplicate symbols during link process... 2017-10-01 16:07:33 +02:00
Guillaume Damiand cc4faa1151 Reorder #include, trying to solve boost bug about flat_map.hpp. 2017-06-29 10:35:02 -04:00
Guillaume Damiand d2f80b3da9 Rename internal namespace to avoid conflict 2017-06-28 09:43:24 -04:00
Guillaume Damiand 6244136d3c Remove two warnings (thanks laurent) 2017-06-27 12:25:45 -04:00
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
Guillaume Damiand 7d590d7902 Index version of LCC is ok. 2014-10-05 18:50:53 +02:00
Guillaume Damiand aad53de70e Integrate the index class into the compact container with index: cont. 2014-10-05 14:25:48 +02:00
Guillaume Damiand 7efb4bdbda Start to integrate the index class into the compact container with index. 2014-10-03 17:35:26 +02:00
Guillaume Damiand f5c47ce46a One different type for each index. 2014-10-02 22:01:48 +02:00
Guillaume Damiand 54b4e8028f Index version. 2014-09-18 16:59:19 +02: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
Guillaume Damiand 42959d525f Add missing typedef 2013-11-14 13:25:45 +01:00
Guillaume Damiand ddefa1f60c Remove warning 2013-11-14 08:39:34 +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
Guillaume Damiand cfad121d1a Remove a useless #include 
Approved by the Release Manager
 2013-09-05 10:28:00 +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 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
Guillaume Damiand 1cc9540daf copy cont 2013-06-03 22:08:57 +02:00
Guillaume Damiand 6cc05e3920 wip copy 2013-06-03 18:50:35 +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 21387b2601 tests for lcc copy (nyf) 2013-05-31 15:45:47 +02:00
Guillaume Damiand 49a19b0b71 End of copy constructor for cmaps. Add tests. 2013-05-31 14:43:56 +02:00
Guillaume Damiand bac62f48fc Add constructor in derived cmap and lcc classes 2013-05-30 14:38:53 +02:00
Guillaume Damiand 7cf8b4944c Bug fix in default traits parameter of LCC (already in master) 2013-02-14 17:40:14 +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 6678832c7a Wip on group/degroup 2013-02-11 17:57:10 +01:00
Guillaume Damiand ba0e0858ea Degroup when remove is now ok 2013-01-28 13:34:49 +01:00
Sébastien Loriot 82b2ebc865 apply the cpp0x namespace renaming in all files 2012-12-19 11:33:17 +01:00
Guillaume Damiand 703e5d4149 Remove warnings. 
Unused typedef, variable; unitialized type.
 2012-11-28 10:10:48 +01:00
Guillaume Damiand c871aa06b4 * Add generic beta in CMap (small feature); 
* Add generic create_dart and create_attribute in CMap (small feature);
* Add generic create_vertex_attribute in LCC (small feature);
* BugFix in LCC doc (wrong concept for item class).
 2012-09-06 11:42:50 +00:00
Guillaume Damiand 1041faed99 More warnings 2012-05-09 11:25:38 +00:00
Guillaume Damiand cb7e3bde41 Merge with next 2012-05-05 07:07:53 +00:00
Guillaume Damiand 559ac7992a Bugfix: Remove an undocumented constructor of Cell_attribute_with_point class which involves a conflict if an user uses Point as Info template argument. 2012-05-03 19:15:06 +00:00
Guillaume Damiand d2160fd6ce Bug fix in sew3_same_facets method 2012-03-29 19:55:53 +00:00
Guillaume Damiand 2e79d76bbe Wip refactoring the demo. 2012-03-29 13:39:14 +00:00
Guillaume Damiand a882e94a07 Modifs of import from triangulation methods to allow to keep the std::map linking the triangulation and the lcc. API is not modified since by default this additional parameter is NULL. 2011-12-20 10:30:11 +00:00
Guillaume Damiand 5354a329a5 Modifs of voronoi examples to set the points in the center of circumcenter circles. 2011-12-19 21:08:48 +00:00
Guillaume Damiand 886b6ef54a * Split dual in two parts (combinatorial and geometrical parts). 
* Bug fix in import from Triangulation_2.
 2011-12-19 19:38:27 +00:00
Guillaume Damiand f6cd69aa7b Add an example to build voronoi_2. 2011-12-19 06:38:04 +00:00
Guillaume Damiand cb3c66dd90 Revert of linear_cell_complex_3 example to use foreach which is now ok. Copyright. Add tests. 2011-11-21 13:11:43 +00:00
Guillaume Damiand c19dae7287 add tests 2011-11-19 07:53:26 +00:00
Guillaume Damiand 20ce6ad41e Remove warnings 2011-11-17 10:32:29 +00:00
Guillaume Damiand f49823ff3a Remove a warning; remove two advanced examples from testsuite. 2011-11-09 08:10:42 +00:00
Guillaume Damiand 9090175566 typo plus add some static_assertions. 2011-11-08 18:16:58 +00:00
Guillaume Damiand e382ed1ea5 Cleanup + copyright. 2011-11-07 16:30:24 +00:00
Guillaume Damiand 121647b223 Re-indent. 2011-11-07 11:20:20 +00:00
Guillaume Damiand e654a4d54e typo 2011-10-31 07:19:38 +00:00
Guillaume Damiand c3ed4ec5cb * Rename class Combinatorial_map_with_points in Linear_cell_complex; 
* Remove inheritance between LCC and Traits class.
 2011-10-24 09:50:18 +00:00
Guillaume Damiand 31440599ae Code modifications to follow doc 2011-10-23 11:42:53 +00:00
Guillaume Damiand 74677eae75 Start modifs of code to follow ref manual (not yet finished) 2011-10-21 15:55:29 +00:00
Guillaume Damiand 34f7291fa4 Add the Linear_cell_complex directory by copy of the previous branch in order to conserv the history 2011-10-14 17:53:30 +00:00
Guillaume Damiand b68c7da28b Remove directory Linear_cell_complex/ 2011-10-14 17:51:15 +00:00
Guillaume Damiand 025a6db5e6 Add Linear_cell_complex directory. 2011-10-14 15:46:50 +00:00