Commit Graph

482 Commits

Author SHA1 Message Date
Jane Tournois c27c011e28 do not dump medit file after each meshing test
it is costly and useless for the testsuite
we keep them commented to help later debugging
2022-06-08 22:57:24 +02:00
Jane Tournois 55728c5042 avoid using deprecated output_to_medit() function 2022-06-08 22:57:24 +02:00
Sébastien Loriot c8cbbbfb1d Merge cgal/master 2022-06-08 22:49:25 +02:00
Jane Tournois 8d9620db50 fix includes 2022-06-08 22:45:20 +02:00
Sébastien Loriot 5e124e5d5f Merge cgal/master 2022-06-08 22:43:17 +02:00
Sébastien Loriot f0fc06b998 Merge cgal/master 2022-06-08 22:10:34 +02:00
Sébastien Loriot 920c35c30e Merge cgal/master 2022-06-08 21:56:39 +02:00
Jane Tournois e0335e3e5e move everything about C3t3 to new package MDS_3 2022-06-08 21:46:51 +02:00
Jane Tournois e86c4027af move C3T3 headers to MDS_3 new package
MDS_3 is "3D Mesh Data Structure"
2022-06-08 21:46:50 +02:00
Sébastien Loriot 18039c7a71 add overload using named function parameters
freeze_bound is still commented for now as the conflict with
boost parameters must be handled
2022-06-04 13:56:45 +02:00
Laurent Rineau 2288225448 Massive update of CMake policies to version 3.23 2022-05-06 09:34:35 +02:00
Laurent Rineau 33635fff6d Fix warning
> test/Mesh_3/test_meshing_polyhedron_with_features.cpp:57:27: warning: type qualifiers ignored on cast result type [-Wignored-qualifiers]
>    57 |       constexpr auto nb = static_cast<decltype(str_size)>(10000);
>       |                           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2022-02-25 15:28:53 +01:00
Laurent Rineau fc7f67269f Make two programs less verbose
Fix #6353
2022-02-24 15:41:47 +01:00
Laurent Rineau 9afc773df1 Merge pull request #6012 from janetournois/Mesh_3-isolated_vertices-jtournois
Mesh_3 - add `remove_isolated_vertices_in_mesh_3()`
2022-02-02 16:38:24 +01:00
Sébastien Loriot 593ff5371c Merge remote-tracking branch 'cgal/master' into HEAD 2022-02-01 20:11:27 +01:00
Andreas Fabri 5259a2317a Deal with Mesh_3 2022-01-18 18:58:06 +00:00
Sébastien Loriot ab48f63e30 update latest cmake version tested 2021-11-09 10:58:47 +01:00
Sébastien Loriot 262a04cef2 remove useless POLICY setting 2021-11-09 10:19:14 +01:00
Sébastien Loriot 58181afcdb remove useless include directives 2021-11-09 10:16:12 +01:00
Jane Tournois 9041574b9e remove free function remove_isolated_vertices_in_mesh_3
a member function of C3T3 is enough
2021-10-11 12:24:10 +02:00
Sébastien Loriot 44df66485d move images 2021-10-07 14:47:15 +02:00
Sébastien Loriot 8350dea94a char* -> std::string 2021-10-04 09:49:24 +02:00
Sébastien Loriot e805052e9e manual fixes 2021-10-04 09:43:55 +02:00
Sébastien Loriot 47028cd184 automatically move data files in data dir + update paths
Done for OFF/OBJ/STL/XYZ/PWN/PLY
2021-10-04 09:42:49 +02:00
Jane Tournois db5e638ac2 un-document remove_far_points_in_mesh_3 and merge with remove_isolated_vertices_in_mesh_3 2021-09-27 11:47:43 +02:00
Jane Tournois 4e8f424f25 test new remove functions 2021-09-24 17:04:39 +02:00
Maxime Gimeno 91ca5a8add Runs of Mesh_2 and Mesh_3 tests 2021-08-31 11:16:39 +02:00
Sébastien Loriot 98e471849b moving files from internal to PKG/internal 2021-08-26 11:33:39 +02:00
Maxime Gimeno a3d1765ab4 Merge remote-tracking branch 'cgal/master' into CGAL-Clean_up_boost_versions-maxGimeno 2021-07-19 14:18:40 +02:00
Laurent Rineau f8a2878b0c Port Mesh_3 to oneAPI-TBB
The work was already mostly done in PR #4892, but there was still two
issues:
  - `tbb::parallel_do` has been removed, and `tbb::parall_for_each`
  was to be used instead,
  - the support for `tbb_hasher` has been removed.

This time, I have tested in a container were
intel-oneapi-tbb-common-devel-2021.3.0-2021.3.0-511.noarch was
installed, but not tbb version 2020.
2021-07-13 11:38:43 +02:00
Maxime Gimeno 393ae7dae6 Clean-up boost_version reqs 2021-05-12 15:03:53 +02:00
Sébastien Loriot 4e519a3c7a move documented IO functions in IO namespace 2021-05-05 13:15:37 +02:00
Sébastien Loriot 70058db9b7 add IO namespace for Mesh_3 package 2021-05-03 15:39:07 +02:00
Sebastien Loriot b7323389c7
Merge pull request #5622 from maxGimeno/CMake-Update_versions_in_scripts-maxGimeno
Update maximum cmake versions
2021-04-17 10:58:14 +02:00
Maxime Gimeno c49152359c update max version of cmake and announce the new minimal in CHANGE.md 2021-04-15 15:08:54 +02:00
Jane Tournois c29b7e2eaf test facets_in_complex_3_to_triangle_mesh() determinism 2021-03-11 15:36:52 +01:00
Laurent Rineau 44d36e534f Merge pull request #5474 from danston/TBB-execution_failures-danston
Triangulation_3 and Mesh_3 Timeouts for parallel tests fix
2021-03-03 17:22:18 +01:00
Dmitry Anisimov 5ca5472ba4 better style 2021-02-22 11:12:43 +01:00
Dmitry Anisimov 9689ad23c2 added RUN_SERIAL option to the parallel tests in Triangulation_3 and Mesh_3 2021-02-22 11:08:06 +01:00
Sébastien Loriot f4935dc199 Merge branch 'CGAL-Eigen3_support-5.1' 2021-01-15 10:54:02 +01:00
Sébastien Loriot eecb00534e fix macro name to be consistent with find_package 2021-01-15 10:43:34 +01:00
Laurent Rineau 3fc0ba4435 Merge branch '5.1.x-branch' into 5.2.x-branch
# Conflicts:
#	Tetrahedral_remeshing/examples/Tetrahedral_remeshing/CMakeLists.txt
2020-12-09 15:35:47 +01:00
Maxime Gimeno 0ed99d0182 Add a test for old Mesh_cell_base_3 2020-11-30 12:54:59 +01:00
Sebastien Loriot 9e4970faef
Merge pull request #4781 from lrineau/Mesh_3-ITT_support-GF
Add ITT support in Mesh_3
2020-10-02 15:20:04 +02:00
Sebastien Loriot 20ac7ff2da
Merge pull request #4792 from lrineau/Mesh_3-reduce_size_of_debuginfo-GF
Reduce size of symbols (and debug infos)
2020-10-02 15:17:44 +02:00
Laurent Rineau dd383217f2 Avoid a race-condition between two tests using the same I/O file 2020-07-29 16:42:10 +02:00
Laurent Rineau 2e912d4cb2 Merge branch 'master' into Mesh_3-ITT_support-GF 2020-07-08 16:22:58 +02:00
Laurent Rineau bc4fffebc0 ITT for CGAL_MESH_3_VERBOSE as well 2020-07-08 15:47:38 +02:00
Laurent Rineau 5572d9dba8 Add move-semantic for c3t3, and a test 2020-06-24 10:59:19 +02:00
Laurent Rineau 25710329ac Add ITT support in Mesh_3 2020-06-11 14:56:04 +02:00
Laurent Rineau 9b8ecd720b Merge pull request #4636 from sgiraudot/CMake-Third_party_imported_targets-GF
CMake: Use Imported Targets for 3rd Party Libs
2020-06-05 17:54:14 +02:00
Jane Tournois 94d98ed0dc c3t3 cell info in the .mesh file is subdomain_index()
the recent internal changes in build_triangulation() use subdomain_index(),
which is part of the concept MeshCellBase_3
2020-05-11 06:48:25 +02:00
Simon Giraudot 421096fd7f Use imported targets everywhere 2020-04-15 14:06:13 +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
Simon Giraudot 6c8fd43ebb Use CGAL_target_use_* mechanism for Eigen, LASLIB, OpenCV, TensorFlow, GLPK, SCIP, Boost IOStreams and Serialization 2020-02-10 11:57:56 +01:00
Mael 8f29c7cb63
Merge branch 'master' into CGAL-Parallel_if_available_tag 2020-01-29 16:42:54 +01:00
Maxime Gimeno 5fbaaa9e42 Workaround for VS 2015 2020-01-27 10:25:24 +01:00
Maxime Gimeno 85712ba28c WIP replacing tbb deprecated includes. 2020-01-14 15:03:20 +01:00
Laurent Rineau 048691b454 Fix test_c3t3_io.cpp after the change in cells order
As this branch modified `insert_in_hole`, then the order of cells in
the cells container is modified.
2019-12-10 14:26:12 +01:00
Mael Rouxel-Labbé 6f0bbc90df Enable parallel for three tests in Mesh_3/test that relied on CONCURRENT_MESH_3
The macro was never defined and if it had been, the targets would not have
been linked properly anyway.
2019-11-20 12:46:42 +01:00
Mael Rouxel-Labbé 9b598c4ee6 Remove mentions of targets that do not exist in CmakeLists of Mesh_3/test 2019-11-20 12:36:42 +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 4fbf00fb8a CMake>=3.13: opt for for new policies up to 3.15 2019-06-19 14:34:59 +02:00
Laurent Rineau 2f09bbdfff Merge pull request #3951 from lrineau/Mesh_3-fix_issue_2870-GF
Mesh_3: fix issue #2870 (do not deactivate all topological criteria)
2019-06-17 14:16:12 +02:00
Laurent Rineau 62b6476f76 Merge pull request #3951 from lrineau/Mesh_3-fix_issue_2870-GF
Mesh_3: fix issue #2870 (do not deactivate all topological criteria)
2019-06-17 14:15:25 +02:00
Laurent Rineau 22d6d9ebd8 Allow lambdas (or other callables) as MeshDomainField_3
That patch uses C++11 `<type_traits>`, and
`boost::callable_traits::is_invocable` that is available only since
1.66. If Boost<1.66, then the previous behavior (testing
`Sizing_field::FT`) is kept.

Fix issue https://github.com/CGAL/cgal/issues/3005
2019-05-24 10:45:12 +02:00
Laurent Rineau 3a9b2fe67f Merge branch 'releases/CGAL-4.14-branch' 2019-05-21 16:36:28 +02:00
Laurent Rineau e4c82fa260 Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-05-21 16:35:24 +02:00
Laurent Rineau f7a4836039 Do not deactivate all topological criteria 2019-05-21 13:43:11 +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 0cdc5b8527 Fix for Boost-1.71 (master branch)
Pass the criteria object by value, instead of const references: same
semantic, but better than the universal reference used by Boost
Parameter 1.71.
2019-05-14 12:36:02 +02:00
Sébastien Loriot f62624c4f9 replace cpp11::tuple by std::tuple 2019-03-29 13:28:33 +01:00
Laurent Rineau 0c16961337
Update Mesh_3/test/Mesh_3/test_meshing_utilities.h
fix precision test

Co-Authored-By: janetournois <janetournois@users.noreply.github.com>
2019-03-08 16:13:05 +01:00
Jane Tournois 60ce59aeaa the assertion is subject to precision of double's
so we can release the test by 1e-15
2019-03-08 16:04:13 +01:00
Laurent Rineau e3fbdb161f Merge pull request #3683 from afabri/CGAL_CMakeLists_cleanup-GF
CGAL: clean up CMakeLists.txt files in examples and tests
2019-02-22 16:38:58 +01:00
Laurent Rineau 35c74b11f3 Merge remote-tracking branch 'cgal/releases/CGAL-4.13-branch' 2019-02-22 11:08:50 +01:00
Andreas Fabri a483f3442b CGAL: clean up CMakeLists.txt files in examples and tests 2019-02-13 17:29:29 +01:00
Laurent Rineau d94a9d139a Add a new test
This test verifies that `Polyhedral_mesh_domain_with_features_3` can
be used without calling `detect_features()`, with both `Polyhedron_3`
and `Surface_mesh`.
2019-02-12 14:38:51 +01:00
Laurent Rineau c06bf7836c Add a test of Mesher_3::display_number_of_bad_elements
And:
- fix compilation errors (with `this->`)
- fix a warning about unused variables
2019-01-09 16:15:57 +01:00
Laurent Rineau 8121e872ab Merge pull request #3513 from sloriot/CGAL-fix_maybe_uninit_vars_wrngs_2
Fix some wmaybe-uninitialized warnings
2018-12-19 16:08:55 +01:00
Laurent Rineau 71563a3338 Fix a [-Wmaybe-uninitialized] warning 2018-12-11 10:31:55 +01:00
Maxime Gimeno d6cfa1a868 Fix CMake warnings about CMP for Visual 2017 2018-11-21 16:17:39 +01:00
Guillaume Damiand 7d406fbb9c
Merge branch 'master' into CGAL-cmake_cleanup-gdamiand 2018-11-05 07:32:58 +01:00
Laurent Rineau e54b036516 Merge pull request #3379 from lrineau/Mesh_3-fix_Index-GF
Mesh_3: Allow `Subdomain_index` to be `short`
2018-10-29 10:27:33 +01:00
Guillaume Damiand 92ba7fa6c9 Update minimum cmake required version in all CMakeLists.txt 2018-10-18 14:49:23 +02:00
Guillaume Damiand cd14640d9a Re-add include({CGAL_USE_FILE} ) for mesh 3, to solve link error with image_io. Todo later : solve this problem in the image_io target. 2018-10-17 15:03:55 +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
Laurent Rineau d82cdbcff1 Mesh_3: Allow `Subdomain_index` to be `short`
... That forced me to modify the `Index` of domains with features.
2018-10-05 17:02:38 +02:00
Laurent Rineau 048934bb6c Parallel compact container and Mesh_3 deterministic with 1 thread 2018-10-03 17:35:10 +02:00
Laurent Rineau 10a84aa34e Merge branch 'master' into Periodic_3_mesh_3-Feature-MBogdanov 2018-06-27 10:33:24 +02:00
Laurent Rineau b86fff3f90 Merge pull request #3128 from sgiraudot/Solver_interface-Warn_against_diagonalize_traits-GF
Solver Interface: deprecate CGAL::Diagonalize_traits
2018-06-27 10:21:37 +02:00
Mael Rouxel-Labbé 7490f34560 Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-06-21 10:15:25 +02:00
Mael Rouxel-Labbé 7d63aa654f Added a test for the deprecated constructor of Implicit_mesh_domain_3 2018-06-20 12:38:04 +02:00