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

fixed the test suites with the changes of the envelope traits

This commit is contained in:
Baruch Zukerman 2006-10-17 14:09:29 +00:00
parent c65604e70b
commit 852399875b
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Envelope_3/test/Envelope_3/Envelope_test_3.h
View File

@ -119,19 +119,20 @@ public:
Xy_monotone_surface_3 &cur_surface = surfaces[i];
// first insert all the projected curves of the boundary of the current surface
// collect the curve in this list, and use sweepline at the end
std::list<std::pair<Object, Oriented_side> > boundary_list;
std::list<Object> boundary_list;
typedef std::pair<X_monotone_curve_2, Oriented_side> Boundary_xcurve;
typedef typename std::list<std::pair<Object, Oriented_side> >::iterator Boundary_iterator;
typedef std::list<Object>::const_iterator Boundary_iterator;
traits.construct_projected_boundary_2_object()(cur_surface, std::back_inserter(boundary_list));
for(Boundary_iterator boundary_it = boundary_list.begin();
boundary_it != boundary_list.end();
++boundary_it)
{
const Object& obj = boundary_it->first;
X_monotone_curve_2 cv;
CGAL_assertion(assign(cv, obj));
assign(cv, obj);
curves_col.push_back(cv);
const Object& obj = *boundary_it;
Boundary_xcurve boundary_cv;
CGAL_assertion(assign(boundary_cv, obj));
assign(boundary_cv, obj);
curves_col.push_back(boundary_cv.first);
}
// second, intersect it with all surfaces before it

15
Envelope_3/test/Envelope_3/Envelope_triangles_test_3.h
View File

@ -124,18 +124,19 @@ public:
#endif
// collect the curve in this list, and use sweepline at the end
std::list<std::pair<Object, Oriented_side> > boundary_list;
std::list<Object> boundary_list;
typedef std::pair<X_monotone_curve_2, Oriented_side> Boundary_xcurve;
traits.construct_projected_boundary_2_object()(cur_surface, std::back_inserter(boundary_list));
typedef typename std::list<std::pair<Object, Oriented_side> >::iterator Boundary_iterator;
typedef std::list<Object>::const_iterator Boundary_iterator;
for(Boundary_iterator boundary_it = boundary_list.begin();
boundary_it != boundary_list.end();
++boundary_it)
{
const Object& obj = boundary_it->first;
X_monotone_curve_2 cv;
CGAL_assertion(assign(cv, obj));
assign(cv, obj);
curves_col.push_back(cv);
const Object& obj = *boundary_it;
Boundary_xcurve boundary_cv;
CGAL_assertion(assign(boundary_cv, obj));
assign(boundary_cv, obj);
curves_col.push_back(boundary_cv.first);
}
// second, intersect it with all surfaces before it
Object cur_obj;