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

Fix the testsuite temporarily, before I break everything again.

This commit is contained in:
Laurent Rineau 2008-04-01 12:55:59 +00:00
parent ee0201e794
commit 1dccc80b79
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Surface_mesher/include/CGAL/Surface_mesher/Implicit_surface_oracle_3.h
View File

@ -243,8 +243,8 @@ namespace CGAL {
}; // end operator()(Surface_3, Line_3) }; // end operator()(Surface_3, Line_3)
// debug function // debug function
static std::string debug_point(const Surface_3& surface, std::string debug_point(const Surface_3& surface,
const Point& p) const Point& p)
{ {
std::stringstream s; std::stringstream s;
s << p << " (distance=" s << p << " (distance="
@ -301,7 +301,7 @@ namespace CGAL {
#ifdef CGAL_SURFACE_MESHER_DEBUG_CLIPPED_SEGMENT #ifdef CGAL_SURFACE_MESHER_DEBUG_CLIPPED_SEGMENT
std::cerr << "=" << debug_point(surface, mid) << "\n"; std::cerr << "=" << debug_point(surface, mid) << "\n";
#endif #endif
mid.set_on_surface(surface_identifiers_generator(value_at_p1, value_at_p2)); // mid.set_on_surface(surface_identifiers_generator(value_at_p1, value_at_p2));
visitor.new_point(mid); visitor.new_point(mid);
return make_object(mid); return make_object(mid);
} }
@ -341,6 +341,7 @@ namespace CGAL {
const FT squared_radius = const FT squared_radius =
GT().compute_squared_radius_3_object()(sphere); GT().compute_squared_radius_3_object()(sphere);
const FT radius = CGAL::sqrt(squared_radius); const FT radius = CGAL::sqrt(squared_radius);
typename Self::Intersect_3 intersect = oracle.intersect_3_object();
typename CGAL::Random_points_on_sphere_3<Point, typename CGAL::Random_points_on_sphere_3<Point,
Point_creator> random_point_on_sphere(CGAL::to_double(radius)); Point_creator> random_point_on_sphere(CGAL::to_double(radius));
@ -361,18 +362,17 @@ namespace CGAL {
#ifdef CGAL_SURFACE_MESHER_DEBUG_INITIAL_POINTS #ifdef CGAL_SURFACE_MESHER_DEBUG_INITIAL_POINTS
std::cerr << "test " std::cerr << "test "
<< Self::Intersect_3::debug_point(surface, center) << intersect.debug_point(surface, center)
<< ", " << Self::Intersect_3::debug_point(surface, p); << ", " << intersect.debug_point(surface, p);
#endif #endif
Object o = oracle.intersect_3_object()(surface, Object o = intersect(surface, segment_3(center, p));
segment_3(center, p));
if (const Point* intersection = object_cast<Point>(&o)) { if (const Point* intersection = object_cast<Point>(&o)) {
*out++= *intersection; *out++= *intersection;
--n; --n;
#ifdef CGAL_SURFACE_MESHER_DEBUG_INITIAL_POINTS #ifdef CGAL_SURFACE_MESHER_DEBUG_INITIAL_POINTS
std::cerr << " = " std::cerr << " = "
<< Self::Intersect_3::debug_point(surface, *intersection) << intersect.debug_point(surface, *intersection)
<< "\n"; << "\n";
#endif #endif
} }