make_square_free not in CGALi

This commit is contained in:
Eric Berberich 2009-02-04 17:21:42 +00:00
parent b7ad310cc9
commit a7bb914c86
2 changed files with 9 additions and 11 deletions

View File

@ -199,7 +199,7 @@ public:
#if !NDEBUG #if !NDEBUG
std::cout << "Res sq_free.." << std::flush; std::cout << "Res sq_free.." << std::flush;
#endif #endif
Polynomial_2 f1 = CGAL::CGALi::make_square_free(sres_f_fy[0]); Polynomial_2 f1 = CGAL::make_square_free(sres_f_fy[0]);
#if !NDEBUG #if !NDEBUG
std::cout << "done" << std::endl; std::cout << "done" << std::endl;
#endif #endif
@ -213,7 +213,7 @@ public:
std::cout << "sq_free.." << std::flush; std::cout << "sq_free.." << std::flush;
#endif #endif
Polynomial_2 f2 Polynomial_2 f2
= CGAL::CGALi::make_square_free(f2_non_sq); = CGAL::make_square_free(f2_non_sq);
#if !NDEBUG #if !NDEBUG
std::cout << "done" << std::endl; std::cout << "done" << std::endl;
#endif #endif
@ -244,8 +244,8 @@ public:
#if !NDEBUG #if !NDEBUG
std::cout << "sq-free.." << std::flush; std::cout << "sq-free.." << std::flush;
#endif #endif
//Polynomial_3 f3 = CGAL::CGALi::make_square_free(curr); //Polynomial_3 f3 = CGAL::make_square_free(curr);
Polynomial_2 f3 = CGAL::CGALi::make_square_free(sres_f_fy[i]); Polynomial_2 f3 = CGAL::make_square_free(sres_f_fy[i]);
#if !NDEBUG #if !NDEBUG
std::cout << "done" << std::endl; std::cout << "done" << std::endl;
@ -1664,10 +1664,8 @@ public:
} }
he_it->second.planar_curve he_it->second.planar_curve =
= CGAL::canonicalize CGAL::canonicalize(CGAL::make_square_free(surface_section));
(CGAL::CGALi::make_square_free
(surface_section) );
// Now, use Curve analysis for adjacencies // Now, use Curve analysis for adjacencies
typename typename
@ -3729,11 +3727,11 @@ public:
construct_curve_2_object(); construct_curve_2_object();
bucket_curves.push_back( bucket_curves.push_back(
construct_curve( construct_curve(
CGAL::CGALi::make_square_free(bucket_int_poly) CGAL::make_square_free(bucket_int_poly)
) )
); );
#if !NDEBUG #if !NDEBUG
std::cout << "," << CGAL::CGALi::make_square_free(bucket_int_poly) std::cout << "," << CGAL::make_square_free(bucket_int_poly)
<< std::flush; << std::flush;
#endif #endif
} }

View File

@ -742,7 +742,7 @@ public:
const Polynomial_2& non_square_free_f, const Polynomial_2& non_square_free_f,
bool no_gcd = false) const { bool no_gcd = false) const {
Polynomial_2 p2 = CGAL::CGALi::make_square_free(non_square_free_f); Polynomial_2 p2 = CGAL::make_square_free(non_square_free_f);
typename typename
Arrangement_traits_2::Curve_kernel_2::Construct_curve_2 Arrangement_traits_2::Curve_kernel_2::Construct_curve_2