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

486 Commits

Author SHA1 Message Date
Guillaume Damiand 2fbce8a8db Remove spaces. 2016-10-06 08:26:16 -04:00
Guillaume Damiand 7620635cfe * Bugfix in correct_invalid_attributes in LCC 
* Remove deprecated code in LCC (that should be removed for CGAL 4.9)
 2016-10-06 08:19:04 -04:00
Laurent Rineau 3fac1b31f0 Fix typos (and compilation errors!) 2016-10-03 12:12:46 +02:00
Andreas Fabri cf8c1a6cdf Dispatch import functions to Polyhedron, T2, T3 2016-09-30 15:23:15 +02:00
Andreas Fabri 91c6426ae2 Move info_check from T3 to T2 2016-09-30 15:22:28 +02:00
Andreas Fabri 21ad968457 Fix package Triangulation_3: Add #include 2016-09-30 15:22:27 +02:00
Clement Jamin fa6ecf39be Merge branch 'Triangulation-add_regular_tri-cjamin_mglisse-old' into Triangulation-add_regular_tri-cjamin_mglisse 2016-09-09 12:55:43 +02:00
Sébastien Loriot 7f3772a50b replace the usage of raw pointer as property map 
It was deprecated in boost 1.55
http://www.boost.org/users/history/version_1_55_0.html
 2016-07-13 13:53:00 +02:00
Clement Jamin 9487c71ad1 Merge branch 'Triangulation-add_regular_tri-cjamin_mglisse-old' into Triangulation-add_regular_tri-cjamin_mglisse 2016-05-18 19:41:22 +02:00
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
Clement Jamin 20dd524de8 Merge branch 'Triangulation-add_regular_tri-cjamin_mglisse-old' into Triangulation-add_regular_tri-cjamin_mglisse 2015-12-08 17:16:16 +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 003b435a46 Merge branch 'Triangulation-add_regular_tri-cjamin_mglisse-old' into Triangulation-add_regular_tri-cjamin_mglisse 2015-11-20 11:53:44 +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
Clement Jamin 8081234930 Merge branch 'Triangulation-add_regular_tri-cjamin_mglisse-old' into Triangulation-add_regular_tri-cjamin_mglisse 2015-10-16 10:59:18 +02:00
Clement Jamin bcb523ba3e Merge branch 'Triangulation-add_regular_tri-cjamin_mglisse-old' into Triangulation-add_regular_tri-cjamin_mglisse 2015-09-09 14:21:30 +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
Clement Jamin 5f8ca65abf Merge branch 'Triangulation-add_regular_tri-cjamin_mglisse-old' into Triangulation-add_regular_tri-cjamin_mglisse 2015-03-25 13:48:38 +01: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 2f4bb69e0a Merge branch 'Triangulation-add_regular_tri-cjamin_mglisse-old' into Triangulation-add_regular_tri-cjamin_mglisse 2014-12-18 10:59:01 +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 03253edf19 Merge branch 'Triangulation-add_regular_tri-cjamin_mglisse-old' into Triangulation-add_regular_tri-cjamin_mglisse 2014-09-09 14:35:38 +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
Clement Jamin 30e47d01a1 Added the ability to export the surface 2014-06-17 14:54:10 +02:00
Clement Jamin eebad0e1a4 Add applications to help comparison between T2/T3 and Td 2014-06-16 19:35:04 +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
Clement Jamin 05efa677a1 Merge branch 'Triangulation-higher_dimensions-odevil_shornus-old' into Triangulation-higher_dimensions-odevil_shornus 
Conflicts:
	NewKernel_d/include/CGAL/NewKernel_d/Cartesian_LA_functors.h
	NewKernel_d/test/NewKernel_d/Epick_d.cpp
 2014-05-28 14:53:26 +02:00
Clement Jamin c9c8335811 More code clean-up 2014-05-27 13:46:34 +02:00
Clement Jamin ce17a717c7 Restore some profiling code and remove some 2014-05-27 13:33:33 +02:00
Clement Jamin 2f78d27bd3 Code clean-up 2014-05-27 13:21:16 +02:00
Clement Jamin dfe800bc40 Clean-up debug code (global lock) 2014-05-27 12:16:29 +02:00
Sébastien Loriot 3fa09693a3 Merge branch 'Mesh_3-compare_index-GF-old' into Mesh_3-compare_index-GF 
Conflicts:
	Mesh_3/include/CGAL/Mesh_3/Detect_features_in_polyhedra.h
	Mesh_3/include/CGAL/Mesh_domain_with_polyline_features_3.h
	Mesh_3/include/CGAL/Mesh_polyhedron_3.h
	Mesh_3/test/Mesh_3/test_meshing_polylines_only.cpp
	STL_Extension/include/CGAL/Compact_container.h
	STL_Extension/test/STL_Extension/test_Compact_container.cpp
 2014-05-21 18:24:17 +02:00
Clement Jamin f3c00442fd Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin 2014-05-14 19:05:40 +02:00
Clement Jamin db3a642de4 Missing include 2014-05-14 17:35:16 +02:00
Andreas Fabri 7e00af50f5 Merge branch 'Triangulation_3-faster_incident_edges-GF' 
Approved by the release manager
 2014-05-14 17:03:41 +02:00
Jane Tournois e97506adb7 Merge branch 'Triangulation_3-regular_cell_base_with_circumcenter-GF' 
Resolve conflicts in Mesh_3/include/CGAL/Mesh_3/config.h

This branch implements the small feature described here :
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/circumcenter%28%29_in_RT3_cell_base

It makes consistent implementations of dual(cell) in RT3 and DT3 :
they both return cell->circumcenter(gt) now

Approved by the release manager
 2014-05-13 14:52:13 +02:00
Jane Tournois 8bc6e6136d fix a warning from clang. Actually highlighted a real error : gt was missing 2014-05-12 14:55:11 +02:00
Andreas Fabri 3d0e6f2a4f boost::unorerdered_set::reserve() was only introduced with Boost 1.50 2014-05-09 11:08:38 +02:00
Andreas Fabri 1ff9694206 int -> std::size_t 2014-05-08 13:41:33 +02:00
Andreas Fabri 3cc64eb19e Call unordered_set::reserve() 2014-05-07 11:51:25 +02:00
Andreas Fabri 2ed094d23c cleanup 2014-05-07 11:14:36 +02:00
Andreas Fabri d1a6046fcd Vertex_extractor gets a partial specialisation for Vertex::Has_visited 2014-05-07 11:00:05 +02:00
Andreas Fabri 09876e23fa Add bool visited to the Vertex in order to avoid a map 2014-04-29 14:04:27 +02:00
Andreas Fabri 3812e53d64 Add flat_set 2014-04-29 06:47:32 +02:00
Andreas Fabri d74653ece0 Replace std::map by boost::unordered_map in TDS_3::incident_edges 2014-04-28 16:18:13 +02:00
Clement Jamin e07baefb17 Change the way we compute the exact circumcenter when needed 
In some rare cases, we need to switch to exact computation for the circumcenter.
Some code for this computation is now moved from RT3 to Refine_facets.
 2014-04-15 18:54:12 +02:00
Andreas Fabri a45ed40f5d Do not use the call stack for a recursive function as it may overflow 2014-03-25 16:01:27 +01:00
Andreas Fabri 18e85a1cea Switch on a workaround using a CGAL_CFG ... 2014-03-24 17:52:31 +01:00
Andreas Fabri 24f78ce6de Hack for the new problem with 'using' for VC12 
We have to find out where the real problem is.
 2014-03-20 16:47:25 +01:00
Clement Jamin 89d2d6a612 Merge branch 'Triangulation-higher_dimensions-odevil_shornus-old' into Triangulation-higher_dimensions-odevil_shornus 2014-03-19 13:00:57 +01: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
Jane Tournois bf03d6964d remove useless diff with integration 2014-02-24 14:37:20 +01:00
Jane Tournois 0740b3652f add class Has_timestamp not to modify the API of Compact_container 
- use the Has_timestamp operator in Compact_container
- add partial specialization to classes that need the time stamp (i.e.
Mesh_vertex_base, Compact_mesh_cell_base_3 and Mesh_cell_base_3)
- remove "ts" from classes where they were actually needed for compilation
purpose only (i.e. Kd_tree_node and Triangulation_ds_cell_base_3)
- rename "ts" to time_stamp_
 2014-02-20 15:53:36 +01:00
Jane Tournois 6db28ed43d move ts from Tds to Compact_container 
Tds now is back to its original version (not different from master)
 2014-02-14 17:15:33 +01:00
Jane Tournois ffc3bdfc2f there is no need to compare "ts". Comparing Vertex_handle's is enough 2014-02-14 15:22:54 +01:00
Jane Tournois 8d7ec0ef19 use time stamps in make_canonical(vertex_triple) 2014-02-14 12:55:29 +01:00
Andreas Fabri 83546c53b1 Add a time stamp in vertices and cells of triangulations and polyhedra 
and use this for operator< of handles in order to make mesh generation
 deterministic
 2014-02-13 19:46:34 +01:00
Jane Tournois 75771bacb3 rename Regular_triangulation_cell_base_with_circumcenter_3 
to Regular_triangulation_cell_base_with_weighted_circumcenter_3
 2014-02-06 15:50:38 +01:00