mirror of https://github.com/CGAL/cgal
remove clash between 2 templates
This commit is contained in:
parent
1c33adf670
commit
fbf351c8a6
|
|
@ -339,20 +339,6 @@ linear_least_squares_fitting_3(InputIterator first,
|
||||||
return CGAL::linear_least_squares_fitting_3(first,beyond,plane,centroid,K());
|
return CGAL::linear_least_squares_fitting_3(first,beyond,plane,centroid,K());
|
||||||
}
|
}
|
||||||
|
|
||||||
// does not return the centroid and deduces the kernel as well.
|
|
||||||
template < typename InputIterator,
|
|
||||||
typename Plane >
|
|
||||||
inline
|
|
||||||
typename Kernel_traits<Plane>::Kernel::FT
|
|
||||||
linear_least_squares_fitting_3(InputIterator first,
|
|
||||||
InputIterator beyond,
|
|
||||||
Plane& plane)
|
|
||||||
{
|
|
||||||
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,K());
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
// fit line
|
// fit line
|
||||||
|
|
||||||
|
|
@ -402,21 +388,23 @@ linear_least_squares_fitting_3(InputIterator first,
|
||||||
typedef typename Kernel_traits<Value_type>::Kernel K;
|
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,line,centroid,K());
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
// does not return the centroid and deduces the kernel as well.
|
// does not return the centroid and deduces the kernel as well.
|
||||||
template < typename InputIterator,
|
template < typename InputIterator,
|
||||||
typename Line >
|
typename Object >
|
||||||
inline
|
inline
|
||||||
typename Kernel_traits<Line>::Kernel::FT
|
typename Kernel_traits<Object>::Kernel::FT
|
||||||
linear_least_squares_fitting_3(InputIterator first,
|
linear_least_squares_fitting_3(InputIterator first,
|
||||||
InputIterator beyond,
|
InputIterator beyond,
|
||||||
Line& line)
|
Object& o)
|
||||||
{
|
{
|
||||||
typedef typename std::iterator_traits<InputIterator>::value_type Value_type;
|
typedef typename std::iterator_traits<InputIterator>::value_type Value_type;
|
||||||
typedef typename Kernel_traits<Value_type>::Kernel K;
|
typedef typename Kernel_traits<Value_type>::Kernel K;
|
||||||
return CGAL::linear_least_squares_fitting_3(first,beyond,line,K());
|
return CGAL::linear_least_squares_fitting_3(first,beyond,o,K());
|
||||||
}
|
}
|
||||||
*/
|
|
||||||
|
|
||||||
CGAL_END_NAMESPACE
|
CGAL_END_NAMESPACE
|
||||||
|
|
||||||
#endif // CGAL_LINEAR_LEAST_SQUARES_FITTING_3_H
|
#endif // CGAL_LINEAR_LEAST_SQUARES_FITTING_3_H
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue