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

removed use of auxiliary vector to save runtime

This commit is contained in:
Francisc Bungiu 2013-09-06 19:08:10 +03:00
parent 535691662c
commit aab7aece16
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Visibility_2/include/CGAL/Simple_polygon_visibility_2.h
View File

@ -102,20 +102,21 @@ public:
typename Input_arrangement_2::Ccb_halfedge_const_circulator circ = typename Input_arrangement_2::Ccb_halfedge_const_circulator circ =
face->outer_ccb(); face->outer_ccb();
typename Input_arrangement_2::Ccb_halfedge_const_circulator curr = circ; typename Input_arrangement_2::Ccb_halfedge_const_circulator curr = circ;
typename Input_arrangement_2::Ccb_halfedge_const_circulator start = curr;
typename Input_arrangement_2::Halfedge_const_handle he = curr; typename Input_arrangement_2::Halfedge_const_handle he = curr;
std::vector<Point_2> temp_vertices; // std::cout << "start\n";
Point_2 min_intersect_pt; Point_2 min_intersect_pt;
bool intersect_on_endpoint = false; bool intersect_on_endpoint = false;
Segment_2 curr_edge(he->source()->point(), he->target()->point()); Segment_2 curr_edge(he->source()->point(), he->target()->point());
Segment_2 curr_min_edge(he->source()->point(), he->target()->point()); Segment_2 curr_min_edge(he->source()->point(), he->target()->point());
Point_2 curr_vertex = he->target()->point();
temp_vertices.push_back(curr_vertex);
Number_type min_dist = CGAL::Visibility_2::compute_squared_distance_2 Number_type min_dist = CGAL::Visibility_2::compute_squared_distance_2
<Geometry_traits_2, Point_2, Segment_2>(geom_traits, q, curr_edge); <Geometry_traits_2, Point_2, Segment_2>(geom_traits, q, curr_edge);
int min_dist_index = 0; int min_dist_index = 0;
int index = 1; int index = 1;
curr++; curr++;
// Push all vertices and determine edge minimum in terms // Push all vertices and determine edge minimum in terms
// of squared distance to query point // of squared distance to query point
do { do {
@ -128,8 +129,8 @@ public:
min_dist = curr_dist; min_dist = curr_dist;
min_dist_index = index; min_dist_index = index;
curr_min_edge = curr_edge; curr_min_edge = curr_edge;
start = curr;
} }
temp_vertices.push_back(he->target()->point());
index++; index++;
} while (++curr != circ); } while (++curr != circ);
@ -145,13 +146,12 @@ public:
else { else {
intersect_pt_on_seg_endpoint = true; intersect_pt_on_seg_endpoint = true;
} }
// Now create vector so that first vertex v0 is visible
for (unsigned int k = min_dist_index ; k < temp_vertices.size() ; k++) { curr = start;
vertices.push_back(temp_vertices[k]); do {
} he = curr;
for (unsigned int k = 0 ; k < min_dist_index ; k++) { vertices.push_back(he->target()->point());
vertices.push_back(temp_vertices[k]); } while(++curr != start);
}
// Push first vertex again to fulfill algo precondition // Push first vertex again to fulfill algo precondition
if (min_intersect_pt != curr_min_edge.source() && if (min_intersect_pt != curr_min_edge.source() &&