Commit Graph

39 Commits

Author SHA1 Message Date
Sébastien Loriot e5b72ac5b3 Merge branch 'old/gsoc2014-VCM_3-jmeyron' into gsoc2014-VCM_3-jmeyron
Conflicts:
	Arrangement_on_surface_2/examples/Arrangement_on_surface_2/bgl_primal_adapter.cpp
	BGL/examples/BGL_arrangement_2/primal.cpp
	BGL/include/CGAL/boost/graph/dijkstra_shortest_paths.hpp
	Installation/changes.html
	Point_set_processing_3/examples/Point_set_processing_3/CMakeLists.txt
2014-11-05 16:11:35 +01:00
Jocelyn MEYRON 4a50711cf8 add halfspaces_intersection_with_construction_3 + doc + benchmark 2014-08-08 17:32:58 +02:00
Clement Jamin fbf824c711 Merge branch 'Mesh_3-parallel-cjamin'
This branch introduces parallel algorithms in Triangulation_3 and Mesh_3,
as well as a Concurrent_compact_container. The corresponding features are:
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Parallel_triangulation_3
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Parallel_Mesh_3

Tested in CGAL-4.5-Ic-98.
Approved by the Release Manager.
2014-07-17 19:08:24 +02:00
Sébastien Loriot 2892c2fb4e Merge branch 'Surface_modeling-new_package-GF-old' into Surface_modeling-new_package-GF
Conflicts:
	Documentation/biblio/geom.bib
	Documentation/doxyassist.xml
2014-04-08 14:41:09 +02:00
Clement Jamin 157cd0465f Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
Conflicts:
	Mesh_3/demo/Mesh_3/Mesh_3_optimization_plugin_cgal_code.cpp
	Mesh_3/doc/Mesh_3/Concepts/MeshCellBase_3.h
	Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h
	Mesh_3/include/CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h
	Mesh_3/include/CGAL/Mesh_3/Mesh_global_optimizer.h
	Mesh_3/include/CGAL/Mesh_3/Sliver_perturber.h
	Mesh_3/include/CGAL/Mesh_3/Slivers_exuder.h
	Mesh_3/include/CGAL/Mesh_3/Triangulation_helpers.h
	Mesh_3/include/CGAL/Mesh_3/config.h
	Mesh_3/include/CGAL/Mesh_3/vertex_perturbation.h
	Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h
	Mesh_3/include/CGAL/exude_mesh_3.h
	Mesh_3/test/Mesh_3/test_meshing_utilities.h
	Triangulation_3/include/CGAL/Triangulation_cell_base_with_circumcenter_3.h
2014-03-10 17:01:03 +01:00
Sébastien Loriot a72ee0c2a0 Merge branch 'Surface_mesh_segmentation-sloriot'
Introduces the Triangulated Surface Mesh Segmentation Package
See also wiki/Features/Surface_mesh_segmentation
Tested in 4.4-Ic-84

Approved by the release manager

Conflicts:
	Documentation/biblio/how_to_cite.html
	Documentation/biblio/manual-4.3.bib
	Manual/doc_tex/Manual/geom.bib
2014-01-10 00:15:18 +01:00
Sébastien Loriot 52cbc39a3c Make cmake generate the bibtex files for the doxygen manual
WIP working only on Linux/Unix and with cmake >= 2.8.11
2013-12-05 22:57:30 +01:00
Clement Jamin ec8e949d21 Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin 2013-11-21 10:50:55 +01:00
Sébastien Loriot 700cfba92f doxygen does not like reference ending with - 2013-10-18 15:23:02 -07:00
Clement Jamin 41929ed520 Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
Conflicts:
	Mesh_3/doc/Mesh_3/Concepts/MeshCellBase_3.h
	Mesh_3/dont_submit
	Triangulation_3/doc/TDS_3/CGAL/Triangulation_data_structure_3.h
	Triangulation_3/doc/TDS_3/Concepts/TriangulationDataStructure_3.h
	Triangulation_3/doc/Triangulation_3/CGAL/Delaunay_triangulation_3.h
	Triangulation_3/doc/Triangulation_3/CGAL/Regular_triangulation_3.h
	Triangulation_3/doc/Triangulation_3/CGAL/Triangulation_3.h
	Triangulation_3/doc/Triangulation_3/PackageDescription.txt
2013-09-25 11:47:43 +02:00
Sébastien Loriot b6640a9d3c Merge branch 'gsoc2012-segmentation-iyaz-old' into gsoc2012-segmentation-iyaz 2013-09-04 08:05:28 +02:00
Sébastien Loriot c235f00659 add reference for Laplace coordinates 2013-08-08 19:43:55 +02:00
Sébastien Loriot b352ca7410 Merge branch 'Surface_modeling-new_package-GF-old' into Surface_modeling-new_package-GF 2013-08-06 16:34:47 +02:00
Sébastien Loriot 8cd8461fa5 fix bibtex 2013-08-05 14:26:44 +02:00
Sébastien Loriot 1a8a2a0814 update url of reference 2013-08-05 10:20:07 +02:00
Sébastien Loriot c2399dee6f update CGAL bibtex 2013-07-26 11:52:26 +02:00
Sébastien Loriot 3121bcfd32 Merge branch 'gsoc2012-segmentation-iyaz-old' into gsoc2012-segmentation-iyaz
Conflicts:
	Documentation/doc/General.txt
	Documentation/doxyassist.xml
	Point_set_processing_3/include/CGAL/IO/write_off_points.h
	Point_set_processing_3/include/CGAL/IO/write_xyz_points.h
	Point_set_processing_3/include/CGAL/Point_with_normal_3.h
	Point_set_processing_3/include/CGAL/improved_jet_smooth_point_set.h
	Point_set_processing_3/include/CGAL/improved_laplacian_smooth_point_set.h
	Point_set_processing_3/include/CGAL/jet_estimate_normals.h
	Point_set_processing_3/include/CGAL/jet_smooth_point_set.h
	Point_set_processing_3/include/CGAL/pca_estimate_normals.h
	Point_set_processing_3/include/CGAL/pca_smooth_point_set.h
	Polyhedron/demo/Polyhedron/CMakeLists.txt
	Spatial_sorting/doc/Spatial_sorting/CGAL/Spatial_sort_traits_adapter_3.h
	Spatial_sorting/doc/Spatial_sorting/CGAL/Spatial_sort_traits_adapter_d.h
	Surface_mesh_simplification/doc/Surface_mesh_simplification/CGAL/Surface_mesh_simplification/edge_collapse.h
2013-07-26 11:52:16 +02:00
Sébastien Loriot 67a118578c bump CGAL version number in the bibtex and add P2T2 2013-07-26 08:45:56 +02:00
Clement Jamin 206b20bc15 Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin 2013-07-02 17:37:50 +02:00
Sébastien Loriot d9cf655db1 Merge branch 'Surface_modeling-new_package-GF-old' into Surface_modeling-new_package-GF
Conflicts:
	Documentation/doxyassist.xml
	Documentation/header_package.html
	Polyhedron/demo/Polyhedron/CMakeLists.txt
2013-06-27 08:55:59 +02:00
Clement Jamin 1e5d9db5d5 Removed capitals 2013-06-11 13:20:22 +02:00
iyaz c393d4e64d added a new reference for k-means++ 2013-05-14 18:49:47 +03:00
Laurent Rineau 7985785781 Fix the citations to VRML. vrml.org is no longer. 2013-04-23 14:06:52 +02:00
iyaz e7e1d96fb5 Bibtex additions 2013-03-18 20:21:11 +02:00
Sébastien Loriot 9ffd1f933a add missing references 2013-03-18 18:11:19 +01:00
Sébastien Loriot dd6005296c update bibtex entry 2013-03-06 12:38:24 +01:00
Sébastien Loriot b9a42236d5 port the documention to the latest CGAL doxygen setup 2013-01-16 18:05:13 +01:00
Sébastien Loriot 6693cdcba8 fix makebiblio sed command and update file 2013-01-08 08:13:51 +01:00
Philipp Möller 8c374aa36f Update how_to_cite_cgal after changing the script 2012-12-18 19:36:25 +01:00
Philipp Möller ee2735c18e Replace CGAL in the output with %CGAL to avoid links 2012-12-18 19:29:32 +01:00
Sébastien Loriot 24407a25c7 bump to 4.2 2012-12-04 19:12:06 +01:00
Luis Peñaranda 33b903206c typo in my last name in .bib files 2012-12-04 12:10:53 -02:00
Eric Berberich bc7519a413 correct location 2012-11-23 16:59:37 +01:00
Philipp Möller 7c6277b01d Fix the links from the ack pages. 2012-10-04 15:35:41 +00:00
Philipp Möller 1dc9a0169b Enable two custom options and integrate them into the mainpages. 2012-09-25 13:43:55 +00:00
Philipp Möller e133a83849 Put the two generated how_to_cite files under version control.
They aren't updated that often and requiring everyone who wants to
build complete documentation to install bibtex2html is highly
unreasonable.
2012-08-30 12:22:14 +00:00
Philipp Möller a66eff4450 document "How To Cite" 2012-08-28 17:47:30 +00:00
Philipp Möller e2616dafb1 Rebuild the how_to_cite structure 2012-08-28 17:33:45 +00:00
Philipp Möller a9196f6f91 prepare generation of how_to_cite 2012-08-28 14:55:22 +00:00