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

282 Commits

Author SHA1 Message Date
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 60c9eb8cbc Remove trailing whitespace. 2015-01-06 15:52:41 +01:00
Guillaume Damiand 4d6a8573f5 Add one example. 2015-01-06 12:24:50 +01:00
Guillaume Damiand 31f97645d9 Finalize doc + example. 2015-01-05 18:37:50 +01:00
Guillaume Damiand 090f2f5cfd Remove warning 2015-01-02 18:50:49 +01:00
Guillaume Damiand 32464de4a5 Update demo for Menger, Sierpinski Carpet and Sierpinski Triangle. 2014-12-28 17:15:02 +01:00
Guillaume Damiand 237c4b87fb Remove warnings. 2014-12-27 20:12:51 +01:00
Guillaume Damiand 029724ab67 Add example file 2014-12-25 08:20:52 +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 69b53d262d Improve demo drawing. 2014-12-24 09:18:55 +01:00
Guillaume Damiand 34e9139cde Update viewers. 2014-12-24 08:19:09 +01:00
Guillaume Damiand bdc0dee6ce Update operations to use are_attributes_automatically_managed 2014-12-23 22:15:49 +01:00
Guillaume Damiand 0860cf5012 Remove trailing whitespaces 2014-12-23 21:52:15 +01:00
Guillaume Damiand c9345af46b add the new function in Linear cell complex class. 2014-12-23 21:51:04 +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
Sylvain Brandel 08af113c95 Adding linear_cell_complex_3_attributes_management.cpp example 2014-12-12 15:41:23 +01:00
Sylvain Brandel b0591661fd Adding example linear_cell_complex_3_attributes_management.cpp 2014-12-12 15:38:14 +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
Laurent Rineau e4b033e964 Add/remove #include 
- I remove <CGAL/basic.h> when I see it, in favor of <CGAL/config.h>.
- <CGAL/ipower.h> is needed for CGAL::ipower
- <ctime> is needed for std::time
 2014-06-26 19:10:06 +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
Sylvain Brandel 4d34b88770 Updating new branch with modified and new files, in accordance with provided features 2014-06-03 11:15:08 +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 7749eb75d5 Remove unused parameter when tests are not traced. 2014-04-08 09:27:19 +02: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
Laurent Rineau 29f28936a0 Revert "Add minimal example showing the vc12 bug (?)" 
This reverts commit 907a2a3130.
 2014-03-31 17:00:16 +02:00
Guillaume Damiand 907a2a3130 Add minimal example showing the vc12 bug (?) 2014-03-27 09:41:04 +01:00
Sébastien Loriot 9114db9085 restore figure source files removed in 0fa2cacb 
| commit 0fa2cacb60
  | Author: Sébastien Loriot <sebastien.loriot@cgal.org>
  | Date:   Tue Dec 3 17:27:02 2013 +0100
  |
  |     remove doc_tex documentation (including developer manual) and old manual tools
 2014-02-10 14:54:23 +01:00
Clement Jamin 28c5fde142 Add an increment policy to the Compact_container, and an operator[] 2013-12-20 15:03:37 +01:00
Sébastien Loriot 0fa2cacb60 remove doc_tex documentation (including developer manual) and old manual tools 2013-12-03 17:27:02 +01:00
Guillaume Damiand 8e8ab82527 Merge branch 'CMap_no_static_for_null_dart_handle-gdamiand' 
null_dart_handle is no longer static; implies to move several methods from Dart concept into CMap concept. This will simplify  the changing of the underlying container in the near future.

Small feature Combinatorial map dart attribute pre-approved in May 2013.

Approved by the release manager.
 2013-11-28 08:22:40 +01:00
Guillaume Damiand 60e9c235af typo 2013-11-26 17:29:31 +01:00
Guillaume Damiand e42f41a615 Small modif in explanations of modifications. 2013-11-22 08:00:00 +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 95dd472779 Remove trailing whitespace. 2013-11-19 16:38:13 +01:00
Guillaume Damiand c34014bcf7 Doc update. 2013-11-19 16:31:53 +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 44687b4f5d Add option allowing to trace the tests in LCC. 2013-11-16 18:22:36 +01:00
Guillaume Damiand 42959d525f Add missing typedef 2013-11-14 13:25:45 +01:00
Guillaume Damiand cd3b457f67 Modif in CMakeList in LCC examples. 
Trivial bug fix for master.
 2013-11-14 11:59:30 +01:00
Guillaume Damiand ddefa1f60c Remove warning 2013-11-14 08:39:34 +01:00
Guillaume Damiand 08b29d689f Remove trailing whitespace. 2013-11-13 17:42:37 +01:00
Guillaume Damiand 3766e7c8e6 Cleanup in benchmarks 2013-11-13 17:41:35 +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 e6647d3751 Add benchmarks for lcc. 2013-11-13 13:50:35 +01:00