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

Fall back to LU instead of LDLT with old Eigen

This commit is contained in:
Marc Glisse 2020-08-27 15:39:08 +02:00
parent 334f8ae105
commit 53ed991b5d
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
NewKernel_d/include/CGAL/NewKernel_d/Types/Weighted_point.h
View File

@ -236,13 +236,24 @@ template <class R_> struct Power_center : Store_kernel<R_> {
}
// Only need to fill the lower half
for(int i = 0; i < k-1; ++i){
for(int j = i; j < k-1; ++j)
for(int j = i; j < k-1; ++j){
m(j, i) = sp(vecs[i], vecs[j]);
#if ! EIGEN_VERSION_AT_LEAST(3, 3, 5)
m(i, j) = m(j, i);
#endif
}
b[i] += m(i, i);
b[i] /= 2;
}
// Assumes Eigen...
#if EIGEN_VERSION_AT_LEAST(3, 3, 5)
Vec res = m.ldlt().solve(b);
#else
// Older versions of Eigen use 1/highest as tolerance,
// which we have no way to set to 0 for exact types.
// Use something slow but that should work.
Vec res = m.fullPivLu().solve(b);
#endif
Vector to_center = sv(vecs[0], res[0]);
for(int i=1;i<k-1;++i)
to_center = pv(to_center, sv(vecs[i],res[i]));

13
NewKernel_d/include/CGAL/NewKernel_d/function_objects_cartesian.h
View File

@ -693,12 +693,23 @@ template <class R_> struct Construct_circumcenter : Store_kernel<R_> {
vecs.emplace_back(dp(*f,p0));
// Only need to fill the lower half
for(int i=0;i<k-1;++i){
for(int j=i;j<k-1;++j)
for(int j=i;j<k-1;++j) {
m(j,i)=sp(vecs[i],vecs[j]);
#if ! EIGEN_VERSION_AT_LEAST(3, 3, 5)
m(i,j)=m(j,i);
#endif
}
b[i]=m(i,i)/2;
}
// Assumes Eigen...
#if EIGEN_VERSION_AT_LEAST(3, 3, 5)
Vec res=m.ldlt().solve(b);
#else
// Older versions of Eigen use 1/highest as tolerance,
// which we have no way to set to 0 for exact types.
// Use something slow but that should work.
Vec res=m.fullPivLu().solve(b);
#endif
Point center=p0;
// Wasteful if we only want the radius
for(int i=0;i<k-1;++i)