Commit Graph

325 Commits

Author SHA1 Message Date
Laurent Rineau 2237e48d2c Merge pull request #5258 from sloriot/Examples-use_polyline_ext
Change extension to the one recognized by the demo
2021-01-06 16:11:37 +01:00
Sébastien Loriot 2fbafbf7c0 ignore isolated vertices 2020-12-15 10:01:38 +01:00
Sébastien Loriot a095b674e7 change extension to the one recognized by the demo 2020-12-09 14:20:07 +01:00
Maxime Gimeno 3b70343590 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-11-16 16:19:43 +01:00
Dmitry Anisimov 263ad6bc99 fixed ch3, inter3, otr2, psp, pmp, smsp, mesh3 + cleanup 2020-08-20 18:25:01 +02:00
Maxime Gimeno 9c15f2c9dc Use FeatureSummary in the demo, and remove CGAL_FOUND 2020-08-04 12:46:17 +02:00
Mael Rouxel-Labbé 26355e2e32 Uniformize capital / third person usage of \brief 2020-06-25 15:13:47 +02:00
Mael Rouxel-Labbé 9cca59ba36 Actually use the new IO functions + some example improvements 2020-06-23 18:24:39 +02:00
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
Mael Rouxel-Labbé 244ad1dd27 Move CGAL::internal into CGAL::SMSP::internal 2019-10-03 11:22:21 +02:00
Mael Rouxel-Labbé cf900da30d Don't assume you can build a FT from a double
Only change /include because we know what kernels we are manipulating in tests
2019-10-03 11:22:21 +02:00
Maxime Gimeno de81a0cc73 fix warning 2019-10-03 11:22:21 +02:00
Maxime Gimeno f4aa864410 Fix warnings 2019-10-03 11:22:21 +02:00
Sébastien Loriot 051f94c4e2 fix and add test that was not in the cmake script 2019-10-03 11:22:21 +02:00
Sébastien Loriot 2681115133 add new test with boundary vertices 2019-10-03 11:22:21 +02:00
Sébastien Loriot 8e27665ba9 init the halfedge of a border vertex to point in a face 2019-10-03 11:22:14 +02:00
Mael Rouxel-Labbé e7f6c3eb2f Fix build_aabb_tree not being documented 2019-09-16 09:51:30 +02:00
Mael Rouxel-Labbé 7e29cbcf46 Misc minor changes (wrap / doc fixes) 2019-09-16 09:51:04 +02:00
Mael Rouxel-Labbé 59dae32b53 Add an example of shortest path using 3D point/ray 2019-09-16 09:50:31 +02:00
Sébastien Loriot 1f8065c6c3 Merge pull request #3885 from MaelRL/PMP-Locate-GF
PMP: Add locate.h and rewrite Triangulation_2 graph traits
2019-07-18 16:40:49 +02:00
Sébastien Loriot 983645a51a match @{ and @} 2019-07-05 21:49:46 +02:00
Mael Rouxel-Labbé f68141a6d3 Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF 2019-07-01 11:28:25 +02:00
Laurent Rineau 4fbf00fb8a CMake>=3.13: opt for for new policies up to 3.15 2019-06-19 14:34:59 +02:00
Mael Rouxel-Labbé 7f6cb0411c Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF 2019-06-18 08:20:16 +02:00
Andreas Fabri e2d19b0c8d Replace NULL and Nullptr_t with nullptr and nullptr_t 2019-06-04 23:45:44 +02:00
Laurent Rineau 419032d859 Merge pull request #3947 from MaelRL/CGAL-Fix_typos-GF
Fix some typos in code/comments/documentation
2019-05-23 08:50:14 +02:00
Mael Rouxel-Labbé 2848158354 Fix typos 2019-05-20 08:54:04 +02:00
Mael c53e7e2c68
Merge branch 'master' into PMP-Locate-GF 2019-05-15 07:59:52 +02:00
Laurent Rineau 90782d4b7f Revert the merge of two pull-requests that target CGAL-4.14-branch
- Revert "Merge pull request #3857 from MaelRL/CGAL-Fix_duplicate_non_manifold_vertices-GF"
- Revert "Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau"
2019-05-14 17:50:45 +02:00
Laurent Rineau 8e872081fc Merge pull request #3898 from lrineau/Mesh_3-stop_during_protection-lrineau
Mesh_3 `Protect_edges_sizing_field`: handle the `stop` Boolean

# Conflicts:
#	.travis/build_package.sh
#	Installation/cmake/modules/CGALConfig_binary.cmake.in
#	Installation/cmake/modules/CGALConfig_install.cmake.in
#	Installation/cmake/modules/CGAL_SetupCGAL_CoreDependencies.cmake
#	Installation/lib/cmake/CGAL/CGALConfig.cmake
#	Polygon_mesh_processing/include/CGAL/Polygon_mesh_slicer.h
#	Polyhedron/demo/Polyhedron/Plugins/Classification/CMakeLists.txt
#	Polyhedron/demo/Polyhedron/Plugins/Mesh_3/CMakeLists.txt
2019-05-14 16:18:24 +02:00
Laurent Rineau 9cbfcee84f Merge branch 'master' into CGAL-Exact_algebraic-GF 2019-05-13 18:11:00 +02:00
Mael Rouxel-Labbé 0b506f5cce Fix package dependencies 2019-05-10 12:41:25 +02:00
Laurent Rineau 870ff45168 Merge pull request #3886 from lrineau/CGAL-Adapt_to_Boost_1.70-GF
Adapt to Boost 1.70
2019-05-07 15:48:03 +02:00
Laurent Rineau aebb058b58 Merge pull request #3886 from lrineau/CGAL-Adapt_to_Boost_1.70-GF
Adapt to Boost 1.70
2019-05-07 15:45:00 +02:00
Laurent Rineau b7631f19b5 Fix Ridges_3 and SM_shortest_path with Boost 1.70 2019-05-06 10:11:18 +02:00
Sébastien Loriot 1398af1b0b Merge remote-tracking branch 'cgal/master' into HEAD 2019-04-12 17:44:31 +02:00
Sébastien Loriot db65bd8ecc Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2019-04-11 21:38:48 +02:00
albert-github 1dd7473818 Correction of links
Correction of redirected links and links that moved to another place.
2019-04-11 21:37:05 +02:00
Sébastien Loriot 124012d9f9 replace cpp11::array by std::array 2019-03-29 13:28:33 +01:00
Laurent Rineau d4e09c1d78 Modernize the CMakeLists.txt that use LEDA
The file `${CGAL_USE_FILE}` must be included before
`find_package(LEDA)` can be called. But that would require to verify
`CGAL_FOUND` first...

Actually, now that we require at least CMake 3.1, let's say that CGAL
is `REQUIRED`, but not the components. That is the basic truth, and
that avoids testing for `CGAL_FOUND`.

At the same time, I have modified the `cmake_minimum_required`:
  - placed as the first line,
  - set to `3.1...3.13`:
      https://cmake.org/cmake/help/latest/command/cmake_policy.html#setting-policies-by-cmake-version

I have also removed the comments that says the `CMakeLists.txt` was
generated. That may have been true... but before a lot of modifications.
2019-03-27 09:56:16 +01:00
Laurent Rineau 5ca3653faa Core or LEDA 2019-03-26 16:30:04 +01:00
Sébastien Loriot 59bc453b42 first batch of replacement for level 1 in classified ref man
command used:
grep -l  "##" */doc/*/PackageDescription.txt | xargs  sed -i  -E 's/\#\#\s*([[:print:]]+[[:alnum:]])\s*\#\#\s*$/\\cgalCRPSection{\1}/'
2019-02-14 10:32:39 +01:00
Laurent Rineau daa1493e98
Merge pull request #3452 from afabri/Heat_method_3-GF
New package: Heat Method
2019-01-18 16:50:01 +01:00
Laurent Rineau 6ffd76a87e Merge pull request #2792 from afabri/Intersections_3-Add_missing_do_intersect-GF
Intersections_3:  Add missing do_intersect() overloads
2019-01-18 16:37:54 +01:00
Maxime Gimeno 2a49dfcb05 Fix conflict 2019-01-11 09:47:34 +01:00
Andreas Fabri 586b185b64 Changes after Guillaume's review 2018-12-21 11:50:27 +01:00
Sébastien Loriot 3a1516e940 add missing Reference and uniformize ref man group declaration 2018-11-20 13:47:16 +01:00
Guillaume Damiand 7d406fbb9c
Merge branch 'master' into CGAL-cmake_cleanup-gdamiand 2018-11-05 07:32:58 +01:00
Maxime Gimeno aee51d4b42 Add Dependency to Distance_3 2018-11-02 11:36:43 +01:00
Guillaume Damiand 92ba7fa6c9 Update minimum cmake required version in all CMakeLists.txt 2018-10-18 14:49:23 +02:00
Guillaume Damiand 0c2dcf7208 Re-add include({CGAL_USE_FILE} ) in each CMakeLists.txt where CGAL is used with some component. 2018-10-18 14:38:42 +02:00