Commit Graph

236 Commits

Author SHA1 Message Date
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
Sebastian Morr bb6c6dca0a Remove TraversalManager and related classes 2014-07-14 13:02:33 +02:00
Sebastian Morr 25793b7683 Removed unused code 2014-06-30 17:14:03 +02:00
Sebastian Morr 8a15677d1c Moved AABB files to subdirectory, for later separation 2014-06-24 16:50:47 +02:00
Sebastian Morr 35290dd479 Moved new files into CGAL::internal namespace 2014-06-24 15:15:22 +02:00
Sebastian Morr ab97c7593d Remove unused ICollisionDetector 2014-06-24 14:55:02 +02:00
Sebastian Morr 0aee2a76d6 Remove unused SweepCollisionDetection.h 2014-06-24 14:50:37 +02:00
Sebastian Morr 07753267c3 Remove some unused functions 2014-06-24 11:32:27 +02:00
Sebastian Morr a0d24bc08d Back to CCW assertion. The user should supply the correct input. 2014-06-24 11:31:41 +02:00
Sebastian Morr 41216a0793 Refactored fillPolyDirs and removed reimplementation of modulo 2014-06-16 16:09:08 +02:00
Sebastian Morr 2dd4ba271d Remove unused "buildReducedConvolution" method 2014-06-16 15:46:49 +02:00
Sebastian Morr 2caa55b30d Fix a typo: "DegenerateCasses" -> "DegenerateCases" 2014-06-16 11:18:32 +02:00
Sebastian Morr 3446fea726 Refacor polygon reflection method 2014-06-16 11:17:27 +02:00
Sebastian Morr 1ab69b0d0b When given a clockwise-oriented polygon, reverse it
Downside: We need to make a copy of the polygons.
2014-06-12 18:32:35 +02:00
Sebastian Morr e3c1074906 Removed commented out code from all the other headers 2014-06-10 08:39:36 +02:00
Sebastian Morr 74cedf2a8f Removed two unused header files 2014-06-02 21:19:49 +02:00
Sebastian Morr b5da9fbfb3 Fixed and documented includes with the help of include-what-you-use 2014-06-02 21:14:34 +02:00
Sebastian Morr 2052644a16 Removed unused includes from Minkowski_sum_conv_lien_2.h 2014-06-02 20:36:15 +02:00
Sebastian Morr 2c817a3158 Moved minkowski_sum_2_new to the public minkowski_sum_2.h 2014-06-02 18:22:24 +02:00
Sebastian Morr ad0e17c2a4 Remove graphics stuff for now 2014-06-02 18:08:37 +02:00
Sebastian Morr d328643e98 Remove commented out code from Minkowski_sum_reduced_conv_2 2014-06-02 18:07:41 +02:00
Sebastian Morr b8b7e5c9ca Remove empty lines before closing brackets
With Vim: "%s/\n\n\( *}\)/\r\1"
2014-06-02 17:24:14 +02:00
Sebastian Morr f27a2309dd Remove double empty lines
With Vim: "%s/\n\n\n\+/\r\r"
2014-06-02 17:20:59 +02:00
Sebastian Morr 1f862ee6fd Remove double spaces
With Vim, via "%s/\([^/ ]\)  \+/\1 /g".
2014-06-02 17:16:32 +02:00
Sebastian Morr 26fa63eff1 Pretty-print headers using astyle with the following configuration:
--add-brackets
--align-pointer=name
--break-blocks
--convert-tabs
--pad-header
--pad-oper
--style=attach
--unpad-paren
2014-06-02 17:08:06 +02:00
Sebastian Morr cfc89c5744 Push new header files down into a directory "new" for now
So I can better differentiate between new and old code
2014-06-02 16:52:54 +02:00
Sebastian Morr 8e5b16863e Integrate Alon's header files into the include directory 2014-06-02 16:47:30 +02:00
Efi Fogel e3acd0433b enhanced to test the vertical decomposition method 2013-08-25 02:41:34 +03:00
Efi Fogel 3314d915d0 fixed usage of traits 2013-08-25 01:28:38 +03:00
Efi Fogel 40d1879c5e cleanup 2013-08-25 01:26:53 +03:00
Efi Fogel b99a327ab0 cleanup 2013-08-25 00:10:57 +03:00
Efi Fogel 5e7e4ee8dd Added support for the computation of Minkowski sum of polygons with holes 2013-08-23 01:24:45 +03:00
Andreas Fabri 31a098f591 more static_cast 2013-02-15 10:39:17 +01:00
Laurent Rineau d19578725b Fix warnings 2013-02-07 18:15:23 +01:00
Laurent Rineau db194534c7 First big patch to fix -Wunused-local-typedefs
-Wunused-local-typedefs is a new warning flag of gcc-4.7, and it will enabled
 by -Wall since gcc-4.8 (not yet released).

The fix is a big set of removals of unused typedefs (or comments, or moves,
depending on the context).
2012-08-01 13:29:16 +00:00
Laurent Rineau 8f59fd9592 Turn QPL into LGPLv3+ 2012-01-13 16:33:35 +00:00
Sandhyaa Radhakrishnan 6054161601 using bso union and no OpenMP 2011-08-22 06:22:05 +00:00
Sandhyaa Radhakrishnan d57ace521d using bso union and no OpenMP 2011-08-22 06:21:00 +00:00
Sandhyaa Radhakrishnan 32fb5ecc07 BSO union moved inside Minkowski_sum_decomp_2.h 2011-08-12 10:20:25 +00:00
Sandhyaa Radhakrishnan 1f9e77c311 BSO union moved inside Minkowski_sum_decomp_2.h 2011-08-12 10:19:56 +00:00
Sandhyaa Radhakrishnan b17c94322b Minkowski sum using BSO 2011-08-11 20:17:28 +00:00
Sandhyaa Radhakrishnan 836a1b19f9 Minkowski sum using BSO 2011-08-11 20:16:47 +00:00
Efi Fogel 732442db65 cleanup 2011-06-23 08:03:02 +00:00
Efi Fogel 8ccdc1ad26 Fixed typo 2011-02-19 21:27:18 +00:00
Efi Fogel 8b87990e9d supported approximate offsetting of single segments 2010-06-15 12:56:47 +00:00
Efi Fogel ff81832f2c Fixed condition to handle approx. offset of a single line-segment 2010-06-14 14:00:04 +00:00
Sébastien Loriot 52317dd49f add python script (replace_CGAL_NAMESPACE.py) to replace CGAL_BEGIN_NAMESPACE and CGAL_END_NAMESPACE
by namespace CGAL { and } //namespace CGAL. in all .h and .cpp files
in a directory.
Apply it to all packages in the trunk
Remove macro definition from the config.h file.
2010-06-09 07:37:13 +00:00
Andreas Fabri ae2396e946 Add using for ansi compliance 2010-05-20 07:53:41 +00:00
Andreas Fabri 5539d84219 Add using statements for ansi-compliance 2010-05-18 07:09:47 +00:00
Sylvain Pion 85dc12f2a7 Remove empty lines at beginning and end of files
(apply Scripts/developer_scripts/remove_empty_lines.pl).
2010-02-01 12:55:28 +00:00
Efi Fogel b150ee2114 Fixed Arrangement_2 construction bug - made the geometry traits const 2009-07-05 13:43:11 +00:00
Andreas Fabri e4a5ffde32 Add more overflow guards when working with int 2009-07-01 15:04:34 +00:00
Andreas Fabri c016346985 Avoid infinite loop in case of double overflow 2008-11-13 11:14:25 +00:00
Ophir Setter 28df0f7118 fixing - no newline at end of file 2008-09-21 08:23:52 +00:00
Ophir Setter c4e38a9096 approximated offset fixes 2008-09-18 12:40:50 +00:00
Ophir Setter cc1af4f86f convolution overlap bug 2008-09-16 06:57:00 +00:00
Efi Fogel 37972247be wein: Implemented inner offset. Used Inner_ccb_iterator instead of obsolete Hole_iterator. Fixed calls to deprecated functions 2008-04-26 21:37:02 +00:00
Efi Fogel 606bd0169b API revisited 2007-11-21 10:23:53 +00:00
Shlomo Golubev e6d816ac3d replace insert_x_monotone_curves with insert 2007-09-05 23:30:17 +00:00
Shlomo Golubev ee82b24831 work arounds for Envelope_3 2007-08-09 15:34:42 +00:00
Shlomo Golubev ba78ad9c97 matching Minkowski_sum_2 to Arrangement_on_surface_2 2007-07-30 14:26:41 +00:00
Ophir Setter b59e477ff4 Fix in convolution condition 2007-04-18 15:35:01 +00:00
Efi Fogel 3d87f8b0de cleanup - initialized variables to pacify some compiler 2007-04-07 09:38:40 +00:00
Efi Fogel 6273371b3b Added the proper SVN keywords 2007-04-03 18:34:02 +00:00
Andreas Fabri 28623ae3ac removed unused parameters 2007-03-16 15:27:11 +00:00
Andreas Fabri 4e48fba101 remove unused parameter 2007-03-16 10:24:57 +00:00
Andreas Fabri b0d802dfbe iterator must not ++ once it is past the end 2007-03-05 08:52:34 +00:00
Sylvain Pion 9115fe5a52 add missing CGAL:: 2007-03-04 19:58:02 +00:00
Sylvain Pion a805732eae add some missing CGAL:: for g++ 4.3 2007-03-03 09:11:39 +00:00
Efi Fogel ef13fbed30 added copyright 2007-02-15 16:07:35 +00:00
Marc Glisse 8ac07260ce can't do: typedef A<B> A
instead: typedef C::A<B> A
2007-02-09 19:10:14 +00:00
Ron Wein 68b20f93dd A bug fix: removed antennas in the convolution cycles, so that the
Arr_labeled_traits_2 are still capable of disregarding pair of contiguous
curves when computing intersections.
Also removed some debug printings.
2007-01-31 15:41:04 +00:00
Ron Wein b7b52a12f3 Fixed a bug. 2006-11-19 15:14:39 +00:00
Andreas Fabri 0c8a5c9c85 typedef Polygon_2<..> Polygon_2; needs qualification 2006-08-18 21:09:31 +00:00
Ron Wein acd8037f11 Completed the test suite + some bug fixes. 2006-08-06 06:20:56 +00:00
Ron Wein c4cc798257 Added a test program. 2006-08-03 16:10:54 +00:00
Ron Wein 8a561f8299 Fixed the package according to Andreas' review, and removes some
redundant stuff.
2006-08-03 14:59:23 +00:00
Ron Wein edcf439fbc Fixed a bug. 2006-07-20 06:20:24 +00:00
Laurent Saboret e42659d1a4 Fixed svn:executable, svn:keywords and svn:eol-style properties of the whole trunk 2006-05-04 09:15:26 +00:00
Ron Wein ea0c8b2927 Finished the rsa_minkowski_sum2() function.
(Still needs debugging ...)
2006-04-17 13:13:14 +00:00
Ron Wein b2351cde24 Updated the class. 2006-04-17 08:57:48 +00:00
Ron Wein e7e5dbf1d0 Updated version. 2006-04-16 13:04:51 +00:00
Ron Wein 21bcd3a296 New functions for computing the Minkowski sum of a polygon with a rotational
swept area of another polygon.
2006-04-16 11:56:42 +00:00
Ron Wein b5117a43af Initial version. 2006-04-09 13:02:28 +00:00
Ron Wein f324860770 Fixed the example. 2006-03-16 11:15:10 +00:00
Ron Wein ce15339db9 Changes (to be tested). 2006-03-16 09:33:30 +00:00
Ron Wein 2bb1f3f635 Initial version of the planar Minkowski-sum package. 2006-02-27 14:29:24 +00:00