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

updated

This commit is contained in:
Efi Fogel 2012-07-18 16:43:03 +00:00
parent 2f079bbf85
commit 9cfc2e8634
3 changed files with 28 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3666,9 +3666,9 @@ _find_leftmost_vertex_on_open_loop(const DHalfedge* he_before,
template <typename GeomTraits, typename TopTraits>
bool
Arrangement_on_surface_2<GeomTraits, TopTraits>::
_is_smaller(int index1, const DHalfedge* he1, Arr_curve_end ce1,
_is_smaller(const DHalfedge* he1,
Arr_parameter_space ps_x1, Arr_parameter_space ps_y1,
int index2, const DHalfedge* he2, Arr_curve_end ce2,
const DHalfedge* he2,
Arr_parameter_space ps_x2, Arr_parameter_space ps_y2) const
{
// std::cout << "he1: " << he1->opposite()->vertex()->point() << " => "
@ -3680,10 +3680,6 @@ _is_smaller(int index1, const DHalfedge* he1, Arr_curve_end ce1,
// std::cout << "ind2: " << index
// << ", ps_x2: " << ps_x << ", ps_y2: " << ps_y << std::endl;
if (index1 < index2) return true;
if (index1 > index2) return false;
// index1 == index2
if (ps_x2 == ARR_INTERIOR) {
if (ps_x1 == ARR_INTERIOR) {
if (ps_y2 == ARR_INTERIOR) {
@ -3696,7 +3692,7 @@ _is_smaller(int index1, const DHalfedge* he1, Arr_curve_end ce1,
// ps1 == {INTERIOR,!INTERIOR}, ps2 == {INTERIOR,INTERIOR}
Comparison_result res = m_geom_traits->compare_x_on_boundary_2_object()
(he2->vertex()->point(), he1->curve(), ce1);
(he2->vertex()->point(), he1->curve(), ARR_MIN_END);
return
(res == EQUAL) ? (ps_y1 == ARR_BOTTOM_BOUNDARY) : (res == LARGER);
}
@ -3704,13 +3700,13 @@ _is_smaller(int index1, const DHalfedge* he1, Arr_curve_end ce1,
if (ps_y1 == ARR_INTERIOR) {
// ps1 == {INTERIOR,INTERIOR}, ps2 == {INTERIOR,!INTERIOR}
Comparison_result res = m_geom_traits->compare_x_on_boundary_2_object()
(he1->vertex()->point(), he2->curve(), ce2);
(he1->vertex()->point(), he2->curve(), ARR_MIN_END);
return (res == EQUAL) ? (ps_y2 == ARR_TOP_BOUNDARY) : (res == SMALLER);
}
// ps1 == {INTERIOR,!INTERIOR}, ps2 == {INTERIOR,!INTERIOR}
Comparison_result res = m_geom_traits->compare_x_on_boundary_2_object()
(he1->curve(), ce1, he2->curve(), ce2);
(he1->curve(), ARR_MIN_END, he2->curve(), ARR_MIN_END);
return (res == EQUAL) ?
((ps_y1 == ARR_BOTTOM_BOUNDARY) && (ps_y2 == ARR_TOP_BOUNDARY)) :
(res == SMALLER);
@ -3914,9 +3910,9 @@ _find_leftmost_vertex_on_closed_loop(const DHalfedge* he_anchor,
if ((he->direction() == ARR_RIGHT_TO_LEFT) &&
(he->next()->direction() == ARR_LEFT_TO_RIGHT))
{
if ((he_min == NULL) ||
_is_smaller(index, he, ARR_MIN_END, ps_x, ps_y,
ind_min, he_min, ARR_MIN_END, ps_x_min, ps_y_min))
if ((he_min == NULL) || (index < ind_min) ||
((index == ind_min) &&
_is_smaller(he, ps_x, ps_y, he_min, ps_x_min, ps_y_min)))
{
ind_min = index;
ps_x_min = ps_x;
@ -3940,9 +3936,9 @@ _find_leftmost_vertex_on_closed_loop(const DHalfedge* he_anchor,
ps_y = ps_y_save;
if (he->direction() == ARR_RIGHT_TO_LEFT) {
if ((he_min == NULL) ||
_is_smaller(index, he, ARR_MIN_END, ps_x, ps_y,
ind_min, he_min, ARR_MIN_END, ps_x_min, ps_y_min))
if ((he_min == NULL) || (index < ind_min) ||
((index == ind_min) &&
_is_smaller(he, ps_x, ps_y, he_min, ps_x_min, ps_y_min)))
{
ind_min = index;
ps_x_min = ps_x;

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

@ -1585,9 +1585,9 @@ protected:
* \param ps_y2 the parameter space in y of the currently known smallest
* halfedge
*/
bool _is_smaller(int index1, const DHalfedge* he1, Arr_curve_end ce1,
bool _is_smaller(const DHalfedge* he1,
Arr_parameter_space ps_x1, Arr_parameter_space ps_y1,
int index2, const DHalfedge* he2, Arr_curve_end ce2,
const DHalfedge* he2,
Arr_parameter_space ps_x2, Arr_parameter_space ps_y2) const;
bool _is_smaller(const X_monotone_curve_2& cv1,

30
Arrangement_on_surface_2/test/Arrangement_on_surface_2/cgal_test_base
View File

@ -1270,26 +1270,26 @@ compile_and_run test_rational_function_traits_2
compile_and_run test_removal
compile_and_run test_iso_verts
compile_and_run test_vert_ray_shoot_vert_segments
compile_and_run test_construction
compile_and_run test_overlay
# compile_and_run test_vert_ray_shoot_vert_segments
# compile_and_run test_construction
# compile_and_run test_overlay
test_point_location_segments
test_point_location_circle_segments
test_point_location_linear
# test_point_location_segments
# test_point_location_circle_segments
# test_point_location_linear
test_point_location_dynamic_segments
# test_point_location_dynamic_segments
compile_and_run test_dual
compile_and_run test_do_intersect
compile_and_run test_zone
# compile_and_run test_dual
# compile_and_run test_do_intersect
# compile_and_run test_zone
compile_and_run test_observer
compile_and_run test_do_equal
# compile_and_run test_observer
# compile_and_run test_do_equal
test_segment_traits_adaptor
test_linear_traits_adaptor
test_spherical_arcs_traits_adaptor
# test_segment_traits_adaptor
# test_linear_traits_adaptor
# test_spherical_arcs_traits_adaptor
compile_and_run test_spherical_removal