Laurent Rineau
ad23db27a3
Merge pull request #4795 from janetournois/Mesh_3-fix_optimisers_parallel-jtournois
...
Mesh_3 - fix parallel optimisers
2020-06-30 16:36:58 +02:00
Jane Tournois
bce4b4e80a
Revert "add an assertion in make_canonical"
...
This reverts commit f55ffabbe0 .
In the exuder, it can happen that this function takes the triple
(Vertex_handle(), Vertex_handle(), Vertex_handle())
so the assertion does not hold
2020-06-26 14:57:02 +02:00
Laurent Rineau
bcf8409e46
Merge pull request #4611 from rathod-sahaab/replace-throws-with-noexcept
...
replaced throw() with noexcept
2020-06-23 18:50:20 +02:00
Jane Tournois
3b8c06f836
fix adjacent_vertices_threadsafe
...
internal::Has_member_visited<Vertex> is not threadsafe
2020-06-19 13:31:52 +02:00
Jane Tournois
daaf92d0ac
rename make_canonical() to make_canonical_oriented_triple()
...
to make it more explicit
2020-06-19 13:31:51 +02:00
Jane Tournois
f55ffabbe0
add an assertion in make_canonical
...
it also helps to make the code more explicit
2020-06-19 13:31:51 +02:00
Jane Tournois
ad9c357f33
add adjacent_vertices_threadsafe and use it in nearest_power_vertex()
2020-06-19 13:31:50 +02:00
Laurent Rineau
dcc4fb1cc1
Merge remote-tracking branch 'cgal/master' into CGAL-move_semantic_for_triangulations-GF
...
# Conflicts:
# STL_Extension/include/CGAL/Compact_container.h
2020-05-20 09:46:26 +02:00
Jane Tournois
9a722c4ef1
Merge branch 'master' into Triangulation_segment_traverser_3-tvanlank__rewrote_history-GF
2020-04-20 06:40:24 +02:00
Jane Tournois
0e45fdc64e
use "permanent" coplanar_orientation() and collinear()
...
instead of generating it on the fly each time
2020-04-16 14:18:01 +02:00
Sébastien Loriot
a49881536d
fix compilation errors and warnings
2020-04-10 18:30:50 +02:00
Sébastien Loriot
d845d6ce8d
Merge remote-tracking branch 'cgal/master'
2020-04-10 18:16:18 +02:00
Sébastien Loriot
2876ad9af1
remove trailing whitespaces
2020-04-10 18:15:32 +02:00
Mael Rouxel-Labbé
c16c1a7ea3
Merge remote-tracking branch 'cgal/master' into CGAL-Optimal_bounding_box-GF
2020-04-10 16:10:11 +02:00
Jane Tournois
163f3c59fb
add range iterators
2020-04-07 07:05:19 +02:00
Jane Tournois
a69d3f1188
replace all the std::get<i>(tuple) by private accessors
...
the code gets easier to read and write
2020-04-06 13:23:39 +02:00
Jane Tournois
2eadd494a8
replace CGAL::cpp11::tuple by std::tuple
2020-04-06 07:02:21 +02:00
Jane Tournois
1ef0d4b83d
segment traverser end() does not need s and t as parameters
...
the API gets simpler and easier with these changes
+ fix last valid value of the simplex iterator in some cases
after this commit, only the test test_triangulation_on_a_grid() keeps failing
2020-04-03 18:02:37 +02:00
Jane Tournois
b9660603b9
add the new API in the code
...
and adapt examples and tests consistently
2020-04-03 06:52:25 +02:00
Maxime Gimeno
b6a5f23e4e
remove trailing whitespaces
2020-04-02 15:02:27 +02:00
rathod-sahaab
dbbee667af
replaced throw() with noexcept
2020-04-02 18:31:00 +05:30
Maxime Gimeno
e02a3fc37e
Merge remote-tracking branch 'cgal/master' into TDS-file_input-maxGimeno
2020-04-02 15:00:23 +02:00
Maxime Gimeno
383eb3d147
Merge tag 'master_before_no_tws_nor_tabs' into TDS-file_input-maxGimeno
2020-04-02 14:56:03 +02:00
Jane Tournois
3aae44f631
apply Monique's doc review
2020-04-02 07:44:53 +02:00
Jane Tournois
a1b292e805
Merge remote-tracking branch 'cgal/master' into Triangulation_segment_traverser_3-tvanlank__rewrote_history-GF
2020-04-01 13:52:57 +01:00
Sébastien Loriot
d1a323c730
extra run of the script to remove tabs and trailing whitespaces
2020-03-26 19:24:14 +01:00
Sébastien Loriot
86e25f7e71
Update branch from master after trailing whitespaces and tabs removal
2020-03-26 19:23:54 +01:00
Sébastien Loriot
9f2eafd06e
extra run of the script to remove tabs and trailing whitespaces
2020-03-26 19:17:02 +01:00
Sébastien Loriot
35b83deffd
Update branch from master after trailing whitespaces and tabs removal
2020-03-26 19:16:25 +01:00
Sébastien Loriot
8bb22d5b2c
extra run of the script to remove tabs and trailing whitespaces
...
right after the merge of the 5.0 release branch
+ manual fix of the files (indentation was changed in the meantime):
* Spatial_sorting/include/CGAL/Multiscale_sort.h
* Spatial_sorting/test/Spatial_sorting/test_multiscale.cpp
2020-03-26 14:26:59 +01:00
Sébastien Loriot
8b153fb495
Merge branch 'cgal/releases/CGAL-5.0-branch'
...
whitespace+tab removal, merged with option -Xignore-space-change
2020-03-26 14:22:32 +01:00
Sébastien Loriot
0779373835
extra run of the script to remove tabs and trailing whitespaces
...
right after the merge of 4.14 release branch
+ manual fix on one line in:
* Arrangement_on_surface_2/include/CGAL/IO/Arr_text_formatter.h
* .travis/generate_travis.sh
2020-03-26 14:16:06 +01:00
Sébastien Loriot
590612a563
run the script to remove tabs and trailing whitespaces
2020-03-26 13:25:16 +01:00
Mael Rouxel-Labbé
2556196dad
Merge remote-tracking branch 'cgal/master' into CGAL-Optimal_bounding_box-GF
2020-03-23 08:59:49 +01:00
Sébastien Loriot
149c7a4afc
Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch'
2020-03-19 16:29:33 +01:00
Sébastien Loriot
d10359d09e
Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch'
2020-03-19 16:27:55 +01:00
Mael Rouxel-Labbé
100304667d
Remove CGAL::internal::boost_::function_property_map
...
This file was duplicated from BOOST 1.64 because it appeared in a boost
release that was younger than the oldest boost release supported by CGAL
when the file was first required.
The minimum boost version (1.57) now required by CGAL is younger
than the version in which the file appeared in boost (1.51)
and it can thus be removed.
2020-03-12 20:58:44 +01:00
Mael Rouxel-Labbé
fe1fd95d23
Fix always returning by copy when it is possible to return by reference
2020-03-09 15:31:51 +01:00
Maxime Gimeno
52cf9815e4
Remove free function and fix TDS3 test
2020-02-28 15:33:03 +01:00
Maxime Gimeno
66cd3401f9
Add a generic function in TDS_3 that takes a boolean argument to decide how to take care of the infinite_vertex, and use it in the T3 functions.
2020-02-26 10:57:55 +01:00
Laurent Rineau
7508a6f93c
Merge remote-tracking branch 'cgal/master' into CGAL-move_semantic_for_triangulations-GF
2020-02-12 17:05:49 +01:00
Laurent Rineau
24082a7114
Fix compilation errors, with a few compiler
...
```
include/CGAL/Triangulation_hierarchy_3.h:163:23: error: invalid use of 'this' at top level
noexcept(noexcept(this->Tr_Base::swap(tr)))
^~~~
```
That is actually the subject of a C++ Defect:
http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#1207
Anyway, this was used only for the `noexcept` specification of `swap`
functions, and I no longer use `swap` for the move semantic. I can
remove those noexcept` specifications.
2020-02-12 16:30:26 +01:00
Guillaume Damiand
72cb67bfff
Allows to deal with weighted points.
2020-02-12 10:34:15 +01:00
Mael
35f895db66
Merge branch 'master' into Spatial_sort-parallel-GF
2020-02-06 12:00:33 +01:00
Laurent Rineau
4261d4635b
Less use of swap
2020-02-04 10:12:29 +01:00
Laurent Rineau
20bb2c8428
Add move-semantic to CT_plus_2 and Tr_hierarchy_2
2020-01-31 16:28:07 +01:00
Laurent Rineau
290c3a2011
I forgot Triangulation_hierarchy_3 (Fast_location)!
...
Note that a move-from object of class `Triangulation_hierarchy_3` is
not really valid. I have just verified that it can be destroyed. Even
a call to `clear()` on a moved-from hierarchy will segfault!
To be fixed later...
2020-01-31 13:22:11 +01:00
Laurent Rineau
b311ab59ed
[modernize-use-nullptr] (clang-tidy)
2020-01-31 12:11:16 +01:00
Laurent Rineau
2717864bd7
Fix warnings cppcoreguidelines-special-member-functions (clang-tidy)
...
- Remove trivial copy-constructors that prevents the compiler to
generate the other special member functions.
2020-01-31 12:08:05 +01:00
Laurent Rineau
b56cdcb743
Add move-semantic to CGAL (non-periodic) 3D triangulations
...
- For `Triangulation_3`, the rule-of-zero cannot be used, because of
the infinite vertex. A special copy-constructor and copy-assignment
operators are required. But one can `= default the move-constructor
and move-assignment operator, as well as the destructor.
- For `Delaunay_triangulation_3`, the rule-of-zero is
sufficient. Nothing to do.
- For `Regular_triangulation_3`, the `hidden_point_visitor` data
member is a function that is constructed with the `this` pointer, so
the rule-of-zero cannot be used. Probably the move-constructor
and move-assignment operator could be explicitly defaulted.
2020-01-31 12:01:43 +01:00
Maxime Gimeno
85712ba28c
WIP replacing tbb deprecated includes.
2020-01-14 15:03:20 +01:00
Maxime Gimeno
065a7ac0c6
Add a test for file_input()
2020-01-10 13:14:31 +01:00
Maxime Gimeno
9fe491adfb
Update license header
2020-01-10 11:54:48 +01:00
Maxime Gimeno
82bcfb7087
Add license and remove need for operator(const C&), which cannot be called.
2020-01-09 10:01:31 +01:00
Maxime Gimeno
2bfdc8398f
Move the file_input.h file to Triangulation_3 and write some doc. Unify with the API of copy_tds() and adapt the c3t3_io plugin.
2020-01-08 16:37:39 +01:00
Mael
8a48be1dd8
Remove unused macro
2019-12-12 13:10:25 +01:00
Laurent Rineau
c08c632fc8
Merge branch 'releases/CGAL-5.0-branch' into T3_accelerate_insert_in_hole-rebased
2019-12-10 13:02:24 +01:00
Laurent Rineau
435bb4d4c4
Cleanup the patch
2019-12-10 10:59:13 +01:00
Andreas Fabri
7c9ef9c9f2
Move code into TDS_3 and make it work for parallel mode
2019-12-10 10:20:12 +01:00
Andreas Fabri
27a93fc25a
First cleanup
2019-12-10 10:19:07 +01:00
Andreas Fabri
9303a3318a
Use small_vector for find_conflicts()
2019-12-10 10:19:07 +01:00
Laurent Rineau
a9abea6dc7
Use local small-indices, 2% win.
2019-12-10 10:18:57 +01:00
Laurent Rineau
a93dd81642
Cleanup
2019-12-10 10:17:08 +01:00
Andreas Fabri
f2eea9cf78
Call clear()
2019-12-10 10:17:08 +01:00
Andreas Fabri
a3fc6790ca
Use a boost::small_vector instead of a std::deque in a stack
2019-12-10 10:17:08 +01:00
Andreas Fabri
6462016ce3
Use an unordered map to find neighbor cells
2019-12-10 10:17:03 +01:00
Andreas Fabri
b98d2f6876
Fix examples
2019-11-04 16:45:30 +01:00
Sébastien Loriot
52164b1fba
First pass on removing license notice in header for LGPL files
2019-10-19 15:40:30 +02:00
Sébastien Loriot
254d60f642
First pass on removing license notice in header for GPL files
2019-10-19 15:23:19 +02:00
Sébastien Loriot
7356421d80
introduce Commercial license SPDX tag
2019-10-19 12:15:19 +02:00
Sébastien Loriot
9bd9c68b83
update LGPL[23]+ and GPL[23]+ SPDX tags
...
ack -l --no-svg "SPDX-License-Identifier: GPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-3.0+/SPDX-License-Identifier: GPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-3.0+/SPDX-License-Identifier: LGPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: GPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-2.0+/SPDX-License-Identifier: GPL-2.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.0+/SPDX-License-Identifier: LGPL-2.0-or-later/"
2019-10-18 21:57:54 +02:00
Jane Tournois
a5bf1e1662
make walk_to_next_3() const
...
and declare variables later when possible
2019-10-14 16:04:56 +02:00
Jane Tournois
d145abaf9a
temporarily change the example for debugging : the commented queries do pass
2019-10-08 17:39:35 +02:00
Jane Tournois
80553fbfb1
improve deal of degenerate cases for simplex traverser
2019-10-08 16:48:41 +02:00
Jane Tournois
27eedb168a
fix the case where source, target, and vert[i] are aligned
...
Revert "deal with another degenerate case"
This reverts commit f269280dd6 .
2019-10-07 17:38:27 +02:00
Jane Tournois
aaf8aa404e
fix moving to end()
2019-10-04 16:21:17 +02:00
Jane Tournois
f269280dd6
deal with another degenerate case
...
when reaching end(), and when source, target, and the vertex vi are aligned,
o0 is ZERO and o1 is ZERO too
but target target can be `inside` anyhow
2019-10-04 14:30:43 +02:00
Laurent Rineau
3c06351ec5
Fix operator-> and add const to the reference and pointer types
2019-10-03 15:02:34 +02:00
Jane Tournois
d4289524a9
fix the constructor of Triangulation_segment_cell_traverser
...
until now, when the query segment started exactly on a vertex/edge/facet,
the constructor was setting _cur to one cell incident to this vertex/edge/facet,
not necessarily the one that was intersected by the segment query
this commit fixes it by introducing the function
`jump_to_intersecting_cell()`, that changes _cur to point to the right cell
2019-10-03 12:25:36 +02:00
Jane Tournois
5813b65267
fix the end conditions of simplex iterator
...
now we get the last simplex traversed before getting end()
2019-10-03 12:25:36 +02:00
Laurent Rineau
3694d7a005
Only use polymorphism if CGAL_TST_ASSUME_CORRECT_TYPES is undefined
2019-09-12 13:10:14 +02:00
Laurent Rineau
c78d4b66a9
Add SPDX license headers
2019-09-12 10:01:20 +02:00
Laurent Rineau
2acb975ba4
Merge 'cgal/master' to fix conflicts
2019-09-11 14:35:38 +02:00
Laurent Rineau
e4e065fad5
'how to make superclass for inserter pattern.txt' turned to comment
2019-09-11 11:22:36 +02:00
Laurent Rineau
b438e73b4b
cleanup: synchronize with the older branch
2019-09-11 11:04:34 +02:00
Jane Tournois
9d23b2f20c
move functions from Triangulation_3 to the traverser header
...
now Triangulation_3.h is the same as in cgal/master branch,
and everything specific to the traverser has been moved to
the traverser header
2019-09-10 19:26:43 +02:00
Jane Tournois
3f96a41f93
fix warning : code not reached
2019-09-10 19:21:45 +02:00
Jane Tournois
4e419e9c75
little cleaning around CGAL_FAST_TRAVERSER
...
using this code speedups the traversal by 20% with Epick, 35% with Epeck
and our tests remain valid,
so we can remove the macro and activate the code
2019-09-10 19:21:45 +02:00
Jane Tournois
0d6a9e8367
add a benchmark for simplex traverser and cell traverser
2019-09-10 19:21:45 +02:00
Laurent Rineau
bbf559ee17
Merge remote-tracking branch cgal/master into Triangulation_segment_traverser_3-tvanlank
2019-09-10 19:21:38 +02:00
Laurent Rineau
88a915779f
Merge tag 'base2018' into HEAD
...
# Conflicts:
# Triangulation_3/examples/Triangulation_3/CMakeLists.txt
# Triangulation_3/include/CGAL/Triangulation_3.h
# Triangulation_3/include/CGAL/Triangulation_utils_3.h
2019-09-10 18:41:08 +02:00
Laurent Rineau
dc02598a5c
Merge pull request #4016 from gdamiand/CGAL-more_viewers-gdamiand
...
CGAL: more viewers
2019-07-10 14:22:50 +02:00
Laurent Rineau
dbb1cb6c9b
Merge pull request #3974 from afabri/Triangulation-add_ranges-GF
...
Triangulation_{2,3): Add ranges
2019-07-01 11:16:05 +02:00
Guillaume Damiand
67307dcead
Merge master to remove conflicts; plus rephrase draw documentation following Sebastien comments.
2019-06-19 15:48:10 +02:00
Andreas Fabri
f7b7b9957f
Merge remote-tracking branch 'cgal/master' into CGAL-null_ptr-GF
2019-06-05 14:47:11 +02:00
Andreas Fabri
4581f1b7a8
Morte replacements
2019-06-05 08:39:55 +02:00
Andreas Fabri
5532b84b4f
nullptr_t -> std::nullptr_t
2019-06-05 07:28:56 +02:00
Andreas Fabri
e2d19b0c8d
Replace NULL and Nullptr_t with nullptr and nullptr_t
2019-06-04 23:45:44 +02:00
Andreas Fabri
285cdd5be5
Add more ranges and a testsuite
2019-06-04 10:40:13 +02:00
Andreas Fabri
4c9bda8169
Use C++11 for loop in examples
2019-06-03 17:23:32 +02:00