diff --git a/Filtered_kernel/include/CGAL/internal/Static_filters/Do_intersect_3.h b/Filtered_kernel/include/CGAL/internal/Static_filters/Do_intersect_3.h index 34c378f4a1d..7e60d752c17 100644 --- a/Filtered_kernel/include/CGAL/internal/Static_filters/Do_intersect_3.h +++ b/Filtered_kernel/include/CGAL/internal/Static_filters/Do_intersect_3.h @@ -126,8 +126,7 @@ public: do_intersect_bbox_segment_aux (px, py, pz, qx, qy, qz, - bxmin, bymin, bzmin, - bxmax, bymax, bzmax); + b); if(is_indeterminate(ub)) return Base::operator()(s,b); else return ub.sup(); diff --git a/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Ray_3_do_intersect.h b/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Ray_3_do_intersect.h index 582fec09c33..25e56bf062d 100644 --- a/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Ray_3_do_intersect.h +++ b/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Ray_3_do_intersect.h @@ -139,8 +139,7 @@ namespace internal { return do_intersect_bbox_segment_aux( source.x(), source.y(), source.z(), point_on_ray.x(), point_on_ray.y(), point_on_ray.z(), - bbox.xmin(), bbox.ymin(), bbox.zmin(), - bbox.xmax(), bbox.ymax(), bbox.zmax() ); + bbox); // const CGAL::cpp0x::array rray = {source.x(), source.y(), source.z(), // point_on_ray.x(), point_on_ray.y(), point_on_ray.z() }; // return do_intersect_bbox_segment_aux diff --git a/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Segment_3_do_intersect.h b/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Segment_3_do_intersect.h index 75d4e613117..c84a850dbfb 100644 --- a/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Segment_3_do_intersect.h +++ b/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Segment_3_do_intersect.h @@ -122,9 +122,15 @@ namespace internal { do_intersect_bbox_segment_aux( const FT& px, const FT& py, const FT& pz, const FT& qx, const FT& qy, const FT& qz, - const double& bxmin, const double& bymin, const double& bzmin, - const double& bxmax, const double& bymax, const double& bzmax) + const Bbox_3& bbox) { + const double& bxmin = bbox.xmin(); + const double& bymin = bbox.ymin(); + const double& bzmin = bbox.zmin(); + const double& bxmax = bbox.xmax(); + const double& bymax = bbox.ymax(); + const double& bzmax = bbox.zmax(); + // The following code encode t1 and t2 by: // t1 = tmin/dmin // t2 = tmax/dmax @@ -447,8 +453,9 @@ namespace internal { return do_intersect_bbox_segment_aux( source.x(), source.y(), source.z(), target.x(), target.y(), target.z(), - bbox.xmin(), bbox.ymin(), bbox.zmin(), - bbox.xmax(), bbox.ymax(), bbox.zmax() ); + bbox); + // bbox.xmin(), bbox.ymin(), bbox.zmin(), + // bbox.xmax(), bbox.ymax(), bbox.zmax() ); // const CGAL::cpp0x::array seg = {source.x(), source.y(), source.z(), // target.x(), target.y(), target.z() }; diff --git a/Intersections_3/test/Intersections_3/bbox_other_do_intersect_test.cpp b/Intersections_3/test/Intersections_3/bbox_other_do_intersect_test.cpp index c0877fdfe5e..3a0586e41e9 100644 --- a/Intersections_3/test/Intersections_3/bbox_other_do_intersect_test.cpp +++ b/Intersections_3/test/Intersections_3/bbox_other_do_intersect_test.cpp @@ -67,7 +67,7 @@ bool test_aux(const T& t, bool b = CGAL::do_intersect(t,bbox); if ( b != expected ) - std::cout << "ERROR: do_intersect(" << name + std::cerr << "ERROR: do_intersect(" << name << ") did not answer the expected result !" << std::endl; return (b == expected); @@ -674,27 +674,24 @@ int main() std::cout << std::setprecision(5); bool b; - // std::cout << "Testing with Simple_cartesian..." << std::endl ; - // b = test_kernel >(false); + std::cout << "Testing with Simple_cartesian..." << std::endl ; + b = test_kernel >(false); - // std::cout << std::endl << "Testing with Simple_cartesian..." << std::endl ; - // b &= test_kernel >(true); + std::cout << std::endl << "Testing with Simple_cartesian..." << std::endl ; + b &= test_kernel >(true); - // std::cout << std::endl << "Testing with Simple_cartesian..." << std::endl ; - // b &= test >(true); - // test_speed >(); + std::cout << std::endl << "Testing with Simple_cartesian..." << std::endl ; + b &= test_kernel >(true); - // std::cout << std::endl << "Testing with Cartesian..." << std::endl ; - // b &= test >(false); - // test_speed >(); + std::cout << std::endl << "Testing with Cartesian..." << std::endl ; + b &= test_kernel >(false); - // std::cout << std::endl << "Testing with Cartesian..." << std::endl ; - // b &= test_kernel >(true); + std::cout << std::endl << "Testing with Cartesian..." << std::endl ; + b &= test_kernel >(true); - // std::cout << std::endl << "Testing with Filtered_kernel > without static filters..." << std::endl ; - // typedef CGAL::Filtered_kernel, false> Fk_no_static; - // b &= test_kernel(); - // test_speed(); + std::cout << std::endl << "Testing with Filtered_kernel > without static filters..." << std::endl ; + typedef CGAL::Filtered_kernel, false> Fk_no_static; + b &= test_kernel(); std::cout << std::endl << "Testing with Exact_predicates_inexact_constructions_kernel..." << std::endl ; b &= test_kernel();