Commit Graph

267 Commits

Author SHA1 Message Date
Laurent Rineau f4fec8c0c1 Fix C++20 errors (patch suggested by Marc Glisse)
See https://github.com/CGAL/cgal/pull/4640#issuecomment-635200332
2020-05-28 11:07:03 +02:00
Maxime Gimeno e9d41d7b7d Fixes for min/max 2020-04-21 11:38:37 +02: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 0a46621dc6 Merge branch 'cgal/releases/CGAL-4.14-branch'
whitespace+tab removal, merged with option -Xignore-all-space
2020-03-26 13:28:46 +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é 3667550e75 Rename new triangulation IDs initializing functions
To look more like the existing function set_halfedgeDS_items_id()
2020-03-04 12:54:56 +01:00
Laurent Rineau 296caae2f7 Merge pull request #4500 from MaelRL/SMSP-Fix_const-GF
SMSP: Fix some const correctness
2020-02-07 16:27:38 +01:00
Laurent Rineau 1ae1fddffa Merge pull request #4500 from MaelRL/SMSP-Fix_const-GF
SMSP: Fix some const correctness
2020-02-07 16:24:33 +01:00
Mael eebaf7fb4d
Tiny rephrasing 2020-01-31 11:16:50 +01:00
Mael Rouxel-Labbé bb35aacb4d Fix some const correctness in SMSP 2020-01-31 11:07:33 +01:00
Maxime Gimeno 6dccde35ef Fix c++11 errors 2020-01-13 16:20:51 +01:00
Laurent Rineau 897ee700f4 Merge pull request #4223 from MaelRL/SMSP-Add_example_with_locate-GF
Shortest_path: Add an example of usage with input being 3D point/ray
2019-12-05 11:05:38 +01:00
Laurent Rineau 15d9e1f0ff Restore the alphabetical order of `dependencies` files 2019-10-31 14:41:37 +01:00
Mael cbe1cfc750
Merge branch 'master' into SMSP-Add_example_with_locate-GF 2019-10-21 09:06: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
Laurent Rineau 7acfdff7d5
SMSP: fix border and robustness issues (#3977)
SMSP: fix border and robustness issues

Co-authored-by: Maxime GIMENO <maxime.gimeno@gmail.com>
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
2019-10-18 14:24:42 +02:00
Mael Rouxel-Labbé 5c025271d9 Merge branch 'SMSP-fix_border_vertices' into SMSP-robustify-5.0-GF 2019-10-16 09:36:11 +02:00
Mael Rouxel-Labbé df6568f733 Fix bad copy paste 2019-10-16 09:35:48 +02:00
Mael Rouxel-Labbé 423c5961e2 Merge branch 'SMSP-fix_border_vertices' into SMSP-robustify-5.0-GF 2019-10-16 09:33:54 +02:00
Mael Rouxel-Labbé e4e63e087b Remove leftover expensive assertion 2019-10-16 09:33:33 +02:00
Mael Rouxel-Labbé 09e563c73f Fix a "potentially uninitialized" warning 2019-10-16 09:33:29 +02:00
Mael Rouxel-Labbé 4780b3066f Merge remote-tracking branch 'sloriot/SMSP-fix_border_vertices' into SMSP-robustify-5.0-GF 2019-10-14 09:09:31 +02:00
Mael 1637608b9a
Remove accidentally committed debug code 2019-10-14 09:03:33 +02:00
Mael Rouxel-Labbé 90d4bbb871 Use traits' functors rather than global functions 2019-10-11 14:30:26 +02:00
Mael Rouxel-Labbé 9eb7852753 Enable robustness tricks by default 2019-10-11 12:02:58 +02:00
Mael Rouxel-Labbé 87b605a68b Fix always propagating on the right as soon as the node is not a source 2019-10-11 12:02:17 +02:00
Mael Rouxel-Labbé e6c788efbd Fix indentation 2019-10-11 09:29:58 +02:00
Mael Rouxel-Labbé b32dd4b5de Add more robust code for two predicates, disabled behind a macro for now 2019-10-11 09:26:17 +02:00
Mael Rouxel-Labbé 53bb36f4d7 Fix debug code compilation 2019-10-11 09:25:10 +02:00
Mael Rouxel-Labbé 7e5f6293f3 Clean debug code 2019-10-10 14:54:35 +02:00
Mael Rouxel-Labbé deb18df291 Remove ineffective pruning filter
This filter was added by me recently, it's not part of the initial code.
It will be so rare it's not worth clunking up the code.
2019-10-10 14:45:25 +02:00
Mael Rouxel-Labbé a6215abf0e Fix sometimes comparing distances with a NULL occupier 2019-10-10 14:44:13 +02:00
Mael Rouxel-Labbé 90f787c111 Use `Compare_relative_intersection_along_segment_2` once again to compare rays
The tiny detail that makes it necessary to do all these complicated shenanigans
is that the two 2D segments are not necessarily living in a common unfolding
2019-10-10 14:40:15 +02:00
Mael Rouxel-Labbé 6b40368c87 Fix namespace and regroup children members together 2019-10-10 14:38:59 +02:00
Mael Rouxel-Labbé c2b3d9e5d8 Add some debug code 2019-10-10 14:22:23 +02:00
Mael Rouxel-Labbé c611285eb5 Simplify orientation calls 2019-10-10 14:13:30 +02:00
Mael Rouxel-Labbé df5d200033 Regroup class members 2019-10-10 14:13:30 +02:00
Mael Rouxel-Labbé a718adea69 Fix namespace usage 2019-10-10 14:13:29 +02:00
Mael Rouxel-Labbé d307df36ea Improve readability (no 250+ char lines) 2019-10-10 14:13:29 +02:00
Mael Rouxel-Labbé 930fbb3280 Add some const correctness + avoid a lot of useless copies 2019-10-10 14:13:29 +02:00
Mael Rouxel-Labbé e63d20cf22 Uniformize namespaces 2019-10-10 14:13:29 +02:00
Mael Rouxel-Labbé 7b887e79ea Add some pruning in case of equal times (node == occupier time)
Probably doesn't happen very often though...
2019-10-10 14:13:29 +02:00
Mael Rouxel-Labbé 77749bb031 Fix some more overzeralous pruning
Similar to commit cda7c5f299, you cannot
just prune and not propagate if times are equal because nothing guarantees
that the first cone to reach a given vertex is the cone that will yield
the shortest path.
2019-10-10 14:13:29 +02:00
Mael Rouxel-Labbé 315d257d98 Tiny misc improvements 2019-10-10 14:13:29 +02:00
Mael Rouxel-Labbé cda7c5f299 Fix sometimes pruning entire branches that are valid
An example can be see in this issue: https://github.com/CGAL/cgal/issues/3993.
This configuration:
- we leave from a vertex v0 and want to reach v1
- a (useful) cone gets split by a vertex v2
- v3 is such that v0v2 = v2v3 and v1 is on the left of the line
- we first reach v3 from the right
- when we reach v3 from the left, with a cone that also contains v1, this cone
  is discarded because we have already reached v3 from the right and the time
  is not better (it's equal). Thus we can't reach v1 with the direct cone
  from v1.

Other artificial configurations can be constructed noting that the case
of identical source-ray target for both nodes where not really handled.
2019-10-03 15:03:01 +02:00
Mael Rouxel-Labbé 7676dca96a Minor code improvements 2019-10-03 13:15:51 +02:00