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

Prevent instantiation of centroid on non-iterator types

This commit is contained in:
Marc Glisse 2011-01-18 11:37:03 +00:00
parent f01ec07125
commit b44bb0322c
1 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Principal_component_analysis/include/CGAL/centroid.h
View File

@ -28,6 +28,9 @@
#include <CGAL/Origin.h>
#include <CGAL/Kernel/global_functions.h>
#include <CGAL/is_iterator.h>
#include <boost/utility.hpp>
#include <iterator>
#include <list>
@ -836,14 +839,18 @@ struct Dispatch_centroid_3
} // namespace internal
template < typename InputIterator, typename K>
typename internal::Dispatch_centroid_3<InputIterator,K,Dynamic_dimension_tag>::result_type
typename internal::Dispatch_centroid_3<
typename boost::enable_if<is_iterator<InputIterator>,InputIterator>::type,
K,Dynamic_dimension_tag>::result_type
centroid(InputIterator begin, InputIterator end, const K& k, Dynamic_dimension_tag tag)
{
return internal::Dispatch_centroid_3<InputIterator,K,Dynamic_dimension_tag>()(begin,end,k,tag);
}
template < typename InputIterator, typename K, int d >
typename internal::Dispatch_centroid_3<InputIterator,K,Dimension_tag<d> >::result_type
typename internal::Dispatch_centroid_3<
typename boost::enable_if<is_iterator<InputIterator>,InputIterator>::type,
K,Dimension_tag<d> >::result_type
centroid(InputIterator begin, InputIterator end, const K& k, Dimension_tag<d> tag)
{
return internal::Dispatch_centroid_3<InputIterator,K,Dimension_tag<d> >()(begin,end,k,tag);
@ -914,23 +921,34 @@ struct Dispatch_centroid <InputIterator, Dynamic_dimension_tag>
// The 3 argument overload calls the internal dispatcher.
template < typename InputIterator, typename Kernel_or_dim >
inline
typename internal::Dispatch_centroid<InputIterator, Kernel_or_dim>::result_type
typename internal::Dispatch_centroid<
typename boost::enable_if<is_iterator<InputIterator>,InputIterator>::type,
Kernel_or_dim>::result_type
centroid(InputIterator begin, InputIterator end, const Kernel_or_dim& k_or_d)
{
internal::Dispatch_centroid<InputIterator, Kernel_or_dim> dispatch_centroid;
return dispatch_centroid(begin, end, k_or_d);
}
namespace internal {
template<class It,bool=is_iterator<It>::value>
class Centroid_2args_return_type_helper{};
template<class It>
class Centroid_2args_return_type_helper<It,true>{
typedef typename std::iterator_traits<It>::value_type val;
typedef typename Kernel_traits<val>::Kernel K;
public:
typedef typename Access::Point<K,typename
Ambient_dimension<val,K>::type>::type type;
};
}
// this one takes an iterator range over kernel objects
// and uses Kernel_traits<> to find out its kernel, and Feature_dimension for the dimension tag.
template < typename InputIterator >
inline
typename Access::Point<typename Kernel_traits<typename std::iterator_traits<InputIterator>::value_type>::Kernel,
typename Ambient_dimension<
typename std::iterator_traits<InputIterator>::value_type,
typename Kernel_traits<typename std::iterator_traits<InputIterator>::value_type>::Kernel >::type
>::type
typename internal::Centroid_2args_return_type_helper<InputIterator>::type
centroid(InputIterator begin, InputIterator end)
{
typedef typename std::iterator_traits<InputIterator>::value_type Point;