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

1083 Commits

Author SHA1 Message Date
Laurent Rineau 434766c22b Merge branch 'releases/CGAL-4.5-branch' 
Approved by the Release Manager.
 2015-01-30 11:30:49 +01:00
Andreas Fabri 062ce726be it is operator -- and not - 2015-01-29 14:49:12 +01:00
Andreas Fabri f048bd9c50 fix figure with ref; add () to a function 2015-01-29 14:40:45 +01:00
Andreas Fabri d40c7919b6 remove Triangulation_hierarchy_3 from the classified reference pages 2015-01-29 14:10:33 +01:00
Andreas Fabri d5580a4b27 \cgalFigureCaptionEnd has no parameters 2015-01-29 09:20:23 +01:00
Laurent Rineau 62069ccfc2 Fix the image 
There was superfluous "arrows" in the cell.
 2015-01-28 17:40:30 +01:00
Laurent Rineau e7d4526c6d New figure, for vertex_triple_index 2015-01-28 16:41:12 +01:00
Laurent Rineau a00429cba1 Add the src files of figures of TDS_3 2015-01-28 16:11:15 +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 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
Guillaume Damiand ebc4300334 Header only for random.cpp. 
For the header only version, the global variable default_random no more exist => we need to replace all occurences of default_random by a call to the global function get_default_random().
As usual, no modification for the non header only version.
 2014-11-14 14:20:26 +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
Aurélien Vialon df9e315536 Correction of some problem (SDK Windows, REQUIERED thing...) and add of comments for findQt5.cmake. 2014-08-15 02:57:48 +02:00
Aurélien Vialon 2d65524aea All last demonstrations ported to Qt4or5. Need to check working of it on Linux. 2014-08-12 22:12:42 +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
Aurélien Vialon ab909badb9 Demonstrations AABB_tree, Alpha_shapes_3 and Circulat_kernel_3 ported. Working on Mesh_3, Polyhedron and Periodic_3_triangulation_3. 2014-07-03 15:07:00 +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
Aurélien Vialon aee9e4eb24 Commit of new demonstrations porting. 2014-06-26 14:38:23 +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
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
Clement Jamin 80e02ba85c We don't need C++11 anymore 2014-06-19 16:59:00 +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
Sébastien Loriot 5de63179f0 setMouseBindingDescription API has been updated in libQGLViewer 2.5.0 2014-06-18 15:45:22 +02:00
Aurélien Vialon 956bdabe0e Addition of find_package(Qt5) file and command into CMakeList of LCC, Triangulation_3 and Surface_mensher demonstrations. 2014-06-12 21:46:52 +02:00
Aurélien Vialon 6ec9415dc1 Demonstrations LCC and Trigulation_3 and surface mesher working. 2014-06-12 14:34:19 +02:00
Aymeric PELLE 4ca1c8a6c1 Remove some bad assert in test_RT_cell_base_with_weighted_circumcenter_3.cpp. 
These asserts should have tested that the wighted_circumcenter is well
invalidate in some cases. However, we can't access to the private pointer.
So we can't check that the pointer is NULL when invalidate_circumcenter is
called. These asserts tested that the new computed weighted circumcenter has
a different address after invalidate_circumcenter. But, that fact isn't
guaranteed.
 2014-06-05 15:02:13 +02:00
Aymeric PELLE 62fe81758a Rename test_regular_triangulation_cell_base_with_weighted_circumcenter_3.cpp. 
It generated a too long file path for some Windows tools (linker).
 2014-06-04 15:16:56 +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
Aurélien Vialon 5f09ccde1a Compilation effective de la demonstration Linear Cell Complex. Commencement du portage de Triangulation_3. 2014-06-01 22:46:14 +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
Andreas Fabri 3a0f46f1d2 suppress automatic link for 'Fast' 2014-05-19 09:59:44 +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 6721cb970c Fix include 2014-05-14 17:35:39 +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
Andreas Fabri 9299cce708 Add an example that compares a sequential and a parallel construction of Delaunay_3 2014-05-13 16:46:57 +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
Andreas Fabri d80d4508d6 typo 2014-05-13 14:38:26 +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
Jane Tournois 1b5f70c871 fix deprecation warning 2014-05-12 12:57:33 +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
Clement Jamin 6e8625845b Code and comments clean-up 2014-04-08 10:26:00 +02:00
Laurent Rineau 07cbf2f01b ConstructWeightedCircumcenter is a concept, not a constructor 2014-04-01 12:47:28 +02:00
Laurent Rineau 5147778ec8 Remove empty long descriptions. 
When the description only has one sentence, it must not end with a full
stop.
 2014-04-01 12:46:21 +02:00
Jane Tournois 359e0f5feb update package description according to previous commit 2014-03-31 12:39:20 +02:00
Jane Tournois b39babb6f1 replace TriangulationTraits_3 with specific Delaunay or Regular 
in cell bases documentation
 2014-03-31 12:34:39 +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
Jane Tournois 0f2a25ea2f replace "Traits" with "TriangulationTraits_3" wherever it's needed 2014-03-18 12:00:46 +01:00
Jane Tournois 1840916322 implement discussion about small feature v4.1 2014-03-17 16:28:19 +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 7b4195b3ad add typedef to delaunay cell base (doc) 2014-02-18 10:23:35 +01:00
Jane Tournois cb60322552 apply small fixes 2014-02-17 16:40:38 +01:00
Clement Jamin b00eb1ffa2 Fixes the doc according to Monique's review 2014-02-17 08:06:49 +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
Sébastien Loriot 9114db9085 restore figure source files removed in 0fa2cacb 
| commit 0fa2cacb60
  | Author: Sébastien Loriot <sebastien.loriot@cgal.org>
  | Date:   Tue Dec 3 17:27:02 2013 +0100
  |
  |     remove doc_tex documentation (including developer manual) and old manual tools
 2014-02-10 14:54:23 +01:00
Jane Tournois c6b0013475 apply doc bug fixes 2014-02-07 10:17:25 +01:00
Jane Tournois 7965a7b727 avoid the use of a deprecated class in documentation 2014-02-06 15:58:39 +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
Jane Tournois fc2be4f233 implement documentation improvements 2014-02-06 15:02:09 +01:00
Jane Tournois 94c78a771e change the "see also" 2014-01-24 12:36:27 +01:00
Jane Tournois 3cffb10ccf remove "see also" to deprecated class 2014-01-24 12:27:10 +01:00
Jane Tournois b4b367deae make cell base Delaunay in DT3 2014-01-24 12:15:23 +01:00
Jane Tournois fa2568d9b1 fix weighted_circumcenter() 2014-01-24 11:55:42 +01:00
Jane Tournois 88666391da introduce weighted_circumcenter() for RegularTriangulationCellBase_3 
weighted_circumcenter() replaces circumcenter() in the regular framework,
which is not a member of TriangulationCellBase_3 anymore.

Triangulation_cell_base_with_circumcenter_3 is deprecated and replaced by:
Delaunay_triangulation_cell_base_with_circumcenter_3
and
Regular_triangulation_cell_base_with_circumcenter_3.

Implement the changes in documentation, Triangulation_3 code and Mesh_3 code.
 2014-01-16 16:55:19 +01:00
Jane Tournois 63a0262e74 fix documentation of Triangulation_cell_base_with_circumcenter_3 
the base class should be Cb, that implements TriangulationCellBase_3 OR
RegularTriangulationCellBase_3
 2014-01-10 16:18:19 +01:00
Jane Tournois a95c93cfe5 more minor documentation bug fixes 2014-01-10 15:13:52 +01:00
Jane Tournois b35a610b12 fix inheritance of cell bases 
there were conflicts between Point (weighted) and Bare_point
as return types of the circumcenter() function
 2014-01-10 14:55:15 +01:00
Jane Tournois 7b55c30ba5 fix the use of Triangulation_cell_base_with_circumcenter 
Triangulation_cell_base_with_circumcenter should not be responsible for
computing the circumcenter value. It is only responsible for its caching.
The Cell_base used as second template parameter should make the construction,
in the circumcenter() function.

Also fix the order of derivation in Mesh_cell_base_3
 2014-01-10 14:31:02 +01:00
Jane Tournois 93c596d23a fix last commit. 
DelaunayTriangulationTraits_3 has already been turned to TriangulationTraits_3
but this 'Delaunay' has been forgotten.
 2014-01-10 14:05:53 +01:00
Jane Tournois feb309fcb3 add some extra precision 2014-01-09 14:49:44 +01:00
Jane Tournois 14087917e6 documentation bug fix : 
- add a Point_3 type to TriangulationCellBase_3.h
- do not use DelaunayTriangulationTraits everywhere but TriangulationTraits as often as possible
 2014-01-09 14:43:26 +01:00
Jane Tournois bf9e964f0e remove macro CGAL_REGULAR_TRIANGULATION_3_USE_CIRCUMCENTER_CACHE 
has been checked and is always activated
 2014-01-09 12:05:50 +01:00
Jane Tournois 9b68754c47 fix documentation 2014-01-06 12:24:40 +01:00
Jane Tournois 88eddc7e8b Merge branch 'Triangulation_3-regular_cell_base_with_circumcenter-GF-old' into Triangulation_3-regular_cell_base_with_circumcenter-GF 2014-01-03 18:03:01 +01:00
Jane Tournois 5fe628385a * added a circumcenter member function 
to be used for cached weigthed circumcenters.
 2014-01-03 17:49:49 +01:00
Jane Tournois 43de5769cb Revert "added a circumcenter member function" 
This reverts commit d21d374732.

this file is obsolete and replaced by a .h file for doxygen
 2014-01-03 17:48:13 +01:00
Jane Tournois 7ad8520d8f Merge branch 'Mesh_3-add_sliver_perturber_criteria-GF-old' into Mesh_3-add_sliver_perturber_criteria-GF 2013-12-10 15:58:46 +01:00
Clement Jamin f35ceac262 Doc: fix the wrong "inherited by" and "inherits" 2013-12-09 15:40:50 +01:00
Clement Jamin bdd16dccdb Doc: typos and minor changes following Monique's review. 2013-12-05 17:45:40 +01:00
Sébastien Loriot 0fa2cacb60 remove doc_tex documentation (including developer manual) and old manual tools 2013-12-03 17:27:02 +01:00
Jane Tournois 0812cc5686 documentation bug fix for inexact_locate 
inexact_lodate that needs x(), y() and z() functions to be available on query point
 2013-12-02 14:51:52 +01:00
Olivier Devillers d8197fb718 merge master and Triangulation 2013-11-29 13:40:14 +01:00
Clement Jamin 1d58bfb1da Changed encoding (UTF8) 2013-11-27 10:09:02 +01:00
Clement Jamin 651dd7dc50 Changed encoding (UTF8) 2013-11-26 12:52:25 +01:00
Clement Jamin fdc154ddb0 Changed encoding 2013-11-26 10:30:44 +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 14850a1703 add missing examples in doc 2013-11-12 10:44:06 +01:00
Sébastien Loriot ef95745bba fix hierarchy of examples 2013-10-24 16:41:06 +02:00
Jane Tournois c557164a44 Merge branch 'Mesh_3-add_sliver_perturber_criteria-GF-old' into Mesh_3-add_sliver_perturber_criteria-GF 2013-10-24 16:28:10 +02:00
Laurent Rineau 3ad8f223cd Fix the documentation of the Tds parameters of cell base classes 
And add see also between Compact_mesh_cell_base_3 and Mesh_cell_base_3.
 2013-10-16 16:34:41 +02:00
Clement Jamin d3a9b3c46d Parallel T3 speed-up chart. 2013-10-16 13:03:49 +02:00
Clement Jamin e7f0e99cfa More details about parallelism 2013-10-16 12:41:41 +02:00
Clement Jamin 6b65ad71da Changes in the "lock data structure" concept and models 
The concept is now much more generic (SurjectiveLockDataStructure).
The names have been changed accordingly.
 2013-10-16 12:17:56 +02:00
Clement Jamin 0d0d54277d Doc corrections according to Monique's review + clean-up conflicts marks 2013-10-15 16:42:00 +02:00
Clement Jamin 18fb7fb37a Small enhancements in the TDS & T3 doc 2013-10-15 15:47:19 +02:00
Clement Jamin bd9c3abf91 Doc: explain Concurrency_tag 2013-10-15 15:31:47 +02:00
Clement Jamin 4273b11f63 TDS: implementation history 2013-10-15 11:19:51 +02:00
Clement Jamin 5101c3d2e7 Added my name in a few places + implementation history 2013-10-15 11:14:58 +02:00
Clement Jamin 26c3ce0c40 Doc: the parallel DT3 must use the default compact location policy 2013-10-15 11:04:50 +02:00
Clement Jamin 8ec2a3eb2f Corrected the typedefs 2013-10-15 10:46:49 +02:00
Clement Jamin 29525dfcb7 Back-quotes for could_lock_zone and true + minor fixes + replace 0 by NULL 2013-10-15 10:27:35 +02:00
Clement Jamin 85bba6fa44 Minor fixes in the doc. 2013-10-15 10:06:24 +02:00
Clement Jamin 72d877ffc7 Updated the TDS typedef in the T3 demo 2013-10-14 17:55:13 +02:00
Clement Jamin f55d87fb33 Clarify the Concurrency_tag documentation 2013-10-14 17:52:45 +02:00
Laurent Rineau 240385d011 Add expensive assertions to check the circumcenter cache 2013-10-14 17:12:54 +02:00
Clement Jamin a27e2d225f Moved "Parallel Algo" into section "Software Design" 2013-10-03 17:32:44 +02:00
Clement Jamin 495330542f Custom CMakeLists.txt for T3 examples (parallel code) 2013-10-02 18:46:26 +02:00
Clement Jamin c4c736ed36 Added parallel examples in user doc 2013-10-02 18:25:45 +02:00
Clement Jamin 6a22496da1 Removed useless #include 2013-10-02 18:25:22 +02:00
Clement Jamin b14ae925cd Added parallel examples 2013-10-02 18:15:48 +02:00
Clement Jamin 985eac26f5 Added examples for parallel triangulations 2013-10-02 18:05:52 +02:00
Clement Jamin ffd3bc7d1e Removed unused type 2013-10-02 17:48:48 +02:00
Clement Jamin 9aeba5f5f5 Documentation: added Lock_data_structure typedef 2013-10-02 17:43:24 +02:00
Clement Jamin 88ed4cc924 Removed strategies in T3 benchmark and Dummy TDS 2013-10-01 17:27:21 +02:00
Clement Jamin 72aaf18f49 Minor fixes in documentation 2013-10-01 17:25:44 +02:00
Clement Jamin 2706cbfeff Compact_container: erase counter strategy is now automatically deduced from T. 
If the T::increment_erase_counter() function exists, then the erase counter
value will be updated by the Compact_container.
 2013-09-30 18:25:41 +02:00
Clement Jamin 2944261214 Merge branch 'Mesh_3-parallel-cjamin' of ssh://scm.cgal.org/var/git/cgal into Mesh_3-parallel-cjamin 2013-09-25 10:50:46 +01: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
Clement Jamin a173372321 Fixes for GCC + removed trailing spaces 2013-09-25 11:18:18 +02:00
Andreas Fabri 5c454cec64 add missing includes 2013-09-13 12:43:01 +02:00
Laurent Rineau bc03aaf30b Put doc/ in the global dont_submit file 2013-08-20 10:57:03 +02:00
Sébastien Loriot e92ed28faa Merge branch 'Triangulation_3-fix_insert_with_info_fast_location-local' 
bug-fix: make the function inserting a range of points with info
         working with the Fast_location tag

Successfully tested in 4.3-Ic-113
 2013-08-09 18:13:38 +02:00
Sébastien Loriot 9a8eeb8867 remove Figure work added by the macro+postprocessing 2013-08-08 23:01:09 +02:00
Sébastien Loriot 197b9210ee add missing advanced 2013-08-08 20:02:07 +02:00
Sébastien Loriot 9c2f35ed1a using cgalHeading instead of h3 2013-08-07 10:06:49 +02:00
Sébastien Loriot d282ade623 use \cgalCite instead of \cite 
using perl -i -pe 's/\\cite\s*{?([a-zA-Z0-9:-]+)}?/\\cgalCite{$1}/g'
 2013-08-05 18:25:26 +02:00
Sébastien Loriot 5676ca70cf add missing \cite 2013-08-05 17:07:46 +02:00
Sébastien Loriot ded66799a6 make the insertion of a range of points with info working with hierarchy 2013-08-05 15:03:46 +02:00
Sébastien Loriot 35533f760c link less 2013-08-05 12:11:06 +02:00
Sébastien Loriot a5b291bc19 link less 2013-08-05 12:09:35 +02:00
Sébastien Loriot 31c2cecdda change order 2013-08-05 10:31:13 +02:00
Sébastien Loriot 6d9aeba4f2 add missing links 2013-08-05 09:48:45 +02:00
Sébastien Loriot e1465ce617 add missing template parameter 
requested by Monique
 2013-08-05 09:18:41 +02:00
Sébastien Loriot da4fccda97 remove doc of hierarchy vertices and triangulation, deprecated since 3.6 2013-08-05 09:12:07 +02:00
Sébastien Loriot f2219bfa46 update classifed ref man 2013-08-05 09:03:23 +02:00
Sébastien Loriot 56faf80e3d Merge branch 'Triangulation_3-array-glisse' 
fixes  array initialization in c++11

Successfully tested in CGAL-4.3-Ic-103
Approved by the interim release manager
 2013-07-29 07:44:03 +02:00
Sébastien Loriot b2ef3b8673 Merge branch 'doc-remove_gif-local' 
Successfully test in CGAL-4.3-Ic-102

This commit fixes a few issues in the doxygen documentation and in particular
the figure for the generation of latex doc.

Approved by the interim release manager

xplain why this merge is necessary,
 2013-07-26 17:50:07 +02:00
Sébastien Loriot 2dfe8a3d73 workaround for a doxygen bug: remove space after /!* to avoid a verbatim env 
this happens if you have an empty line or the text directly after /!*
to find them in the generated documentation, grep for "pre class=\"fragment\""
(a few of them are legitimate however)
 2013-07-25 14:58:53 +02:00
Sébastien Loriot 143a2181b3 add latex format for \imagei doxygen command 
perl -pe 's/^(\s*)\\image\s+html\s+(.*)\s*$/$1\\image html $2\n$1\\image latex $2\n/' -i
 2013-07-25 11:50:53 +02:00
Sébastien Loriot 74a1ac055e remove pdf files from doxygen doc include path 2013-07-25 11:15:18 +02:00
Sébastien Loriot 519b301130 remove gif files from doxygen doc include path 2013-07-25 11:14:16 +02:00
Sébastien Loriot 4389b0bac8 remove the usage of gif in the doxygen doc as pdflatex does handle them 
replace the files with png
 2013-07-25 11:06:13 +02:00
Clement Jamin 5c17ff1591 Adjustments in the doc following some discussions with Mariette. 2013-07-24 15:06:07 +02:00
Clement Jamin 18895e6f42 Use the TBB's scalable allocator in a few places 
=> better scalability of the parallel remove
 2013-07-23 17:51:06 +02:00
Clement Jamin fc10668b31 Spelling mistake + minor change 2013-07-23 17:17:38 +02:00
Marc Glisse 530f20179c Finish Philipp's patch on initializing arrays. 2013-07-23 15:58:04 +02:00
Clement Jamin 8aaee67985 Removed some "p_" prefixes in variable names 2013-07-12 15:49:45 +02:00
Clement Jamin a664003024 Doc fix 2013-07-12 15:08:29 +02:00
Clement Jamin 1eae99f042 Doc: escaped double quotes + use unspecified_type instead of Hidden_type 2013-07-12 15:01:41 +02:00
Clement Jamin f5e6d4e00d More replacement in the doc of \R by \mathbb{R} 
(cherry picked from commit 2ddd815832)
 2013-07-10 19:41:39 +02:00
Clement Jamin 2ddd815832 More replacement in the doc of \R by \mathbb{R} 2013-07-10 19:40:29 +02:00
Sébastien Loriot 33f0193644 replace in the doc \R by \mathbb{R} 
\R is not a valid latex command
I used: sed -i 's/\\f$\s*\\R/\\f$ \\mathbb{R}/g'

(cherry picked from commit d4d9bc212b)
 2013-07-10 17:22:29 +02:00
Sébastien Loriot d4d9bc212b replace in the doc \R by \mathbb{R} 
\R is not a valid latex command
I used: sed -i 's/\\f$\s*\\R/\\f$ \\mathbb{R}/g'
 2013-07-10 17:07:43 +02:00
Clement Jamin 09d75308fb Untabify 2013-07-02 18:16:22 +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
Clement Jamin b0e1f0ead1 Benchmark "Delaunay with Fast_location" for sequential benchmark only 2013-07-02 13:48:22 +02:00
Clement Jamin 159ca5fab8 Remove the "TBB malloc proxy" recommendation, since we don't use it anymore 2013-07-02 13:32:15 +02:00
Clement Jamin fcdf906f06 Option to add temporary points on a far sphere before insertion 
Helps to reduce contention on the infinite vertex
But removing those points in the end takes time
so it's only worth it when points lie on a surface.
 2013-07-02 12:57:26 +02:00
Clement Jamin 8181587ed7 Fix tabs + better profiling 2013-07-02 11:37:32 +02:00
Jane Tournois 56d733b254 Merge remote-tracking branch 'origin/Mesh_3-improvements-GF' 
Several improvements of Mesh_3, including
- speedup of optimizers,
- make inexact_locate public in Triangulation_2 and Triangulation_3,
- compactify mesh_cell_base and mesh_vertex_base,
- fix of documentation,
- and more

Small feature :
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Various_improvements_of_Mesh_3

Approved by the release manager.
 2013-07-01 16:25:56 +02:00
Clement Jamin 04c1a83977 Minor alignment change 2013-06-28 15:18:13 +02:00
Clement Jamin 079c39eef4 Update CMakeLists according to changes in FindTBB 2013-06-28 15:16:49 +02:00
Clement Jamin 2dc6c405b8 Drop the use of the TBB malloc proxy, use TBB allocators manually instead 
The TBB's "malloc proxy", which allows to replace all calls to the standard
allocators by calls to the TBB scalable allocator, is not available on MacOS.
Instead, we use the TBB allocators manually, where relevant.
 2013-06-27 15:29:47 +02:00
Laurent Rineau 0033b19157 Fix a precondition (bad copy paste from `vertex_triple_index()`) 2013-06-25 17:05:47 +02:00
Jane Tournois dcf22e09bb improve documentation for inexact_locate (because 'inexact_locate' does not come after 'locate' in the output of long descriptions of functions) 2013-06-24 13:28:44 +02:00
Jane Tournois 404f2e0e3c merge 2013-06-21 10:01:19 +01:00
Sébastien Loriot 716f87d2d7 rename Hidden_type to unspecified_type and update its description 2013-06-13 18:48:58 +02:00
Clement Jamin d0ca823aa8 Doc minor change 2013-06-11 13:23:54 +02:00
Clement Jamin bc360c8b13 Changes for GCC compilation + removed some trailing spaces 2013-06-07 17:40:53 +02:00
Clement Jamin 440a654a58 Added a concurrency-safe version of DT3::find_conflicts + better doc 2013-06-05 17:23:19 +02:00
Clement Jamin b43f28c6ab Renamed p_could_lock_zone + use NULL instead of 0 + CGAL_TRIANGULATION_3_PROFILING 2013-06-05 13:44:34 +02:00
Ross Hemsley 4d9caf3763 Added names that were missing into the Doxyfile.in entries. 
Also modified Installation/CMakeLists.txt to push the version number variable to the parent level
so that it can be accessed by the documentation
 2013-05-30 17:55:43 +02:00
Philipp Möller d4e379ba82 Small fixes in the generated Doxyfile.in 2013-05-30 15:32:33 +02:00
Philipp Möller 4d469821f7 Generated Doxyfile.in and dependencies 2013-05-30 14:13:47 +02:00
Jane Tournois 6b63e0585c fix documentation of inexact_locate 2013-05-30 11:02:17 +02:00
Jane Tournois efec975bd8 add comment about what inexact_locate returns when triangulation is not in full dimension 2013-05-28 16:08:05 +02:00
Jane Tournois af93d9b5ad doc improvement suggested by Monique 2013-05-28 16:03:27 +02:00
Clement Jamin dbe1c9c597 Reversed the "facet_not_in_its_cz" variables by removing the "not" 2013-05-28 15:56:22 +02:00
Clement Jamin eeeb6cc841 Smaller tag names (continued) 2013-05-28 15:42:39 +02:00
Clement Jamin 127926aa14 Proof-reading + minor changes 
Renamed unlock_all_tls_locked_locations => unlock_all_points_locked_by_this_thread
 2013-05-28 15:07:20 +02:00