Commit Graph

285 Commits

Author SHA1 Message Date
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
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
Andreas Fabri 4581f1b7a8 Morte replacements 2019-06-05 08:39:55 +02:00
Mael Rouxel-Labbé 2848158354 Fix typos 2019-05-20 08:54:04 +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 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 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
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
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
Efi Fogel ebe16ef2f8 Added missing definition of a constructor in compare-cy 2018-04-07 16:03:58 +03:00
Efi Fogel 98b4a49690 Introduced compare_xy() 2018-03-21 19:04:12 +02:00
Andreas Fabri 0625e73722 Replace CGAL::Open_hash by boost::unordered_set 2018-01-04 16:47:41 +01: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
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 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
Sébastien Loriot 97e8ea1794 remove extra space 2017-11-12 10:17:51 +01:00
Efi Fogel 56beb0cfff Removed unused typedef 2017-08-03 14:49:15 +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 6b317dc18f Moved license header directive immediately after the ifndef/define directive guards 2017-07-08 18:09:02 +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 54d1373ec8 Aplit visitors into dedicated files 2017-06-20 08:02:58 +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
Efi Fogel 3e6de6b439 Renamed sweep-line to surface-sweep and cleaned up 2017-05-27 12:30:41 +03: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
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
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
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
Sébastien Loriot b92e34fcfd also do the swap if f1!=f2 2015-09-27 16:08:14 +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