songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove things like p==q

This commit is contained in:
kanhuang 2013-09-12 09:48:24 -04:00
parent d35ac74685
commit d5f1b05f4c
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Visibility_2/include/CGAL/Rotational_sweep_visibility_2.h
View File

@ -142,16 +142,19 @@ public:
} }
visibility_region_impl(e->face(), q); visibility_region_impl(e->face(), q);
timer.reset();
timer.start();
//Decide which inside of the visibility butterfly is needed. //Decide which inside of the visibility butterfly is needed.
int source_idx, target_idx ; int source_idx(-1), target_idx(-1) ;
for (int i = 0; i != polygon.size(); i++) { for (int i = 0; i != polygon.size(); i++) {
if ( polygon[i]== source ) { if ( Visibility_2::compare_xy_2(geom_traits, polygon[i], source)==EQUAL ) {
source_idx = i; source_idx = i;
} }
else if ( polygon[i] == target ) { else if ( Visibility_2::compare_xy_2(geom_traits, polygon[i], target)==EQUAL ) {
target_idx = i; target_idx = i;
} }
if (source_idx != -1 && target_idx != -1)
break;
} }
int small_idx, big_idx; int small_idx, big_idx;
if ( source_idx < target_idx ) { if ( source_idx < target_idx ) {
@ -184,7 +187,8 @@ public:
next_idx++; next_idx++;
} }
} }
timer.stop();
cut_from_butterfly_t+=timer.time();
typename Pvec::iterator first = polygon.begin() + small_idx; typename Pvec::iterator first = polygon.begin() + small_idx;
typename Pvec::iterator last = polygon.begin() + big_idx; typename Pvec::iterator last = polygon.begin() + big_idx;
@ -239,7 +243,6 @@ void attach(const Input_arrangement_2& arr) {
void detach() { void detach() {
p_arr = NULL; p_arr = NULL;
geom_traits = NULL; geom_traits = NULL;
vs.clear();
} }
const Input_arrangement_2& arr() { const Input_arrangement_2& arr() {