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

update fitting plane

This commit is contained in:
Pierre Alliez 2006-02-28 09:40:57 +00:00
parent 65105814e0
commit 1e943748fc
2 changed files with 29 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Principal_component_analysis/include/CGAL/eigen.h
View File

@ -32,7 +32,7 @@ void eigen_symmetric(const FT *mat,
FT *eigen_values,
const int MAX_ITER = 100)
{
static const FT EPSILON = 0.00001;
static const FT EPSILON = (FT)0.00001;
// number of entries in mat
int nn = (n*(n+1))/2;
@ -108,9 +108,9 @@ void eigen_symmetric(const FT *mat,
FT x;
if(delta == 0.0)
x = - CGAL_PI/4 ;
x = (FT) - CGAL_PI / 4;
else
x = - atan( (a_lm+a_lm) / delta ) / 2.0;
x = (FT)(- atan( (a_lm+a_lm) / delta ) / 2.0);
FT sinx = sin(x);
FT cosx = cos(x);

74
Principal_component_analysis/include/CGAL/linear_least_squares_fitting_3.h
View File

@ -230,15 +230,15 @@ linear_least_squares_fitting_3(InputIterator first,
Vector e1 = Vector(triangle[0],triangle[1]);
Vector e2 = Vector(triangle[0],triangle[2]);
FT c1 = 2.0 * area * 10.0 / 72.0;
FT c2 = 2.0 * area * 7.0 / 72.0;
FT c1 = (FT)(2.0 * area * 10.0 / 72.0);
FT c2 = (FT)(2.0 * area * 7.0 / 72.0);
covariance[0] += c1*(e1[0]*e1[0] + e2[0]*e2[0]) + 2.0*c2*e1[0]*e2[0];
covariance[0] += c1*(e1[0]*e1[0] + e2[0]*e2[0]) + (FT)2.0*c2*e1[0]*e2[0];
covariance[1] += c1*(e1[1]*e1[0] + e2[1]*e2[0]) + c2*(e1[1]*e2[0] + e1[0]*e2[1]);
covariance[2] += c1*(e1[1]*e1[1] + e2[1]*e2[1]) + 2.0*c2*e1[1]*e2[1];
covariance[2] += c1*(e1[1]*e1[1] + e2[1]*e2[1]) + (FT)2.0*c2*e1[1]*e2[1];
covariance[3] += c1*(e1[2]*e1[0] + e2[2]*e2[0]) + c2*(e1[2]*e2[0] + e1[0]*e2[2]);
covariance[4] += c1*(e1[2]*e1[1] + e2[2]*e2[1]) + c2*(e1[2]*e2[1] + e1[1]*e2[2]);
covariance[5] += c1*(e1[2]*e1[2] + e2[2]*e2[2]) + 2.0*c2*e1[2]*e2[2];
covariance[5] += c1*(e1[2]*e1[2] + e2[2]*e2[2]) + (FT)2.0*c2*e1[2]*e2[2];
// add area(t) c(t) * transpose(c(t))
covariance[0] += area * c_t.x() * c_t.x();
@ -290,7 +290,6 @@ linear_least_squares_fitting_3(InputIterator first,
} // end namespace CGALi
// fit plane
template < typename InputIterator,
typename K >
@ -307,41 +306,6 @@ linear_least_squares_fitting_3(InputIterator first,
centroid, k, (Value_type*) NULL);
}
template < typename InputIterator,
typename K >
inline
typename K::FT
linear_least_squares_fitting_3(InputIterator first,
InputIterator beyond,
typename K::Plane_3& plane,
const K& k)
{
typedef typename std::iterator_traits<InputIterator>::value_type Value_type;
typename K::Point_3 centroid;
return CGALi::linear_least_squares_fitting_3(first, beyond, plane,
centroid, k,(Value_type*) NULL);
}
// deduces the kernel from the points in container.
template < typename InputIterator,
typename Plane,
typename Point>
inline
typename Kernel_traits<Plane>::Kernel::FT
linear_least_squares_fitting_3(InputIterator first,
InputIterator beyond,
Plane& plane,
Point& centroid)
{
typedef typename std::iterator_traits<InputIterator>::value_type Value_type;
typedef typename Kernel_traits<Value_type>::Kernel K;
return CGAL::linear_least_squares_fitting_3(first,beyond,plane,centroid,K());
}
/*
// fit line
template < typename InputIterator,
typename K >
inline
@ -357,6 +321,21 @@ linear_least_squares_fitting_3(InputIterator first,
centroid, k, (Value_type*) NULL);
}
template < typename InputIterator,
typename K >
inline
typename K::FT
linear_least_squares_fitting_3(InputIterator first,
InputIterator beyond,
typename K::Plane_3& plane,
const K& k)
{
typedef typename std::iterator_traits<InputIterator>::value_type Value_type;
typename K::Point_3 centroid;
return CGALi::linear_least_squares_fitting_3(first, beyond, plane,
centroid, k,(Value_type*) NULL);
}
template < typename InputIterator,
typename K >
inline
@ -375,20 +354,19 @@ linear_least_squares_fitting_3(InputIterator first,
// deduces the kernel from the points in container.
template < typename InputIterator,
typename Line,
typename Object,
typename Point>
inline
typename Kernel_traits<Line>::Kernel::FT
typename Kernel_traits<Object>::Kernel::FT
linear_least_squares_fitting_3(InputIterator first,
InputIterator beyond,
Line& line,
Object& object,
Point& centroid)
{
typedef typename std::iterator_traits<InputIterator>::value_type Value_type;
typedef typename Kernel_traits<Value_type>::Kernel K;
return CGAL::linear_least_squares_fitting_3(first,beyond,line,centroid,K());
return CGAL::linear_least_squares_fitting_3(first,beyond,object,centroid,K());
}
*/
// does not return the centroid and deduces the kernel as well.
template < typename InputIterator,
@ -397,11 +375,11 @@ inline
typename Kernel_traits<Object>::Kernel::FT
linear_least_squares_fitting_3(InputIterator first,
InputIterator beyond,
Object& o)
Object& object)
{
typedef typename std::iterator_traits<InputIterator>::value_type Value_type;
typedef typename Kernel_traits<Value_type>::Kernel K;
return CGAL::linear_least_squares_fitting_3(first,beyond,o,K());
return CGAL::linear_least_squares_fitting_3(first,beyond,object,K());
}