songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
113,740 Commits 3 Branches 156 Tags 958 MiB
Commit Graph

148 Commits

Author SHA1 Message Date
Simon Giraudot 6b991a95ad Update code with changes in Compact container 2020-10-22 09:45:31 +02:00
Simon Giraudot 739a8b66e8 Use named constructor to resolve ambiguity 2020-10-22 08:59:49 +02:00
Simon Giraudot 2d1afb8895 Use Compact Container to store/allocate events 2020-10-22 08:59:48 +02:00
Simon Giraudot 8710690817 Use CC allocation for multiset in surface sweep 2020-10-22 08:59:48 +02:00
Simon Giraudot 2c490b7ec7 Merge remote-tracking branch 'mine/Surface_sweep_2-Small_unordered_set-GF' into Surface_sweep_2-Small_unordered_set-GF 2020-10-20 15:17:24 +02:00
Simon Giraudot 7d23ac99e2 Update internal doc from review 2020-08-17 10:26:08 +02:00
Simon Giraudot 47f3372ad9 Handle open boundary in indexed sweep (fallback to unindexed mode) 2020-08-17 10:22:03 +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
Simon Giraudot caf5b31af6 Indexed sweep in overlay (WIP: triggers assertions in some tests) 2020-08-04 15:42:26 +02:00
Simon Giraudot 9e77e501bd Add member functions for indexed sweep 2020-08-04 15:04:42 +02:00
Simon Giraudot ca794fa991 Remove now useless Curve_pair, move and fix includes/classes accordingly 2020-08-03 14:01:18 +02:00
Simon Giraudot 107d77b311 Use one small unordered set per curve instead of one global unordered set per pair 2020-08-03 13:02:13 +02: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 708469fb5e MFurther eliminating CGAL::Object 2020-06-12 14:06:58 +03:00
Laurent Rineau f4fec8c0c1 Fix C++20 errors (patch suggested by Marc Glisse) 
See https://github.com/CGAL/cgal/pull/4640#issuecomment-635200332
 2020-05-28 11:07:03 +02:00
Efi Fogel 4158542c86 Fixed intersection result 2020-04-01 12:31:51 +03:00
Sébastien Loriot 8bb22d5b2c extra run of the script to remove tabs and trailing whitespaces 
right after the merge of the 5.0 release branch

+ manual fix of the files (indentation was changed in the meantime):
   * Spatial_sorting/include/CGAL/Multiscale_sort.h
   * Spatial_sorting/test/Spatial_sorting/test_multiscale.cpp
 2020-03-26 14:26:59 +01:00
Sébastien Loriot 8b153fb495 Merge branch 'cgal/releases/CGAL-5.0-branch' 
whitespace+tab removal, merged with option -Xignore-space-change
 2020-03-26 14:22:32 +01:00
Sébastien Loriot 0779373835 extra run of the script to remove tabs and trailing whitespaces 
right after the  merge of 4.14 release branch

+ manual fix on one line in:
    * Arrangement_on_surface_2/include/CGAL/IO/Arr_text_formatter.h
    * .travis/generate_travis.sh
 2020-03-26 14:16:06 +01:00
Andreas Fabri 48fedbae06 Typos: splitted -> split 2019-12-11 16:57:34 +01:00
Laurent Rineau 4b7a97c702 Merge pull request #4374 from maxGimeno/4_14_Fixes-maxGimeno 
Surface_sweep_2 Fix c++11 call
 2019-12-05 11:01:08 +01:00
Maxime Gimeno e5df49fa54 Replace a nullptr by NULL 2019-11-25 16:09:00 +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
Sébastien Loriot b9a079b530 remove cpp11/cpp0x 2019-11-04 11:34:53 +01: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 a939af4f4a Merge remote-tracking branch 'sloriot/Sweep_surface_2-derecursive_overlaps' into HEAD 2019-10-24 11:05:52 +02:00
Sébastien Loriot 0970a303e9 fix warning 2019-10-24 11:05:24 +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 7b4de1ec34 replace the function clipping last-curves at the end of overlapping curves 
There are several advantages:
- no longer use a recursive call
- only split curves if needed (because there are effectively on the right of an event)
- fix a bug when the subcurve on the right was not a subcurve of an overlapping curve
  This happens in test/construction_segments/data/test_12.txt for example where
  the curve C1 is created by doing (A+B)+C while (B+C) is then added on the right
  of the end of C1 -> with the old code (B+C) it would not be split (here X+Y means
  curve created from the overlap of curve X and Y).
 2019-10-20 12:09:18 +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
Sébastien Loriot c6736c45a9 Merge remote-tracking branch 'sloriot/Sweep_surface_2-derecursive_overlaps' into HEAD 
Conflicts:
	Installation/include/CGAL/version.h
	Maintenance/release_building/BUGFIX_NUMBER
	Maintenance/release_building/public_release_name
	Surface_sweep_2/include/CGAL/Surface_sweep_2/Surface_sweep_2_impl.h
 2019-10-11 07:08:59 +02:00
Sébastien Loriot 44fd43d61a opti passing the expected event 
also answer an old question from @efifogel
 2019-08-30 15:16:21 +02:00
Sébastien Loriot faec960196 fix the derecursification 
the principal change is to make sure that curves involved in an overlap
on the left of an event are split before computing new overlaps
 2019-08-30 14:27:47 +02:00
Sébastien Loriot 47b31ed273 missing renaming 2019-07-20 06:06:05 +02:00
Sébastien Loriot 338e03ef67 fix conditions 2019-07-20 05:52:22 +02:00
Sébastien Loriot adef5eb4c4 various fixes: 
- Split x-monotone curve at the event
 - test intersection with an existing curve on the right (not one that could be replaced)
 - avoid testing intersection with the same subcurve several times
 2019-07-20 05:03:35 +02:00
Sébastien Loriot 63e9884f1e inimal derecursification of overlap detectiong on the right of event 
only partial fix, full testsuite of Arrangement_on_surface_2 does not
pass
 2019-07-19 22:42:33 +02:00
Sébastien Loriot c0edb5ecaa remove CGAL_CXX11 macro usage 2019-07-08 11:42:17 +02:00
Andreas Fabri e2d19b0c8d Replace NULL and Nullptr_t with nullptr and nullptr_t 2019-06-04 23:45:44 +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
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 a9e37b6ac6 Merge branch 'Aos_2-fixes-efif-old' into Aos_2-fixes-efif 2018-08-01 10:13:29 +03:00
Andreas Fabri f0c1d3aab7 more allocator_traits 2018-04-19 14:49:05 +01:00
Laurent Rineau 33d3abaf26 Fix compilation errors 2018-04-17 17:15:00 +02:00
Laurent Rineau 095c27e2be cosmetic changes 2018-04-17 17:14:19 +02:00
Andreas Fabri 1df9441888 Deal with deprecated functions allocator<T>::construct/destroy 2018-04-17 13:54:01 +01:00
Andreas Fabri 7cbffac35b Deal with deprecated functions allocator<T>::construct/destroy 2018-04-17 13:35:04 +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 c5351fc584 Moved the operation that adds curves to the left so that an event is never left without (left or right) curves 2018-03-21 18:00:09 +02:00
Sébastien Loriot 483f69728e Refresh branch 2018-02-12 22:21:38 +01: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 47c817d741 Fixed boundary tags 2017-12-31 18:50:41 +02:00
Efi Fogel c0279e9ed3 Dispatched operator() 2017-12-31 18:49:55 +02:00
Efi Fogel 91e75657a1 Cleaned up 2017-12-31 18:49:19 +02:00
Efi Fogel cf50bcc509 Cleaned up 2017-12-31 18:49:05 +02:00
Efi Fogel 4f64718306 Dispatched _handle_event_without_left_curves() and _init_curve_end() 2017-12-31 18:48:39 +02:00
Efi Fogel bc51f20b58 Added missing const 2017-12-25 19:16:17 +02:00
Efi Fogel 0804f437af Cleaned up 2017-12-25 17:58:58 +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
Sébastien Loriot b65cb895a7 add missing include directive 2017-12-21 15:40:05 +01:00
Sébastien Loriot 54b7272e6f add missing return statement 2017-12-20 12:54:46 +01: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
Efi Fogel 3b2110656e Renamed sweep_line to surface_sweep 2017-11-29 21:48:38 +02:00
Sébastien Loriot 3d0ccd7c7b add missing identifier 2017-11-22 13:09:43 +01:00
Sébastien Loriot 0b5353ca35 add missing identifiers 2017-11-21 13:48:10 +01: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
Efi Fogel 3aa04dac77 Removed unused function and cleaned up 2017-08-03 14:48:39 +03:00
Efi Fogel c43c7ceac8 Introduced for backward compatibility 2017-07-09 08:08:25 +03:00
Efi Fogel 1471668d00 Used make_sorted_pair. Cleaned up. 2017-07-09 07:59:41 +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
Efi Fogel 77420a8749 Fixed some typos 2017-06-29 10:46:13 +03:00
Efi Fogel ba527bd3a3 Added const version of some member functios 2017-06-29 00:26:57 +03: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
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 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 b68a5fdb65 Added missing Surface_sweep_2 namespace and sfurther split headers to separate classes 2017-06-20 09:16:17 +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
Efi Fogel 930c79d58e Remove the casting of surfac-sweep object 2017-06-15 23:38:42 +03: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 b32af48f9f Cleaned up 2017-06-07 17:19:52 +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
Efi Fogel 9661d1a090 1st revision 2017-06-05 19:16:05 +03:00
Efi Fogel e579227fa3 1st revision 2017-06-05 16:04:01 +03: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