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

154 Commits

Author SHA1 Message Date
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
Sébastien Loriot 000def03c7 create the arrangement from scratch only if there are many edges to remove 
this update the CGAL_JOIN_CREATE_AN_ARRANGEMENT version.
The benchmark program polygon_set_2_join.cpp is now better
using the CGAL_JOIN_CREATE_AN_ARRANGEMENT version.
I've put 2 as weight parameter but it should be fine tune
to better match the cost of removing an edge
 2015-09-04 18:44:00 +02:00
Sébastien Loriot b916dbaa36 variant for joining polygons protected by CGAL_JOIN_CREATE_AN_ARRANGEMENT 
this code is faster when the input contains many hole to relocate
but is bit slower on disjoint polygon for example.

This is a temporary commit to start the work with Efi

Here is the output of benchmark program polygon_set_2_join.cpp on my machine

current version (polygon_set_2_join):
  Time for 402 grid crossing polygons 10.184
  Time for 1000 random polygons 1.1s
  Time for 100000 nested polygons 2.544s
  Time for 40000 disjoint polygons 5.18s
CGAL_JOIN_CREATE_AN_ARRANGEMENT version (polygon_set_2_join):
  Time for 402 grid crossing polygons 1.216
  Time for 1000 random polygons 1.108s
  Time for 100000 nested polygons 2.572s
  Time for 40000 disjoint polygons 5.891999999999999s

current version(polygon_set_2_join 2):
Time for 566 grid crossing polygons 44.416
Time for 2000 random polygons 2.263999999999996s
Time for 200000 nested polygons 5.82s
Time for 160000 disjoint polygons 28.86000000000001s

CGAL_JOIN_CREATE_AN_ARRANGEMENT version (polygon_set_2_join 2):
Time for 566 grid crossing polygons 2.28
Time for 2000 random polygons 2.248000000000001s
Time for 200000 nested polygons 5.68s
Time for 160000 disjoint polygons 32.036s
 2015-09-04 15:08:20 +02:00
Laurent Rineau 91bca286d3 Fix warnings with CGAL_USE 
All those variables were unused only if CGAL_NDEBUG was
defined. CGAL_USE can solve that.
 2015-08-19 17:37:46 +02: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
Sébastien Loriot 5b9be0f8c7 workaround ambiguous call in kernel intersection functions when including BSO_2 2014-12-11 16:33:29 +01:00
Efi Fogel 90c16905b1 Made all traits const. Pass traits as const reference 2014-10-25 00:37:54 +03:00
Efi Fogel 7af4a1e05a Added destructor 2013-12-06 16:09:38 +02:00
Efi Fogel d92ba7cb5b removed unnecessary new (resolved leak). 2013-12-06 12:42:36 +02:00
Andreas Fabri 6c547e5663 Mainly added includes 2013-09-13 22:24:30 +02:00
Efi Fogel 57101ce35d Integrated with a recent version master 2013-07-14 14:40:09 +03:00
Andreas Fabri b6dfb6c41f virtual function of derived class must match the API of the base class 2013-02-26 07:10:26 +01:00
Andreas Fabri be1e1738c2 static_casts and int -> size_t in Arrangement and Boolean Set Operations 2013-02-14 13:01:58 +01:00
Andreas Fabri 99968b0461 Add static_cast<int> 2013-02-08 13:01:19 +01:00
Laurent Rineau d19578725b Fix warnings 2013-02-07 18:15:23 +01:00
Andreas Fabri c029f702a3 use more types 2013-02-07 11:02:14 +01:00
Andreas Fabri 61afcbbd9b replace define 2013-02-06 20:09:12 +01:00
Philipp Möller 71ea8e6e22 Minimal boost includes 
Replace type_traits.hpp and utility.hpp with the respective
fine-grained includes.
 2012-12-14 18:13:59 +01:00
Eric Berberich 1102c1994e Internal _insert_xyz function get a more intuitive signature 
This change is motivated by other internal function that have a
similar signature already. Example: prev1->cv<-prev2+cmp is now 
he_to->cv,cv_dir->he_away
 2012-10-23 12:55:25 +00:00
Eric Berberich 13f17350f5 adaptions to new signatures of internal insertion functions 
question open: Do we have to care about swapping of predecessors
halfedges, or do we have to disallow it?
 2012-08-06 12:53:40 +00:00
Laurent Rineau 8f59fd9592 Turn QPL into LGPLv3+ 2012-01-13 16:33:35 +00:00
Michael Hemmer d93ed35b8b added missing Multiplicity 2011-08-18 09:08:58 +00:00
Efi Fogel b4084a7765 cleanup 2011-06-22 14:09:56 +00:00
Eric Berberich a7a06c4e2b replaced Arr_..._side_category with :.._side_category 2011-05-31 18:08:54 +00:00
Marc Glisse 154a2dd729 Revert last commit, sorry 2011-03-13 11:42:28 +00:00
Marc Glisse fab4d9c26c add missing operator 2011-03-12 09:59:43 +00:00