Sébastien Loriot
590612a563
run the script to remove tabs and trailing whitespaces
2020-03-26 13:25:16 +01:00
Laurent Rineau
04bf5e7248
Merge pull request #3998 from sloriot/BO2-fix_outer_ccb_supply
...
Fix outer ccb supply chain
2019-06-17 13:51:28 +02:00
Sébastien Loriot
4117fcd727
allocate new outer ccb if the initial set is empty
2019-06-13 09:31:02 +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
82451a276d
Merge pull request #3774 from sloriot/BO2-fix_outer_ccb_set
...
Fix error in outer CCB setting
2019-03-19 18:26:54 +01:00
Sébastien Loriot
6fc06efd70
fix progation when no inner ccb is adjacent to a outer ccb to be updated
2019-03-15 18:28:18 +01:00
Efi Fogel
07f9ac6430
Fixed the validation of orientation. (This time fixed it right...)
2019-02-23 11:20:56 +02:00
Efi Fogel
58ae1c521b
Guarded local variable used only in DEBUG mode
2019-02-19 16:08:55 +02:00
Efi Fogel
2d4a477296
Fixed validation of orientation of a relative simple polygon
2019-02-16 14:27:55 +02:00
Andreas Fabri
4aaf2bb600
Use decltype to find the type of the allocator
2018-04-20 09:39:19 +01:00
Andreas Fabri
f0c1d3aab7
more allocator_traits
2018-04-19 14:49:05 +01:00
Andreas Fabri
df2e978158
Fix disable/enable warnings; Fix indentation
2018-02-13 14:02:40 +00:00
Sébastien Loriot
483f69728e
Refresh branch
2018-02-12 22:21:38 +01:00
Andreas Fabri
fb262e4c03
Boolean_set_operations_2
2018-01-18 16:25:50 +00:00
Andreas Fabri
0625e73722
Replace CGAL::Open_hash by boost::unordered_set
2018-01-04 16:47:41 +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
Sébastien Loriot
8cdfad0d08
add missing URL and Id tags
2017-11-15 22:58:57 +01:00
Sébastien Loriot
ee57fc2d6c
add SPDX identifier for files under the GPL-3+ license
2017-11-12 10:17:51 +01:00
Efi Fogel
984feb6382
Fixed header guard
2017-08-04 17:54:34 +03:00
Efi Fogel
206a1e3f06
Ops. Refracted
2017-07-11 17:42:23 +03:00
Sergey Fedotov
cc2f0e2a40
Boolean_set_operations_2: Fix insert to Gps
2017-07-10 16:56:00 +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
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
3e6de6b439
Renamed sweep-line to surface-sweep and cleaned up
2017-05-27 12:30:41 +03:00
Sébastien Loriot
deb9d984f5
Merge remote-tracking branch 'cgal/releases/CGAL-4.9-branch'
2017-03-29 13:23:05 +02:00
Sébastien Loriot
09f5a176b6
fix a bug when removing redundant edges after an overlay for a boolean operation
...
inner ccbs and outer ccb were reused to avoid a reallocation. However,
since the face field of inner/outer ccbs are needed will reassign them,
we now delay the setting of the new face for the ccbs to avoid
overwritting the face field
2017-03-27 16:28:37 +02: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
Michael Hemmer
ca7962443a
fix namespace issue
2016-12-29 13:25:05 -08:00
Mael Rouxel-Labbé
2038e558b2
Fixed typos in doc and comments
2016-12-09 11:27:17 +01:00
Sébastien Loriot
befe820313
move Polygon_with_holes_2 in the Polygon package
...
with the agreement from TAU
2016-10-03 15:32:31 +02:00
Andreas Fabri
4344158dcd
Fix package Boolean_set_operations_2: include headers
2016-09-30 15:22:29 +02:00
Guillaume Damiand
61f812a711
Replace os.iword(IO::mode) by get_mode(os)
2016-03-09 10:37:57 +01:00
Sébastien Loriot
434fb62b88
replace the flooding algorithm by an iterative method to flag ccbs
...
the former algorithm was buggy
2016-01-21 21:34:08 +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
1fa107c8c4
deallocate is only called if the number of curves is not 0
2015-10-07 17:01:55 +02:00
Sébastien Loriot
cbbd23d7f3
remove extra typename
2015-10-06 15:17:07 +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
adbd23fa23
use an integer flag in the halfedge instead of obscure functions
2015-10-06 15:17:00 +02:00
Sébastien Loriot
4517d99c1c
use an id instead of an internal handle
2015-10-06 10:55:21 +02:00
Efi Fogel
3662d9e0a2
Included CGAL/Union_find.h
2015-09-29 18:15:21 +03: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
e6c2511ef6
name get_base similarly to the static arrangement functions
2015-09-27 15:30:35 +02:00
Sébastien Loriot
9968192330
enrich Arr_accessor of some functions to allow dcel manipulations
2015-09-27 15:30:02 +02:00
Sébastien Loriot
752ddd3729
remove the alternative version that is now slower that the new edge removal
2015-09-27 13:39:27 +02:00
Sébastien Loriot
a273738e8a
force to keep the unbounded face, even if not the master of its set
2015-09-26 15:42:35 +02:00
Sébastien Loriot
e3f9788555
add an optimization in case the boolean operation result is empty
2015-09-26 15:42:35 +02:00
Sébastien Loriot
9db6cc2465
if more inner ccb are created by edge removal, then we create new in the dcel
2015-09-26 13:34:52 +02:00
Sébastien Loriot
c354e37479
fix the flooding algorithm: the flooding should also go through outer_ccbs
2015-09-26 09:45:50 +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