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

bug fix - _are_vertices_unique and merge

This commit is contained in:
Ophir Setter 2007-09-18 07:00:47 +00:00
parent 38451f4d27
commit a81582cee9
2 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
Arrangement_on_surface_2/include/CGAL/Arr_spherical_arc_traits_2.h
View File

@ -1303,10 +1303,15 @@ public:
kernel.counterclockwise_in_between_2_object(); kernel.counterclockwise_in_between_2_object();
typename Kernel::Equal_2 equal = kernel.equal_2_object(); typename Kernel::Equal_2 equal = kernel.equal_2_object();
if (xc1.is_vertical()) { if (xc1.is_vertical())
{
const Plane_3 & plane1 = xc1.plane(); const Plane_3 & plane1 = xc1.plane();
const Plane_3 & plane2 = xc2.plane(); const Plane_3 & plane2 = xc2.plane();
#if defined(CGAL_ARR_PLANE)
bool res = plane1.equal(plane2);
#else
bool res = kernel.equal_3_object()(plane1, plane2); bool res = kernel.equal_3_object()(plane1, plane2);
#endif
if ((!res && (xc1.is_directed_right() == xc2.is_directed_right())) || if ((!res && (xc1.is_directed_right() == xc2.is_directed_right())) ||
(res && (xc1.is_directed_right() != xc2.is_directed_right()))) (res && (xc1.is_directed_right() != xc2.is_directed_right())))
return oi; return oi;
@ -1435,25 +1440,39 @@ public:
CGAL_precondition(!xc1.is_degenerate()); CGAL_precondition(!xc1.is_degenerate());
CGAL_precondition(!xc2.is_degenerate()); CGAL_precondition(!xc2.is_degenerate());
CGAL_precondition_code( Kernel kernel;
Kernel kernel; typename Kernel::Equal_3 equal = kernel.equal_3_object();
typename Kernel::Equal_3 equal = kernel.equal_3_object();
);
#if defined(CGAL_ARR_PLANE) #if defined(CGAL_ARR_PLANE)
CGAL_precondition((xc1.plane()).equal(xc2.plane())); CGAL_precondition((xc1.plane()).equal(xc2.plane()));
#else #else
CGAL_precondition(equal(xc1.plane(), xc2.plane())); CGAL_precondition(equal(xc1.plane(), xc2.plane()));
#endif #endif
CGAL_precondition(equal(xc1.right(), xc2.left()) && CGAL_precondition_code(Are_mergeable_2 are_merg;);
xc2.left().is_no_boundary()); CGAL_precondition (are_merg(xc1, xc2) == true);
xc.set_source(xc1.left()); if (equal(xc1.right(), xc2.left()))
xc.set_target(xc2.right()); {
xc.set_plane(xc1.plane()); xc.set_source(xc1.left());
xc.set_is_degenerate(false); xc.set_target(xc2.right());
xc.set_is_x_monotone(true); xc.set_plane(xc1.plane());
xc.set_is_vertical(xc1.is_vertical()); xc.set_is_degenerate(false);
xc.set_is_directed_right(true); xc.set_is_x_monotone(true);
xc.set_is_vertical(xc1.is_vertical());
xc.set_is_directed_right(true);
}
else
{
CGAL_assertion(equal(xc1.left(), xc2.right()));
xc.set_source(xc2.left());
xc.set_target(xc1.right());
xc.set_plane(xc2.plane());
xc.set_is_degenerate(false);
xc.set_is_x_monotone(true);
xc.set_is_vertical(xc2.is_vertical());
xc.set_is_directed_right(true);
}
} }
}; };

4
Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_on_surface_2_impl.h
View File

@ -5014,14 +5014,16 @@ _are_vertices_unique() const
Vertex_const_iterator vit; Vertex_const_iterator vit;
unsigned int i = 0; unsigned int i = 0;
for (vit = vertices_begin(); vit != vertices_end(); ++vit, ++i) for (vit = vertices_begin(); vit != vertices_end(); ++vit)
{ {
if (vit->boundary_in_x() == NO_BOUNDARY && if (vit->boundary_in_x() == NO_BOUNDARY &&
vit->boundary_in_y() == NO_BOUNDARY) vit->boundary_in_y() == NO_BOUNDARY)
{ {
points_vec[i] = vit->point(); points_vec[i] = vit->point();
++i;
} }
} }
points_vec.resize (i);
// Sort the vector of points and make sure no two adjacent points in the // Sort the vector of points and make sure no two adjacent points in the
// sorted vector are equal. // sorted vector are equal.