From a7bb914c865c6766f2419ad0999a61e7fe27e9a9 Mon Sep 17 00:00:00 2001 From: Eric Berberich Date: Wed, 4 Feb 2009 17:21:42 +0000 Subject: [PATCH] make_square_free not in CGALi --- ...gebraic_surface_3_z_at_xy_isolator_traits.h | 18 ++++++++---------- ...ic_surface_3_z_at_xy_isolator_traits_base.h | 2 +- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_surface_3_z_at_xy_isolator_traits.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_surface_3_z_at_xy_isolator_traits.h index d35733eb1ce..a7df24fdaca 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_surface_3_z_at_xy_isolator_traits.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_surface_3_z_at_xy_isolator_traits.h @@ -199,7 +199,7 @@ public: #if !NDEBUG std::cout << "Res sq_free.." << std::flush; #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 std::cout << "done" << std::endl; #endif @@ -213,7 +213,7 @@ public: std::cout << "sq_free.." << std::flush; #endif Polynomial_2 f2 - = CGAL::CGALi::make_square_free(f2_non_sq); + = CGAL::make_square_free(f2_non_sq); #if !NDEBUG std::cout << "done" << std::endl; #endif @@ -244,8 +244,8 @@ public: #if !NDEBUG std::cout << "sq-free.." << std::flush; #endif - //Polynomial_3 f3 = CGAL::CGALi::make_square_free(curr); - Polynomial_2 f3 = CGAL::CGALi::make_square_free(sres_f_fy[i]); + //Polynomial_3 f3 = CGAL::make_square_free(curr); + Polynomial_2 f3 = CGAL::make_square_free(sres_f_fy[i]); #if !NDEBUG std::cout << "done" << std::endl; @@ -1664,10 +1664,8 @@ public: } - he_it->second.planar_curve - = CGAL::canonicalize - (CGAL::CGALi::make_square_free - (surface_section) ); + he_it->second.planar_curve = + CGAL::canonicalize(CGAL::make_square_free(surface_section)); // Now, use Curve analysis for adjacencies typename @@ -3729,11 +3727,11 @@ public: construct_curve_2_object(); bucket_curves.push_back( construct_curve( - CGAL::CGALi::make_square_free(bucket_int_poly) + CGAL::make_square_free(bucket_int_poly) ) ); #if !NDEBUG - std::cout << "," << CGAL::CGALi::make_square_free(bucket_int_poly) + std::cout << "," << CGAL::make_square_free(bucket_int_poly) << std::flush; #endif } diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_surface_3_z_at_xy_isolator_traits_base.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_surface_3_z_at_xy_isolator_traits_base.h index a6d0ce8f96a..6531921f58b 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_surface_3_z_at_xy_isolator_traits_base.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_surface_3_z_at_xy_isolator_traits_base.h @@ -742,7 +742,7 @@ public: const Polynomial_2& non_square_free_f, 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 Arrangement_traits_2::Curve_kernel_2::Construct_curve_2