Commit Graph

236 Commits

Author SHA1 Message Date
Sébastien Loriot 4464229a52 remove cpp11 workarounds in argt related packages 2019-03-29 10:41:50 +01:00
Laurent Rineau 300659577a Other fixes for GMPXX
Followup-up to the previous commit.
2019-02-05 13:32:27 +01:00
Efi Fogel dbc45fac53 Fixed face filtering in case one of the summands does not have an outer boundary 2018-11-27 16:32:07 +02:00
Sébastien Loriot cdbe19b480 Merge pull request #3369 from maxGimeno/AABB_tree-AABB_transformed_traits-GF
[Small Feature] Add collision detection in PMP
2018-10-30 15:49:38 +01:00
Maxime Gimeno a764322b7d Create a dummy traits and fix AABB_traits and AABBTraits implem/doc problems. 2018-10-09 10:24:31 +02:00
Sébastien Loriot 3dd0aa112d rename macro not following the convention 2018-10-08 10:28:55 +02:00
Sébastien Loriot a2e8a1c68f add the suffix Ref to doxygen link to reference 2018-10-08 10:26:56 +02:00
Sébastien Loriot 4d00a8e070 Merge branch 'cgal/releases/CGAL-4.12-branch' 2018-05-15 22:32:45 +02:00
Andreas Fabri c65a07db7e Qualify local struct with class scope 2018-05-15 15:37:51 +02:00
Efi Fogel 06fb3dbc10 Fixed the code to handle polygons-with-holes with empty outer boundary. 2018-05-01 12:48:18 +03:00
Laurent Rineau 689f5d828d Merge branch 'releases/CGAL-4.11-branch' 2018-01-04 16:15:15 +01:00
Efi Fogel eedebc584a Fixed bug when testing whether a face is included in the sum or not when using polygons with holes 2017-11-29 18:39:47 +01:00
Sébastien Loriot 8cdfad0d08 add missing URL and Id tags 2017-11-15 22:58:57 +01:00
Sébastien Loriot ee57fc2d6c add SPDX identifier for files under the GPL-3+ license 2017-11-12 10:17:51 +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
Laurent Rineau 51f5697d3d Add missing #include 2016-09-30 15:23:14 +02:00
Andreas Fabri 0cfcafba86 Fix package Minkowski_sum_2: include headers 2016-09-30 15:22:28 +02:00
Efi Fogel eed57c67a9 Used the explicit type Gps_segment_traits_2 to resolve ambiguity 2016-06-02 17:59:35 +03:00
Efi Fogel bbc514714c Merge branch 'MS_2-decomposition_optimization-efif-old' into MS_2-decomposition_optimization-efif
Conflicts:
	Documentation/biblio/cgal_manual.bib
	Documentation/biblio/geom.bib
	Minkowski_sum_2/doc/Minkowski_sum_2/Minkowski_sum_2.txt
	Minkowski_sum_2/test/Minkowski_sum_2/test_minkowski_sum_with_holes.cpp
2016-02-24 18:25:07 +02:00
Andreas Fabri c3ad989c9f Use wrapper for the very basic mutex locking 2015-09-04 09:46:51 +02:00
Efi Fogel 4e7379e957 1st revision 2015-07-01 12:00:46 +03:00
Efi Fogel e006eaa6c6 Added minkowski_sum_by_decomposition_2() 2015-06-29 16:47:53 +03:00
Efi Fogel 91a79a7ff8 Fixed comment 2015-06-29 13:29:18 +03:00
Efi Fogel 58eef9eacd Renamed minkowski_sum_{full_convolution,reduced_convolution} => minkowski_sum_by_{full_convolution,reduced_convolution} 2015-06-29 11:27:45 +03:00
Efi Fogel b56453e897 Fixed typo 2015-06-22 18:47:46 +03:00
Efi Fogel b1019a64ad Enhanced the test to use 2 decomposition strategies 2015-06-22 17:05:31 +03:00
Efi Fogel 4218896b1e For now, allocate 2 decomposition strategies if not present 2015-06-22 17:04:41 +03:00
Efi Fogel c5d334d345 Added second parameter to Minkowski sum function by decomposition 2015-06-22 12:42:50 +03:00
Laurent Rineau 284116af48 Patch to remove a warning
The warning, reported by g++-4.8 with `-O3 -DCGAL_NDEBUG`, was:

    In file included from [...]/CGAL-4.7-Ic-35/include/CGAL/predicates/kernel_ftC2.h:32:0,
                     from [...]/CGAL-4.7-Ic-35/include/CGAL/Cartesian/Line_2.h:30,
                     from [...]/CGAL-4.7-Ic-35/include/CGAL/Cartesian/Cartesian_base.h:35,
                     from [...]/CGAL-4.7-Ic-35/include/CGAL/Simple_cartesian.h:28,
                     from [...]/CGAL-4.7-Ic-35/include/CGAL/Exact_predicates_inexact_constructions_kernel.h:28,
                     from [...]/CGAL-4.7-Ic-35/cmake/platforms/i686_Linux-2.6_g++-4.1.2_CentOS-5.1-O3/test/Polygon_Demo/Polygon_2.cpp:4:
    [...]/CGAL-4.7-Ic-35/include/CGAL/constructions/kernel_ftC2.h:40:3: warning: 'min_q' may be used uninitialized in this function [-Wmaybe-uninitialized]
       x = (px+qx) / 2;
       ^
    In file included from [...]/CGAL-4.7-Ic-35/include/CGAL/minkowski_sum_2.h:25:0,
                     from [...]/CGAL-4.7-Ic-35/cmake/platforms/i686_Linux-2.6_g++-4.1.2_CentOS-5.1-O3/test/Polygon_Demo/Polygon_2.cpp:13:
    [...]/CGAL-4.7-Ic-35/include/CGAL/Minkowski_sum_2/Minkowski_sum_by_reduced_convolution_2.h:463:13: note: 'min_q' was declared here
         Point_2 min_q;
                 ^

See https://cgal.geometryfactory.com/CGAL/Members/testsuite/CGAL-4.7-Ic-35/Polygon_Demo/TestReport_lrineau_i686_Linux-2.6_g++-4.1.2_CentOS-5.1-O3.gz
2015-05-27 12:08:02 +02:00
Sebastian Morr d0f492a3fd Fix incorrect function evocation 2015-05-18 12:04:49 +02:00
Sebastian Morr a69dd3f6c7 Rename more Polygon to Polygon_2 and remove an unused variable 2015-05-14 09:22:06 +02:00
Sebastian Morr c52234a531 Never use Polygon_2::vertex(i), in case that the Container is std::list 2015-05-13 16:34:35 +02:00
Sebastian Morr 0c5d3bdbdd Avoid warnings about the size_t to int cast 2015-05-12 23:37:04 +02:00
Efi Fogel 423ce309f4 Added missing Container template parameter 2015-05-12 21:48:40 +03:00
Efi Fogel 46d8e206f0 Added copyright statetemnt 2015-05-09 10:30:58 +03:00
Efi Fogel 39f1e22dad Type and typename fixes 2015-05-06 00:40:52 +03:00
Efi Fogel 1b0c1de7b3 Cleaned up 2015-05-03 15:11:10 +03:00
Efi Fogel 3ecd5a3795 Cleaned up 2015-05-03 14:55:06 +03:00
Sebastian Morr e584aa7f53 Adding a missing method signature 2015-03-23 22:36:55 +01:00
Sebastian Morr 1acbf41fd5 Documentation additions 2015-03-23 22:25:05 +01:00
Sebastian Morr 2560066432 Add Hole_filter to all Minkowski sum methods 2015-01-28 20:17:14 +01:00
Sebastian Morr 90836bcbe3 Add a hole filter to the p-w-h strategies
When the bounding box of the other polygon's outer boundary does not fit
into the bounding box of a hole, the hole is irrelevant.
2014-11-29 16:36:20 +01:00
Efi Fogel 675b3e716b Fixed simplify() 2014-11-04 10:49:55 +02:00
Efi Fogel 819cc274fd pacify msvc 2014-11-04 10:44:49 +02:00
Efi Fogel 83ef9bb773 cleaned up 2014-11-04 10:04:19 +02:00
Sebastian Morr 57c865c2a4 Merge branch 'MS_2-of_holes-efif' 2014-10-31 11:45:07 +01:00
Sebastian Morr 6f04ce37f5 Fix reduced convolution for polygons without holes 2014-10-31 11:44:38 +01:00
Sebastian Morr cd80f2ed16 Avoid connect_holes in reduced convolution computation 2014-10-30 22:08:30 +01:00
Efi Fogel 90c16905b1 Made all traits const. Pass traits as const reference 2014-10-25 00:37:54 +03:00
Efi Fogel 7f14950322 resolved conflicts 2014-10-21 19:27:55 +03:00
Efi Fogel a1eabac401 Fixed the documentation of the decomposition concept. Added one for polygon with holes. Fixed the implementation of the decomp. methods that supports polygons with holes. 2014-10-21 19:17:21 +03:00
Sebastian Morr 0c8149465f Integrate the reduced convolution method into test_minkowski_sum_with_holes
Also, put minkowski_sum_reduced_convolution_2(pwh, pwh) into the API.
2014-10-18 11:23:45 +02:00
Efi Fogel ba34b4fab9 Enhanced testing: added test_minkowski_sum_with_holes to test Minkowski sum of polygons with holes 2014-10-07 14:43:01 +03:00
Efi Fogel 99f663b8bd merged with the reduced convolution branch 2014-09-15 19:33:17 +03:00
Efi Fogel f48ce38473 Removed Ron from maintainer list. Updated Ron's email address. Cleaned up documentation and example programs 2014-08-28 17:05:57 +03:00
Efi Fogel 4a1c1a89d0 updated docimentation. Added decomposition method based on vertical decomposition 2014-08-27 17:46:42 +03:00
Sebastian Morr fe291a5e83 Remove debugging timing information 2014-08-14 14:31:15 +02:00
Sebastian Morr 187856517f Revert "Move the package's documentation commentss to the actual headers"
This reverts commit 843fd4b053.
Reason: Internal classes get documented, few packages do inline
documentation, this should be fixed CGAL-wide sometime.

Conflicts:
	Minkowski_sum_2/include/CGAL/minkowski_sum_2.h
2014-08-13 13:53:47 +02:00
Sebastian Morr 90d86774dd Documentation: Mention AABB_tree dependency, add authors 2014-08-13 13:51:40 +02:00
Sebastian Morr b1a95d3226 Drop "_by" from the specialized M-sum method names 2014-08-13 13:21:01 +02:00
Sebastian Morr 843fd4b053 Move the package's documentation commentss to the actual headers 2014-08-13 13:11:50 +02:00
Sebastian Morr 9575bd52d4 Segment_2_primitive: Don't copy the datum if not necessary 2014-08-12 16:51:30 +02:00
Sebastian Morr 4d6c8facd5 Speed up polygon-inside-of-polygon testing by avoiding is_simple and translation 2014-08-12 12:52:38 +02:00
Sebastian Morr 2630936c49 Copy modified AABB classes back to M-sum package
Append "_with_join" to each class and include guard to avoid any clashes.
2014-08-11 12:47:33 +02:00
Sebastian Morr 157028d61d Refer to Alon's master's thesis and to specific chapters 2014-08-11 12:15:19 +02:00
Sebastian Morr 55d0e7bf45 Give public methods more descriptive names, default one defaults to reduced conv 2014-08-11 12:01:12 +02:00
Sebastian Morr 436ed7ce76 Some manual style tweaks 2014-08-09 09:03:30 +02:00
Sebastian Morr 1bc8f28969 Adapt to package style: Indent two spaces, brackets on own lines
Astyle options:

    --style=break
    --indent=spaces=2
    --max-code-length=80
    --attach-namespaces
2014-08-09 08:58:52 +02:00
Sebastian Morr 6c354e34da Moved reduced convolution files up to the other headers 2014-08-09 08:52:04 +02:00
Sebastian Morr 00ff5a443b In the AABB_segment_2_primitive, only save the Id, not the Datum itself 2014-08-08 21:35:40 +02:00
Sebastian Morr 7ef5cddb3f Adapt M-sum's collision detector to new API 2014-08-08 20:13:04 +02:00
Sebastian Morr 6686d5ebc6 Refactored and commented internal AABB classes 2014-08-08 13:45:52 +02:00
Sebastian Morr 567c064509 The do_intersect_join no longer needs the reference polygons 2014-08-06 15:43:11 +02:00
Sebastian Morr 03a17c19b4 Remove unused code from AABB_traits_2
When testing againts points in the interior of faces, weak intersections
always mean the face is in the M-sum's interior, so they don't need
special handling.
2014-08-06 15:29:59 +02:00
Sebastian Morr 634581b173 Remove AABB_node_2 and AABB_tree_2 2014-08-06 11:39:45 +02:00
Sebastian Morr 2f9b4cdff9 Put do_intersect_join into AABB_tree package 2014-08-06 09:40:55 +02:00
Sebastian Morr c95387785b Put join_traversal into the AABB_tree package 2014-08-06 08:56:59 +02:00
Sebastian Morr 3c3d1cce3a Corrected all include guards 2014-08-05 10:12:16 +02:00
Sebastian Morr 23f2cae4bf Mark const parameters in Minkowski_sum_by_reduced_convolution_2 2014-08-05 08:18:46 +02:00
Sebastian Morr f2fce71661 Remove Arr_segment_data_traits_2.
Benchmarks showed no significant benefits, and the code is quite ugly to
maintain.
2014-08-04 23:55:21 +02:00
Sebastian Morr c2f1271c3e Refactor build_reduced_convolution 2014-08-04 22:54:49 +02:00
Sebastian Morr e2ddf7b231 Point caching during convolution building seems to be unnecessary overhead 2014-08-04 16:00:31 +02:00
Sebastian Morr 0249743d1f Comment most of Minkowski_sum_by_reduced_convolution_2 2014-08-04 13:02:47 +02:00
Sebastian Morr d6a58be770 Remove references to the CGAL namespace, as we're already in it 2014-08-04 11:44:45 +02:00
Sebastian Morr f6bd2fda24 Remove "internal" namespace: Doesn't seem to be convention 2014-08-04 11:37:28 +02:00
Sebastian Morr 446e1c4994 Adhere to CGAL's naming conventions 2014-08-04 09:58:13 +02:00
Sebastian Morr 86f630d546 Fix another bug in find_inside_point 2014-07-31 23:07:36 +02:00
Sebastian Morr 196a547131 Fix two bugs in find_inside_point 2014-07-31 17:49:37 +02:00
Sebastian Morr f51ad49794 Refactor AABB_Collision_detector 2014-07-30 18:16:05 +02:00
Sebastian Morr 036dd3cb8e Introduce a new find_inside_point for more stable intersection tests 2014-07-29 09:34:47 +02:00
Sebastian Morr 0a152d750e Print out stage timing information 2014-07-25 20:27:53 +02:00
Sebastian Morr 99ccd7cb3c Remove unused code from Arr_SegmentData_traits 2014-07-25 19:57:15 +02:00
Sebastian Morr a1e3bc5c72 Rotation by 180 degrees == Inversion 2014-07-25 18:30:39 +02:00
Sebastian Morr 6ed342a75e Remove findInsidePoint
It was used with a different collision detection approach.
2014-07-22 13:26:48 +02:00
Sebastian Morr 4b1c043ae7 Refactored build_reduced_convolution 2014-07-22 12:11:23 +02:00
Sebastian Morr 79506faf54 Refactored some typedefs 2014-07-19 17:51:12 +02:00
Sebastian Morr a7c2ec45c5 Remove DenegerateCasesManager and don't extend edges
Both are not necessary when we're interested in the resulting
polygon-with-holes, and not in the arrangement.
2014-07-19 17:37:05 +02:00
Sebastian Morr a986f9e749 Refactor getColDetect() 2014-07-19 17:04:23 +02:00
Sebastian Morr 88ddafbbac Remove unused includes and typedefs 2014-07-14 13:56:31 +02:00
Sebastian Morr c0f1fe824e Remove ConvSegMapper and related classes 2014-07-14 13:25:54 +02:00