Commit Graph

2446 Commits

Author SHA1 Message Date
Laurent Rineau a7cd94f82f Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch' into 5.1.x-branch 2020-10-23 16:06:46 +02:00
Simon Giraudot c02ffb762b Use 2 booleans instead of an enum 2020-10-21 13:31:21 +02:00
Simon Giraudot adef28b496 Add assertions and fix bug 2020-10-21 10:12:51 +02:00
Efi Fogel 3f623d99df Construct opposite only if CGAL_ALWAYS_LEFT_TO_RIGHT 2020-10-21 08:40:51 +02:00
Simon Giraudot 615a8768dd Fix inverted segments 2020-10-21 08:40:51 +02:00
Simon Giraudot fcbbea5e0d Better handling of invertions 2020-10-21 08:40:51 +02:00
Simon Giraudot 7588d8803d Cache overlaps and dump at the end (inverted if needed) 2020-10-21 08:40:51 +02:00
Simon Giraudot 3e17be2b30 Merge branch 'Arrangement-Fix_polycurve_intersection-efif-GF' into Boolean_operations-Use_GPS_based_polylines-GF 2020-10-20 10:34:46 +02:00
Simon Giraudot 0b70318c51 Merge remote-tracking branch 'mine/Polygon-Vertex_pair_iterator-GF' into Polygon-Vertex_pair_iterator-GF 2020-10-20 09:01:29 +02:00
Simon Giraudot 8f1d611dda Fix inverted segments 2020-10-19 13:34:31 +02:00
Simon Giraudot 4e25e0c650 Better handling of invertions 2020-10-19 11:47:14 +02:00
Simon Giraudot 4ff6c4952e Cache overlaps and dump at the end (inverted if needed) 2020-10-15 11:59:30 +02:00
Mael Rouxel-Labbé f55ef7dd50 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-10-09 18:36:17 +02:00
Ahmed Essam 32093e6ea3 Merge branch 'master' of https://github.com/CGAL/cgal into gsoc2020-aos_demo-theartful 2020-10-03 20:55:38 +02:00
Sebastien Loriot 03ff1a667f
Merge pull request #4784 from efifogel/Aos_2-remove_object-efif
Aos_2: Change Make_x_monotone_2 return type from legacy CGAL::Object to boost::variant
2020-10-02 15:19:36 +02:00
Ahmed Essam 1ae6f3f495 Fix past the "beginning" bug
This caused assertion error in msvc debug mode while running the demo
2020-10-01 15:56:44 +01:00
Ahmed Essam aa2bc8d05f Fix msvc min/max conflict (hopefully for the last time!) 2020-10-01 19:40:54 +01:00
Ahmed Essam 1fb65b6ea8 Fix msvc warning 2020-10-01 18:35:00 +01:00
Simon Giraudot 4f0648d17b Use Point_2/Point_2 constructor so that it also works with Arr_non_caching_segment_traits 2020-10-01 08:54:47 +02:00
Simon Giraudot 1d3c289481 Fix outdated variable name 2020-09-30 15:41:05 +02:00
Ahmed Essam f2115d534b Fix min/max macro conflict 2020-09-30 10:53:02 +02:00
Jane Tournois 5c8df6672a remove CGAL_CFG_MATCHING_BUG_ variants
the "matching bug" of msvc has been fixed since at least vs 2015
2020-09-25 14:25:14 +02:00
Ahmed Essam b238db17ae Merge remote-tracking branch 'cgal/master' into gsoc2020-aos_demo-theartful 2020-09-24 20:46:06 +02:00
Ahmed Essam 885759ff05 Fix compilation error with msvc2017
Fixes the compilation error in x64_Cygwin-Windows10_MSVC2017-Debug-64bits
platform.
CXXFLAGS=/DWIN32 /D_WINDOWS /W3 /GR /EHsc -D_CRT_SECURE_NO_DEPRECATE
-D_SCL_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS
-D_SCL_SECURE_NO_WARNINGS
-D_SILENCE_CXX17_ADAPTOR_TYPEDEFS_DEPRECATION_WARNING /fp:strict
/fp:except- /wd4503 /bigobj /permissive- /std:c++17 /D_DEBUG /MDd /Ob0
/Od /RTC1
LDFLAGS=/machine:x64 /debug /INCREMENTAL
Curve_renderer_2.h(1753): error C2760: syntax error: unexpected token
'identifier', expected ')'
Produced the error locally and for some reason adding the extra parenthesis
fixed the problem. Most probably a bug with msvc2017 with these flags.
2020-09-23 18:19:24 -07:00
Efi Fogel 92801f4f8f Chenged back size_t to unsigned int (at some point all Multiplicity types should be defined as size_t) 2020-09-23 14:27:53 +03:00
Efi Fogel 3f1647345b Initialized m_is_directed_right in default constructor 2020-09-23 14:27:22 +03:00
Mael Rouxel-Labbé 4694a48913 Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-09-22 11:35:25 +02:00
Efi Fogel 70f5d0eede Removed redundant typedefs 2020-09-22 10:08:47 +03:00
Efi Fogel 3600f6ccd5 Updated 2020-09-16 15:32:04 +03:00
Efi Fogel b41988aa70 Merge remote-tracking branch 'cgal/master' into Aos_2-remove_object-efif 2020-09-15 17:18:34 +03:00
Laurent Rineau 6cf203f5ca Merge pull request #4861 from sgiraudot/Arrangement_2-Small_enhancements-GF
Arrangement 2: Small Enhancements
2020-09-11 15:07:50 +02:00
Efi Fogel 7cd3a2663b Updated 2020-09-08 17:46:08 +03:00
Simon Giraudot 2992fcc508 Add CGAL::Single to create range of one isolated element 2020-08-25 12:50:30 +02:00
Simon Giraudot 0678c996e5 Add option to close the curve 2020-08-25 12:38:25 +02:00
Simon Giraudot d09d4079cf Add function to make Curve_2 from range of points 2020-08-25 11:32:46 +02:00
Efi Fogel 23a02ff441 Pacify Windows msvc (definition of casting operator). 2020-08-25 11:48:20 +03:00
Mael Rouxel-Labbé 8682f9bafb Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-08-24 11:45:17 +02:00
Efi Fogel 58fb204e97 Placed back the bbox() function. (Will be deprecated in a separate commit.) 2020-08-24 11:52:27 +03:00
Simon Giraudot 267e7316f1 Fix: compute orientation before checking if segment is vertical 2020-08-24 09:41:43 +02:00
Efi Fogel b4e7a4ad02 Reverted the bbox computation optimization as it turns out it doesn't help 2020-08-22 21:04:40 +03:00
Efi Fogel a857651c21 Optimized the bbox construction in do_bboxes_overlap() 2020-08-20 20:39:50 +03:00
Ahmed Essam 48e0fee7dd Rebase fixes 2020-08-20 19:34:50 +02:00
Ahmed Essam 489499f081 Solve compiler warnings 2020-08-20 19:30:16 +02:00
Ahmed Essam 4e3c64f488 Fix some compiler warnings 2020-08-20 19:30:16 +02:00
Ahmed Essam 4bc9d2bff2 Add missing break 2020-08-20 19:30:16 +02:00
Ahmed Essam 087005d7c0 Fix warnings in algebraic traits 2020-08-20 19:30:16 +02:00
Ahmed Essam 78af28d4c5 Revert all changes outside the demo 2020-08-20 19:30:16 +02:00
Ahmed Essam e1ea14b461 some update 2020-08-20 19:26:10 +02:00
Ahmed Essam 2f0a283139 Use new originator constructor 2020-08-20 19:26:10 +02:00
Ahmed Essam 4ee591f500 Intersection points can be due to 2 or more points
to reproduce this bug, try upper envelope operation on the arrangement
by Jeb
2020-08-20 19:26:10 +02:00
Ahmed Essam 8b78d0e790 Fix bug with self intersecting curves 2020-08-20 19:26:10 +02:00
Ahmed Essam a2bc6227c3 Temporary change to be backward compatible with bezier serialization 2020-08-20 19:23:25 +02:00
Ahmed Essam 94ea08a2c4 Bezier serialization 2020-08-20 19:17:06 +02:00
Ahmed Essam 669b975f60 Unbounded faces, snapping and more! 2020-08-20 19:17:06 +02:00
Ahmed Essam e026e0b435 Revert "Add Approximate_number_type to Arr_circular_arc_traits"
This reverts commit 7db9e267b3d7d11f4372e00b0b4329d4412b5eb4.
2020-08-20 19:17:05 +02:00
Ahmed Essam 6b85115679 Add Approximate_number_type to Arr_circular_arc_traits 2020-08-20 19:17:05 +02:00
Ahmed Essam a19207b957 Clean up and big fixes 2020-08-20 19:17:05 +02:00
Ahmed Essam ac72f408a0 Move EnvelopeCallback class implementation to cpp file 2020-08-20 19:17:05 +02:00
Efi Fogel 9d6d9929ec Cleaned up. Moved some operations from the the curve (Arr_segment_2) to the traits and declared the former deprecated. Optimized further the Intersect_2 functor. 2020-08-20 19:53:52 +03:00
Simon Giraudot 3656be09c6 Only compute line if needed 2020-08-19 16:11:14 +02:00
Sébastien Loriot ae62039df3 remove used variable 2020-08-18 14:10:16 +02:00
Efi Fogel d309bdf2ca Used ..._object() member function to obtain functor objects and cleaned up formatting. 2020-08-18 12:16:27 +03:00
Simon Giraudot 7d23ac99e2 Update internal doc from review 2020-08-17 10:26:08 +02:00
Simon Giraudot 36a210065f Fix for cases where red and blue handles are differently typed 2020-08-17 10:11:28 +02:00
Simon Giraudot 4f99fe893d Use vertex pair iterator in GPS to avoid constructing Segment_2 objects 2020-08-13 15:37:33 +02:00
Simon Giraudot 901f52018c Some fixes + internal doc for indexed sweep 2020-08-13 09:52:47 +02:00
Simon Giraudot b7583f43d5 Add indexed sweep with isolated points 2020-08-13 09:19:50 +02:00
Simon Giraudot 6022a74ac8 Only use indexed sweep for curves with bottom(/top) side NOT contracted 2020-08-13 08:47:33 +02:00
Simon Giraudot acb96cba86 Get rid of index using pointer squatting + before/after functions 2020-08-12 15:56:46 +02:00
Ahmed Essam 3dc2804b9e Move _inc_to_right != cv._inc_to_right assertion to its right location 2020-08-11 13:23:08 +02:00
Ahmed Essam ff93e2b3bd Curve params "s" and "t" are interchangeable with self intersections 2020-08-11 13:18:30 +02:00
Ahmed Essam 6d949cd14f Fix bug with self intersecting bezier curves 2020-08-08 17:29:55 +02:00
Simon Giraudot caf5b31af6 Indexed sweep in overlay (WIP: triggers assertions in some tests) 2020-08-04 15:42:26 +02:00
Efi Fogel 5b6a8e83e3 Updated 2020-08-01 15:23:11 +03:00
Efi Fogel 6642407d60 Merge remote-tracking branch 'cgal/master' into Aos_2-boundary_objects-efic 2020-07-29 18:08:32 +03:00
Efi Fogel f0f0856679 Updated 2020-07-26 00:06:56 +03:00
Mael Rouxel-Labbé 0d66e19361 IO documentation fixes
See @sloriot's review:

https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Polgyon_soup_mesh_IO/2nd_round/Answer_to_review

(+ some commits before and after this one)
2020-07-24 17:06:00 +02:00
Simon Giraudot becb663e39 Use fast pool allocator 2020-07-21 11:46:25 +02:00
Simon Giraudot 94155bd89e Fix assertion with explicit boolean conversion 2020-07-21 11:23:24 +02:00
Simon Giraudot a43b994425 Use specialized do_intersect + early ending 2020-07-21 10:19:06 +02:00
Simon Giraudot 4ee8f532b7 Early intersection ending with bbox 2020-07-21 10:19:06 +02:00
Efi Fogel 11c51142a4 Fixed zone computation 2020-07-21 10:04:04 +03:00
Efi Fogel e00e4adfa8 Cleaned up 2020-07-21 09:59:28 +03:00
Efi Fogel 87a3cf9458 Cleaned up 2020-07-21 09:57:34 +03:00
Efi Fogel b2bda2e603 Cleaned up 2020-07-21 09:56:13 +03:00
Efi Fogel ff20707e2f cleaned up 2020-07-21 09:52:09 +03:00
Efi Fogel 16f6196076 Merge branch 'Aos_2-boundary_objects-efic' of github.com:CGAL/cgal-public-dev into Aos_2-boundary_objects-efic 2020-07-21 09:51:17 +03:00
Efi Fogel 598a988fd5 cleaned up 2020-07-21 09:47:34 +03:00
Efi Fogel 372e838d73 Missing include of CGAL/assertions.h 2020-07-06 11:32:32 +03:00
Laurent Rineau cdfbe3b0df Merge branch 'releases/CGAL-5.0-branch' 2020-07-03 16:21:42 +02:00
Laurent Rineau bf88dfcc80 Merge pull request #4820 from sloriot/Argt-missing_it_cstr
Add constructor from base
2020-07-03 16:20:22 +02:00
Efi Fogel 09ad8ab1dc Replaced legacy CGAL::Object with modern variant 2020-07-02 19:12:43 +03:00
Efi Fogel 2aa0c9cefb Cleaned up 2020-07-02 19:11:30 +03:00
Efi Fogel 7cf9a11936 Cleaned up 2020-07-02 19:11:07 +03:00
Efi Fogel 89e5200b5b Cleaned up 2020-07-02 19:10:56 +03:00
Efi Fogel 5298ff114e Cleaned up 2020-07-02 19:10:29 +03:00
Efi Fogel 3d83f95897 Cleaned up 2020-07-02 19:10:21 +03:00
Efi Fogel 89ad70a2de Cleaned up 2020-07-02 19:10:08 +03:00
Efi Fogel 1b23ac2b08 Cleaned up 2020-07-02 19:10:00 +03:00
Efi Fogel d08f8b4ca1 Cleaned up 2020-07-02 19:09:51 +03:00
Efi Fogel e0c80487a7 Replaced legacy CGAL::Object with modern variant 2020-07-02 14:08:08 +03:00
Efi Fogel d58b971e85 Replaced legacy CGAL::Object with modern varian 2020-06-30 23:21:55 +03:00
Efi Fogel 436ba5fa35 Left over of replacing legacy CGAL::Object with variant 2020-06-30 21:23:16 +03:00
Efi Fogel 3c5552b14a Replaced legacy CGAL::Object with variant in vertical decomposition 2020-06-30 21:22:40 +03:00
Laurent Rineau e439aaf30c Merge pull request #4556 from theartful/arrangments_bugfix
Fix Bezier intersection bug around the boundaries (issue #3381)

# Conflicts:
#	Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Bezier_cache.h
2020-06-30 16:39:17 +02:00
Laurent Rineau cba160f7f0 Merge pull request #4556 from theartful/arrangments_bugfix
Fix Bezier intersection bug around the boundaries (issue #3381)
2020-06-30 16:37:01 +02:00
Sébastien Loriot 3a53d241c8 add constructor from base 2020-06-30 09:51:05 +02:00
Mael Rouxel-Labbé 26355e2e32 Uniformize capital / third person usage of \brief 2020-06-25 15:13:47 +02:00
Efi Fogel 33b8d552e7 Fixed a bug of non-linear curves (when make-x-monotone produces more than one item) 2020-06-15 20:12:11 +03:00
Efi Fogel f73d067658 acified clang 2020-06-15 20:11:46 +03:00
Efi Fogel fdffdef85e Introduced Make_x_monotone_2 functor to convert CGAL::Object objects obtained from the circular kernel to variant 2020-06-15 17:21:17 +03:00
Efi Fogel e8f81ff4fc Cleaned up 2020-06-15 17:21:02 +03:00
Efi Fogel 03a2d28026 Further eliminated CGAL::Object 2020-06-14 10:47:45 +03:00
Efi Fogel c92f3b6fcf Cleaned up 2020-06-14 10:46:41 +03:00
Efi Fogel 8d1ff43997 Fixed comment 2020-06-14 10:45:50 +03:00
Efi Fogel 7ad0ffa012 Added missing Multiplicity typedef definition 2020-06-14 10:45:27 +03:00
Efi Fogel ecb632a056 Fixed comment 2020-06-14 00:43:16 +03:00
Efi Fogel 3849f5e154 Further eliminating CGAL::Object 2020-06-14 00:41:25 +03:00
Efi Fogel 40152a2582 Continues to eliminate CGAL::Object 2020-06-13 16:43:09 +03:00
Efi Fogel 708469fb5e MFurther eliminating CGAL::Object 2020-06-12 14:06:58 +03:00
Efi Fogel 0626eb0a2e First stage elliminating CGAL::Object 2020-06-11 12:32:33 +03:00
Laurent Rineau 319383c963 Revert "Merge pull request #4519 from lrineau/Kernel_23-Epeck_objects_in_Compact_container-lrineau_gdamiand"
This reverts commit bcab082f82, reversing
changes made to 2d3e126450.
2020-05-20 09:47:58 +02:00
Laurent Rineau 3d3788925b Merge pull request #4607 from efifogel/Aos_2-intersection-efif
Arrangement_on_surface_2: change intersection return types (from legacy CGAL::Object to variants)

# Conflicts:
#	Installation/CHANGES.md
2020-05-19 10:55:30 +02:00
Sebastien Loriot 5ccfdbe9e4
Merge pull request #4230 from efifogel/Aos_2-small_fixes-efif
Aos 2 small fixes efif
2020-05-05 14:26:20 +02:00
Sebastien Loriot bcab082f82
Merge pull request #4519 from lrineau/Kernel_23-Epeck_objects_in_Compact_container-lrineau_gdamiand
Enable the use of Lazy objects in Compact_container
2020-04-29 13:56:59 +02:00
Efi Fogel 4e19667750 Fixed unused local variable 2020-04-29 12:58:02 +03:00
Sebastien Loriot 0325219ce6
Merge pull request #4671 from maxGimeno/DGAL-Fix_MIN_MAX_issues-maxGimeno
CGAL: Min-max errors on windows
2020-04-27 09:46:04 +02:00
Sebastien Loriot 74d44ff97f
Merge pull request #4672 from maxGimeno/CGAL_Fix_MIN_MAX_5_0-maxGimeno
CGAL: Fixes for min/max 5.0
2020-04-27 09:45:35 +02:00
Sebastien Loriot 1c05c79244
Merge pull request #4673 from maxGimeno/CGAL_Fix_MIN_MAX_4_14-maxGimeno
CGAL: Fixes for min/max 4.14
2020-04-27 09:45:16 +02:00
Sébastien Loriot c5af2b25f3 Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch' 2020-04-22 13:27:29 +02:00
Sébastien Loriot 157bdbda08 Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2020-04-22 13:26:52 +02:00
Sebastien Loriot b02bf1c6e7
Merge pull request #4577 from theartful/bezier_bugfix
Fix bug in point_position in the bezier traits
2020-04-22 13:05:47 +02:00
Efi Fogel 5d37a1bbf8 Initialized some fileds of _Linear_object_cached_2 2020-04-22 00:31:33 +03:00
Efi Fogel 6fcbee1fa9 Removed redundant typedef statements 2020-04-21 17:12:21 +03:00
Maxime Gimeno 5b2d46cfa0 Fixes for min/max 2020-04-21 12:04:45 +02:00
Maxime Gimeno 50766d9d03 Fixes for min/max 2020-04-21 11:52:56 +02:00
Maxime Gimeno e9d41d7b7d Fixes for min/max 2020-04-21 11:38:37 +02:00
Efi Fogel 6eefda4e6d Added missing include <boost/variant.h> 2020-04-06 15:34:28 +03:00
Efi Fogel 4158542c86 Fixed intersection result 2020-04-01 12:31:51 +03:00
Efi Fogel 58276edba3 Cleaned up and Fixed intersection return type 2020-03-31 18:34:28 +03:00
Efi Fogel 523fcfdbc5 Cleaned up 2020-03-31 17:32:38 +03:00
Efi Fogel c1fed0bd0b Cleaned up 2020-03-31 17:30:55 +03:00
Efi Fogel 11059b4f84 Fixed typo 2020-03-29 13:33:08 +03:00
Efi Fogel dc0cab62a4 Fixed Intersect_2 to return optional of variant (instead of CGAL::Object) 2020-03-29 13:31:26 +03:00
Efi Fogel 077829724a Cleaned up; used result_of when computing intersections. 2020-03-29 13:25:18 +03:00
Efi Fogel f5f3440fc0 Used correct result of intersection 2020-03-29 13:02:24 +03:00
Efi Fogel 04adcb982f Cleaned up 2020-03-29 12:34:33 +03:00
Ahmed Essam 30104c6032 Fix bug in matching roots 2020-03-27 08:34:04 +01:00
Sébastien Loriot 97e46accad extra run of the script to remove tabs and trailing whitespaces 2020-03-26 19:26:37 +01:00
Sébastien Loriot 34ce87be56 Update branch from master after trailing whitespaces and tabs removal 2020-03-26 19:26:15 +01:00
Sébastien Loriot 180c06146f Update branch from master after trailing whitespaces and tabs removal 2020-03-26 19:10:41 +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
Sébastien Loriot 2419170514 be resilient to the absence of trailing whitespace in input 2020-03-26 13:24:27 +01:00
Ahmed Essam a7eb7cfe04 Fix bug in point_position in the brazier traits 2020-03-12 23:14:42 +02:00
Guillaume Damiand 5c9bb6f016 Rename PTR into PTR.p following the modifs in Handle.h 2020-02-14 11:30:56 +01:00
Efi Fogel c3c15948e6 Removed wrong comment 2019-12-18 09:06:18 +02:00
Efi Fogel b0c3c8492f Fixed typo 2019-12-18 09:05:45 +02:00
Efi Fogel 9d2ef0ed9a Commented out print out 2019-12-17 13:26:20 +02:00
Efi Fogel f25e420e65 Moved in_between complete implementation to the adapter class 2019-12-17 13:24:37 +02:00
Efi Fogel bac045d269 Used c++11 features to remove clutter 2019-12-17 13:24:06 +02:00
Efi Fogel 966bd50f9d Used c++11 features to remove clutter 2019-12-14 19:48:11 +02:00
Efi Fogel 33ffd8a0e0 Fixed is_in_x_range_2---handled the case where one of the curves is on the left or right boundary 2019-12-14 19:46:44 +02:00
Efi Fogel 70f7cb84b0 Used auto ro remove clutter 2019-12-14 19:45:01 +02:00
Efi Fogel 19f19f7dcb Cleaned up; added cprecondition 2019-12-14 19:44:30 +02:00
Efi Fogel d91194f469 Fixed documentation of Arrangement_2 (exploited inheritance). 2019-12-02 21:22:25 +02:00
Efi Fogel d1b33ff238 Cleaned up 2019-12-02 13:37:01 +02:00
Efi Fogel a47858ee25 Cleaned up 2019-12-02 13:36:52 +02:00
Efi Fogel 5408fdb115 Fixed is_betweein_imp() and do_overlap_impl() 2019-12-02 02:16:27 +02:00
Sébastien Loriot c662a59645 avoid a construction
this helps the sweep working with EPICK in case no
new construction are needed
2019-11-26 17:00:59 +01:00
Efi Fogel 2a3fbc0ee8 Merge remote-tracking branch 'cgal/master' into Aos_2-boundary_objects-efic 2019-11-19 09:47:44 +02:00
Laurent Rineau 092cf8e2c5 Merge pull request #4284 from sloriot/Sweep_surface_2-derecursive_overlaps_5.0
Derecursification of overlaps detection on the right of event - [5.X]
2019-10-25 16:26:17 +02:00
Sébastien Loriot 47c092557f Merge remote-tracking branch 'sloriot/Sweep_surface_2-derecursive_overlaps' into HEAD 2019-10-21 13:04:25 +02: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
Sébastien Loriot 90b199b952 fix typos 2019-10-18 09:40:01 +02:00
Laurent Rineau 13beab6ae3 Merge pull request #4278 from sloriot/AOS_2-Trapezoid_map_fixes
Trapezoid map fixes
2019-10-16 18:18:30 +02:00
Laurent Rineau 7143b69bb1 fix warning
```
include/CGAL/Arr_point_location/Td_active_trapezoid.h:98:10: warning: class Non_recursive_td_map_item_destructor was previously declared as a struct [-Wmismatched-tags]
  friend class internal::Non_recursive_td_map_item_destructor<Traits>;
         ^
```
2019-10-16 18:18:01 +02:00
Laurent Rineau e81a805cf6 Merge pull request #4278 from sloriot/AOS_2-Trapezoid_map_fixes
Trapezoid map fixes
2019-10-15 16:33:29 +02:00
Sébastien Loriot 770da55188 Prevent recursive calls to ~Handle while clearing the dag or removing elements in the dag 2019-10-09 18:15:31 +02:00
Sébastien Loriot 9694f5b1ce avoid extra call to random_shuffle 2019-10-08 18:10:26 +02:00
Sébastien Loriot f3092b5438 hide debug info 2019-10-08 18:01:05 +02:00
Sébastien Loriot 11b865e4e4 remove duplicate halfedges before rebuild
a halfedge can be associated to several nodes in the dag
(since a halfedge can contribute to several trapezoids)
2019-10-08 17:14:13 +02:00
Sébastien Loriot 678811cdde fix typo 2019-10-08 17:13:36 +02:00
Sébastien Loriot b2eb6a405b fix cw update
direction is not a good criteria, especially for dangling edges
2019-10-07 16:00:18 +02:00
Sébastien Loriot 08a3411d85 fix the update of cw halfedge of active vertex after update
cw source must be v and cw is the first halfedge seen from noon
when using cw order
2019-10-07 15:58:42 +02:00
Efi Fogel be96223d8e Fixed discrepancy between traits and subcurve-traits in the polycurve basic traits. 2019-09-18 13:20:17 +03:00
Efi Fogel ea6b70dfbc Down casted a variable of type Point_2 (extended direction) to the Kernel::Direction_2 type, so that it can be passed to kernel functors. 2019-09-18 13:19:30 +03:00
Sébastien Loriot 25a05e9f4c Merge branch 'CGAL-named_function_parameters-4.14' into master
Conflicts resolved by hand
2019-07-28 23:46:43 +02:00
Sébastien Loriot 2f81a21523 Merge 'CGAL-named_function_parameters' for 4.13-branch into 4.14-branch
Conflicts resolved by hand
2019-07-28 22:30:13 +02:00
Sebastien Loriot 2a426bb1e1
Merge pull request #4063 from sloriot/CGAL-NO_CXX11
Remove CGAL_CXX11 macro usage
2019-07-19 16:16:22 +02:00
Sebastien Loriot 667e4022f7
Merge pull request #4060 from sloriot/CGAL-doc_match_brackets
match @{ and @}
2019-07-18 16:26:43 +02:00
Sébastien Loriot 560c77f567 rename named function parameter class 2019-07-15 06:25:02 +02:00
Sébastien Loriot c0edb5ecaa remove CGAL_CXX11 macro usage 2019-07-08 11:42:17 +02:00
Sébastien Loriot 983645a51a match @{ and @} 2019-07-05 21:49:46 +02:00
Laurent Rineau 7b0c6f0cf7 Fix a stack-use-after-scope in Arr_polycurve_basic_traits_2
Before this patch, `Arr_polycurve_basic_traits_2` was holding a const
reference to a temporary object.

Here was the result of ctest, with the address sanitizer:
```shellsession
$ make && ASAN_OPTIONS=detect_leaks=0 ctest -L Arr -j6
[...]
The following tests FAILED:
        144 - execution___of__generic_curve_data (Failed)
        170 - execution___of__polycurve_circular_arc (Failed)
        172 - execution___of__polycurve_conic (Failed)
        176 - execution___of__polycurves_basic (Failed)
        178 - execution___of__polylines (Failed)
        2166 - test_traits_test_polylines__data_polylines_compare_y_at_x__polyline_traits (Failed)
        2168 - test_traits_test_polylines__data_polylines_intersect__polyline_traits (Failed)
        2169 - test_traits_test_polylines__data_polylines_split__polyline_traits (Failed)
        2171 - test_traits_test_polylines__data_polylines_assertions__polyline_traits (Failed)
        2175 - test_traits_conic_polycurve__data_polycurves_conics_compare_y_at_x__polycurve_conic_traits (Failed)
        2176 - test_traits_conic_polycurve__data_polycurves_conics_compare_y_at_x_left__polycurve_conic_traits (Failed)
        2177 - test_traits_conic_polycurve__data_polycurves_conics_compare_y_at_x_right__polycurve_conic_traits (Failed)
        2179 - test_traits_conic_polycurve__data_polycurves_conics_intersect__polycurve_conic_traits (Failed)
        2180 - test_traits_conic_polycurve__data_polycurves_conics_split__polycurve_conic_traits (Failed)
        2193 - test_traits_circular_arc_polycurve__data_Polycurves_circular_arcs_compare_y_at_x__polycurve_circular_arc_traits (Failed)
        2198 - test_traits_circular_arc_polycurve__data_Polycurves_circular_arcs_split__polycurve_circular_arc_traits (Failed)
        2221 - test_traits_non_caching_polylines__data_polylines_compare_y_at_x__non_caching_polyline_traits (Failed)
        2223 - test_traits_non_caching_polylines__data_polylines_intersect__non_caching_polyline_traits (Failed)
        2224 - test_traits_non_caching_polylines__data_polylines_split__non_caching_polyline_traits (Failed)
        2226 - test_traits_non_caching_polylines__data_polylines_assertions__non_caching_polyline_traits (Failed)
        2400 - execution___of__test_construction_polylines (Failed)
        2477 - execution___of__test_io (Failed)
```

This is fixed rather easily, by copying the traits class, instead of
holding a reference to it.
2019-06-18 15:18:15 +02:00
Andreas Fabri 4581f1b7a8 Morte replacements 2019-06-05 08:39:55 +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
Laurent Rineau b8fe6b10ee Merge pull request #3804 from afabri/CGAL_tests_must_not_include_basic-GF
Do not include <CGAL/basic.h>
2019-05-21 16:37:01 +02:00
Mael Rouxel-Labbé 2848158354 Fix typos 2019-05-20 08:54:04 +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 2f8eeb0db3 Fix the headers dependency-hell around gmpxx in Number_types 2019-05-09 15:05:23 +02:00
Sébastien Loriot 4464229a52 remove cpp11 workarounds in argt related packages 2019-03-29 10:41:50 +01:00
Andreas Fabri dcb6c1478c Fix Arrangement_2 2019-02-08 08:57:43 +01:00
Andreas Fabri cc23699ea0 fix Arrangement_2 2019-01-28 09:14:59 +01:00
Laurent Rineau afc3de2894
Merge branch 'master' into Stream_support-Color-GF 2019-01-23 09:37:08 +01:00
Andreas Fabri 0496d840ff Fix arrangement and lcc 2019-01-18 10:05:48 +01:00
Efi Fogel 16b35aa0b2 Merge branch 'Aos_2-boundary_objects-efic-old' into Aos_2-boundary_objects-efic 2019-01-17 00:30:16 +02:00
Efi Fogel 8bcaf645af Added nested types 2019-01-16 21:21:57 +02:00
Andreas Fabri 303aaa04ae Fix arrangement 2019-01-15 19:18:53 +01:00
Andreas Fabri de14c487da Fix Arrangement 2019-01-10 18:52:35 +01:00
Efi Fogel ace09977af Cleaned up the code 2019-01-02 12:22:58 +02:00
Efi Fogel 6d6c2f3717 Fixed initializer
with workaround for the absense of c++11 auto feature--added facets properly.
2018-11-30 10:09:31 +01:00
Efi Fogel 1d36c090ec Replaced c++11 feature with non-c++11 code. 2018-11-03 20:03:12 +02:00
Sébastien Loriot 9223c1b28e fix warnings 2018-11-01 12:52:02 +01:00
Efi Fogel 5afbc4985a Merge branch 'Aos_2-fixes-efif-old' into Aos_2-fixes-efif 2018-10-06 18:36:51 +03:00
Efi Fogel c0fc218fdf Implemented missing function object Compare_x_near_boundary_2. 2018-09-09 16:51:55 +03:00
Efi Fogel 5e7b21da7c Fixed API of surface builder 2018-09-09 14:39:56 +03:00
Efi Fogel 678e0b7066 Cleaned up and completed the implementation of Compare_xy of two curves. 2018-09-09 09:16:02 +03:00
Efi Fogel 0a94f758f8 Added Compare_xy_2 operator for 2 cx-monotone curves 2018-09-06 07:40:09 +03:00
Efi Fogel 949c118f03 Fixed computing the zone on a curve with an endpoint on the boundary. Introduced generic do_overlap() & is_between_cw(). 2018-09-06 07:37:46 +03:00
Efi Fogel 2187738873 Introduced do_overlap() and is_between_cw() 2018-09-06 07:35:43 +03:00
Efi Fogel e2fb25e2c0 Cleaned up comments 2018-09-04 16:08:03 +03:00
Efi Fogel 7a4e740991 Fixed handling dual arrangements. Instead of including a header file several times, define some macros and call them several times. 2018-09-01 19:44:52 +03:00
Sébastien Loriot 12651796a0 use a generic file with the argt class name being a macro
since several free functions needs to be defined, it seems
to be the simplest and cleanest solution
2018-08-28 10:35:46 +02:00
Sébastien Loriot f96854a359 cleaning up + also use the mechanism for Arrangement_2 2018-08-27 15:46:12 +02:00
Sébastien Loriot 348345a482 add missing specialization 2018-08-27 10:03:52 +02:00
Sébastien Loriot 085bfb0aef first try to make Dual working with Argt_with_history 2018-08-27 09:26:45 +02:00
Efi Fogel 66258c7d33 Cleaned up. In particular added 'm_' suffix to data member names. 2018-08-01 15:48:11 +03:00
Efi Fogel a9e37b6ac6 Merge branch 'Aos_2-fixes-efif-old' into Aos_2-fixes-efif 2018-08-01 10:13:29 +03:00
Mael Rouxel-Labbé 26c857a431 Moved unary/binary_function to CGAL::cpp98 2018-06-13 15:58:19 +02:00
Mael Rouxel-Labbé 6283291c8a Moved CGAL::iterator to CGAL::cpp98 2018-06-13 15:58:19 +02:00
Laurent Rineau ed3df2366e Merge pull request #3109 from psarahdactyl/master
add missing const to compare_endpoints_xy_2 () operator taking x-mono…
2018-06-06 14:39:16 +02:00
Laurent Rineau 089e0c10ce Merge pull request #3093 from efifogel/Aos_2-ric_remove_edges-efif
Aos 2 ric remove edges efif

# Conflicts:
#	Minkowski_sum_2/test/Minkowski_sum_2/CMakeLists.txt
2018-05-28 13:58:28 +02:00
Efi Fogel 8631b3c09f Fixed a warning about an unsed variable. 2018-05-25 13:21:42 +03:00
sarahanne 078aa22839 add missing const to compare_endpoints_xy_2 () operator taking x-monotone-curve as a parameter 2018-05-22 15:23:16 -04:00
Efi Fogel 224a500ec7 Called locate_opt_empty() after the removal of an edge to reset the hint. Introduced update_vtx_cw_he_after_remove() and called it to update the cw halfedge of an active vertex when a halfedge is removed. 2018-05-16 17:52:15 +03:00
Efi Fogel 343ca15477 Introduced set_cw_he_visitor() member function 2018-05-16 17:49:02 +03:00
Efi Fogel 06d2fc762a Introduced member function reset_cw_he() 2018-05-16 17:48:15 +03:00
Efi Fogel d5a26a0bc0 Cleaned up; stage 2 2018-05-16 11:21:07 +03:00
Sebastien Loriot fe262d6215
Merge pull request #3085 from afabri/Arrrangement_2-static_or_atomic-GF
Arrangement_2: Address all remaining points of issue #1384, but the renderer
2018-05-16 08:46:18 +02:00
Efi Fogel 972cede312 Cleaned up, stage 1. 2018-05-16 08:37:27 +03:00
Andreas Fabri 99bc374cce More forward declarations 2018-05-15 15:37:51 +02:00
Andreas Fabri 5690cc4a02 Arrangement_2: Add Forward Declaration 2018-05-15 15:37:51 +02:00
Andreas Fabri b984dce222 Address all remaining points of issue #1384, but the renderer 2018-05-11 08:32:11 +01:00
Efi Fogel 37ff684b6f Uncommented a necessary call to update the container of the curves when rebuilding 2018-05-06 15:54:46 +03:00
Laurent Rineau abea1b9cb6 Merge pull request #3028 from sloriot/Argt-missing_const
Add missing const
2018-04-24 17:33:30 +02:00
Laurent Rineau 81cfcf722d
Indentation 2018-04-23 13:26:50 +00:00
Laurent Rineau 1e1025e604
Fix the indentation!! 2018-04-23 13:09:34 +00:00
Andreas Fabri d7a4a4ac49 Use decltype 2018-04-21 09:41:23 +01:00
Andreas Fabri f0c1d3aab7 more allocator_traits 2018-04-19 14:49:05 +01:00
Laurent Rineau 095c27e2be cosmetic changes 2018-04-17 17:14:19 +02:00
Sébastien Loriot e0d0599949 add missing const 2018-04-17 16:01:35 +02:00
Andreas Fabri 97ac4d5f51 Exploit that construct is variadic 2018-04-17 14:15:07 +01:00
Andreas Fabri 7cbffac35b Deal with deprecated functions allocator<T>::construct/destroy 2018-04-17 13:35:04 +01:00
Andreas Fabri c54a6a4980 Put CGAL::random_shuffle() in the subnamespace cpp98 2018-04-11 09:32:23 +01:00
Efi Fogel ebe16ef2f8 Added missing definition of a constructor in compare-cy 2018-04-07 16:03:58 +03:00
Efi Fogel 5b35b2fb6e Added missing const 2018-04-07 16:03:32 +03:00
Andreas Fabri 063a91a771 Use CGAL::random_shuffle 2018-04-04 14:00:23 +01:00
Andreas Fabri 807c777f50 Remove unused variable 2018-03-30 13:32:57 +01:00
Efi Fogel fb0d16577e Merge branch 'Aos_2-fixes-efif-old' into Aos_2-fixes-efif 2018-03-21 19:55:10 +02:00
Efi Fogel 98b4a49690 Introduced compare_xy() 2018-03-21 19:04:12 +02:00
Laurent Rineau 85ce0157cf Merge pull request #2839 from afabri/STL_extension-replace_std_iterator-GF
STL_extension: Introduce CGAL::iterator
2018-02-23 17:34:57 +01:00
Laurent Rineau c409a61ec5 Merge pull request #2813 from MaelRL/BGL-doc_improvement-GF
BGL: Doc & tests improvements
2018-02-23 17:34:32 +01:00
Mael Rouxel-Labbé f99d3db974 Fixed conversion warnings 2018-02-20 17:20:36 +01:00
Andreas Fabri faa2866763 More CGAL_STATIC_THREAD_LOCAL_VARIABLE 2018-02-20 11:22:32 +00:00
Andreas Fabri d5523f80c0 Use CGAL_STATIC_THREAD_LOCAL_VARIABLE 2018-02-19 17:32:21 +00:00
Mael Rouxel-Labbé dafdafa0bb
Merge branch 'master' into BGL-doc_improvement-GF 2018-02-19 15:41:45 +01:00
Laurent Rineau 78e7060525 Merge pull request #2712 from afabri/CGAL-VC+warnlevel_4-GF
Deal with VC++ warnings of level /W4
2018-02-19 14:27:06 +01:00
Mael Rouxel-Labbé 28d55f8981
Merge branch 'master' into BGL-doc_improvement-GF 2018-02-15 11:32:50 +01:00
Andreas Fabri 52549b1145 STL_extension: Introduce CGAL::iterator as replacement for the deprecated std::iterator 2018-02-14 18:46:45 +00:00
Sébastien Loriot 483f69728e Refresh branch 2018-02-12 22:21:38 +01:00
Mael Rouxel-Labbé e87001f764 Added null_vertex to Arrangement_2 graph traits 2018-02-08 18:15:40 +01:00
Andreas Fabri 6e66f6bb15 Fix two warnings about unused variable/parameter 2018-02-08 07:40:23 +00:00
Andreas Fabri e0cb4e4b4f int -> std::size_t 2018-02-02 07:31:11 +00:00
Andreas Fabri 11d5e2ec50 increment in the loop instead of decrement, after change from int to std::size_t as the latter is never negative 2018-02-01 10:13:06 +00:00
Andreas Fabri 769ac1a348 Arrangement_2 2018-01-26 08:14:34 +00:00
Andreas Fabri dc2f37a4ae disable/enable warnings 2018-01-24 08:59:20 +00:00
Andreas Fabri 18acb2ece9 Arrangements 2018-01-18 15:05:34 +00:00
Andreas Fabri 0625e73722 Replace CGAL::Open_hash by boost::unordered_set 2018-01-04 16:47:41 +01:00
Efi Fogel 72b7377d29 Fixed boundary tags 2017-12-31 19:03:33 +02:00
Efi Fogel 75a733f1a6 Handled the cases where an intersection point lies on the boundary 2017-12-31 19:02:23 +02:00
Efi Fogel 60e23aa1b9 Fixed boundary tags 2017-12-31 19:00:38 +02:00
Efi Fogel e30a595cd5 Fixed boundary tags 2017-12-31 18:57:47 +02:00
Efi Fogel 7271605d41 Fixed boundary tags 2017-12-31 18:55:50 +02:00
Efi Fogel fd834d771a Dispatched before_handle_event_imp() 2017-12-31 18:55:23 +02:00
Efi Fogel 557e948667 Introduced overloaded move_halfedge_indices(), and dispatched it 2017-12-31 18:54:26 +02:00
Efi Fogel 32aa9d5016 Fixed boundary tags 2017-12-31 18:51:42 +02:00
Efi Fogel 6d0d370423 Fixed boundary tags 2017-12-31 18:51:27 +02:00
Efi Fogel 30a92c4dd5 Fixed boundary tags 2017-12-31 18:45:48 +02:00
Efi Fogel 1ca6e69a5e Merge branch 'Aos_2-boundary_objects-efic-old' into Aos_2-boundary_objects-efic 2017-12-25 16:15:07 +02:00
Sebastien Loriot 6bbfed5352
Merge pull request #2236 from efifogel/Aos_2-surface_sweep-efif
Aos 2 surface sweep
2017-12-22 22:32:15 +01:00
Sebastien Loriot 03d36bb86d
Merge pull request #2671 from efifogel/Aos_2-mon_symetric_observer-efif
Aos_2: non symetrical observer
2017-12-22 22:14:43 +01:00
Laurent Rineau 08bc15141e
Merge branch 'master' into Aos_2-surface_sweep-efif 2017-12-19 17:20:28 +01:00
Laurent Rineau f2391a30a5 Merge pull request #2562 from afabri/Filtered_kernel-Do_intersect_2-GF
Add Static Filters for the Exact Construction Kernel
2017-12-19 16:29:53 +01:00
Efi Fogel e565f69e69 Saved end vertices of halfedge before removing the halfedge, so that they can be used later (after the halfedge is removed) 2017-12-19 14:57:47 +02:00
Efi Fogel 3b0e5ba106 When removing an edge and the user has requested to remove the end-vertices in case they become redundant (either isolated or approach infinity), defer the removal of the such end-vertices to occur after the observer is notified that the edge has been removed. 2017-12-11 09:18:45 +02:00
Efi Fogel f1483cfa25 Merge branch 'Aos_2-surface_sweep-efif-old' into Aos_2-surface_sweep-efif
Merging Sebastien's fix to the surface-sweep cod.
Also, replaced all occurrences of '_SL_' with '_SS_'.
2017-12-07 15:56:00 +02:00
Laurent Rineau 2cec8e6aca Merge pull request #2342 from sloriot/Argt-overlap_intersect_at_insertion
Reworking the handling of overlaps
2017-12-05 18:27:35 +01:00
Laurent Rineau 47a3922a74 Merge pull request #2576 from efifogel/Aos_2-data_traits_construct_opposite-efif
Aos_2: data traits construct opposite

# Conflicts:
#	Installation/changes.html
2017-12-05 18:19:23 +01:00
Efi Fogel 7c762c4e6e Added missing test for isolated points 2017-11-26 13:58:12 +02:00
Efi Fogel 4ac4be5681 Remove obsolete macros and reimplemented compute_intersections() called when the normals are identical 2017-11-26 13:57:20 +02:00
Efi Fogel 5ad703a1ba Added some debug info. print out statements 2017-11-26 13:50:05 +02:00
Efi Fogel a9c2a49605 Used the Construct_point_2 and Construct_curve_2 functors of the traits instead of constructing the corresponding type directly 2017-11-26 13:47:57 +02:00
Efi Fogel fbb4365cf8 Added template parameter to match the base Arr_geodesic_arc_on_sphere_traits_2 template 2017-11-26 13:45:42 +02:00
Efi Fogel b2390cd6b3 Handled correctly some functors that are required for boundary conditions 2017-11-26 13:43:44 +02:00
Sébastien Loriot 0b5353ca35 add missing identifiers 2017-11-21 13:48:10 +01:00
Efi Fogel 3b6973dceb Merge branch 'Aos_2-boundary_objects-efic-old' into Aos_2-boundary_objects-efic
Conflicts:
	Arrangement_on_surface_2/archive/include/CGAL/Arr_extended_rational_arc_traits_d_1.h
	Arrangement_on_surface_2/archive/include/CGAL/Arr_rational_arc_traits_2.h
	Arrangement_on_surface_2/include/CGAL/Arr_accessor.h
	Arrangement_on_surface_2/include/CGAL/Arr_algebraic_segment_traits_2.h
	Arrangement_on_surface_2/include/CGAL/Arr_counting_traits_2.h
	Arrangement_on_surface_2/include/CGAL/Arr_geodesic_arc_on_sphere_traits_2.h
	Arrangement_on_surface_2/include/CGAL/Arr_linear_traits_2.h
	Arrangement_on_surface_2/include/CGAL/Arr_observer.h
	Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_batched_point_location_traits_2.h
	Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_naive_point_location_impl.h
	Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_traits.h
	Arrangement_on_surface_2/include/CGAL/Arr_spherical_topology_traits_2.h
	Arrangement_on_surface_2/include/CGAL/Arr_tags.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_inc_insertion_zone_visitor.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_planar_topology_traits_base_2.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_insertion_helper.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_overlay_helper.h
	Arrangement_on_surface_2/include/CGAL/Arr_tracing_traits_2.h
	Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arr_traits_adaptor_2.h
	Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arr_traits_adaptor_2_dispatching.h
	Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_on_surface_2_global.h
	Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_on_surface_2_impl.h
	Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_zone_2_impl.h
	Arrangement_on_surface_2/include/CGAL/Arrangement_on_surface_2.h
	Arrangement_on_surface_2/include/CGAL/Arrangement_zone_2.h
	Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Arc_2.h
	Arrangement_on_surface_2/include/CGAL/IO/Arr_text_formatter.h
	Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op.h
	Sweep_line_2/include/CGAL/Sweep_line_2/Arr_basic_insertion_traits_2.h
	Sweep_line_2/include/CGAL/Sweep_line_2/Arr_overlay_traits_2.h
	Sweep_line_2/include/CGAL/Sweep_line_2/Sweep_line_functors.h
2017-11-20 18:38:03 +02:00
Efi Fogel 7936109c6c Merge branch 'Aos_2-surface_sweep-efif-old' into Aos_2-surface_sweep-efif
Conflicts:
	.travis.yml
	.travis/packages.txt
	Arrangement_on_surface_2/include/CGAL/Arr_batched_point_location.h
	Arrangement_on_surface_2/include/CGAL/Arr_bounded_planar_topology_traits_2.h
	Arrangement_on_surface_2/include/CGAL/Arr_default_overlay_traits.h
	Arrangement_on_surface_2/include/CGAL/Arr_overlay_2.h
	Arrangement_on_surface_2/include/CGAL/Arr_spherical_topology_traits_2.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_batched_pl_helper.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_construction_helper.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_insertion_helper.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_overlay_helper.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_topology_traits_2_impl.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_bounded_planar_vert_decomp_helper.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_planar_topology_traits_base_2.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_batched_pl_helper.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_construction_helper.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_insertion_helper.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_overlay_helper.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_vert_decomp_helper.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_batched_pl_helper.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_construction_helper.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_insertion_helper.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_overlay_helper.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_topology_traits_2_impl.h
	Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_unb_planar_vert_decomp_helper.h
	Arrangement_on_surface_2/include/CGAL/Arr_unb_planar_topology_traits_2.h
	Arrangement_on_surface_2/include/CGAL/Arr_vertical_decomposition_2.h
	Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arr_default_planar_topology.h
	Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_on_surface_2_global.h
	Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_on_surface_2_impl.h
	Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_basic_insertion_traits_2.h
	Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_batched_pl_ss_visitor.h
	Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_construction_ss_visitor.h
	Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_default_overlay_traits_base.h
	Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_insertion_traits_2.h
	Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_no_intersection_insertion_ss_visitor.h
	Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_overlay_ss_visitor.h
	Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_overlay_subcurve.h
	Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_overlay_traits_2.h
	Arrangement_on_surface_2/include/CGAL/Surface_sweep_2/Arr_vert_decomp_ss_visitor.h
	Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_meta_traits.h
	Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op.h
	Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op_sweep.h
	Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op_visitor.h
	Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_polygon_simplifier.h
	Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_polygon_validation.h
	CGAL_ipelets/demo/CGAL_ipelets/arrangement.cpp
	Documentation/doc/Documentation/dependencies
	Installation/include/CGAL/config.h
	Snap_rounding_2/include/CGAL/Snap_rounding_2.h
	Surface_sweep_2/examples/Surface_sweep_2/CMakeLists.txt
	Surface_sweep_2/include/CGAL/Surface_sweep_2/No_intersection_surface_sweep_2_impl.h
	Surface_sweep_2/include/CGAL/Surface_sweep_2/No_overlap_event_base.h
	Surface_sweep_2/include/CGAL/Surface_sweep_2/Surface_sweep_2_utils.h
	Surface_sweep_2/include/CGAL/Surface_sweep_2_algorithms.h
	Sweep_line_2/include/CGAL/Sweep_line_2/Arr_construction_event.h
	Sweep_line_2/include/CGAL/Sweep_line_2/Arr_construction_subcurve.h
	Sweep_line_2/include/CGAL/Sweep_line_2/Arr_insertion_sl_visitor.h
	Sweep_line_2/include/CGAL/Sweep_line_2/Sweep_line_2_visitors.h
	Sweep_line_2/include/CGAL/Sweep_line_2/Sweep_line_curve_pair.h
	Sweep_line_2/include/CGAL/Sweep_line_2/Sweep_line_functors.h
	Sweep_line_2/include/CGAL/Sweep_line_2/Sweep_line_subcurve.h
	Sweep_line_2/include/CGAL/Sweep_line_empty_visitor.h
2017-11-16 16:31:52 +02:00
Sébastien Loriot 8cdfad0d08 add missing URL and Id tags 2017-11-15 22:58:57 +01:00
Efi Fogel 2cedf1bcc0 Used BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF 2017-11-15 17:31:40 +01:00
Efi Fogel e60ec0ac3e Small enhansment to the construct-opposite functor 2017-11-15 17:30:40 +01:00
Efi Fogel 5dac09329e Added Construct_opposite_2. Used generic meta functionality to check whether the base geometry traits has the respective nested functor defined, and dispatched accordingly. 2017-11-15 17:30:40 +01:00
Efi Fogel a8a7f6b133 Cleaned up 2017-11-15 17:30:38 +01:00
Sébastien Loriot ff26773f7b remove include directive for checking GPL compliance in LGPL headers 2017-11-12 10:21:35 +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 97e8ea1794 remove extra space 2017-11-12 10:17:51 +01:00
Sébastien Loriot 0698f79aff add SPDX identifier for files under the LGPL-3+ license 2017-11-12 10:17:50 +01:00
Laurent Rineau aa03c5b83a Fix compilation error in Arrangement "Spherical Gaussian Map" 2017-10-31 11:05:21 +01:00
Laurent Rineau 8f46324806 Merge pull request #2475 from sgiraudot/Fix_counting_iterator_warning_everywhere-GF
Fix counting iterator warnings
2017-10-11 19:15:15 +02:00
Laurent Rineau 2b35bddfb2 Replace all std::binary_function by CGAL::binary_function 2017-10-04 16:36:32 +02:00
Laurent Rineau 7e9f756935 Replace all std::unary_function by CGAL::unary_function 2017-10-04 15:57:09 +02:00
Simon Giraudot 1e7b9ea027 Fix counting iterator warnings 2017-09-29 14:47:17 +02:00
Efi Fogel f0dbd8dfb5 Guarded typedefs used only in Debug mode 2017-08-03 14:50:11 +03:00
Efi Fogel 56beb0cfff Removed unused typedef 2017-08-03 14:49:15 +03:00
Laurent Rineau 8fea129ff8 Merge pull request #2234 from lrineau/Arr_2-fix_warnings-lrineau
Arr_2: fix warnings
2017-07-10 15:35:47 +02:00
Laurent Rineau ef116f9fcb Merge pull request #2188 from sloriot/CGAL-prefix_sign
Quality calls to sign
2017-07-10 15:33:55 +02:00
Efi Fogel d10ed5ad2c Introduced CGAL_CFG_NO_CPP0X_TEMPLATE_ALIASES and used it 2017-07-10 12:29:17 +03:00
Efi Fogel 6fdfe96c08 Substituted 'sl' (which stands for sweep-line) with 'ss' (which stands for surface-sweep) 2017-07-09 08:01:02 +03:00
Efi Fogel ab6c2be8fa Cleaned up 2017-07-08 19:32:57 +03:00
Efi Fogel 4f64a69b42 Added namespace std to size_t 2017-07-08 18:14:10 +03:00
Efi Fogel 73edfc524e Fixed typos 2017-07-08 18:09:26 +03:00
Efi Fogel 6b317dc18f Moved license header directive immediately after the ifndef/define directive guards 2017-07-08 18:09:02 +03:00
Efi Fogel 1e1bd0ea15 Merge branch 'Aos_2-surface_sweep-efif' of github.com:efifogel/cgal into Aos_2-surface_sweep-efif 2017-07-07 15:29:05 +03:00
Efi Fogel 0a91b2809b Added rebing to construction helpers to allow rebinding with derived geometry traits. Ranemd sweep-line with surface-sweep. Fixed the regularized Boolean operations to use the new heleper/visitor/sweep scheme. Cleaned up the code. 2017-07-07 15:22:33 +03:00
Laurent Rineau c4438a472b Merge branch 'master' into Aos_2-surface_sweep-efif 2017-07-05 15:39:09 +02:00
Laurent Rineau b0e8672d4c Fix warnings about unused parameters 2017-07-05 10:34:23 +02:00
Laurent Rineau adb33f184a Merge pull request #2214 from sloriot/AOS_2-fix_warnings
fix unused variable warnings
2017-06-30 16:52:08 +02:00
Efi Fogel c20ff0b97e Fixed small typo 2017-06-29 12:00:21 +03:00
Efi Fogel 73bf518479 Workaround what seems as a VC bug 2017-06-29 11:59:30 +03:00
Sébastien Loriot 76309b265b workaround warnings triggered by dynamic_cast with g++ -Wnonnull-compare 2017-06-28 12:50:32 +02:00
Sébastien Loriot 2386c147f3 fix unused variable warnings 2017-06-28 10:48:30 +02:00
Sébastien Loriot 7fa251e3e8 make debug output more robust in case of loss of precision 2017-06-28 09:57:04 +02:00
Efi Fogel c5f40dc28a Added Allocator template parameter 2017-06-28 01:02:08 +03:00
Efi Fogel cf9c7f8524 Added Allocator template parameter 2017-06-27 22:56:02 +03:00
Sébastien Loriot d1e257f7cf small fix 2017-06-26 15:38:29 +02:00
Efi Fogel f63d80fed9 Fixed typo 2017-06-22 00:15:06 +03:00
Efi Fogel 3c455e9c70 Split classes into dedicated headers. Changed sweep helper and visitor definition method 2017-06-21 19:18:40 +03:00
Efi Fogel 9c2f966111 Cleaned up 2017-06-20 12:45:25 +03:00
Efi Fogel 9664674d39 Moved some files back from the Surface_sweep_2 package to Arrangement_on_surface_2 package 2017-06-20 11:44:18 +03:00
Efi Fogel 54d1373ec8 Aplit visitors into dedicated files 2017-06-20 08:02:58 +03:00
Efi Fogel 10412b7e56 Renamed default visitor 2017-06-19 19:08:49 +03:00
Sébastien Loriot 1bba93acc7 explicit that the sign function is the one from CGAL to avoid ambiguity 2017-06-17 07:31:22 +02:00
Efi Fogel ae01194712 Changed Surface_sweep_2 and No_intersection_surface_sweep_2 to be templates parameterized only by visitors. 2017-06-15 16:19:00 +03:00
Efi Fogel 2c09a3f378 Resolved interdependence relation between Event and Subcurve of the surface-sweep using CRTP. 2017-06-09 09:20:48 +03:00
Efi Fogel 1af365a6b1 Added Surface_sweep_2 namespace and renamed some class accordingly 2017-06-07 14:11:35 +03:00
Efi Fogel 36490bbe74 Fixed subcurve and event of surface-sweep 2017-06-06 02:37:46 +03:00
Laurent Rineau a53f3e5dd4 Merge pull request #2061 from efifogel/Sgm-bug_fix-efif
Arrangment: Spherical Gaussian Map bug fix
2017-05-29 11:17:22 +02:00
Efi Fogel e8cb005bde Used the non-intersection surface-sweep for vertical decomposition 2017-05-28 16:19:03 +03:00
Efi Fogel ea7d71517b Fixed hierarchy of subcurve types used by the surface-sweep procedure 2017-05-28 11:51:12 +03:00
Efi Fogel 3e6de6b439 Renamed sweep-line to surface-sweep and cleaned up 2017-05-27 12:30:41 +03:00
Efi Fogel 65406224fa Removed dedundant type definition of Arr_vertex_handle 2017-05-22 14:49:31 +03:00
Mael Rouxel-Labbé cd2a562ffa Fixed improper guards against the inclusion of deprecated headers 2017-05-16 10:17:41 +02:00
Efi Fogel 359d5ea5f1 Merge branch 'Aos_2-boundary_objects-efic-old' into Aos_2-boundary_objects-efic
Conflicts:
	Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Arrangement_on_surface_2.txt
	Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementOpenBoundaryTraits_2.h
	Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_traits.h
	Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_on_surface_2_global.h
	Sweep_line_2/include/CGAL/Sweep_line_2.h
	Sweep_line_2/include/CGAL/Sweep_line_2/Basic_sweep_line_2_impl.h
	Sweep_line_2/include/CGAL/Sweep_line_2/Sweep_line_2_debug.h
	Sweep_line_2/include/CGAL/Sweep_line_2/Sweep_line_2_impl.h
	Sweep_line_2/include/CGAL/Sweep_line_2/Sweep_line_event.h
2017-05-11 13:40:10 +03:00
Efi Fogel b50ccf6e1f Pacify VS 2017-05-01 02:22:49 +03:00
Maxime Gimeno 289012269b Add model of in the doc. 2017-04-24 09:58:25 +02:00
Maxime Gimeno 21e20c66cf Precise the model of ConstRange and fix the templated argument of the const handles to XXX_const_iterator. 2017-04-24 09:58:25 +02:00
Maxime Gimeno dba36d50a5 fix face_handles() 2017-04-24 09:58:25 +02:00
Maxime Gimeno 9d2487cb7e Typo fixes. 2017-04-24 09:58:25 +02:00
Maxime Gimeno 3016500246 Add_range_support for Arrangement Dcel. 2017-04-24 09:56:21 +02:00
Efi Fogel 8f63f6857e Removed out of CGAL namespace 2017-04-18 15:00:44 +03:00
Efi Fogel 37d4f89148 Made the polyhedron a model of FaceGraph 2017-04-18 13:01:03 +03:00
Christian Gagneraud d8502c0469 Fix a few typos in the documentation 2017-04-16 13:20:12 +12:00
Efi Fogel a21d0e561f Added Segment_2 and X_monotone_segment_2 types for backward compatibility 2017-03-21 14:43:18 +02:00
Sébastien Loriot 889307a486 Merge remote-tracking branch 'cgal/releases/CGAL-4.9-branch' into HEAD 2017-03-16 09:44:58 +01:00
Sébastien Loriot 6075c8fbcb fix unused variable warning 2017-03-16 09:44:17 +01:00
Sébastien Loriot b64cca5fdf Merge remote-tracking branch 'cgal/releases/CGAL-4.9-branch' into HEAD 2017-03-14 17:10:19 +01:00
daillen 81baa282a2 Fixed typos in Basic_sweep_line_2 2017-03-10 13:12:30 -03:00
Efi Fogel e7d6456cdf remove invalid precondition 2017-03-09 11:16:39 +01:00
Sébastien Loriot 02705704fb add missing license include directive 2017-01-19 15:20:27 +01:00
Sébastien Loriot e28842cf76 add missing include guards 2017-01-19 15:20:27 +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 4342ac3821 Update Arr_counting_traits_2.h 2017-01-13 09:52:36 +01:00
Laurent Rineau 3f4bcabe13 Merge pull request #1756 from MaelRL/Arrangement_2-Fix_typos
Fixed some typos in Arrangement_2
2016-12-22 17:11:08 +01:00
andrew morton bfa7aca7c2 Fix spelling of 'matches' 2016-12-17 13:57:54 -07:00
Mael Rouxel-Labbé 2038e558b2 Fixed typos in doc and comments 2016-12-09 11:27:17 +01:00
Laurent Rineau 8c2efe9549 Merge pull request #1642 from afabri/Arrangement_2-static-GF
Arrangement_2: make some variables atomic or tss
2016-12-02 11:36:15 +01:00
Andreas Fabri 21149fa574 Deal with the case CGAL_NO_ATOMIC 2016-11-02 17:33:54 +01:00
Andreas Fabri 5202e26ada make some variables atomic or tss 2016-11-01 14:54:56 +01:00
Andreas Fabri 38d4e4ce23 Remove unused uncompilable file Hyperbolic_arc_2.h 2016-11-01 10:00:56 +01:00
Laurent Rineau a00e886ee0 Merge pull request #1595 from afabri/Arrangement-fix_Rational_arc_d_1-GF
Arrangement_2: fix Continuous_rational_arc_d_1
2016-10-24 11:47:06 +02:00
Laurent Rineau b93ba2109a Fix the warning
[ 50%] Building CXX object CMakeFiles/test_rational_function_traits_2.dir/test_rational_function_traits_2.cpp.obj
	C:\PROGRA~2\MICROS~1.0\VC\bin\amd64\cl.exe  @C:\Users\afabri\AppData\Local\Temp\nm6849.tmp
test_rational_function_traits_2.cpp
C:\CGAL\test\CGAL-4.10-Ic-28\include\CGAL/Arr_rat_arc/Rational_arc_d_1.h(1833) : warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
        C:\CGAL\test\CGAL-4.10-Ic-28\include\CGAL/Arr_rat_arc/Rational_arc_d_1.h(1833) : while compiling class template member function 'bool CGAL::Arr_rational_arc::Continuous_rational_arc_d_1<Algebraic_kernel_>::is_left_to_right(void) const'
        with
        [
            Algebraic_kernel_=CGAL::Algebraic_kernel_d_1<Number_type>
        ]
        C:\CGAL\test\CGAL-4.10-Ic-28\cmake\platforms\x64_Cygwin-Windows8_MSVC2012-Debug-64bits\test\Arrangement_on_surface_2\test_rational_function_traits_2.cpp(250) : see reference to function template instantiation 'bool CGAL::Arr_rational_arc::Continuous_rational_arc_d_1<Algebraic_kernel_>::is_left_to_right(void) const' being compiled
        with
        [
            Algebraic_kernel_=CGAL::Algebraic_kernel_d_1<Number_type>
        ]
        C:\CGAL\test\CGAL-4.10-Ic-28\cmake\platforms\x64_Cygwin-Windows8_MSVC2012-Debug-64bits\test\Arrangement_on_surface_2\test_rational_function_traits_2.cpp(174) : see reference to class template instantiation 'CGAL::Arr_rational_arc::Continuous_rational_arc_d_1<Algebraic_kernel_>' being compiled
        with
        [
            Algebraic_kernel_=CGAL::Algebraic_kernel_d_1<Number_type>
        ]
2016-10-21 10:12:53 +02:00
Laurent Rineau 3e0ab881c1 Merge pull request #1584 from afabri/Installation-compute_dependencies-GF
Make Algebraic_kernel_d independent from CGAL/Arr_enum.h
2016-10-20 09:47:42 +02:00
Laurent Rineau c826500c7d Merge pull request #1551 from mglisse/Number_types-gmpxx_coercion-glisse
Misc GMPXX fixes
2016-10-20 09:47:39 +02:00
Andreas Fabri 59925a27e1 Replace && with & as we do want to test a single bit 2016-10-19 14:00:47 +02:00
Andreas Fabri 554bd0fd26 Make Algebraic_kernel_d independent from CGAL/Arr_enum.h
Introduce Box_parameterization_2 in CGAL/enum.h
Add a typedef and constants in the Arrangement package to stay bw compatible
2016-10-17 11:56:43 +02:00
Marc Glisse 232fc7ecf0 Help type deduction for expression template number types. 2016-10-13 11:25:59 +02:00
Sébastien Loriot 733e948e28 move file to archive and remove dont_submit 2016-10-06 09:53:40 +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
Andreas Fabri 40e9c6f735 Move specializations of graph_traits the packages that are concerned 2016-09-30 15:22:29 +02:00
Efi Fogel d7678c44fb Cleaned up 2016-09-30 09:24:24 +02:00
Efi Fogel 52292c825c Enhanced debug messages & Cleaned up 2016-09-30 09:24:24 +02:00
Efi Fogel 72e114fb3f Enhanced debug messages & Cleaned up 2016-09-30 09:24:24 +02:00
Laurent Rineau 44b4199878 Merge pull request #1366 from lrineau/CGAL-remove_support_for_LEDA_5_and_before-GF
Remove all usage of CGAL_LEDA_VERSION
2016-08-29 12:32:24 +02:00
Laurent Rineau 3481352110 Merge pull request #1361 from sloriot/AOS_2-fix_for_polycurve_traits from 'cgal/releases/CGAL-4.8-branch' 2016-08-29 12:13:31 +02:00
Laurent Rineau 0c690014b7 Remove all usage of CGAL_LEDA_VERSION
Now, LEDA version >= 6.0 is required if `CGAL_USE_LEDA` is toggled.
2016-08-25 14:38:16 +02:00
Sébastien Loriot 6987c417b2 fix Compare_y_at_x_2 of traits based on Arr_polycurve_basic_traits_2
this fix an issue when an xmonotone curve is vertical and not
oriented from left-to-right, as the xmonotone curve was assumed
to be oriented from left-to-right.
Note that in the case of a vertical curve, oriented from left-to-right
means from down-to-up
2016-08-24 11:27:20 +02:00
Sébastien Loriot 43bba7d980 add missing this-> when CGAL_ALWAYS_LEFT_TO_RIGHT is defined 2016-08-24 11:26:42 +02:00
Efi Fogel f9d113d735 Enhanced the description of the geodesic traits 2016-07-28 00:52:20 +03:00
Efi Fogel cb21be15bc Fixed reading and writing geodesic arcs and points 2016-07-14 01:09:54 +03:00
Efi Fogel 7d1022e0f9 Fixed skip_comment() 2016-07-14 01:09:31 +03:00
Efi Fogel da8757b082 Cleaned up geodesic arc on sphere traits and started to document it 2016-06-30 01:19:48 +03:00
Efi Fogel 5677c6db62 Renamed Compare_x_at_limit and Compare_x_near_limit to Compare_x_on_boundary and Compare_c_near_boundary, resp. 2016-04-06 18:25:59 +03:00
Efi Fogel 047bc66024 ../../include/CGAL/Arr_polyline_traits_2.h 2016-04-06 18:23:49 +03:00
Efi Fogel c63193c31e Merge branch 'Aos_2-boundary_objects-efic-old' into Aos_2-boundary_objects-efic
Conflicts:
	Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Arc_2.h
2016-04-06 14:33:54 +03:00
Laurent Rineau 00e6e03d5c Merge pull request #785 from afabri/CGAL-missing_includes-GF
Partial cleanup of issue #595   Part2
2016-03-24 17:02:27 +01:00
Andreas Fabri eb90e8e3e1 Include consistently <CGAL/property_map.h> 2016-02-24 12:09:36 +01:00
Sébastien Loriot 5be27c2998 Merge remote-tracking branch 'cgal/releases/CGAL-4.7-branch' into HEAD 2016-02-22 08:17:10 +01:00
Efi Fogel 7293d45d98 A fix by Iddo for the case where the curve is closed (first and last points are the same) 2016-02-22 08:13:48 +01:00
Andreas Fabri 600416bfa2 remove a commented include 2016-02-15 15:03:35 +01:00
Sebastien Loriot 48da87c2b5 Merge pull request #732 from afabri/CGAL-replace_bind-GF
Replace all std::bind with boost::bind
2016-02-07 18:21:05 +01:00
Sébastien Loriot ba0c304859 remove emacs user commands 2016-02-04 17:36:31 +01:00
Andreas Fabri 52f8129579 replace all std::bind with boost::bind 2016-02-04 08:59:38 +01:00
Sébastien Loriot 96656bbbdd Add missing const qualifiers 2016-02-03 15:42:51 +01:00
Sébastien Loriot 8cee2ef1dd Merge pull request #686 from afabri/Kernel_fix-warnings-GF
Fix warnings concerning indentation and unused parameter
2016-02-03 09:49:54 +01:00
Sébastien Loriot b406fb8a83 use special case is only for visual not clang 2016-01-29 14:46:30 +01:00
Sébastien Loriot 40de762742 fix indentation warning 2016-01-29 14:20:20 +01:00
Efi Fogel c26bf713b2 Hid unused variables 2016-01-28 13:40:54 +02:00
Efi Fogel 7484d24f34 Prevented min/max macro expansion to pacify MSVC 2016-01-28 13:40:43 +02:00
Efi Fogel f1161c6e6b Hid unused variables 2016-01-27 01:55:40 +02:00
Efi Fogel bce5aa428e Used operational code instead of deprecated code. Used predefined type (size_t) instead of int 2016-01-21 19:27:01 +02:00
Efi Fogel f8c83d82f9 Added back deprecated member functions begin_subcurves() and end_subcurves() 2016-01-19 15:48:16 +01:00
Efi Fogel be691a3644 Supported CGAL::Segment_2<Kernel> 2016-01-19 15:48:16 +01:00
Efi Fogel 9750733dfb Moved IO operations from Polycurve_2 to Polycirve_2_iostream.h 2016-01-19 15:48:16 +01:00
Efi Fogel 4486cba188 replaced {begin,end}_{points,subcurvs} with {points,subcurvs}_{begin,end} moved IO operations to Polycirve_2_iostream.h 2016-01-19 15:48:16 +01:00
Efi Fogel d405c9aa51 replaced {begin,end}_{points,subcurvs} with {points,subcurvs}_{begin,end} 2016-01-19 15:48:15 +01:00
Efi Fogel cf01ef7a26 replaced {begin,end}_{points,subcurvs} with {points,subcurvs}_{begin,end} and included Polycurve_2_iostream.h 2016-01-19 15:48:15 +01:00
Efi Fogel 101d1bcefc replaced {begin,end}_{points,subcurvs} with {points,subcurvs}_{begin,end} 2016-01-19 15:48:15 +01:00
Efi Fogel 245f11ac68 Initialized res to pacifiy compiler warnings 2016-01-19 15:48:15 +01:00
Efi Fogel 92544a44ab Cleanup 2016-01-19 15:48:14 +01:00
Efi Fogel a013201184 Cleanup 2016-01-19 15:48:12 +01:00
Andreas Fabri c32b00acce partial cleanup of issue #595 2016-01-08 17:55:08 +01:00
Efi Fogel fb09c4ac65 Fixed initializer API 2016-01-03 01:01:26 +02:00
Efi Fogel 87309bafcd Merge branch 'Aos_2-boundary_objects-efic-old' into Aos_2-boundary_objects-efic
Conflicts:
	Arrangement_on_surface_2/include/CGAL/Basic_sweep_line_2.h
2016-01-02 23:53:18 +02:00
Sébastien Loriot 4b4723752a Merge remote-tracking branch 'cgal/releases/CGAL-4.7-branch' 2015-12-28 10:09:01 +01:00
Sebastien Loriot a905f55a29 Merge pull request #497 from sloriot/AOS-leak_in_trapezoidal_decomposition
fix a leak in the trapezoidal decomposition that occurs when a curve is removed
2015-12-28 10:07:16 +01:00
Sébastien Loriot 287a5078ea Merge remote-tracking branch 'cgal/releases/CGAL-4.7-branch' 2015-12-10 20:56:52 +01:00
Sébastien Loriot c5ff83ce3f fix IO of polycurves
on the behalf of @efifogel
2015-12-07 09:21:05 +01:00
Sébastien Loriot 04a8230daa fix a leak in the trapezoidal decomposition that occurs when a curve is removed
A dag node contains a variant that amongst other can point onto a
Tr_active_trapezoid. This class inherits from Handle in order to
reference count the data (of type Tr_active_trapezoid::Data) that
contains 4 neightbors, each being of type Tr_active_trapezoid.
The problem is that if a dag node is no longer used and if it
holds a instance of a Tr_active_trapezoid which neighbors trapezoid
are not cleared, we might have objects of type Tr_active_trapezoid
pointing onto each others preventing them from being deleted.
2015-11-23 14:49:52 +01:00
Efi Fogel 29bec5b0e4 Added missing this-> 2015-11-18 11:00:01 +01:00
Efi Fogel ad86fc799f Added missing copy constructor 2015-11-18 11:00:00 +01:00
Efi Fogel cd36eed4f4 Fixed Compare_y_at_x predicate. In Particular, correctly handled the case of vertical curves 2015-11-18 10:59:58 +01:00
Sebastien Loriot bb85ae0179 Merge pull request #474 from afabri/BGL-suppress_warning-GF
suppress warning in boost as this has to be solved upstream
2015-11-17 13:21:05 +01:00
Efi Fogel 49ce1f0f05 Added missing this-> 2015-11-16 09:53:08 +02:00
Efi Fogel 2a9c8f1f5b Added missing copy constructor 2015-11-15 12:19:54 +02:00
Efi Fogel 3b96690d37 Fixed Compare_y_at_x predicate. In Particular, correctly handled the case of vertical curves 2015-11-14 11:10:43 +02:00
Andreas Fabri bf6cfaa8d9 include header which pragma pushes a warning 2015-11-14 09:44:04 +01:00
Sebastien Loriot 91dd3e6a1e Merge pull request #369 from sloriot/AOS-removal_optimisation-efifogel_sloriot
Arr_2: removal optimisation
2015-10-22 08:49:46 +02:00
Sébastien Loriot cddf8c3ab8 use pointer of simplices to be more consistant 2015-10-06 15:17:06 +02:00
Sébastien Loriot fa3fe631f1 fix a memory leak: curves of edges and point of vertices deleted must be deleted 2015-10-05 17:20:48 +02:00
Sebastien Loriot 2243728001 Merge pull request #373 from efifogel/AOS-ccb_removal_optimization-efif
Aos ccb removal optimization efif
2015-10-01 11:02:10 +02:00
Efi Fogel 9bfaa542d8 Introduced _move_all_isolated_vertices() and used it 2015-09-28 16:57:44 +03:00
Efi Fogel 452444e704 Introduced _move_all_inner_ccb() and used it 2015-09-28 15:04:14 +03:00
Efi Fogel 0f72382580 Pure aesthetic changes 2015-09-28 12:20:18 +03:00
Sébastien Loriot b92e34fcfd also do the swap if f1!=f2 2015-09-27 16:08:14 +02:00
Sébastien Loriot d81b0b4545 update face type to give access to the ccb containers 2015-09-27 15:48:14 +02:00
Sébastien Loriot 9968192330 enrich Arr_accessor of some functions to allow dcel manipulations 2015-09-27 15:30:02 +02:00
Efi Fogel ecf346287c Clean up the code of:
_remove_edge(DHalfedge* e, bool remove_source, bool remove_target).

If (f1 != f2) then retain the face that has a larger number of inner ccbs.
Otherwise, continue as before...
2015-09-26 14:48:56 +03:00
Efi Fogel e695933cbb Brought up to date with master. Resolved conflicts mainly due to recent changes in master for polylines 2015-09-26 11:49:30 +03:00
Sébastien Loriot cdfc7f1c31 Merge branch 'old/CGAL-split_packages-GF' into CGAL-split_packages-GF 2015-09-23 10:08:41 +02:00
Sébastien Loriot 621a134f3a add an alternative way to remove edges by remove all elements at the same time
Here is the output of benchmark program polygon_set_2_join.cpp on my machine

current version (polygon_set_2_join):
   Timer for join is 0.316
   Timer for remove_redundant_edges is 0.08799999999999997
   Timer for _reset_faces is 0
Time for 402 grid crossing polygons 0.404

   Timer for join is 1.512
   Timer for remove_redundant_edges is 0.008000000000000007
   Timer for _reset_faces is 0
Time for 1000 random polygons 1.52s

   Timer for join is 3.108
   Timer for remove_redundant_edges is 0
   Timer for _reset_faces is 0
Time for 100000 nested polygons 3.108s

   Timer for join is 6.103999999999999
   Timer for remove_redundant_edges is 0.01200000000000045
   Timer for _reset_faces is 0.003999999999999559
Time for 40000 disjoint polygons 6.119999999999999s

current version (polygon_set_2_join 2):
   Timer for join is 0.636
   Timer for remove_redundant_edges is 0.1719999999999999
   Timer for _reset_faces is 0
Time for 566 grid crossing polygons 0.8079999999999999

   Timer for join is 3.124000000000001
   Timer for remove_redundant_edges is 0.01199999999999868
   Timer for _reset_faces is 0
Time for 2000 random polygons 3.135999999999999s

   Timer for join is 6.892000000000001
   Timer for remove_redundant_edges is 0
   Timer for _reset_faces is 0
Time for 200000 nested polygons 6.892000000000001s

   Timer for join is 32.16799999999999
   Timer for remove_redundant_edges is 0.04800000000000182
   Timer for _reset_faces is 0.008000000000002672
Time for 160000 disjoint polygons 32.224s
2015-09-18 16:21:20 +02:00
Laurent Rineau 7ddefbdcc8 Merge pull request #297 from afabri/CGAL-assert-GF
assert() should not be used in CGAL headers!
2015-09-07 10:58:20 +02:00
Sébastien Loriot f38a3e8cf9 when removing an edge, keep the face having more holes
the output of the benchmark program polygon_set_2_join.cpp
are similar for all input but the grid crossing:

current version (polygon_set_2_join):
Time for 402 grid crossing polygons 4.68

current version(polygon_set_2_join 2):
Time for 566 grid crossing polygons 18.804

This improves the run time but the version with CGAL_JOIN_CREATE_AN_ARRANGEMENT
defined is still faster for this example
2015-09-04 17:19:08 +02:00
Andreas Fabri 1e2ff1131e assert -> CGAL_assertion 2015-08-27 16:51:55 +02:00
Laurent Rineau 0fd6f2fa59 Merge pull request #288 from afabri/CGAL-add_hash-GF
No longer forward declare struct std:hash

Fixes issues #287 and #274.
2015-08-27 15:41:50 +02:00
Andreas Fabri bf975ead95 No longer forward declare struct std:hash 2015-08-23 14:30:54 +02:00
Andreas Fabri 67d72675fe split packages 2015-08-17 23:46:59 +02:00
Laurent Rineau 08666dce25 Merge pull request #179 from afabri/CGAL-add_hash-GF
Add boost::hash and std::hash

https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/hash

Conflicts:
	Installation/changes.html
2015-07-17 15:39:18 +02:00
Sébastien Loriot 2a7696c210 cast to size_t to avoid a warning by clang 2015-07-16 17:50:31 +02:00
Andreas Fabri 2dea6db3bb Merge branch 'CGAL-add_hash-GF-old' into CGAL-add_hash-GF
Conflicts:
	Surface_mesh/include/CGAL/Surface_mesh/Surface_mesh.h
2015-07-06 10:51:23 +02:00
Andreas Fabri dadb129147 g++ needs a forward declaration for std::hash 2015-06-02 08:46:20 +02:00
Andreas Fabri b6850d35c0 #include <functional> and suppress struct/class warning for VC10 2015-06-01 10:42:52 +02:00
Efi Fogel 39f1e22dad Type and typename fixes 2015-05-06 00:40:52 +03:00
Efi Fogel 0f7cb5c709 Merge branch 'MS_2-of_holes-efif-old' into MS_2-of_holes-efif
Conflicts:
	Arrangement_on_surface_2/include/CGAL/Arr_segment_traits_2.h
	Documentation/biblio/cgal_manual.bib
	Minkowski_sum_2/test/Minkowski_sum_2/test_Minkowski_sum.cpp
2015-05-03 11:41:36 +03:00
Andreas Fabri 157756f3b3 Add std::hash and boost::hash for the arrangement 2015-04-29 14:30:36 +02:00
Sebastien Loriot faee08becd Merge pull request #56 from efifogel/Aos-Polycurve_tests-wkhan
Aos polycurve tests wkhan
2015-04-22 18:00:03 +02:00
Efi Fogel a7c602449b Commenting out unnecessary code (which some compilers barf on) 2015-04-15 09:51:22 +03:00
Philipp Möller 76a4f0da85 Replace detail/algorithm.hpp with type_traits/is_same.hpp
Also remove the superfluous map include
2015-04-10 13:46:13 +02:00
Philipp Möller ae72a9f616 Replace detail/algorithm.hpp with type_traits/is_same.hpp
is_same is the only part of boost used in this file
2015-04-10 13:45:47 +02:00
Efi Fogel 6cab541cdb Removed unused var. in release mode 2015-03-21 12:50:05 +02:00
Efi Fogel b9570fad98 Updated changes.html and minor fixes discovered by the test suite 2015-02-25 09:37:24 +02:00
Efi Fogel 8724140fd2 Added this-> to access base members 2015-02-24 21:05:48 +02:00
Efi Fogel 4b941981c1 Fixed small issues found by different platforms 2015-02-24 19:22:26 +02:00
Efi Fogel c686aed4cb polycurve stuff 2015-02-19 20:25:25 +02:00
Efi Fogel 0e1716a7eb polycurve 2015-02-16 11:26:39 +02:00
Efi Fogel e35966bac3 Pacify MSVC 10 2015-02-16 01:30:10 +02:00