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

Solve_2 now also handles vertical lines

This commit is contained in:
Michael Kerber 2008-10-28 09:13:03 +00:00
parent e70292c73a
commit cb2fe127ab
2 changed files with 44 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2.h
View File

@ -1280,18 +1280,35 @@ public:
std::pair<int, int> ipair;
for(i = 0; i < n; i++) {
cpv_line = cpa_2.status_line_at_event(i);
if(!cpv_line.is_intersection())
continue;
// store x-coord for future use
X_coordinate_1 x = cpv_line.x();
bool ca1_covers_line
= ca1.status_line_at_exact_x(x).covers_line();
bool ca2_covers_line
= ca2.status_line_at_exact_x(x).covers_line();
for(j = 0; j < cpv_line.number_of_events(); j++) {
ipair = cpv_line.curves_at_event(j,ca1,ca2);
if(ipair.first == -1 || ipair.second == -1)
if(ipair.first != -1 && ipair.second != -1) {
*roots++
= Xy_coordinate_2(x,
(first_curve ? ca1 : ca2),
(first_curve ? ipair.first
: ipair.second));
*mults++ = cpv_line.multiplicity_of_intersection(j);
continue;
// VOILA!! we've got it !!!
*roots++ = Xy_coordinate_2(x, (first_curve ? ca1 : ca2),
(first_curve ? ipair.first: ipair.second));
*mults++ = cpv_line.multiplicity_of_intersection(j);
}
if(ipair.first!=-1 && ca2_covers_line) {
*roots++
= Xy_coordinate_2(x,ca1,ipair.first);
*mults++ = -1;
continue;
}
if(ipair.second!=-1 && ca1_covers_line) {
*roots++
= Xy_coordinate_2(x,ca2,ipair.second);
*mults++ = -1;
continue;
}
}
}
return std::make_pair(roots, mults);

21
Algebraic_kernel_d/test/Algebraic_curve_kernel_2/include/CGAL/_test_algebraic_curve_kernel_2.h
View File

@ -45,12 +45,14 @@ static const char *ACK_2_ascii_polys[] = {
"P[7(1,P[7(1,-500)(3,300)(5,-60)(7,4)])(3,P[5(1,300)(3,-147)(5,12)])(5,P[3(1,-60)(3,12)])(7,P[1(1,4)])]", // (4*x)*y^7 + (12*x^3 + (-60)*x)*y^5 + (12*x^5 + (-147)*x^3 + 300*x)*y^3 + (4*x^7 + (-60)*x^5 + 300*x^3 + (-500)*x)*y // 9
"P[2(0,P[2(0,148)(1,20)(2,1)])(1,P[0(0,16)])(2,P[0(0,1)])]", // y^2 + 16*y + (x^2 + 20*x + 148) //10
"P[0(0,P[1(0,10)(1,1)])]", // x+10 // 11
};
static const int ACK_2_n_polys = 10;
static const int ACK_2_n_polys = 12;
template< class AlgebraicCurveKernel_2 >
void test_algebraic_curve_kernel_2() {
@ -334,6 +336,21 @@ void test_algebraic_curve_kernel_2() {
//std::cerr << "pt: " << *xyit << "; mult: " << *iit << "\n";
}
points.clear();
mults.clear();
Curve_analysis_2 c10 = kernel_2.construct_curve_2_object()(polys[10]),
c11 = kernel_2.construct_curve_2_object()(polys[11]);
kernel_2.solve_2_object()(c10, c11, std::back_inserter(points),
std::back_inserter(mults));
assert(points.size()==2);
points.clear();
mults.clear();
kernel_2.solve_2_object()(c11, c10, std::back_inserter(points),
std::back_inserter(mults));
assert(points.size()==2);
///////////// testing Swap_x_and_y /////////////
{
Curve_analysis_2 c7_c6 =