Improvement backports from CDT_3 branch (Follow-up to PR #8170) #8273
Conversation
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
Triangulation_2/include/CGAL/Triangulation_2/internal/Polyline_constraint_hierarchy_2.h
Outdated
Show resolved
Hide resolved
lrineau
changed the title
This comment was marked as off-topic.
This comment was marked as off-topic.
This comment was marked as off-topic.
This comment was marked as off-topic.
This comment was marked as off-topic.
This comment was marked as off-topic.
This comment was marked as off-topic.
This comment was marked as off-topic.
...and `refactor Polyline_constraint_hierarchy_2` to use it. `CGAL::unordered_flat_map` will be Boost `unordered_flat_map` if availlable, or the standard `std::unordered_map` otherwise.
To debug non-determinism on Linux platforms.
Triangulation_2/include/CGAL/Triangulation_2/internal/Polyline_constraint_hierarchy_2.h
Outdated
Show resolved
Hide resolved
That uses Boost.STLInterfaces from Boost >= 1.74.
That code was never used nor tested, and cannot compile anyway.
- remove all mentions of `Edge` and `Constraint` - `Subconstraint_iterator` is renamed `Subconstraint_and_contexts_iterator` (because of its value type) - a new `Subconstraint_iterator`, with value type `Subconstraint` - a few unused/untested and uncompilable functions are removed from the code - a lot of internal renamings == Breaking changes == For `Constrained_triangulation_plus_2`, there are a few breaking changes... - The value type of `subconstraints_begin()`, `subconstraints_end()`, of the range `subconstraints()` has changed to `Subconstraint` (a simple `std::pair` of vertex handles). That is actually a kind of bug-fix, because it was documented as such in the user manual. - The new member functions `subconstraints_and_contexts_begin()`, `subconstraints_and_contexts_end()`, `subconstraints_and_contexts()` are created get the old value type (`std::pair<const Subconstraint, std::list<Context>*>`). - A few range types have changed from `CGAL::Iterator_range<It>` to `unspecified_type`, for efficiency reasons. - Doc fixes. == Determinism == Even if it was not documented, the range `subconstraints()` is deterministic (used by Mesh_2), and `subconstraints_and_contexts()` is not.
lrineau
force-pushed
the
CGAL-followup_PR_8170-lrineau
branch
from
e0ba29f to
eafa97a
Compare
|
boost 1.74 is requested but some test plateforms do not have it. Do you really need that minimal version? |
The regular expression I used was: ``` ((?!(?:^.*(\/\/|\/\*).*|^ *\* .*|^[^"]*"(?:"[^"]*"|[^"])*))^(?:.*[ ,\(]|))(\b(?:(?:[A-Za-z]+::)*)(?:max|min))\b *\( ```
Dump the requirement for Boost to 1.74 or later? (currently 1.72)
Short answerYes, I really need it. Long answerActually no: I could use the ancient But platforms supported by CGAL-6.0 currently have also Boost 1.74 or later. Details... (click to expand)
So...
|
|
I saw that you changed it in ThirdParties.txt,. So all which remains to do is to ask Nicolas to upgrade the testsuite machines. |
| @@ -3,6 +3,9 @@ | |||
|
|
|||
| ## [Release 6.1](https://github.com/CGAL/cgal/releases/tag/v6.1) | |||
|
|
|||
| ### General Changes | |||
| - The minimal supported version of Boost is now 1.74.0. | |||
|
|
|||
| ### [Algebraic Kernel](https://doc.cgal.org/6.1/Manual/packages.html#PkgAlgebraicKernelD) | |||
There was a problem hiding this comment.
Must also announce the breaking changes in Triangulation_2/doc/Triangulation_2/CGAL/Constrained_triangulation_plus_2.h.
Summary of Changes
In the PR #8170, merged for CGAL-6.0, there was several commits that I had to revert, because they broke the testsuite results:
save_binary_file. That was no correct as regards to the C3t3 concept. It is now fixed by commit c10dcf7 from this PR.Polyline_constraint_hierarchy_2using an unordered map, instead of astd::map. The issue was that is broke the determinism of Mesh_2. See Improvement backports from CDT_3 branch (Follow-up to PR #8170) #8273 (comment).CGAL::Segment_3, for some CGAL kernels.This pull-request reintroduces those features, for CGAL-6.1.
Release Management