Commit Graph

1222 Commits

Author SHA1 Message Date
Giles Bathgate b5580573d6 Fix cyclic dependencies
Move shared code to SNC_halfedge_key.h, remove unneeded headers, add a one forward declaration for SNC_io_parser
2023-01-18 20:30:19 +00:00
Giles Bathgate 59ef7678aa Add header required by additional typedef 2023-01-13 20:01:22 +00:00
Giles Bathgate c2a1810b64 Calculate edge Nef_boxes only once 2023-01-13 18:43:33 +00:00
Giles Bathgate cb5fd9404c Remove unused hash function 2023-01-13 18:43:33 +00:00
Giles Bathgate 15820b3009 Include required headers 2023-01-13 18:43:33 +00:00
Giles Bathgate 017210acfb Rename parameters 2023-01-13 18:43:33 +00:00
Giles Bathgate 1f8244d9bb Cleanup - remove CGAL_NEF3_BOX_INTERSECTION_CUTOFF 2023-01-13 18:43:33 +00:00
Giles Bathgate f827481216 Make binop_intersection_tests const to remove const_cast 2023-01-13 18:43:32 +00:00
Andreas Fabri ae271b08f7 Revert to deque 2023-01-02 10:46:01 +00:00
Mael 0ff7882997
Merge branch 'master' into feature/bug_documentation_spell_20221113 2022-12-06 22:21:06 +01:00
Laurent Rineau 5c943e558c Merge pull request #6935 from lrineau/CGAL-fix_autotest_with_ctest-GF
Fix autotest_cgal_with_ctest
2022-11-25 10:15:07 +01:00
Laurent Rineau b363b7e4af Merge pull request #6935 from lrineau/CGAL-fix_autotest_with_ctest-GF
Fix autotest_cgal_with_ctest
2022-11-25 10:14:18 +01:00
Sébastien Loriot 7322c7908d try to workaround warnings 2022-11-21 14:09:08 +01:00
Sébastien Loriot 8bbbf8d494 try workaround warnings 2022-11-17 19:11:00 +01:00
albert-github 3674c937f7 spelling corrections
Some spelling corrections (Directories starting with `M`-` N`),
some backward work
some forward work
2022-11-15 15:21:01 +01:00
albert-github 45478184de spelling corrections
Some spelling corrections (Directories starting with `E`-` L`),
some backward work
some forward work
2022-11-15 13:39:40 +01:00
Guillaume Damiand e18a573cc1 add missing include 2022-10-19 15:22:09 +02:00
Guillaume Damiand 58fead22b1 draw nef3 review 2022-10-17 17:53:56 +02:00
Guillaume Damiand 24a8004ee0
Merge branch 'master' into gsoc2022-EBVs-Mostafa-ashraf19 2022-10-14 08:53:12 +02:00
Mostafa-ashraf19 2f592577c1 Scope changed. 2022-10-07 19:16:27 +02:00
Mostafa-ashraf19 c4d612c85e Uses new APIs version in Nef_3. 2022-10-07 03:00:19 +02:00
albert-github 17a84db90e Some obvious missing quotes
Some obvious missing quotes  (last set)
2022-09-25 18:00:08 +02:00
Laurent Rineau d49ee20965
Merge pull request #6665 from sloriot/CGAL-std_type_traits 2022-08-17 13:56:54 +02:00
Sébastien Loriot 098ca52aff Merge remote-tracking branch 'cgal/5.5.x-branch' 2022-08-10 18:39:17 +02:00
Sébastien Loriot 601bd64dc8 Merge remote-tracking branch 'cgal/5.4.x-branch' 2022-08-10 18:38:50 +02:00
Sébastien Loriot 861588abe1 Merge 'sloriot/CGAL-std_type_traits' into master 2022-08-03 20:19:51 +02:00
Andreas Fabri 7b09c8e5ea Nef_3: Fix in nary functions 2022-08-02 17:37:38 +01:00
Sebastien Loriot 4b9032f8c6
Merge pull request #6547 from afabri/Skeletoniation-HDS-GF
Skeletonization: Replace internally Polyhedron by HDS
2022-07-08 20:24:58 +02:00
Sébastien Loriot 3186833268 WIP working with simple soup example 2022-07-07 10:16:18 +02:00
Sébastien Loriot 744a964372 fix compilation errors 2022-07-07 09:36:39 +02:00
Sébastien Loriot 69c4af61a9 fix types, still not valid 2022-07-07 09:21:10 +02:00
Sébastien Loriot 07b04366a0 WIP 2022-07-06 17:09:55 +02:00
Andreas Fabri a994933ccb Nef_3: Fix conversion to a FaceGraph 2022-06-30 11:44:09 +01:00
Sébastien Loriot 707b45cb5b Merge remote-tracking branch 'cgal/5.5.x-branch' 2022-06-29 10:48:00 +02:00
Sébastien Loriot f1f201b542 Merge remote-tracking branch 'cgal/5.4.x-branch' into HEAD 2022-06-29 10:47:14 +02:00
Sébastien Loriot 078122cd2e test constructor and constness 2022-06-20 16:59:35 +02:00
Sébastien Loriot e9e07ea874 fix constness issues without constcast and use initialized Index pmap mechanism 2022-06-20 16:30:10 +02:00
Sébastien Loriot 4400120244 remove non-needed include directives 2022-06-16 09:54:57 +02:00
Sébastien Loriot 3fa436459d BOOST_MPL_ASSERT -> static_assert 2022-06-10 08:46:01 +02:00
Sébastien Loriot ac8b6d4731 boost::is_same --> std::is_same 2022-06-10 08:18:20 +02:00
Sébastien Loriot 4f5f8341cc use std::enable_if_t 2022-06-10 07:37:53 +02:00
Giles Bathgate 0570e6aa3c Merge branch 'master' into Nef_3-performance_shoot-GilesBathgate 2022-06-03 15:30:05 +01:00
Laurent Rineau d5b6911929 Merge pull request #6480 from GilesBathgate/Nef_3-performance_reduce_object_casts-GilesBathgate
Nef_3: Use separate lists K3_tree node to avoid object casts
2022-06-03 16:08:58 +02:00
Sebastien Loriot 269a391fa0
Merge pull request #6558 from lrineau/Installation-remove_wd4503-GF
CMake script updates: version of CMake and /wd4503 is only for MSVC 2015
2022-05-13 15:53:36 +02:00
Laurent Rineau 2288225448 Massive update of CMake policies to version 3.23 2022-05-06 09:34:35 +02:00
Andreas Fabri 9567522297 Include header 2022-04-19 17:02:20 +01:00
Andreas Fabri 36f2260948 Move return() out of the switch to avoid warning 2022-04-14 08:36:36 +01:00
Giles Bathgate 168ae33f73 Remove extraneous semicolon, initialize solution enum. 2022-04-13 17:36:12 +01:00
Andreas Fabri 2a5fcdcfb1 Add reserve() in generic code and change comment to avoid warning 2022-04-13 12:59:21 +01:00
Andreas Fabri 68d896b496 Fix warnings 2022-04-13 11:53:02 +01:00
Giles Bathgate 0bbb92aac7 Inline variable to only construct segment when needed 2022-04-07 18:07:32 +01:00
Giles Bathgate 32f04e082d Rename local variable to not conflict with member variable name 2022-04-07 17:40:28 +01:00
Andreas Fabri 3aea3f4691 initialize solution 2022-04-07 13:14:14 +01:00
Andreas Fabri 26571bf354 As leaves have at least 2 data elements we can reserve less 2022-04-07 07:56:51 +01:00
Giles Bathgate 69562405f5 Use enum in SNC_point_locator to avoid object casts 2022-04-06 23:39:24 +01:00
Giles Bathgate ddce635de2 Remove object casting in Intersection_call_back 2022-04-06 23:10:06 +01:00
Giles Bathgate af913fd00f Use separate lists K3_tree node to avoid object casts 2022-04-06 20:27:04 +01:00
Andreas Fabri d5311e37c4 Allocate a big enough vector for the nodes of the K3_tree 2022-04-06 15:55:49 +01:00
Giles Bathgate 104aca6295 Add a comment to the get_hash method 2022-04-04 17:38:41 +01:00
Giles Bathgate 4f9bb66292 Use bucket_count constructor in std::unordered_map 2022-04-03 23:30:42 +01:00
Giles Bathgate 52e0166b5f Use std::unordered map instead of std::map 2022-04-03 20:45:18 +01:00
Giles Bathgate 04f7b8d7b9 Avoid filter failure in ray shoot facet 2022-04-03 11:41:26 +01:00
Giles Bathgate 0dfa8a4941 Avoid double hash lookup 2022-04-03 11:41:07 +01:00
Laurent Rineau 0d9f80e557 Merge pull request #6435 from GilesBathgate/Nef_3-cleanup_snc_list-GilesBathgate
Nef_3: Cleanup SNC_list
2022-03-31 16:58:05 +02:00
Sébastien Loriot 4c4aeb74f4 Merge pull request #6433 from GilesBathgate/Nef_3-cleanup_nef_list_of_triangles-GilesBathgate
Nef_3: Cleanup Halffacet_triangle_handle/Halffacet_triangle_const_handle
2022-03-29 17:47:51 +02:00
Sébastien Loriot 6bc0dc90a7 Merge pull request #6431 from afabri/Nef_3-Avoid_filter_failures-GF
Nef_3:  Avoid Filter Failures
2022-03-29 17:47:37 +02:00
Sébastien Loriot 2067913940 Merge pull request #6424 from GilesBathgate/Nef_3-cleanup_snc_intersection-GilesBathgate
Nef_3: Cleanup and performance improvements SNC_intersection
2022-03-29 17:46:56 +02:00
Sébastien Loriot 5e894656f5 Merge pull request #6422 from afabri/Nef_3-avoid_needless_tests-GF
Nef_3: Avoid needless tests
2022-03-29 17:46:42 +02:00
Sébastien Loriot 3e959d7ca6 Merge pull request #6421 from afabri/Nef_3-has_smaller_distance_to_point-GF
Nef_3: Use has_smaller_distance_to_point()
2022-03-29 17:46:16 +02:00
Sébastien Loriot 99f0598f3e Merge pull request #6378 from GilesBathgate/Nef_3-performance_sphere_circle-GilesBathgate
Nef_3: Sphere circle constructors.
2022-03-29 17:45:52 +02:00
Sébastien Loriot b34bc3f8f7 Merge pull request #6306 from GilesBathgate/Hash_map-performance_chained_map_reserve-GilesBathgate
Reserve method for Chained Map / Unique Hash Map
2022-03-29 17:45:37 +02:00
Andreas Fabri 913c6155ec Don't use a variable for calling a static method (VC2015 warned) 2022-03-24 08:55:27 +01:00
Andreas Fabri 5dd90d21fe Fix the expression 2022-03-23 16:39:23 +01:00
Andreas Fabri 80b0ec3960 Don't use a variable for calling a static method (VC2015 warned) 2022-03-23 10:47:24 +01:00
Andreas Fabri 45365e473c Don't use a variable for calling a static method (VC2015 warned) 2022-03-23 10:04:37 +01:00
Andreas Fabri 1c4b191c71 Remove no longer needed typedef (led to a W in the testsuite) 2022-03-23 09:23:25 +01:00
Andreas Fabri 7390809208 Fix in the testcode 2022-03-23 08:14:01 +01:00
Giles Bathgate dc18d7abb2 Restore other predicates in ray_segment intersections 2022-03-22 21:00:57 +00:00
Giles Bathgate c8d0409297 Using planes is faster for segment intersections 2022-03-22 19:46:25 +00:00
Giles Bathgate 50ec2fadf8 Call reserve before adding infinibox vertices 2022-03-22 18:43:19 +00:00
Giles Bathgate 13592cc496 Using planes is faster for ray intersections 2022-03-22 07:37:04 +00:00
Giles Bathgate 62da2dab06 Coplanar check is a worthwhile performance tweak 2022-03-21 20:47:46 +00:00
Andreas Fabri cc3125068f Remove redundant test 2022-03-21 18:08:35 +01:00
Andreas Fabri 1a4bf304ae Switch to an overload as suggested by Giles 2022-03-21 09:19:50 +01:00
Giles Bathgate e451af9f50 As a consequence of previous changes check_has_on is never called with false 2022-03-20 10:44:17 +00:00
Giles Bathgate 0124fc9e6d Call appropriate function with different name 2022-03-20 10:44:17 +00:00
Giles Bathgate 7411d76e2f Inline function as its only called once 2022-03-20 10:44:17 +00:00
Giles Bathgate c4fc25ad82 Use simpler and faster tests for internal segment intersection 2022-03-20 10:44:17 +00:00
Giles Bathgate fdc647b510 Standardise parameter wrapping 2022-03-20 10:44:16 +00:00
Giles Bathgate 99e8bece4c Standardise check_has_on parameter name 2022-03-20 10:44:16 +00:00
Giles Bathgate 42aa3c3c87 Remove unused code, make methods static 2022-03-20 10:44:16 +00:00
Giles Bathgate 3b8a9dc9c1 Merge remote-tracking branch 'afabri/Nef_3-avoid_needless_tests-GF' into Nef_3-cleanup_snc_intersection-GilesBathgate 2022-03-20 10:35:12 +00:00
Giles Bathgate e5f47961e7 Remove commented out code 2022-03-19 12:43:38 +00:00
Giles Bathgate 415bf5ab5e Remove unused code in SNC_list 2022-03-19 12:40:28 +00:00
Giles Bathgate 252aab710f Remove Halffacet_triangle_handle/Halffacet_triangle_const_handle 2022-03-19 12:16:25 +00:00
Giles Bathgate 4390be94b3 Remove code defined in CGAL_NEF_LIST_OF_TRIANGLES 2022-03-19 12:10:22 +00:00
Giles Bathgate 29191ffe1a Add Halffacet_triangle_const_handle to fix compilation issue 2022-03-19 11:13:05 +00:00
Giles Bathgate 035745559a Remove call to reserve in SNC_simplify that triggers assertion 2022-03-18 18:25:40 +00:00
Andreas Fabri 211cb75dd3 Nef_3: Avoid geometric test 2022-03-18 15:42:17 +01:00
Andreas Fabri f09f38c3f2 Nef_3: Avoid geometric test 2022-03-18 15:39:41 +01:00
Andreas Fabri 108c91ad24 Fix the testcode as the signature of an internal function has changed 2022-03-18 08:49:47 +01:00
Giles Bathgate 9692f2b97a Remove redundant Unique_hash_map in SNC_external_structure 2022-03-17 21:29:56 +00:00
Giles Bathgate 16bed97ec5 Remove sizing of hash tables in copy constructors, size just grows 2022-03-17 20:21:12 +00:00
Andreas Fabri 2edb6dcf32 are_strictly_ordered_along_line() does the job 2022-03-16 22:27:59 +01:00
Andreas Fabri ebd5e00ba8 Nef_3: Avoid needless tests 2022-03-16 15:40:41 +01:00
Andreas Fabri a92e6e6039 Nef_3: Use has_smaller_distance_to_point() 2022-03-16 15:00:02 +01:00
Giles Bathgate 2d4a857c81 Make boundary_entry_objects_ private and use accessor method 2022-03-12 12:06:17 +00:00
Giles Bathgate f1a3f68fbb Ensure reference address is the same as member address 2022-03-12 12:00:42 +00:00
Giles Bathgate 0a8ef644c2 Init hashtable size in SNC_FM_decorator 2022-03-11 22:48:44 +00:00
Giles Bathgate 933604b1e6 Init hashtable size in SNC_structure 2022-03-11 21:27:32 +00:00
Giles Bathgate ded44f2329 Init hashtable size in SNC_external_structure 2022-03-10 18:30:55 +00:00
Giles Bathgate aa9e7cf34d Reserve hashtable size in polygon_mesh_to_nef_3 2022-03-10 18:24:07 +00:00
Giles Bathgate 7aa98b48bc Init hashtable size in SNC_simplify 2022-03-10 18:24:07 +00:00
Giles Bathgate 7d76d31943 Init hashtable size in Binary_operation.h 2022-03-10 18:24:07 +00:00
Giles Bathgate 1009acb9cd Reserve hashtable size in SNC_simplify 2022-03-10 18:24:07 +00:00
Giles Bathgate 263c168d9d Reserve hashtable size in K3_tree/SNC_k3_tree_traits 2022-03-10 18:24:07 +00:00
Giles Bathgate 3004350b7a Add const to is_boundary_object and is_sm_boundary_object 2022-03-10 18:24:07 +00:00
Guillaume Damiand 2df2398108 trailing... 2022-03-07 17:37:54 +01:00
Guillaume Damiand 182389ed44 Update draw nef3 example to observe faces with holes 2022-03-07 17:33:07 +01:00
Guillaume Damiand dd653cd396 Update nef_3 draw to deal with faces with holes. 2022-03-07 17:32:26 +01:00
Giles Bathgate a0d5fae2bd Add Origin based constructor to sphere_point and avoid conditional constructor 2022-03-03 18:55:37 +00:00
Laurent Rineau 258d704a90 Merge pull request #6209 from sloriot/PMP-std_instead_of_boost
Use features available in std instead of boost
2022-02-24 19:57:17 +01:00
Laurent Rineau 43b49409d1 Merge pull request #6288 from GilesBathgate/Nef_3-constructor_single_initialise-GilesBathgate
Simplify initialisation in Nef_polyhedron_3
2022-02-18 11:43:45 +01:00
Laurent Rineau d78a7b9255 Merge pull request #6302 from afabri/P2T2-assert-GF
CGAL: In testcode do not use CGAL_assertion but assert
2022-02-08 23:44:24 +01:00
Sébastien Loriot 4ffc949199 replace boost::unordered by std::unordered
but in T3, Mesh_3, TDS_3, P3[TM]3
2022-02-03 19:11:12 +01:00
Andreas Fabri 440a8dfb7b Fix file name 2022-02-03 08:41:04 +00:00
Andreas Fabri 735752bec9 Do the remaining changes after Laurent's check 2022-02-03 08:02:11 +00:00
Laurent Rineau f9c05a0ba1 Merge pull request #6253 from afabri/P2T2-assert-GF
CGAL:   In testcode do not use CGAL_assertion  but assert
2022-02-02 16:38:22 +01:00
Giles Bathgate 9346d14c55 Simplify initialisation in Nef_polyhedron_3 2022-01-31 18:33:28 +00:00
Andreas Fabri 79a38d5cb9 CGAL Examples: CGAL_assertion -> assert 2022-01-24 10:19:04 +00:00
Andreas Fabri 5259a2317a Deal with Mesh_3 2022-01-18 18:58:06 +00:00
Laurent Rineau fa4c12cb22 Merge pull request #5772 from GilesBathgate/Nef_3-performance_k3_tree_vertices-GilesBathgate
18% performance boost in Nef_3 K3_tree.
2022-01-12 12:24:34 +01:00
Andreas Fabri 7b8c3ab4c3 Remove the reference as the Side_of_plane constructor is called with a temporary 2021-12-09 18:11:56 +00:00
Laurent Rineau 28cdf9b08f Merge pull request #6154 from afabri/Nef_3-fix_comparison-GF
Nef_3: Fix broken greater-than
2021-12-03 15:27:31 +01:00
Sébastien Loriot e1e0b737b4 fix type 2021-12-03 11:54:46 +01:00
Andreas Fabri a1a289461b Remove unused variables 2021-12-03 09:58:13 +00:00
Andreas Fabri 99a8b0c15d Add test 2021-11-30 16:36:31 +00:00
Andreas Fabri 294715ff53 Fix broken greater-than 2021-11-30 16:16:23 +00:00
Giles Bathgate 35c24ccb7e Use renamed Non_zero_coordinate_index_3 2021-11-19 07:56:16 +00:00
Giles Bathgate ea3f55b208 Fix using depth instead of coord for Side_of_plane 2021-11-19 07:50:04 +00:00
Giles Bathgate 264bc155e5 Use original method to construct homogeneous splitting plane 2021-11-19 07:50:03 +00:00
Giles Bathgate ec3257f42b Use cartesian overload for construct_splitting_plane 2021-11-19 07:50:01 +00:00
Giles Bathgate 38a23a84a7 Remove redundant comparison functors 2021-11-19 07:50:00 +00:00
Andreas Fabri f856f05861 Plane constructor needs as 4th parameter a RT not a FT 2021-11-19 07:49:59 +00:00
Giles Bathgate 61e8c5a069 Move non_effective_splits to member variable 2021-11-19 07:49:58 +00:00
Giles Bathgate cbd3d6e514 Reuse get_child_by_side function 2021-11-19 07:49:57 +00:00
Giles Bathgate e615c9e885 Find a splitting plane between median and its predecessor 2021-11-19 07:49:56 +00:00
Giles Bathgate da8eb6e6cd Build K3_tree from seperate vertex, edge, and facet lists 2021-11-19 07:49:55 +00:00
Laurent Rineau df777080ff Merge pull request #6102 from afabri/Kernel_23-Non_zero_dimension_3-GF
Kernel_23: Add NonZeroDimension_3
2021-11-18 14:02:07 +01:00
Laurent Rineau 4d38f2b7b3 Merge pull request #6114 from sloriot/CGAL-cmake_clean_up
Clean cmake scripts of examples and tests
2021-11-18 12:27:19 +01:00