Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make SmartRange sum and avg compatible with Eigen vectors

Browse Source
This commit is contained in:
Max Lyon
2019-11-28 11:50:03 +01:00
parent 04e798920d
commit 8fa5f36d13
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/OpenMesh/Core/Mesh/SmartRange.hh
View File

@@ -78,13 +78,13 @@ struct SmartRangeT
* @param f Functor that is applied to all elements before computing the sum * @param f Functor that is applied to all elements before computing the sum
*/ */
template <typename Functor> template <typename Functor>
auto sum(Functor&& f) -> decltype (f(std::declval<HandleT>())+f(std::declval<HandleT>())) auto sum(Functor&& f) -> decltype (f(std::declval<HandleT>()))
{ {
auto range = static_cast<const RangeT*>(this); auto range = static_cast<const RangeT*>(this);
auto begin = range->begin(); auto begin = range->begin();
auto end = range->end(); auto end = range->end();
assert(begin != end); assert(begin != end);
decltype (f(*begin) + f(*begin)) sum = f(*begin); decltype (f(*begin)) sum = f(*begin);
auto it = begin; auto it = begin;
++it; ++it;
for (; it != end; ++it) for (; it != end; ++it)
@@ -99,13 +99,13 @@ struct SmartRangeT
* @param f Functor that is applied to all elements before computing the average. * @param f Functor that is applied to all elements before computing the average.
*/ */
template <typename Functor> template <typename Functor>
auto avg(Functor&& f) -> decltype (1.0 * (f(std::declval<HandleT>())+f(std::declval<HandleT>()))) auto avg(Functor&& f) -> decltype (f(std::declval<HandleT>()))
{ {
auto range = static_cast<const RangeT*>(this); auto range = static_cast<const RangeT*>(this);
auto begin = range->begin(); auto begin = range->begin();
auto end = range->end(); auto end = range->end();
assert(begin != end); assert(begin != end);
decltype (f(*begin) + f(*begin)) sum = f(*begin); decltype (f(*begin)) sum = f(*begin);
auto it = begin; auto it = begin;
++it; ++it;
int n_elements = 1; int n_elements = 1;