Commit Graph

293 Commits

Author SHA1 Message Date
kanhuang fbc9e5d3e2 clean 2013-09-14 16:31:43 -04:00
kanhuang 1ca5912fba remove neighbors 1 2013-09-14 16:09:22 -04:00
kanhuang e12375f1a8 replaced with handle() 2013-09-14 15:00:11 -04:00
kanhuang 9fd1162029 without bounding box 2013-09-13 14:41:04 -04:00
kanhuang 782520bdf0 add functor Less for maps 2013-09-13 13:29:18 -04:00
Francisc Bungiu 804d3fbccd Merge branch 'gsoc2013-Visibility_doc-hemmer' of ssh://scm.cgal.org/var/git/cgal-gsoc into gsoc2013-Visibility_doc-hemmer 2013-09-13 15:25:20 +03:00
Francisc Bungiu ccfe5dc5d8 added method to find first visible vertex 2013-09-13 15:24:58 +03:00
kanhuang 046f4016ff using handles 2013-09-12 20:22:01 -04:00
kanhuang 26625d436b change types 2013-09-12 14:35:57 -04:00
kanhuang d5f1b05f4c remove things like p==q 2013-09-12 09:48:24 -04:00
kanhuang d35ac74685 switch names 2013-09-12 09:32:44 -04:00
kanhuang 08aa9c27f8 clean up R 2013-09-12 08:59:55 -04:00
kanhuang bf5c9f0842 improve sweep again 2013-09-11 21:27:11 -04:00
kanhuang c99a8954ec improve sweeping a little 2013-09-11 20:49:50 -04:00
kanhuang a730c197c8 name change 2013-09-11 18:31:18 -04:00
kanhuang 0bfda1170c improve funnel 2013-09-11 17:34:26 -04:00
kanhuang b69f2623ea change the interface of is_closer() 2013-09-11 14:06:46 -04:00
kanhuang b64af4e611 rename files 2013-09-11 10:01:37 -04:00
kanhuang 9b8ebbfbb2 replace quicksort() by std::sort and use better is_closer() 2013-09-10 20:47:59 -04:00
Francisc Bungiu d1051a3d2c added regularization tag 2013-09-10 19:50:56 +03:00
kanhuang b475a005fa little change 2013-09-10 09:16:22 -04:00
kanhuang 21c18a23b9 add timer and change swap() 2013-09-09 19:41:57 -04:00
kanhuang fc6b6464aa finish debug of report_while_handling_needles_() 2013-09-09 09:54:02 -04:00
Michael Hemmer e2b6772382 use fast insertion functions of arr 2013-09-09 14:52:08 +03:00
kanhuang 4a863866ae add report_while_handling_needles_(). still not working now 2013-09-08 22:01:22 -04:00
Francisc Bungiu 3c1f1193fa Merge branch 'gsoc2013-Visibility_doc-hemmer' of ssh://scm.cgal.org/var/git/cgal-gsoc into gsoc2013-Visibility_doc-hemmer 2013-09-07 17:45:21 +03:00
Francisc Bungiu 4c067a656f implemented selection of visible edge with CDT and stl map 2013-09-07 17:45:09 +03:00
kanhuang 6801f60335 little change 2013-09-06 17:42:13 -04:00
kanhuang a98cca6bfe switch back to build_arr() to make sure other changes are correct 2013-09-06 15:22:17 -04:00
kanhuang 33281edff8 clean code 2013-09-06 13:12:11 -04:00
Francisc Bungiu 9f58cd79c2 Merge branch 'gsoc2013-Visibility_doc-hemmer' of ssh://scm.cgal.org/var/git/cgal-gsoc into gsoc2013-Visibility_doc-hemmer 2013-09-06 19:08:22 +03:00
Francisc Bungiu aab7aece16 removed use of auxiliary vector to save runtime 2013-09-06 19:08:10 +03:00
Francisc Bungiu 535691662c fixed end of needle bug 2013-09-06 19:05:32 +03:00
kanhuang 43a518a60a delete report_while_not_handling_needle() which is useless. 2013-09-06 00:27:07 -04:00
kanhuang e623a07d3c replace build_arr() by reporting_while_handling_needles() 2013-09-05 14:40:04 -04:00
kanhuang 92d3080b80 passed test after introducing visibility cone 2013-09-05 13:20:27 -04:00
kanhuang 382e673b73 initiation of active edges should be good edges after visibility cone is introduced. 2013-09-04 23:40:46 -04:00
kanhuang 7945dc12da use visibility cone to reduce the vertices need to sweep 2013-09-04 20:04:51 -04:00
Francisc Bungiu 0a57e658b1 cached orientation tests 2013-09-04 16:58:37 +03:00
Francisc Bungiu debc1df9d3 fixed segmentation fault and cleaned code 2013-09-04 16:33:09 +03:00
Francisc Bungiu bd725adaa1 adapted to new function names and fixed bug 2013-09-04 14:10:58 +03:00
Francisc Bungiu e1f9eefbbe fixed function names and adapted to specialized insertion functions 2013-09-04 14:04:16 +03:00
Francisc Bungiu ae6e64f2ce Merge branch 'gsoc2013-Visibility_doc-hemmer' of ssh://scm.cgal.org/var/git/cgal-gsoc into gsoc2013-Visibility_doc-hemmer 2013-09-04 12:30:42 +03:00
Francisc Bungiu eb1854307d trying to resolv bug 2013-09-04 12:30:33 +03:00
kanhuang 04c0c2560a change input_neighbor() 2013-09-04 00:03:03 -04:00
kanhuang ab28895f13 update quadrant 2013-09-03 20:22:21 -04:00
kanhuang e8703b429b remove .x() 2013-09-03 19:02:58 -04:00
kanhuang 6c0a16623b comment the change to get compiled 2013-09-03 07:48:11 -04:00
Francisc Bungiu 201d56f863 switched to specialized insertion functions and kernel predicates 2013-09-03 13:02:37 +03:00
Francisc Bungiu 2a22baee64 switched to specialized insertion functions 2013-09-03 13:01:57 +03:00
kanhuang fad5883a7f specialized insert method to build output arr. not finished 2013-09-02 23:37:33 -04:00
kanhuang df2419b3bc Merge branch 'gsoc2013-Visibility_doc-hemmer' of ssh://scm.cgal.org/var/git/cgal-gsoc into gsoc2013-Visibility_doc-hemmer 2013-09-02 21:48:45 -04:00
kanhuang 12c7923c2c small changes 2013-09-02 21:48:32 -04:00
Francisc Bungiu bd7918549f Merge branch 'gsoc2013-Visibility_doc-hemmer' of ssh://scm.cgal.org/var/git/cgal-gsoc into gsoc2013-Visibility_doc-hemmer 2013-09-03 00:56:31 +03:00
Francisc Bungiu 99b86148d6 fixed last major bug 2013-09-03 00:56:19 +03:00
kanhuang 9fe4c7f032 replace is_closer() by no intersection construction version 2013-09-02 11:03:27 -04:00
kanhuang e453aa9495 improve efficency: one edge in one edge out
reduce times of heap operation.
2013-08-31 11:28:44 -04:00
kanhuang 97cc81efd5 improve heap_remove() 2013-08-31 00:58:03 -04:00
kanhuang db71654296 fix bug in is_closer() and is_good_edge() 2013-08-30 20:24:54 -04:00
kanhuang 8ce5c1041c fix bug in is_closer() and heap_remove() 2013-08-30 09:19:54 -04:00
kanhuang d1a423b1d3 fix bug of holes touches boundary 2013-08-29 17:16:54 -04:00
kanhuang a7abab0175 fix bug of q is a extream point 2013-08-29 14:35:52 -04:00
Michael Hemmer 9837a95ab1 (Input_arrangement_2& arr -> (const Input_arrangement_2& 2013-08-29 14:31:52 +03:00
kanhuang 8a024117b8 accidentally delete Triangular_expansion. add it back 2013-08-29 01:40:33 -04:00
kanhuang 72c75d58b4 add Rotational to benchmark and simple_benchmark 2013-08-28 22:45:06 -04:00
kanhuang 4e5d0ad9f9 passed test_rotational_visibility.cpp 2013-08-28 19:35:09 -04:00
kanhuang 9f08ea7bc7 Merge branch 'gsoc2013-Visibility_doc-hemmer' of ssh://scm.cgal.org/var/git/cgal-gsoc into gsoc2013-Visibility_doc-hemmer 2013-08-28 17:02:46 -04:00
kanhuang dac41a739e fix bugs in rotational 2013-08-28 17:02:40 -04:00
Francisc Bungiu 98dc1b615e Merge branch 'gsoc2013-Visibility_doc-hemmer' of ssh://scm.cgal.org/var/git/cgal-gsoc into gsoc2013-Visibility_doc-hemmer 2013-08-28 22:42:31 +03:00
Francisc Bungiu 85a69c2894 corrected bugs 2013-08-28 22:41:02 +03:00
kanhuang dce92bfe46 begin debug rotational 2013-08-28 13:14:11 -04:00
kanhuang 3e5542b870 add funnel and sweep by vertex 2013-08-27 22:06:27 -04:00
kanhuang 60cc91bec4 add tunnel and sweep by vertex 2013-08-27 19:51:54 -04:00
kanhuang c0f0186c71 add heap functions 2013-08-27 14:53:00 -04:00
kanhuang ded4c747d6 remove const of input arr in test code 2013-08-27 11:20:26 -04:00
kanhuang 2a334dd3ab Merge branch 'gsoc2013-Visibility_doc-hemmer' of ssh://scm.cgal.org/var/git/cgal-gsoc into gsoc2013-Visibility_doc-hemmer 2013-08-27 10:34:58 -04:00
kanhuang 96df7dd38c add funnel sort for needles 2013-08-27 10:34:23 -04:00
Michael Hemmer fd4f2fe3f7 input arr can not be const 2013-08-27 17:31:22 +03:00
Michael Hemmer e1e1e43a9d const Point& in visibility_region 2013-08-27 15:54:14 +03:00
kanhuang 8df97c5652 replace functions using intersections 2013-08-26 23:45:38 -04:00
kanhuang 876e0d22e0 support simple benchmark report 2013-08-25 20:45:29 -04:00
Michael Hemmer 837d78dd91 update testing 2013-08-23 17:36:36 +02:00
Francisc Bungiu 5a41fd77f0 testing git config 2013-08-23 13:38:59 +03:00
fbungiu f6302358f3 testing push git e-mail 2013-08-23 12:54:01 +03:00
fbungiu 70522c02ac testing push git e-mail 2013-08-23 12:48:52 +03:00
Francisc 5be465fe2e Merge branch 'gsoc2013-Visibility_doc-hemmer' of ssh://scm.cgal.org/var/git/cgal-gsoc into gsoc2013-Visibility_doc-hemmer 2013-08-23 12:08:05 +03:00
Francisc 1bd1397858 bug correction progress 2013-08-23 12:07:56 +03:00
kanhuang 133f23dd82 Merge branch 'gsoc2013-Visibility_doc-hemmer' of ssh://scm.cgal.org/var/git/cgal-gsoc into gsoc2013-Visibility_doc-hemmer 2013-08-22 20:34:04 -04:00
kanhuang 2eedfed4f7 rotational 1 2013-08-22 20:33:58 -04:00
Francisc ff5ea64548 corrected bug 2013-08-23 00:02:42 +03:00
Francisc a0753d3cf3 finished reimplementing algo for simple polygons 2013-08-22 21:30:31 +03:00
Francisc cdd926e007 progress 2013-08-22 18:36:06 +03:00
Francisc 21daeae809 progress 2013-08-22 14:48:10 +03:00
Francisc 788eeda527 progress 2013-08-22 12:45:24 +03:00
Francisc 9232bd70a3 removed printout 2013-08-22 10:21:36 +03:00
Francisc b29780a838 Merge branch 'gsoc2013-Visibility_doc-hemmer' of ssh://scm.cgal.org/var/git/cgal-gsoc into gsoc2013-Visibility_doc-hemmer 2013-08-22 10:02:36 +03:00
Francisc 074e5a3516 added test cases and reimplemented simple poly visibility 2013-08-22 10:01:02 +03:00
kanhuang 015cf140c4 begin of rotational sweep 2013-08-21 23:19:22 -04:00
kanhuang 688c1a087f begin of rotational sweep 2013-08-21 23:17:22 -04:00
kanhuang bd1d9bd828 add a example 2013-08-20 18:14:48 -04:00
Francisc 634da26494 progress fixing bugs 2013-08-15 22:09:04 +03:00
Francisc 3ad6f10b83 corrected bugs - now example3.environment works completely 2013-08-15 18:33:14 +03:00
Francisc 7ba3ae4617 corrected bugs - now all 7 test cases pass 2013-08-15 13:39:28 +03:00
Francisc 6422401339 Merge branch 'gsoc2013-Visibility_doc-hemmer' of ssh://scm.cgal.org/var/git/cgal-gsoc into gsoc2013-Visibility_doc-hemmer 2013-08-15 13:25:48 +03:00
kanhuang 932c2c4d9c two bugs removed 2013-08-14 21:04:31 -04:00
Francisc c37f8f504d fixed bug in clearing output arr, fixed segmentation fault for first 3 test cases and added check for possible loop in vector passed to needle detection method 2013-08-14 19:51:28 +03:00
Michael Hemmer 7f6ae911e4 remove wrong assert 2013-08-14 12:32:37 +02:00
Michael Hemmer ef33a39639 fix double reporting of points on needles 2013-08-14 12:15:44 +02:00
kanhuang 817609dd0f fix bug of degree>2 case 2013-08-13 19:14:39 -04:00
kanhuang cf6b201110 fix a bug in naive 2013-08-13 12:15:33 -04:00
Michael Hemmer 6b02858d87 instance 1-6 works, instance 7 for complex needle has a segfault 2013-08-13 17:36:30 +02:00
Michael Hemmer 54458dcd7b prepare needles in Triangular_expansion_visibility_2_.h 2013-08-13 15:08:16 +02:00
Michael Hemmer 5b2b678e2c Merge branch 'gsoc2013-Visibility_doc-hemmer' of ssh://scm.cgal.org/var/git/cgal-gsoc into gsoc2013-Visibility_doc-hemmer 2013-08-13 09:02:52 +02:00
kanhuang 76bab4362f fix a bug in naive and add information to test_methods() 2013-08-12 22:18:43 -04:00
Michael Hemmer 7194710dcb Merge branch 'gsoc2013-Visibility_doc-hemmer' of ssh://scm.cgal.org/var/git/cgal-gsoc into gsoc2013-Visibility_doc-hemmer 2013-08-12 17:07:21 +02:00
Francisc 66df2206fd corrected bug in selecting vertex order when query is on the edge 2013-08-12 16:29:53 +03:00
Michael Hemmer 07afe29926 fix bug in query on vertex case 2013-08-12 12:10:31 +02:00
kanhuang df462df4dc test all cases from command line 2013-08-11 15:37:17 -04:00
Michael Hemmer 46d8bf9a33 continued work of query on vertex but not working yet 2013-08-10 12:36:21 +02:00
Michael Hemmer ae40611db9 bug fixes 2013-08-09 20:15:23 +02:00
Michael Hemmer 1d1b033020 use CGAL::insert_non_intersecting_curves
it is faster and will also reveal a bug in case the algo would return a selfintersecting polygon.
2013-08-09 11:31:28 +02:00
Michael Hemmer 03ebf24ad4 added case for qpoint on edge case for qpoint on vertex is missing 2013-08-09 11:23:22 +02:00
Michael Hemmer 415ae312fb Minior fixes to get it compiling / not complete yet
Merge branch 'gsoc2013-Visibility_doc-hemmer' of ssh://scm.cgal.org/var/git/cgal-gsoc into gsoc2013-Visibility_doc-hemmer

Conflicts:
	Visibility_2/include/CGAL/Triangular_expansion_visibility_2_.h
2013-08-09 10:00:58 +02:00
Michael Hemmer faaf1465b2 minor 2013-08-09 09:20:50 +02:00
kanhuang 55fb89191b add is_star_shape() 2013-08-08 23:14:35 -04:00
kanhuang b6cd227a52 compile benchmark 2013-08-08 10:25:01 -04:00
Francisc 6d316b8986 resolved conflicts 2013-08-08 16:01:58 +03:00
kanhuang 2fbd64a8e5 consistency of Naive 2013-08-08 00:28:54 -04:00
kanhuang fd46d789eb benchmark debug 2013-08-07 13:20:51 -04:00
Francisc d38ee56f8b switched parameter order 2013-08-07 18:44:45 +03:00
kanhuang b2902dcb06 debug compiling benchmark.cpp 2013-08-07 11:39:19 -04:00
kanhuang 0f4ac346a9 Merge branch 'gsoc2013-Visibility_doc-hemmer' of ssh://scm.cgal.org/var/git/cgal-gsoc into gsoc2013-Visibility_doc-hemmer 2013-08-07 11:07:09 -04:00
kanhuang 641f2fdbb9 handle replace 2013-08-07 11:06:58 -04:00
Francisc 8723eff2de moved const argument to front 2013-08-07 18:05:39 +03:00
kanhuang db1b380622 Merge branch 'gsoc2013-Visibility_doc-hemmer' of ssh://scm.cgal.org/var/git/cgal-gsoc into gsoc2013-Visibility_doc-hemmer 2013-08-07 10:41:27 -04:00
Francisc 6c9adf11d2 changed handle to const_handles 2013-08-07 17:36:45 +03:00
kanhuang d35c8c0834 Merge branch 'gsoc2013-Visibility_doc-hemmer' of ssh://scm.cgal.org/var/git/cgal-gsoc into gsoc2013-Visibility_doc-hemmer 2013-08-07 09:05:45 -04:00
kanhuang 72e3787d51 Naive_visibility 2013-08-07 09:01:42 -04:00
Francisc aa83fb5d04 switched to const handles and moved kernel predicates to visibility_utils.h 2013-08-07 15:08:22 +03:00
Michael Hemmer 156fdf8e6f Merge branch 'gsoc2013-Visibility_doc-hemmer' of ssh://scm.cgal.org/var/git/cgal-gsoc into gsoc2013-Visibility_doc-hemmer 2013-08-07 10:41:17 +02:00
Michael Hemmer 787c54b299 initial version of triangular expansion 2013-08-07 10:40:59 +02:00
Francisc 6b14c3a558 fixed face_handle return and constness of face_handle 2013-08-06 22:16:10 +03:00
kanhuang df6dfe57a5 Naive debug 2013-08-06 10:17:44 -04:00
Francisc 2240ef4424 changed namespce from CGAL::Visibility_2 to CGAL 2013-08-06 12:43:43 +03:00
kanhuang cd09171483 debug naive 2013-08-05 22:09:03 -04:00
kanhuang 505cd77901 comple Naive 2013-08-05 09:27:05 -04:00
Francisc 16b3dfda3a Merge branch 'gsoc2013-Visibility_doc-hemmer' of ssh://scm.cgal.org/var/git/cgal-gsoc into gsoc2013-Visibility_doc-hemmer 2013-08-04 20:22:32 +03:00
Francisc aacc051354 finished methods to test concept obediance 2013-08-04 19:59:29 +03:00
kanhuang 4d650aa2b0 Merge branch 'gsoc2013-Visibility_doc-hemmer' of ssh://scm.cgal.org/var/git/cgal-gsoc into gsoc2013-Visibility_doc-hemmer 2013-08-02 16:09:49 -04:00
kanhuang d2f0568762 Naive 2013-08-02 16:09:34 -04:00