Laurent Rineau
1f5fb012ba
Merge pull request #1015 from afabri/Mesh_3-accelerations-GF
...
Accelerate vertex removal in a 3D triangulation and saving a mesh
2016-04-22 15:24:06 +02:00
Andreas Fabri
abd9bfb125
std::map -> boost::unordered_map
2016-04-15 20:54:51 +02:00
Laurent Rineau
535c5bb5b2
Speed-up Triangulation_3::read_cells...
...
... by a factor 5 for big triangulations! The old code was using:
std::map<size_t, Vertex_handle> V;
std::map<size_t, Cell_handle> C;
whereas the indices are contiguous: from 0 to n. `std::vector` is a lot
better for that use case!
2016-04-06 16:03:55 +02:00
Andreas Fabri
64644c8c49
Init the doubles to avoid a warning
2016-03-02 16:31:52 +01:00
Sébastien Loriot
5e57abdc50
Merge remote-tracking branch 'cgal/releases/CGAL-4.7-branch' into HEAD
2016-02-18 17:01:59 +01:00
Andreas Fabri
4c477c853c
Accelerete 3D version of inexact_locate as we do it for 2D
2016-02-15 10:57:59 +01:00
Andreas Fabri
b623100175
split the dual() functions; make the power test check for the absence of weights
2015-12-08 11:27:14 +01:00
Sébastien Loriot
4318feeca0
remove deprecated class since CGAL 3.6
2015-11-24 01:15:21 +01:00
Clement Jamin
b6c1581456
Fix type
2015-10-28 11:06:46 +01:00
Clement Jamin
ebf4192456
Add missing copy constructor + improve code/formatting
2015-10-27 12:25:14 +01:00
Clement Jamin
6fc4dd7dd3
Enable parallel insertion of points with info
...
There was a bug preventing the parallelism to be activated when
using points with info
2015-10-27 12:17:58 +01:00
Sebastien Loriot
37ff880fb8
Merge pull request #58 from dfunke/ParallelInsertionWithInfo
...
Enable parallel insertion of points with info
2015-10-22 09:48:56 +02:00
Andreas Fabri
91543fd382
move header files to TDS_2 and TDS_3
2015-08-23 15:36:12 +02:00
Sébastien Loriot
9f14949e69
add missing protecting guards
2015-07-29 08:44:14 +02:00
Sébastien Loriot
62906461f2
fix out of array bound warning
2015-07-21 09:12:12 +02:00
Daniel Funke
b0eae3bebe
remove explicit copy constructor
2015-06-26 17:40:57 +02:00
Daniel Funke
51eb954081
correct profiler branch name
2015-04-22 13:11:39 +02:00
Daniel Funke
1c78d67a0f
correct comment
2015-04-22 13:11:21 +02:00
Daniel Funke
77e2f38d6c
move addition and deletion of tempoary points on far sphere into own methods
2015-04-22 13:10:15 +02:00
Daniel Funke
8d29fc6e6e
Enable parallel insertion of points with info
2015-04-16 17:40:05 +02:00
Laurent Rineau
434766c22b
Merge branch 'releases/CGAL-4.5-branch'
...
Approved by the Release Manager.
2015-01-30 11:30:49 +01:00
Laurent Rineau
72e0a3e677
Fix warnings about signed/unsigned
...
The code involved is about TBB.
2015-01-21 12:59:07 +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
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
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
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
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
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
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
82c89aa58e
Fix template params
2014-06-30 15:52:24 +02:00
Clement Jamin
a09ed46810
Thread-safe version of incident_cells and incident_facets
2014-06-23 10:45:26 +02:00
Clement Jamin
48a8abb278
Use Face_circulator for incident_cells_2
2014-06-23 09:20:57 +02:00
Clement Jamin
9f5927af61
Move function from C3T3_helpers to TDS
...
Move C3T3_helpers::get_incident_cells_without_using_tds_data to TDS::incident_cells_threadsafe
2014-06-23 08:21:09 +02:00
Sébastien Loriot
0230e979e2
Merge branch 'CGAL-use_leda-GF-OLD' into CGAL-use_leda-GF
...
Conflicts:
Arrangement_on_surface_2/test/Arrangement_on_surface_2/construction_test_suite_generator.cpp
Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_construction.cpp
Documentation/doc/Installation.txt
Kernel_23/include/CGAL/Exact_predicates_exact_constructions_kernel.h
2014-06-18 22:50:06 +02:00
Aymeric PELLE
c496b52d0c
The documentation of the member function swap is added.
...
rhs is renamed other in this member function.
2014-06-04 14:38:34 +02:00
Aymeric PELLE
250c079439
Implement the copy-and-swap idiom for the assigment operator.
2014-06-04 14:04:52 +02:00
Aymeric PELLE
144545cbf2
Fix Regular_triangulation_cell_base_with_weighted_circumcenter_3.
...
The default value for the template parameter 'Cell base' is replaced by
Regular_triangulation_cell_base_3. (The doc is updated.)
The operator= is fixed.
A test file is added for this class.
Trivial bug-fix for master
2014-06-03 19:34:29 +02:00
Clement Jamin
7145f7db0b
Replaced some C++11 lambda functions by functors +change mutex (static=>member)
2014-06-03 18:18:12 +02:00