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

fixed segmentation fault and cleaned code

This commit is contained in:
Francisc Bungiu 2013-09-04 16:33:09 +03:00
parent bd725adaa1
commit debc1df9d3
1 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -396,8 +396,7 @@ private:
} }
void left(int& i, Point_2& w, const Point_2& query_pt) { void left(int& i, Point_2& w, const Point_2& query_pt) {
std::cout << "L w = " << w << std::endl; if (i >= vertices.size() - 1) {
if (i == vertices.size() - 1) {
upcase = FINISH; upcase = FINISH;
} }
else { else {
@ -407,31 +406,23 @@ private:
vertices[i+1]); vertices[i+1]);
if (orient == CGAL::LEFT_TURN || orient == CGAL::COLLINEAR) { if (orient == CGAL::LEFT_TURN || orient == CGAL::COLLINEAR) {
upcase = LEFT; upcase = LEFT;
std::cout << "L push " << vertices[i+1] << std::endl;
std::cout << "L w updated to " << vertices[i+1] << std::endl;
s.push(vertices[i+1]); s.push(vertices[i+1]);
w = vertices[i+1]; w = vertices[i+1];
i++; i++;
} }
else { else {
Point_2 s_t = s.top(); Point_2 s_t = s.top();
std::cout << "L s_Top = " << s_t << std::endl;
s.pop(); s.pop();
Point_2 s_t_prev = s.top(); Point_2 s_t_prev = s.top();
std::cout << "L s_t_prev = " << s_t_prev << std::endl;
std::cout << "L v[i] = " << vertices[i] << std::endl;
std::cout << "L v[i+1] = " << vertices[i+1] << std::endl;
if (CGAL::Visibility_2::orientation_2(geom_traits, if (CGAL::Visibility_2::orientation_2(geom_traits,
s_t_prev, s_t_prev,
vertices[i], vertices[i],
vertices[i+1]) == CGAL::RIGHT_TURN) { vertices[i+1]) == CGAL::RIGHT_TURN) {
std::cout << "L scana\n";
upcase = SCANA; upcase = SCANA;
w = vertices[i]; w = vertices[i];
} }
else { else {
std::cout << "L right\n";
upcase = RIGHT; upcase = RIGHT;
w = vertices[i+1]; w = vertices[i+1];
i++; i++;
@ -444,8 +435,8 @@ private:
void right(int& i, Point_2& w, const Point_2& query_pt) { void right(int& i, Point_2& w, const Point_2& query_pt) {
// Scan s_t, s_t-1, ..., s_1, s_0 for the first edge (s_j, s_j-1) such that // Scan s_t, s_t-1, ..., s_1, s_0 for the first edge (s_j, s_j-1) such that
// (z, s_j, v_i) is a right turn and (z, s_j-1, v_i) is a left turn, or // (z, s_j, v_i) is a right turn and (z, s_j-1, v_i) is a left turn, or
bool found = false; bool found = false;
std::cout << "R w = " << w << std::endl;
while(!found && upcase == RIGHT) { while(!found && upcase == RIGHT) {
assert(!s.empty()); assert(!s.empty());
Point_2 s_j = s.top(); Point_2 s_j = s.top();
@ -541,14 +532,12 @@ private:
void scana(int& i, Point_2& w, const Point_2& query_pt) { void scana(int& i, Point_2& w, const Point_2& query_pt) {
// Scan v_i, v_i+1, ..., v_n for the first edge to intersect (z, s_t) // Scan v_i, v_i+1, ..., v_n for the first edge to intersect (z, s_t)
int k = i; int k = i;
std::cout << "scana w = " << w << std::endl;
while (k+1 < vertices.size()) { while (k+1 < vertices.size()) {
CGAL::Orientation qwv_orient = CGAL::Visibility_2::orientation_2(geom_traits, CGAL::Orientation qwv_orient = CGAL::Visibility_2::orientation_2(geom_traits,
query_pt, query_pt,
w, w,
vertices[k+1]); vertices[k+1]);
if (qwv_orient == CGAL::LEFT_TURN) { if (qwv_orient == CGAL::LEFT_TURN) {
std::cout << "scana left turn\n";
Ray_2 s2(query_pt, s.top()); Ray_2 s2(query_pt, s.top());
Segment_2 s1(vertices[k], vertices[k+1]); Segment_2 s1(vertices[k], vertices[k+1]);
@ -564,33 +553,24 @@ private:
} }
} }
else if (qwv_orient == CGAL::COLLINEAR) { else if (qwv_orient == CGAL::COLLINEAR) {
std::cout << "scana coll\n";
if ((!query_pt_is_vertex && !query_pt_is_on_halfedge) if ((!query_pt_is_vertex && !query_pt_is_on_halfedge)
|| ((query_pt_is_vertex || query_pt_is_on_halfedge) || ((query_pt_is_vertex || query_pt_is_on_halfedge)
&& CGAL::Visibility_2::collinear_are_ordered_along_line_2<Geometry_traits_2> && CGAL::Visibility_2::collinear_are_ordered_along_line_2<Geometry_traits_2>
(geom_traits, query_pt, w, vertices[k+1]))) { (geom_traits, query_pt, w, vertices[k+1]))) {
if (k+2 >= vertices.size()) {
s.push(vertices[k+1]);
upcase = FINISH;
break;
}
if (CGAL::Visibility_2::orientation_2(geom_traits, query_pt, w, vertices[k+2]) == RIGHT_TURN) { if (CGAL::Visibility_2::orientation_2(geom_traits, query_pt, w, vertices[k+2]) == RIGHT_TURN) {
if (CGAL::Visibility_2::orientation_2(geom_traits, vertices[k], vertices[k+1], vertices[k+2]) == LEFT_TURN) { if (CGAL::Visibility_2::orientation_2(geom_traits, vertices[k], vertices[k+1], vertices[k+2]) == LEFT_TURN) {
upcase = SCANA; upcase = SCANA;
w = vertices[k+2];
i = k+2; i = k+2;
} }
else if (CGAL::Visibility_2::orientation_2(geom_traits, vertices[k], vertices[k+1], vertices[k+2]) == RIGHT_TURN) { else if (CGAL::Visibility_2::orientation_2(geom_traits, vertices[k], vertices[k+1], vertices[k+2]) == RIGHT_TURN) {
upcase = SCANA; upcase = SCANA;
s.push(vertices[k+1]); s.push(vertices[k+1]);
w = vertices[k+2]; w = vertices[k+1];
i = k+1; i = k+1;
} }
else { else {
upcase = LEFT; upcase = LEFT;
std::cout << "scana push: " << vertices[k+1] << std::endl;
s.push(vertices[k+1]); s.push(vertices[k+1]);
w = vertices[k+1]; w = vertices[k+1];
i = k+1; i = k+1;
@ -608,7 +588,6 @@ private:
} }
k++; k++;
} }
std::cout << "scana found w = " << w << " i = " << i << std::endl;
} }
void scanc(int& i, Point_2& w, const Point_2& query_pt) { void scanc(int& i, Point_2& w, const Point_2& query_pt) {