Commit Graph

56772 Commits

Author SHA1 Message Date
Sébastien Loriot bc8e1f399d workaround a bug in dijsktra algorithm in boost 1.54 affecting normal estimation 2014-07-19 12:20:29 +02:00
Sébastien Loriot 8b7af3a397 vector_property_map include is done by CGAL/property_map.h 2014-07-19 11:36:33 +02:00
Sébastien Loriot 25f74f2a74 LEDA library numbers has been renamed to leda_numbers
trivial bugfix for master
2014-07-18 16:04:27 +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
Clement Jamin 2ae815910e Switch to LGPL 2014-07-17 18:36:21 +02:00
Clement Jamin c8c7ed03a6 Relax the "number of facets/vertices" criteria 2014-07-17 17:46:37 +02:00
Clement Jamin ca70dd0bde The parallel algorithms are experimental 2014-07-17 10:52:39 +02:00
Sébastien Loriot 6ed1ba826e Merge branch 'to-be-tested/Stop_testing_taucs-sloriot'
Taucs, Lapack and Blas supports are no longer tested

Approved by the Release Manager
Tested in CGAL-4.5-Ic-97

Conflicts:
	Polyhedron/demo/Polyhedron/CMakeLists.txt
2014-07-16 20:19:21 +02:00
Laurent Rineau ca5e5b1bda "Fix" a license.txt file
There was an extra space.
2014-07-16 18:02:32 +02:00
Clement Jamin a7a654e207 Temporarily change Haussdorf distance threshold 2014-07-16 18:02:00 +02:00
Laurent Rineau 495ed0b6ab Merge remote-tracking branch 'origin/CGAL-Less_warnings-GF'
Fix various warnings.

Tested in CGAL-4.5-Ic-97. Approved by the Release Manager.
2014-07-16 17:48:56 +02:00
Laurent Rineau 984c5aa9c4 Merge branch 'Point_set_processing_3-fix_bug_with_Boost_1_54-GF'
Workaround the incompatibility between Point_set_processing_3 and Boost
1.54. In the testsuite, the tests that failed because of Boost-1.54 are
no longer compiled.

Tested in CGAL-4.5-Ic-97.

Approved by the Release Manager.
2014-07-16 17:45:40 +02:00
Laurent Rineau 5b376e80e5 Merge remote-tracking branch 'origin/Triangulation_3-fix_adjacent_vertices-GF'
Fix a bug in finite_adjacent_vertices when dimension()==0

Tested in CGAL-4.5-Ic-97.

Approved by the Release Manager.
2014-07-16 17:39:51 +02:00
Laurent Rineau d0570871e7 Fix a warning 2014-07-16 17:06:11 +02:00
Clement Jamin deb6edcb1f Wrong variable name. 2014-07-16 17:05:22 +02:00
Clement Jamin 63056df061 Merge branch 'Mesh_3-parallel-cjamin' of ssh://scm.cgal.org/var/git/cgal into Mesh_3-parallel-cjamin 2014-07-16 17:05:08 +02:00
Clement Jamin dad9162352 Missing "using" 2014-07-16 17:04:47 +02:00
Laurent Rineau 7348b466f3 Fix a warning
Otherwise `p` can be used without being initialized.
2014-07-16 16:52:50 +02:00
Laurent Rineau bf3937fabc Reformat the long list of #ifdef/#else
And display the typeid of the kernel, for checking.

(cherry picked from commit 8eb51bee7a)

Conflicts:
	Triangulation_3/benchmark/Triangulation_3/Triangulation_benchmark_3.cpp
2014-07-16 16:47:33 +02:00
Andreas Fabri cb09dc9065 Add Leda
(cherry picked from commit a25077bf90)

Conflicts:
	Triangulation_3/benchmark/Triangulation_3/Triangulation_benchmark_3.cpp
2014-07-16 16:47:33 +02:00
Clement Jamin 2dd27c4d13 Fix a (minor) data race on the circumcenter cache 2014-07-16 16:35:31 +02:00
Laurent Rineau f53344ef9b Let's try to deactivate CGAL_Core and see... 2014-07-16 15:29:54 +02:00
Clement Jamin 6f7587c6dd Fix small differences between master and Mesh_3-parallel 2014-07-16 14:13:40 +02:00
Clement Jamin aa1aa597bb Restore commit a09ed468 with a bug fix
"Thread-safe version of incident_cells and incident_facets"
2014-07-15 20:13:30 +02:00
Clement Jamin 32616470c7 Add parallelism to test_meshing_unit_tetrahedron.cpp 2014-07-15 20:04:35 +02:00
Clement Jamin 2d35c204fb Remove VERBOSE macro 2014-07-15 19:28:19 +02:00
Clement Jamin db6db80096 Fix identation 2014-07-15 18:11:31 +02:00
Clement Jamin d299aa2202 Use different checking intervals for the sequential and the parallel version 2014-07-15 16:30:56 +02:00
Sébastien Loriot e97efd228f prevent linking 2014-07-15 14:25:21 +02:00
Sébastien Loriot bb191be68b use cmake variable instead of hard-coded lib names
trivial bugfix for master
2014-07-15 11:32:52 +02:00
Sébastien Loriot 2dfd63ecd0 using delete instruction if available
trivial bugfix for master
2014-07-15 10:03:57 +02:00
Efi Fogel 207f70b167 minor fix for master. traits() => geometry_traits() 2014-07-13 10:27:30 +03:00
Andreas Fabri cdb0ee6381 trivial bug-fix for master 2014-07-12 19:37:25 +02:00
Sébastien Loriot a0de599134 a bool that is false can never become true with &&'s
did somebody try to use splatting since 5f33a481

trivial bug fix for master
2014-07-12 00:21:36 +02:00
Laurent Rineau 2fd95b6d17 Merge branch 'CGAL-use_leda-GF'
Fix the use CMake variable CGAL_DISABLE_GMP.
That variable must be stored in CGALConfig.cmake, so that UseCGAL.cmake
can see it.

Approved by Release Manager.

Tested in CGAL-4.5-Ic-92.
2014-07-11 17:57:16 +02:00
Laurent Rineau 64c5573a85 rm warning
(cherry picked from commit c309fde259c04b8e3beb609b3dece1673240ab34)

Trivial fix for master
2014-07-11 16:51:27 +02:00
Laurent Rineau 84fcae4788 Workaround the incompatibility with Boost 1.54 2014-07-11 12:04:42 +02:00
Laurent Rineau 6147850312 Fix remaining warnings 2014-07-11 11:01:24 +02:00
Andreas Fabri 964f04c5fb Remove unnecessary include and typedef 2014-07-11 09:50:19 +02:00
Andreas Fabri 56deede019 Use CGAL_USE_TYPE 2014-07-11 09:49:55 +02:00
Andreas Fabri c0be9a38d3 initialize to avoid warning 2014-07-11 09:27:10 +02:00
Laurent Rineau 64fe2b3f8e Remove warnings 2014-07-10 14:46:12 +02:00
Laurent Rineau 19158bac27 Remove warnings about unused parameters 2014-07-10 14:41:42 +02:00
Sébastien Loriot d5f7ba8ff3 fix a bug introduced in 31042b8d
glDrawElements call expect unsigned int!

trivial bug-fix for master
2014-07-10 00:22:08 +02:00
Sébastien Loriot 5fce0d89f2 remove non-needed conversion operator (because of inheritance)
trivial bug-fix for master
2014-07-09 23:54:52 +02:00
Sébastien Loriot ddc01022d8 remove a warning
trivial bug-fix for master
2014-07-09 23:54:51 +02:00
Andreas Fabri b63488b0e9 remove unused parameters 2014-07-09 16:15:54 +02:00
Efi Fogel ff308b5696 minor fix for master. Removed description of non-exisiting member functions 2014-07-09 17:12:13 +03:00
Andreas Fabri 13bb5e38aa remove unused parameters 2014-07-09 16:02:45 +02:00
Andreas Fabri 4ddd31365c Merge branch 'Mesh_3-parallel-cjamin' of ssh://scm.cgal.org/var/git/cgal into Mesh_3-parallel-cjamin 2014-07-09 15:47:05 +02:00