Commit Graph

1793 Commits

Author SHA1 Message Date
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
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é fe1fd95d23 Fix always returning by copy when it is possible to return by reference 2020-03-09 15:31:51 +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
Maxime Gimeno 35600534f0 fixes 2020-01-21 10:05:19 +01:00
Maxime Gimeno 85712ba28c WIP replacing tbb deprecated includes. 2020-01-14 15:03:20 +01:00
Laurent Rineau de1074426b Merge pull request #4389 from lrineau/DT_3-issue4388-GF
Fix  DT3 parallel performance loss (issue #4388)
2019-12-17 09:15:48 +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
Laurent Rineau 6cdd833e13 Merge branch 'DT_3-issue4388__for_CGAL-4.14.2-GF' into DT_3-issue4388-GF 2019-12-04 15:39:55 +01:00
Laurent Rineau 6ded244449 Merge branch 'DT_3-issue4388__for_CGAL-4.13.2-GF' into DT_3-issue4388__for_CGAL-4.14.2-GF 2019-12-04 15:32:07 +01:00
Laurent Rineau 3ade506eba Create approximate_size() in Concurrent_compact_container
Instead of having an atomic integer for the size of the compact
container, now all free lists have an atomic integer for their size,
but it is only updated when the size is increased by 10%.
2019-12-04 15:20:52 +01:00
Laurent Rineau 12181210e8 Add a bench of DT3 with TBB and Google benchmark 2019-12-04 15:16:25 +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
Laurent Rineau 830bb9640f Merge pull request #4141 from albert-github/feature/bug_obsolete_images
warning: image file name tds_small.png is ambiguous.
2019-08-16 13:24:58 +02:00
albert-github 62f2fef741 warning: image file name tds_small.png is ambiguous.
Some images were present on multiple places but the second reference was not used anymore.
2019-08-08 13:41:18 +02:00
Maxime Gimeno 660ebe9e81 Add missing highp and remove unwanted highp 2019-08-05 14:16:02 +02:00
Sébastien Loriot 2e747dd300 Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' into HEAD 2019-07-18 17:01:42 +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
Sebastien Loriot 667e4022f7
Merge pull request #4060 from sloriot/CGAL-doc_match_brackets
match @{ and @}
2019-07-18 16:26:43 +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
Maxime Gimeno 261c596cfc Merge branch 'CGAL_Qt-Fix_deprecation_warnings-GF' into CGAL_Qt-Fix_deprecation_warnings-4.14-GF 2019-07-10 14:04:34 +02:00
Maxime Gimeno 1184530530 More warnings fixed 2019-07-10 14:02:06 +02:00
Sébastien Loriot fbafb9d06f fix remaining mismatches and fix bugs 2019-07-10 11:40:45 +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 32f80cbece Merge pull request #4018 from lrineau/CGAL-refresh_cmake_minimum_required-GF
CMake>=3.13: opt for for new policies up to 3.15
2019-07-01 11:16:30 +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
Laurent Rineau 4fbf00fb8a CMake>=3.13: opt for for new policies up to 3.15 2019-06-19 14:34:59 +02:00
Guillaume Damiand 8a3cb666fd Correct links to CGAL::draw functions. 2019-06-19 13:10:08 +02:00