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
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
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
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