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

476 Commits

Author SHA1 Message Date
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
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
Andreas Fabri 38b2e57b11 PMP 2018-01-17 17:59:35 +00: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
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
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 b80315367f Do not return void. 2017-06-14 13:46:03 -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 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 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 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 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 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 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 084c2c8c19 Add a test; add deprecated class Dart 2016-11-29 11:43:29 +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 c88fd4fd1c Corrections following Sebastien review (nyf) 2016-11-29 11:43:26 +01:00
Guillaume Damiand 25f51ac30c Add missing this-> 2016-11-29 11:43:22 +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 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 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 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
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
Guillaume Damiand 0cf192cd44 Add index function in Compact container (usefull to debug) 2016-09-28 17:14:07 -04: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
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 efdd6c5a26 Remove warnings and errors 2016-04-11 18:31:38 +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
Guillaume Damiand 37e95ca593 Remove trailling whitespaces. 2016-03-10 10:47:24 +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 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 6a171dcc77 Deprecate global modification functions. 2016-03-08 18:45:55 +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
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
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
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
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 06731095ae Add using declaration for Exception_no_more_available_mark. 2015-10-28 11:19:02 +01: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
Guillaume Damiand 600e7b1b30 Start to merge with the new qt5 version of the LCC demo (nyf). 2015-08-28 11:51:48 +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
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 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
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
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 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 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
Clement Jamin 28c5fde142 Add an increment policy to the Compact_container, and an operator[] 2013-12-20 15:03:37 +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 305b6a4ba0 Add debug message 2013-11-18 19:47:27 +01:00
Guillaume Damiand 2b6bf9fbe7 Remove a warning 2013-11-15 08:05:22 +01:00
Guillaume Damiand 42959d525f Add missing typedef 2013-11-14 13:25:45 +01:00
Guillaume Damiand 6592ca0bc7 Remove warning 2013-11-14 09:36:53 +01:00
Guillaume Damiand ddefa1f60c Remove warning 2013-11-14 08:39:34 +01:00
Guillaume Damiand 8d560a5661 Bugfix in dart functions with c++11. 2013-11-14 08:34:36 +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
Andreas Fabri 6c547e5663 Mainly added includes 2013-09-13 22:24:30 +02:00
Guillaume Damiand d2e409487e Bug fix in close operation. 2013-07-04 16:55:53 +02:00
Guillaume Damiand b3ad1c44c4 Merge branch 'Combinatorial_map-reverse_orientation-kenohori' 
Approved by the release manager.
 2013-06-25 12:17:36 +02:00
Guillaume Damiand 6653320136 Tests for reverse orientation. 
Bugfix: initialization of internal::Test_is_same_attribute_functor<Self, Map2>::value.
Add text in changes.html.
 2013-06-24 10:27:26 +02:00
Guillaume Damiand 37d7b8ef0f Merge branch 'Combinatorial_map-reverse_orientation-kenohori-old' into Combinatorial_map-reverse_orientation-kenohori 2013-06-23 21:02:11 +02:00
Guillaume Damiand 1018501173 Replace t.get<i>() by CGAL::cpp11::get<i>(t) for tuples. 2013-06-18 09:33:37 +02:00
Guillaume Damiand 867cf4767e Example for dynamic functor. 2013-06-17 10:14:04 +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 50fd54b5f1 Patch for compiler gcc4.3 
(Sebastien is the best, even it is not fair because I don't have access to the compiler. But I will pay my beer ;)
 2013-06-13 14:53:04 +02:00
Guillaume Damiand 7f7788bd84 Small corrections on reverse orientations; reformating; start to add tests 2013-06-13 11:14:03 +02:00
Guillaume Damiand 67756fd5d3 Add missing template keywords 2013-06-13 10:21:09 +02:00
Guillaume Damiand ff8b4686d9 Remove a warning 2013-06-07 08:46:25 +02:00
Guillaume Damiand 23e8a540f7 Small corrections after first results of testsuite 2013-06-06 08:18:13 +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