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
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
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
48fedbae06
Typos: splitted -> split
2019-12-11 16:57:34 +01:00
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
e5df49fa54
Replace a nullptr by NULL
2019-11-25 16:09:00 +01:00
b9a079b530
remove cpp11/cpp0x
2019-11-04 11:34:53 +01:00
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
a939af4f4a
Merge remote-tracking branch 'sloriot/Sweep_surface_2-derecursive_overlaps' into HEAD
2019-10-24 11:05:52 +02:00
0970a303e9
fix warning
2019-10-24 11:05:24 +02:00
47c092557f
Merge remote-tracking branch 'sloriot/Sweep_surface_2-derecursive_overlaps' into HEAD
2019-10-21 13:04:25 +02:00
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
254d60f642
First pass on removing license notice in header for GPL files
2019-10-19 15:23:19 +02:00
7356421d80
introduce Commercial license SPDX tag
2019-10-19 12:15:19 +02:00
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
90b199b952
fix typos
2019-10-18 09:40:01 +02:00
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
44fd43d61a
opti passing the expected event
...
also answer an old question from @efifogel
2019-08-30 15:16:21 +02:00
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
47b31ed273
missing renaming
2019-07-20 06:06:05 +02:00
338e03ef67
fix conditions
2019-07-20 05:52:22 +02:00
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
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
c0edb5ecaa
remove CGAL_CXX11 macro usage
2019-07-08 11:42:17 +02:00
e2d19b0c8d
Replace NULL and Nullptr_t with nullptr and nullptr_t
2019-06-04 23:45:44 +02:00
2848158354
Fix typos
2019-05-20 08:54:04 +02:00
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
a9e37b6ac6
Merge branch 'Aos_2-fixes-efif-old' into Aos_2-fixes-efif
2018-08-01 10:13:29 +03:00
f0c1d3aab7
more allocator_traits
2018-04-19 14:49:05 +01:00
33d3abaf26
Fix compilation errors
2018-04-17 17:15:00 +02:00
095c27e2be
cosmetic changes
2018-04-17 17:14:19 +02:00
1df9441888
Deal with deprecated functions allocator<T>::construct/destroy
2018-04-17 13:54:01 +01:00
7cbffac35b
Deal with deprecated functions allocator<T>::construct/destroy
2018-04-17 13:35:04 +01:00
fb0d16577e
Merge branch 'Aos_2-fixes-efif-old' into Aos_2-fixes-efif
2018-03-21 19:55:10 +02:00
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
483f69728e
Refresh branch
2018-02-12 22:21:38 +01:00
18acb2ece9
Arrangements
2018-01-18 15:05:34 +00:00
0625e73722
Replace CGAL::Open_hash by boost::unordered_set
2018-01-04 16:47:41 +01:00
b65cb895a7
add missing include directive
2017-12-21 15:40:05 +01:00
54b7272e6f
add missing return statement
2017-12-20 12:54:46 +01:00
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
3b2110656e
Renamed sweep_line to surface_sweep
2017-11-29 21:48:38 +02:00
3d0ccd7c7b
add missing identifier
2017-11-22 13:09:43 +01:00
0b5353ca35
add missing identifiers
2017-11-21 13:48:10 +01:00
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
3aa04dac77
Removed unused function and cleaned up
2017-08-03 14:48:39 +03:00
c43c7ceac8
Introduced for backward compatibility
2017-07-09 08:08:25 +03:00
1471668d00
Used make_sorted_pair. Cleaned up.
2017-07-09 07:59:41 +03:00
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
77420a8749
Fixed some typos
2017-06-29 10:46:13 +03:00
Sébastien Loriot
Andreas Fabri
Laurent Rineau
Maxime Gimeno
Mael Rouxel-Labbé
Efi Fogel