From 6c9625e514cac79240d567d5f10da5e39ca76ebf Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Sat, 21 Jan 2012 08:33:51 +0000 Subject: [PATCH] Fix for bug --- .../triangle_3_triangle_3_intersection.cpp | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Intersections_3/test/Intersections_3/triangle_3_triangle_3_intersection.cpp b/Intersections_3/test/Intersections_3/triangle_3_triangle_3_intersection.cpp index ac3b7f3ee9e..2e576c43233 100644 --- a/Intersections_3/test/Intersections_3/triangle_3_triangle_3_intersection.cpp +++ b/Intersections_3/test/Intersections_3/triangle_3_triangle_3_intersection.cpp @@ -12,7 +12,7 @@ typedef CGAL::Cartesian Kernel; typedef Kernel::Triangle_3 Triangle; typedef Kernel::Point_3 Point; typedef Kernel::Segment_3 Segment; -typedef std::vector Polygon; +typedef std::vector Polygon2; void test_coplanar_triangles(){ CGAL::Object obj; @@ -162,29 +162,29 @@ void test_coplanar_triangles(){ t1=Triangle( Point(0,0,0),Point(1,0,0),Point(0.5,1.5,0) ); t2=Triangle( Point(0,1,0),Point(1,1,0),Point(0.5,-0.5,0) ); obj=CGAL::intersection(t1,t2); - CGAL_assertion(CGAL::object_cast(&obj)!=NULL); - CGAL_assertion(CGAL::object_cast(&obj)->size()==6); + CGAL_assertion(CGAL::object_cast(&obj)!=NULL); + CGAL_assertion(CGAL::object_cast(&obj)->size()==6); obj=CGAL::intersection(t2,t1); - CGAL_assertion(CGAL::object_cast(&obj)!=NULL); - CGAL_assertion(CGAL::object_cast(&obj)->size()==6); + CGAL_assertion(CGAL::object_cast(&obj)!=NULL); + CGAL_assertion(CGAL::object_cast(&obj)->size()==6); //intersection of two triangle corners t1=Triangle( Point(0,0,0),Point(1,0,0),Point(0.5,1,0) ); t2=Triangle( Point(0,1,0),Point(1,1,0),Point(0.5,0,0) ); obj=CGAL::intersection(t1,t2); - CGAL_assertion(CGAL::object_cast(&obj)!=NULL); - CGAL_assertion(CGAL::object_cast(&obj)->size()==4); + CGAL_assertion(CGAL::object_cast(&obj)!=NULL); + CGAL_assertion(CGAL::object_cast(&obj)->size()==4); obj=CGAL::intersection(t2,t1); - CGAL_assertion(CGAL::object_cast(&obj)!=NULL); - CGAL_assertion(CGAL::object_cast(&obj)->size()==4); + CGAL_assertion(CGAL::object_cast(&obj)!=NULL); + CGAL_assertion(CGAL::object_cast(&obj)->size()==4); //t2 pierces two edges of t1 t1=Triangle( Point(0,0,0),Point(1,0,0),Point(0,1,0) ); t2=Triangle( Point(-0.1,0.1,0),Point(-0.1,0.2,0),Point(0.5,0.8,0) ); obj=CGAL::intersection(t1,t2); - CGAL_assertion(CGAL::object_cast(&obj)!=NULL); - CGAL_assertion(CGAL::object_cast(&obj)->size()==4); + CGAL_assertion(CGAL::object_cast(&obj)!=NULL); + CGAL_assertion(CGAL::object_cast(&obj)->size()==4); obj=CGAL::intersection(t2,t1); - CGAL_assertion(CGAL::object_cast(&obj)!=NULL); - CGAL_assertion(CGAL::object_cast(&obj)->size()==4); + CGAL_assertion(CGAL::object_cast(&obj)!=NULL); + CGAL_assertion(CGAL::object_cast(&obj)->size()==4); //Intersection is empty t1=Triangle( Point(0,0,0),Point(0,1,0),Point(1,0,0) ); t2=Triangle( Point(-0.1,-0.1,0),Point(-0.1,-0.9,0),Point(-1,-0.1,0) );