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

Fix the test 

One cannot expect exact intersections computations results when the kernel
is not. This patch fixes the test: the equality between the result and the
expected result is tested with an epsilon unless the kernel has exact
constructions.
This commit is contained in:
Laurent Rineau 2012-04-23 22:17:15 +00:00
parent a4be5cfc47
commit 6c705ab777
1 changed files with 139 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

273
Intersections_3/test/Intersections_3/triangle_other_intersection_test.cpp
View File

@ -216,15 +216,20 @@ void random_test()
// Precomputed results test
// -----------------------------------
template <class Triangle, class Query, class Result>
bool test_aux(const Triangle t,
bool test_aux(bool is_kernel_exact,
const Triangle t,
const Query& q,
const std::string& name,
const Result& expected)
const Result& expected,
double sq_espilon = 1e-20)
{
CGAL::Object object = CGAL::intersection(t,q);
const Result* pr = CGAL::object_cast<Result>(&object);
if ( (NULL != pr) && (expected == *pr) )
if ( (NULL != pr) &&
(is_kernel_exact ?
(expected == *pr) :
CGAL::to_double(CGAL::squared_distance(expected, *pr)) < sq_espilon ) )
{
return true;
}
@ -243,7 +248,7 @@ bool test_aux(const Triangle t,
}
template <class K>
bool test()
bool test(bool is_kernel_exact = true)
{
// types
typedef typename K::FT FT;
@ -281,10 +286,10 @@ bool test()
Segment s32(p3,p2);
Segment s31(p3,p1);
bool b = test_aux(t,s12,"t-s12",s12);
b &= test_aux(t,s21,"t-s21",s21);
b &= test_aux(t,s13,"t-s13",s13);
b &= test_aux(t,s23,"t-s23",s23);
bool b = test_aux(is_kernel_exact,t,s12,"t-s12",s12);
b &= test_aux(is_kernel_exact,t,s21,"t-s21",s21);
b &= test_aux(is_kernel_exact,t,s13,"t-s13",s13);
b &= test_aux(is_kernel_exact,t,s23,"t-s23",s23);
// Inside points
Point p4(FT(0.5), FT(0.5), FT(0.));
@ -318,30 +323,30 @@ bool test()
Segment s78(p7,p8);
Segment s87(p8,p7);
b &= test_aux(t,s14,"t-s14",s14);
b &= test_aux(t,s41,"t-s41",s41);
b &= test_aux(t,s24,"t-s24",s24);
b &= test_aux(t,s42,"t-s42",s42);
b &= test_aux(t,s15,"t-s15",s15);
b &= test_aux(t,s25,"t-s25",s25);
b &= test_aux(t,s34,"t-s34",s34);
b &= test_aux(t,s35,"t-s35",s35);
b &= test_aux(t,s36,"t-s36",s36);
b &= test_aux(t,s45,"t-s45",s45);
b &= test_aux(t,s16,"t-s16",s16);
b &= test_aux(t,s26,"t-s26",s26);
b &= test_aux(t,s62,"t-s62",s62);
b &= test_aux(t,s46,"t-s46",s46);
b &= test_aux(t,s65,"t-s65",s65);
b &= test_aux(t,s64,"t-s64",s64);
b &= test_aux(t,s48,"t-s48",s48);
b &= test_aux(t,s56,"t-s56",s56);
b &= test_aux(t,s17,"t-t17",s17);
b &= test_aux(t,s67,"t-t67",s67);
b &= test_aux(t,s68,"t-s68",s68);
b &= test_aux(t,s86,"t-s86",s86);
b &= test_aux(t,s78,"t-t78",s78);
b &= test_aux(t,s87,"t-t87",s87);
b &= test_aux(is_kernel_exact,t,s14,"t-s14",s14);
b &= test_aux(is_kernel_exact,t,s41,"t-s41",s41);
b &= test_aux(is_kernel_exact,t,s24,"t-s24",s24);
b &= test_aux(is_kernel_exact,t,s42,"t-s42",s42);
b &= test_aux(is_kernel_exact,t,s15,"t-s15",s15);
b &= test_aux(is_kernel_exact,t,s25,"t-s25",s25);
b &= test_aux(is_kernel_exact,t,s34,"t-s34",s34);
b &= test_aux(is_kernel_exact,t,s35,"t-s35",s35);
b &= test_aux(is_kernel_exact,t,s36,"t-s36",s36);
b &= test_aux(is_kernel_exact,t,s45,"t-s45",s45);
b &= test_aux(is_kernel_exact,t,s16,"t-s16",s16);
b &= test_aux(is_kernel_exact,t,s26,"t-s26",s26);
b &= test_aux(is_kernel_exact,t,s62,"t-s62",s62);
b &= test_aux(is_kernel_exact,t,s46,"t-s46",s46);
b &= test_aux(is_kernel_exact,t,s65,"t-s65",s65);
b &= test_aux(is_kernel_exact,t,s64,"t-s64",s64);
b &= test_aux(is_kernel_exact,t,s48,"t-s48",s48);
b &= test_aux(is_kernel_exact,t,s56,"t-s56",s56);
b &= test_aux(is_kernel_exact,t,s17,"t-t17",s17);
b &= test_aux(is_kernel_exact,t,s67,"t-t67",s67);
b &= test_aux(is_kernel_exact,t,s68,"t-s68",s68);
b &= test_aux(is_kernel_exact,t,s86,"t-s86",s86);
b &= test_aux(is_kernel_exact,t,s78,"t-t78",s78);
b &= test_aux(is_kernel_exact,t,s87,"t-t87",s87);
// Outside points (in triangle plane)
Point pA(FT(-0.5), FT(1.), FT(0.5));
@ -362,17 +367,17 @@ bool test()
Segment s1F(p1,pF);
Segment sF6(pF,p6);
b &= test_aux(t,sAB,"t-sAB",p2);
b &= test_aux(t,sBC,"t-sBC",s46);
b &= test_aux(t,s2E,"t-s2E",s26);
b &= test_aux(t,sE2,"t-sE2",s62);
b &= test_aux(t,s2A,"t-s2A",p2);
b &= test_aux(t,s6E,"t-s6E",p6);
b &= test_aux(t,sB8,"t-sB8",s48);
b &= test_aux(t,sC8,"t-sC8",s68);
b &= test_aux(t,s8C,"t-s8C",s86);
b &= test_aux(t,s1F,"t-s1F",s13);
b &= test_aux(t,sF6,"t-sF6",s36);
b &= test_aux(is_kernel_exact,t,sAB,"t-sAB",p2);
b &= test_aux(is_kernel_exact,t,sBC,"t-sBC",s46);
b &= test_aux(is_kernel_exact,t,s2E,"t-s2E",s26);
b &= test_aux(is_kernel_exact,t,sE2,"t-sE2",s62);
b &= test_aux(is_kernel_exact,t,s2A,"t-s2A",p2);
b &= test_aux(is_kernel_exact,t,s6E,"t-s6E",p6);
b &= test_aux(is_kernel_exact,t,sB8,"t-sB8",s48);
b &= test_aux(is_kernel_exact,t,sC8,"t-sC8",s68);
b &= test_aux(is_kernel_exact,t,s8C,"t-s8C",s86);
b &= test_aux(is_kernel_exact,t,s1F,"t-s1F",s13);
b &= test_aux(is_kernel_exact,t,sF6,"t-sF6",s36);
// Outside triangle plane
Point pa(FT(0.), FT(0.), FT(0.));
@ -386,11 +391,11 @@ bool test()
Segment sa8(pa,p8);
Segment sb2(pb,p2);
b &= test_aux(t,sab,"t-sab",p1);
b &= test_aux(t,sac,"t-sac",p6);
b &= test_aux(t,sae,"t-sae",p8);
b &= test_aux(t,sa8,"t-sa8",p8);
b &= test_aux(t,sb2,"t-sb2",p2);
b &= test_aux(is_kernel_exact,t,sab,"t-sab",p1);
b &= test_aux(is_kernel_exact,t,sac,"t-sac",p6);
b &= test_aux(is_kernel_exact,t,sae,"t-sae",p8);
b &= test_aux(is_kernel_exact,t,sa8,"t-sa8",p8);
b &= test_aux(is_kernel_exact,t,sb2,"t-sb2",p2);
// -----------------------------------
// ray queries
@ -401,10 +406,10 @@ bool test()
Ray r13(p1,p3);
Ray r23(p2,p3);
b &= test_aux(t,r12,"t-r12",s12);
b &= test_aux(t,r21,"t-r21",s21);
b &= test_aux(t,r13,"t-r13",s13);
b &= test_aux(t,r23,"t-r23",s23);
b &= test_aux(is_kernel_exact,t,r12,"t-r12",s12);
b &= test_aux(is_kernel_exact,t,r21,"t-r21",s21);
b &= test_aux(is_kernel_exact,t,r13,"t-r13",s13);
b &= test_aux(is_kernel_exact,t,r23,"t-r23",s23);
// In triangle
Point p9_(FT(0.), FT(0.5), FT(0.5));
@ -432,26 +437,26 @@ bool test()
Ray r68(p6,p8);
Segment r89_res(p8,p9_);
b &= test_aux(t,r14,"t-r14",s12);
b &= test_aux(t,r41,"t-r41",s41);
b &= test_aux(t,r24,"t-r24",s21);
b &= test_aux(t,r42,"t-r42",s42);
b &= test_aux(t,r15,"t-r15",s15);
b &= test_aux(t,r25,"t-r25",s23);
b &= test_aux(t,r34,"t-r34",s34);
b &= test_aux(t,r35,"t-r35",s32);
b &= test_aux(t,r36,"t-r36",s31);
b &= test_aux(t,r45,"t-r45",s45);
b &= test_aux(t,r16,"t-r16",s13);
b &= test_aux(t,r26,"t-r26",s26);
b &= test_aux(t,r62,"t-r62",s62);
b &= test_aux(t,r46,"t-r46",s46);
b &= test_aux(t,r48,"t-r48",s46);
b &= test_aux(t,r56,"t-r56",s56);
b &= test_aux(t,r47,"t-r47",s45);
b &= test_aux(t,r89,"t-t89",r89_res);
b &= test_aux(t,r68,"t-r68",s64);
b &= test_aux(t,r86,"t-r86",s86);
b &= test_aux(is_kernel_exact,t,r14,"t-r14",s12);
b &= test_aux(is_kernel_exact,t,r41,"t-r41",s41);
b &= test_aux(is_kernel_exact,t,r24,"t-r24",s21);
b &= test_aux(is_kernel_exact,t,r42,"t-r42",s42);
b &= test_aux(is_kernel_exact,t,r15,"t-r15",s15);
b &= test_aux(is_kernel_exact,t,r25,"t-r25",s23);
b &= test_aux(is_kernel_exact,t,r34,"t-r34",s34);
b &= test_aux(is_kernel_exact,t,r35,"t-r35",s32);
b &= test_aux(is_kernel_exact,t,r36,"t-r36",s31);
b &= test_aux(is_kernel_exact,t,r45,"t-r45",s45);
b &= test_aux(is_kernel_exact,t,r16,"t-r16",s13);
b &= test_aux(is_kernel_exact,t,r26,"t-r26",s26);
b &= test_aux(is_kernel_exact,t,r62,"t-r62",s62);
b &= test_aux(is_kernel_exact,t,r46,"t-r46",s46);
b &= test_aux(is_kernel_exact,t,r48,"t-r48",s46);
b &= test_aux(is_kernel_exact,t,r56,"t-r56",s56);
b &= test_aux(is_kernel_exact,t,r47,"t-r47",s45);
b &= test_aux(is_kernel_exact,t,r89,"t-t89",r89_res);
b &= test_aux(is_kernel_exact,t,r68,"t-r68",s64);
b &= test_aux(is_kernel_exact,t,r86,"t-r86",s86);
// Outside points (in triangre prane)
@ -467,17 +472,17 @@ bool test()
Ray r1F(p1,pF);
Ray rF6(pF,p6);
b &= test_aux(t,rAB,"t-rAB",p2);
b &= test_aux(t,rBC,"t-rBC",s46);
b &= test_aux(t,r2E,"t-r2E",s26);
b &= test_aux(t,rE2,"t-rE2",s62);
b &= test_aux(t,r2A,"t-r2A",p2);
b &= test_aux(t,r6E,"t-r6E",p6);
b &= test_aux(t,rB8,"t-rB8",s46);
b &= test_aux(t,rC8,"t-rC8",s64);
b &= test_aux(t,r8C,"t-r8C",s86);
b &= test_aux(t,r1F,"t-r1F",s13);
b &= test_aux(t,rF6,"t-rF6",s31);
b &= test_aux(is_kernel_exact,t,rAB,"t-rAB",p2);
b &= test_aux(is_kernel_exact,t,rBC,"t-rBC",s46);
b &= test_aux(is_kernel_exact,t,r2E,"t-r2E",s26);
b &= test_aux(is_kernel_exact,t,rE2,"t-rE2",s62);
b &= test_aux(is_kernel_exact,t,r2A,"t-r2A",p2);
b &= test_aux(is_kernel_exact,t,r6E,"t-r6E",p6);
b &= test_aux(is_kernel_exact,t,rB8,"t-rB8",s46);
b &= test_aux(is_kernel_exact,t,rC8,"t-rC8",s64);
b &= test_aux(is_kernel_exact,t,r8C,"t-r8C",s86);
b &= test_aux(is_kernel_exact,t,r1F,"t-r1F",s13);
b &= test_aux(is_kernel_exact,t,rF6,"t-rF6",s31);
// Outside triangle plane
Ray rab(pa,pb);
@ -486,11 +491,11 @@ bool test()
Ray ra8(pa,p8);
Ray rb2(pb,p2);
b &= test_aux(t,rab,"t-rab",p1);
b &= test_aux(t,rac,"t-rac",p6);
b &= test_aux(t,rae,"t-rae",p8);
b &= test_aux(t,ra8,"t-ra8",p8);
b &= test_aux(t,rb2,"t-rb2",p2);
b &= test_aux(is_kernel_exact,t,rab,"t-rab",p1);
b &= test_aux(is_kernel_exact,t,rac,"t-rac",p6);
b &= test_aux(is_kernel_exact,t,rae,"t-rae",p8);
b &= test_aux(is_kernel_exact,t,ra8,"t-ra8",p8);
b &= test_aux(is_kernel_exact,t,rb2,"t-rb2",p2);
// -----------------------------------
// Line queries
@ -501,10 +506,10 @@ bool test()
Line l13(p1,p3);
Line l23(p2,p3);
b &= test_aux(t,l12,"t-l12",s12);
b &= test_aux(t,l21,"t-l21",s21);
b &= test_aux(t,l13,"t-l13",s13);
b &= test_aux(t,l23,"t-l23",s23);
b &= test_aux(is_kernel_exact,t,l12,"t-l12",s12);
b &= test_aux(is_kernel_exact,t,l21,"t-l21",s21);
b &= test_aux(is_kernel_exact,t,l13,"t-l13",s13);
b &= test_aux(is_kernel_exact,t,l23,"t-l23",s23);
// In triangle
Line l14(p1,p4);
@ -530,26 +535,26 @@ bool test()
Segment l89_res(p1,p9_);
b &= test_aux(t,l14,"t-l14",s12);
b &= test_aux(t,l41,"t-l41",s21);
b &= test_aux(t,l24,"t-l24",s21);
b &= test_aux(t,l42,"t-l42",s12);
b &= test_aux(t,l15,"t-l15",s15);
b &= test_aux(t,l25,"t-l25",s23);
b &= test_aux(t,l34,"t-l34",s34);
b &= test_aux(t,l35,"t-l35",s32);
b &= test_aux(t,l36,"t-l36",s31);
b &= test_aux(t,l45,"t-l45",s45);
b &= test_aux(t,l16,"t-l16",s13);
b &= test_aux(t,l26,"t-l26",s26);
b &= test_aux(t,l62,"t-l62",s62);
b &= test_aux(t,l46,"t-l46",s46);
b &= test_aux(t,l48,"t-l48",s46);
b &= test_aux(t,l56,"t-l56",s56);
b &= test_aux(t,l47,"t-l47",s45);
b &= test_aux(t,l89,"t-t89",l89_res);
b &= test_aux(t,l68,"t-l68",s64);
b &= test_aux(t,l86,"t-l86",s46);
b &= test_aux(is_kernel_exact,t,l14,"t-l14",s12);
b &= test_aux(is_kernel_exact,t,l41,"t-l41",s21);
b &= test_aux(is_kernel_exact,t,l24,"t-l24",s21);
b &= test_aux(is_kernel_exact,t,l42,"t-l42",s12);
b &= test_aux(is_kernel_exact,t,l15,"t-l15",s15);
b &= test_aux(is_kernel_exact,t,l25,"t-l25",s23);
b &= test_aux(is_kernel_exact,t,l34,"t-l34",s34);
b &= test_aux(is_kernel_exact,t,l35,"t-l35",s32);
b &= test_aux(is_kernel_exact,t,l36,"t-l36",s31);
b &= test_aux(is_kernel_exact,t,l45,"t-l45",s45);
b &= test_aux(is_kernel_exact,t,l16,"t-l16",s13);
b &= test_aux(is_kernel_exact,t,l26,"t-l26",s26);
b &= test_aux(is_kernel_exact,t,l62,"t-l62",s62);
b &= test_aux(is_kernel_exact,t,l46,"t-l46",s46);
b &= test_aux(is_kernel_exact,t,l48,"t-l48",s46);
b &= test_aux(is_kernel_exact,t,l56,"t-l56",s56);
b &= test_aux(is_kernel_exact,t,l47,"t-l47",s45);
b &= test_aux(is_kernel_exact,t,l89,"t-t89",l89_res);
b &= test_aux(is_kernel_exact,t,l68,"t-l68",s64);
b &= test_aux(is_kernel_exact,t,l86,"t-l86",s46);
// Outside points (in triangle plane)
@ -565,17 +570,17 @@ bool test()
Line l1F(p1,pF);
Line lF6(pF,p6);
b &= test_aux(t,lAB,"t-lAB",p2);
b &= test_aux(t,lBC,"t-lBC",s46);
b &= test_aux(t,l2E,"t-l2E",s26);
b &= test_aux(t,lE2,"t-lE2",s62);
b &= test_aux(t,l2A,"t-l2A",p2);
b &= test_aux(t,l6E,"t-l6E",s26);
b &= test_aux(t,lB8,"t-lB8",s46);
b &= test_aux(t,lC8,"t-lC8",s64);
b &= test_aux(t,l8C,"t-l8C",s46);
b &= test_aux(t,l1F,"t-l1F",s13);
b &= test_aux(t,lF6,"t-lF6",s31);
b &= test_aux(is_kernel_exact,t,lAB,"t-lAB",p2);
b &= test_aux(is_kernel_exact,t,lBC,"t-lBC",s46);
b &= test_aux(is_kernel_exact,t,l2E,"t-l2E",s26);
b &= test_aux(is_kernel_exact,t,lE2,"t-lE2",s62);
b &= test_aux(is_kernel_exact,t,l2A,"t-l2A",p2);
b &= test_aux(is_kernel_exact,t,l6E,"t-l6E",s26);
b &= test_aux(is_kernel_exact,t,lB8,"t-lB8",s46);
b &= test_aux(is_kernel_exact,t,lC8,"t-lC8",s64);
b &= test_aux(is_kernel_exact,t,l8C,"t-l8C",s46);
b &= test_aux(is_kernel_exact,t,l1F,"t-l1F",s13);
b &= test_aux(is_kernel_exact,t,lF6,"t-lF6",s31);
// Outside triangle plane
Line lab(pa,pb);
@ -584,11 +589,11 @@ bool test()
Line la8(pa,p8);
Line lb2(pb,p2);
b &= test_aux(t,lab,"t-lab",p1);
b &= test_aux(t,lac,"t-lac",p6);
b &= test_aux(t,lae,"t-lae",p8);
b &= test_aux(t,la8,"t-la8",p8);
b &= test_aux(t,lb2,"t-lb2",p2);
b &= test_aux(is_kernel_exact,t,lab,"t-lab",p1);
b &= test_aux(is_kernel_exact,t,lac,"t-lac",p6);
b &= test_aux(is_kernel_exact,t,lae,"t-lae",p8);
b &= test_aux(is_kernel_exact,t,la8,"t-la8",p8);
b &= test_aux(is_kernel_exact,t,lb2,"t-lb2",p2);
return b;
@ -606,22 +611,22 @@ int main()
// -----------------------------------
std::cout << "Test precomputed intersection results" << std::endl;
std::cout << "\tTesting with Simple_cartesian<float>..." << std::endl ;
bool b = test<Sc_f>();
bool b = test<Sc_f>(false);
std::cout << "\tTesting with Simple_cartesian<double>..." << std::endl ;
b &= test<Sc_d>();
b &= test<Sc_d>(false);
std::cout << "\tTesting with Cartesian<float>..." << std::endl ;
b &= test<C_f>();
b &= test<C_f>(false);
std::cout << "\tTesting with Cartesian<double>..." << std::endl ;
b &= test<C_d>();
b &= test<C_d>(false);
std::cout << "\tTesting with Exact_predicates_inexact_constructions_kernel..." << std::endl ;
b &= test<Epic>();
b &= test<Epic>(false);
std::cout << "\tTesting with Exact_predicates_exact_constructions_kernel..." << std::endl ;
b &= test<Epec>();
b &= test<Epec>(true);
//test with a coplanar segment
b &= CGAL::intersection(
Epec::Segment_3(Epec::Point_3(0.125, 0, -0.125),Epec::Point_3(0.25, 0, -0.125) ),