Commit Graph

866 Commits

Author SHA1 Message Date
Clement Jamin 315ffdcbc8 Merge branch 'Triangulation-higher_dimensions-odevil_shornus-old' into Triangulation-higher_dimensions-odevil_shornus 2014-12-18 09:32:23 +01:00
Jane Tournois 3a5a65f264 update branch 2014-12-08 17:30:41 +01:00
Clement Jamin c6de2a50b2 Merge branch 'Triangulation-higher_dimensions-odevil_shornus-old' into Triangulation-higher_dimensions-odevil_shornus 2014-11-20 19:19:23 +01:00
Jane Tournois 545fe18310 add missing typedef for compilation on Linux 2014-10-03 17:11:08 +02:00
Jane Tournois a68adcffb2 add code to test Delaunay_cell_base_3 2014-10-02 11:30:30 +02:00
Jane Tournois 9e921b1d48 add typedef requested as documented 2014-10-02 11:28:43 +02:00
Jane Tournois d874698109 fix implementation of Delaunay_triangulation_cell_base_3 2014-10-02 10:49:16 +02:00
Clement Jamin 8f259e5dea Merge branch 'Triangulation-higher_dimensions-odevil_shornus-old' into Triangulation-higher_dimensions-odevil_shornus 2014-09-09 11:20:33 +02:00
Laurent Rineau 9955677bd1 Merge branch 'Triangulation_3-fix_testsuite_powertest-GF'
Fix the testsuite for Triangulation_3 on
i686_Linux-2.6_g++-4.1.2_CentOS-5.1 with optimizers.

In `test_static_filters.cpp` with the x87 FPU, there was an issue where
the two sides operators or `Kernel_checker` may not be tested with the
exact same floating points (one side with 80 bits of precision, and the other with
64 bits or precision).

Tested in CGAL-4.5-Ic-118.

Approved by the Release manager.
2014-08-08 12:00:08 +02:00
Laurent Rineau 83a06dc85d Yet another fix
I have tested that version of the platform
i686_Linux-2.6_g++-4.1.2_CentOS-5.1-O3. That should be the last attempt.
2014-08-06 15:40:17 +02:00
Mael Rouxel-Labbé da6279672c Fix warning introduced by c71c8a1 in weightless powertest tests 2014-08-05 11:36:00 +02:00
Mael Rouxel-Labbé c71c8a13b5 Fix warning in weightless powertest tests 2014-08-03 15:06:43 +02:00
Mael Rouxel-Labbé 1d99641c8d Add new tests for Triangulation_3's power_test_3 2014-08-01 12:34:05 +02:00
Mael Rouxel-Labbé 7cc8f59898 Small layout changes for Power_test_3's doc entry
(cherry picked from commit fdb4959b3e06c4c3fe4dd17d4420664a5d140486)
2014-07-21 12:15:57 +02:00
Laurent Rineau 374ab8413c Here is another source of potential problem
The variable x/y/z/r can have different values in the two contexts.
2014-07-18 17:42:50 +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
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
Laurent Rineau d2bd75d8a6 Better solution
There was still 'double' variables that were not forced to 64 bits. I
opt for another solution: the result of myrand() itself is forced to
64 bits.
2014-07-17 14:32:10 +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
Laurent Rineau 4689ac4db5 Force 53 bits of precision (double with 64 bits only)
I have the impression that the `x` value can be different in the two
sides of the kernel checker, because of compiler optimization and
80-bits floating point registers.
2014-07-16 14:53:21 +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
Andreas Fabri 13bb5e38aa remove unused parameters 2014-07-09 16:02:45 +02:00
Mael Rouxel-Labbé d0b222bfac Fix a bug in finite_adjacent_vertices when dimension()==0
When tr.dimension()==0, tr.finite_adjacent_vertices(...)
returned infinite things.
2014-07-08 15:44:26 +02:00
Clement Jamin 078e89f55f Add the possibility to remove the far points
The far points are added by the parallel version to reduce the contention
on the infinite vertex
2014-07-08 15:37:59 +02:00
Clement Jamin aa8577b65e Test with less points 2014-07-07 19:07:11 +02:00
Sébastien Loriot 0b353bb85b Merge remote-tracking branch 'origin/CGAL-use_leda-GF'
Reintroduce the possibility to use CGAL without GMP
  (to use LEDA number types instead for example).
  The cmake option to set to switch off GMP when building
  the lib is CGAL_DISABLE_GMP.

Tested in CGAL-4.5-Ic-86
Approved by the release manager

ge is necessary,
2014-07-04 12:02:37 +02:00
Clement Jamin a3db71cc20 Remove warnings 2014-07-04 09:31:27 +02:00
Sébastien Loriot fee85470c1 Merge branch 'Triangulation_3-determinism-gf' into to-be-tested/Triangulation_3-determinism-gf
Conflicts:
	.gitattributes
	Matrix_search/include/CGAL/rectangular_3_center_2.h
	Spatial_sorting/include/CGAL/spatial_sort.h
2014-07-03 16:34:46 +02:00
Clement Jamin 0e4c8e54cd Fix a few other warnings 2014-07-03 15:57:35 +02:00
Clement Jamin da4cf8fc1d Fix gcc warnings (reorder + unused variables & typedef...) 2014-07-03 15:54:39 +02:00
Clement Jamin 0a4267b7ce Temporarily revert "Thread-safe version of incident_cells and incident_facets" 2014-07-03 15:41:02 +02:00
Clement Jamin 65e8d40e33 Fix warning 2014-07-03 09:26:25 +02:00
Clement Jamin 982f140911 Use tbb::task_scheduler_init::default_num_threads...
... instead of boost:🧵:hardware_concurrency
2014-07-02 15:10:34 +02:00
Clement Jamin 55ff0a9404 Add a warning in comments 2014-07-02 10:49:44 +02:00
Clement Jamin ddd0dcded4 Protect parallel code with #ifdef 2014-07-02 09:29:40 +02:00
Clement Jamin 906da2deac Restore those #define as in master 2014-07-01 19:35:00 +02:00
Clement Jamin 3e873a1f5c Fix #ifdef mismatch bug 2014-07-01 17:02:09 +02:00
Clement Jamin 5a6623c3fa Move typedef since Vector_3 is not available in all kernels
TODO: find a better fix later
2014-07-01 17:00:05 +02:00
Clement Jamin 1bb441317d Add missing CGAL_ prefix 2014-07-01 16:57:26 +02:00
Clement Jamin 134369d7f4 Reduce the number of points inserted. 2014-07-01 16:24:45 +02:00
Clement Jamin 9ca5bf92be Improve code and CMakeLists.txt for tests
There was no need for a CMake option here since the parallel code is tested by
specific cpp files.
2014-07-01 16:18:37 +02:00
Clement Jamin e3abf7fc40 Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin 2014-07-01 10:38:14 +02:00
Clement Jamin 7af8f8b768 Fix compilation with GCC 2014-06-30 19:58:44 +02:00
Clement Jamin f257b07d78 Fix type of the cell base 2014-06-30 19:57:52 +02:00
Clement Jamin 22e086e2ff Add a CMakeLists.txt file for T3 tests (needed for TBB) 2014-06-30 16:35:23 +02:00
Clement Jamin 82811b9a05 Tests of parallel DT and RT 2014-06-30 16:24:04 +02:00
Clement Jamin 82c89aa58e Fix template params 2014-06-30 15:52:24 +02:00
Clement Jamin 9eb766b039 CONCURRENT_MESH_3 => CGAL_CONCURRENT_MESH_3 2014-06-25 12:53:15 +02:00
Clement Jamin a09ed46810 Thread-safe version of incident_cells and incident_facets 2014-06-23 10:45:26 +02:00