Commit Graph

145 Commits

Author SHA1 Message Date
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 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é 30d4754a04 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-03-17 09:03:12 +01:00
Laurent Rineau 378554e5a7 Change the API of `for_compact_container`/`Compact_container_traits`
Now, we have a proper pair of getter/setter, and the `void` pointer is
get by a `reinterpret_cast`, instead of a union.

Cc: @mglisse
2020-03-09 17:19:58 +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 14b8930f79 Fix a clang-tidy warning by using nullptr instead of 0 2020-01-31 15:48:45 +01:00
Laurent Rineau aed73efb46 Move-semantic for TDS_2 2020-01-31 14:20:39 +01:00
Mael Rouxel-Labbé 828e47f61e Fix some header includes 2020-01-17 17:55:53 +01:00
Mael Rouxel-Labbé 2c2313ea44 Do not use inheritance in concepts 2020-01-16 12:23:21 +01:00
Laurent Rineau 0567554126 Merge pull request #4363 from afabri/TDS_3-doc-GF
TDS_2/3: Cleanup in the documentation
2020-01-15 17:23:57 +01:00
Mael Rouxel-Labbé 9d58d7ff67 Document the parameter template of CGAL::T_DS_vertex/face/cell_23 2019-12-30 18:57:16 +01:00
Mael Rouxel-Labbé 19ceed98b8 Misc minor fixes 2019-12-30 18:32:04 +01:00
Mael Rouxel-Labbé ba7c36850a Remove Rebind_vertex/Face from TDS2 concept
The rebind mechanism is for the model CGAL::TDS_2, not the concept TDS2
where this doesn't make sense.
2019-12-30 18:24:11 +01:00
Mael Rouxel-Labbé 4b693695cd Don't duplicate requirements between TriangulationDSFace and TDS2::Face 2019-12-30 18:23:37 +01:00
Mael Rouxel-Labbé fb539f605c TriangulationDSVertexBase_2 should refine TDS2::Vertex 2019-12-30 18:22:42 +01:00
Mael Rouxel-Labbé db357a9ecb TriangulationDSFaceBase_2 should refine TDS2::Face 2019-12-30 18:22:10 +01:00
Mael Rouxel-Labbé 0d7ce069ae Add a note explaining rebind mechanisms in the doc of vertex/face typedefs 2019-12-30 18:21:29 +01:00
Mael Rouxel-Labbé 80bfae0c78 Merge remote-tracking branch 'afabri/TDS_3-doc-GF' into TDS-Fix_doc-GF 2019-12-30 14:29:12 +01:00
Mael cf83a22e2d
Merge branch 'master' into T2-Throw_on_collinear_strongly_intersecting_segments-GF 2019-12-02 16:32:29 +01:00
Andreas Fabri 1b2ed599d7 Unify template parameter names and add tpram for TDS_2 2019-11-23 10:20:33 +01: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 df49068ce4 Fix dependencies 2019-10-11 11:57:46 +02:00
Mael Rouxel-Labbé faf55abc73 Doc improvements 2019-10-01 14:35:02 +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 fbafb9d06f fix remaining mismatches and fix bugs 2019-07-10 11:40:45 +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
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
Mael addad6c953
Do not define a halfedge range for TDS_2
Halfedges have no place in the TDS, and the only reason they exist
is because of the 2D triangulation graph traits. The latter are 
reworked in another PR (https://github.com/CGAL/cgal/pull/3885) 
such that there is no need to have halfedges defined in TDS_2/T2
2019-06-07 09:00:02 +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 785ae04e0b Add ranges to Regular_triangulation_2 2019-06-04 12:45:42 +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 Rouxel-Labbé aa4e1913d1 Partial revert of 42a1c49066
Halfedges in TDS2 and T2 were being used to get halfedges in the T2 graph traits
We now do it differently and without polluting the packages T2 and TDS2
2019-04-29 08:29:40 +02:00
Andreas Fabri a1609350aa Remove #include<CGAL/basic.h> amd put what is needed if something is missing 2019-03-27 15:21:33 +01:00
Laurent Rineau 7ddef3d14e Merge pull request #3725 from afabri/TDS_2-fix_Default_vertex_converter-GF
TDS_2: Fix Default_vertex_converter
2019-03-05 16:20:49 +01:00
Andreas Fabri 762d899cc0 TDS_2: Fix Default_vertex_converter 2019-03-04 09:26:06 +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
Andreas Fabri bbec783e08 Remove code for mips CC 7.4 as it triggers a warning: implicitly-declared 2019-01-09 17:19:17 +01:00
Sébastien Loriot 54381db68a fix -Wmaybe-uninitialized warnings 2018-11-12 19:27:53 +01:00
Guillaume Damiand 7d406fbb9c
Merge branch 'master' into CGAL-cmake_cleanup-gdamiand 2018-11-05 07:32:58 +01:00
Guillaume Damiand 92ba7fa6c9 Update minimum cmake required version in all CMakeLists.txt 2018-10-18 14:49:23 +02:00
Guillaume Damiand 0bd9088b5a Remove all include( ) and include( CGAL_CreateSingleSourceCGALProgram ) in CMakeLists.txt; they are no more required. 2018-10-17 14:17:08 +02:00
Sébastien Loriot ea240cfac5 use \PkgXXX instead of \PkgXXXSummary 2018-10-08 10:28:44 +02:00
Sébastien Loriot a2e8a1c68f add the suffix Ref to doxygen link to reference 2018-10-08 10:26:56 +02:00
Laurent Rineau 3c70f8bad0 Fix dependencies by moving files 2018-03-23 14:17:24 +01:00
Laurent Rineau 0a74393dcf Commit all new dependencies files 2018-03-06 18:44:48 +01:00
Maxime Gimeno 688b5dd06e Move dependencies creation to package_info and add dependencies to git 2018-02-02 12:08:05 +01:00
Maxime Gimeno 8bde832931 Fix METIS headers in BGL 2018-02-02 12:08:05 +01:00
Maxime Gimeno a676d5a60e Try to fix errors in classification checks 2018-02-02 12:08:05 +01:00
Maxime Gimeno acd0a72edf Modify travis script to test dependencies 2018-02-02 12:08:05 +01:00
Maxime Gimeno ae36b452bc Add dependencies of all packages 2018-02-02 12:08:05 +01:00
Sébastien Loriot ee57fc2d6c add SPDX identifier for files under the GPL-3+ license 2017-11-12 10:17:51 +01:00
Iordan Iordanov 2d497ea826 fix for doc bug, github issue #2346 2017-08-14 14:38:01 +02:00
Andreas Fabri 3112b11e67 Add license check; Add defines for test_lipschitz.cpp 2017-04-06 17:32:50 +02:00
Andreas Fabri dfb37af958 test dependencies in Mesh_2 2017-04-06 13:16:35 +02:00
Andreas Fabri 98e41d81af Add \cgalRefines and polish a little bit 2017-03-24 09:29:21 +01:00
Sébastien Loriot 50510c05ea add include directive for license of all GPL header files
done using:
ack-grep "^GPL" */package_info/*/license.txt -l | awk -F "/" '{print $1}' > /tmp/gpl_packages
for i in `cat /tmp/gpl_packages | \
          grep -v Operations_on_polyhedra | \
          grep -v Algebraic_kernel_for_circles | \
          grep -v Algebraic_kernel_for_spheres | \
          grep -v Polyhedron_IO`;
do
  echo $i
  python Scripts/developer_scripts/add_license_in_pkg_header.py $i
done
python Scripts/developer_scripts/add_license_in_pkg_header.py Operations_on_polyhedra Polygon_mesh_processing
python Scripts/developer_scripts/add_license_in_pkg_header.py Algebraic_kernel_for_circles Circular_kernel_2
python Scripts/developer_scripts/add_license_in_pkg_header.py Algebraic_kernel_for_spheres Circular_kernel_3
python Scripts/developer_scripts/add_license_in_pkg_header.py Polyhedron_IO Polyhedron
2017-01-19 15:20:25 +01:00
Andreas Fabri b2e6e3f468 Update TriangulationDSFaceBase_2.h
Prefix with `CGAL::` in order to generate a link.
2016-12-13 14:23:35 +01:00
Laurent Rineau cd0335cda9 Fix warnings with CGAL_TRIANGULATION_NO_ASSERTIONS
Warnings about unused variables when `CGAL_TRIANGULATION_NO_ASSERTIONS`
is defined.
2016-10-07 14:33:44 +02:00
Laurent Rineau 223c1cf5a4 Merge pull request #1530 from lrineau/Installation-compute_dependencies-GF
Compute and fix packages dependencies
2016-10-05 13:11:04 +02:00
Laurent Rineau 9a0bb54922 Merge pull request #1438 from sloriot/CGAL-clean_up_projects_name_cmake
Clean up projects name in cmake scripts
2016-10-05 13:02:25 +02:00
Laurent Rineau 1aefb3b0f3 include <CGAL/config.h>, not <CGAL/basic.h> 2016-09-30 15:23:14 +02:00
Andreas Fabri 939581a2b2 Fix package TDS_2: Add #include 2016-09-30 15:22:27 +02:00
Iordan Iordanov 3ee9a62497 Corrections for compile warnings 2016-09-21 10:35:41 +02:00
Iordan Iordanov 670c58ad8d Corrections for compile warnings 2016-09-21 10:35:41 +02:00
Iordan Iordanov 24d7fd0142 Small change to description of insert_in_hole() in the documentation 2016-09-21 10:35:41 +02:00
Iordan Iordanov 76d664402e Bugfix for insert_in_hole -- vertices on the boudary of the hole now point at new faces 2016-09-21 10:35:41 +02:00
Iordan Iordanov a791e577c2 Small updates to doc for TDS_2 and assertion added in TDS_2.insert_in_hole() 2016-09-21 10:35:41 +02:00
Iordan Iordanov 441df3c540 Modifications to the code for TDS_2.insert_in_hole, the documentation and also the testsuite 2016-09-21 10:35:41 +02:00
Iordan Iordanov e90be729d6 Small feature: doc description update for function insert_in_hole in TDS_2 2016-09-21 10:35:41 +02:00
Iordan Iordanov 649745d040 Small feature: add function insert_in_hole to Triangulation_data_structure_2. Contains documentation and test. 2016-09-21 10:35:41 +02:00
Sébastien Loriot 7e2ee496de update project name of cmake scripts of tests 2016-09-08 00:26:37 +02:00
Sébastien Loriot 4c29bf1b44 CMAKE_SOURCE_DIR -> CMAKE_CURRENT_SOURCE_DIR 2016-03-24 16:33:46 +01:00
Sébastien Loriot 881e4d3199 request Core only in examples, tests and demos when really needed 2016-03-07 22:36:57 +01:00
Sébastien Loriot 2d191d6651 commit CMakeLists.txt for all examples and tests 2016-03-07 17:39:36 +01:00
Philipp Möller 0a04a3a48f Use CGAL_DOC_VERSION 2016-02-11 15:37:54 +01:00
Sébastien Loriot 2ed0fc0fdf Merge pull request #151 from cjamin/gsoc2014-2d-reconstruction-ivovigan
2D Reconstruction Simplification, new package, GSoC 2014
2016-02-09 19:42:32 +01:00
Philipp Möller 71b4e9c515 Use CGAL_FULL_VERSION in all Doxyfile.in 2015-12-17 16:33:28 +01:00
Philipp Möller 4613ed8c84 Remove out-package reference in TDS_3
Remove out-package reference in TDS_2
2015-12-10 17:03:46 +01:00
Philipp Möller 81a8f982dc Handle the easy INPUT cases
If INPUT is just PKG/doc/PKG, handle it automatically.
2015-12-10 17:00:26 +01:00
Clement Jamin f6a9afd028 Merge branch 'gsoc2014-2d-reconstruction-ivovigan-old' into gsoc2014-2d-reconstruction-ivovigan 2015-10-23 14:26:50 +02:00
Sébastien Loriot 01a2ad4ac8 duplicate test files from Triangulation_2 testsuite 2015-09-24 06:26:33 +02:00
Andreas Fabri f592fb7e89 move test files to TDS_2 and TDS_3 2015-08-23 16:12:02 +02:00
Andreas Fabri 91543fd382 move header files to TDS_2 and TDS_3 2015-08-23 15:36:12 +02:00
Andreas Fabri 67d72675fe split packages 2015-08-17 23:46:59 +02:00