From d63a2151f426a844f05cefcd14ea326f7acfc31d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Oberhuber?= <oberhuber.tomas@gmail.com>
Date: Sun, 30 Jun 2019 22:09:25 +0200
Subject: [PATCH] Fixed sum of bool vectors.
---
.../Expressions/ExpressionTemplates.h | 56 ++++---
src/TNL/Containers/VectorExpressions.h | 97 ++++++------
src/TNL/Containers/VectorViewExpressions.h | 41 +++--
src/UnitTests/Containers/VectorTest-6.h | 140 ++++++++++++++++++
4 files changed, 252 insertions(+), 82 deletions(-)
diff --git a/src/TNL/Containers/Expressions/ExpressionTemplates.h b/src/TNL/Containers/Expressions/ExpressionTemplates.h
index dab52995a8..659e4c69c1 100644
--- a/src/TNL/Containers/Expressions/ExpressionTemplates.h
+++ b/src/TNL/Containers/Expressions/ExpressionTemplates.h
@@ -1937,8 +1937,9 @@ exp( const Containers::Expressions::UnaryExpressionTemplate< L1, LOperation >& a
template< typename L1,
typename L2,
template< typename, typename > class LOperation >
-typename Containers::Expressions::BinaryExpressionTemplate< L1, L2, LOperation >::RealType
-min( const Containers::Expressions::BinaryExpressionTemplate< L1, L2, LOperation >& a )
+//typename Containers::Expressions::BinaryExpressionTemplate< L1, L2, LOperation >::RealType
+auto
+min( const Containers::Expressions::BinaryExpressionTemplate< L1, L2, LOperation >& a ) -> decltype( ExpressionMin( a ) )
{
return ExpressionMin( a );
}
@@ -1946,8 +1947,9 @@ min( const Containers::Expressions::BinaryExpressionTemplate< L1, L2, LOperation
template< typename L1,
template< typename > class LOperation,
typename Parameter >
-typename Containers::Expressions::UnaryExpressionTemplate< L1, LOperation, Parameter >::RealType
-min( const Containers::Expressions::UnaryExpressionTemplate< L1, LOperation, Parameter >& a )
+//typename Containers::Expressions::UnaryExpressionTemplate< L1, LOperation, Parameter >::RealType
+auto
+min( const Containers::Expressions::UnaryExpressionTemplate< L1, LOperation, Parameter >& a ) -> decltype( ExpressionMin( a ) )
{
return ExpressionMin( a );
}
@@ -1955,7 +1957,8 @@ min( const Containers::Expressions::UnaryExpressionTemplate< L1, LOperation, Par
template< typename L1,
typename L2,
template< typename, typename > class LOperation >
-typename Containers::Expressions::BinaryExpressionTemplate< L1, L2, LOperation >::RealType
+//typename Containers::Expressions::BinaryExpressionTemplate< L1, L2, LOperation >::RealType
+auto
max( const Containers::Expressions::BinaryExpressionTemplate< L1, L2, LOperation >& a )
{
return ExpressionMax( a );
@@ -1964,7 +1967,8 @@ max( const Containers::Expressions::BinaryExpressionTemplate< L1, L2, LOperation
template< typename L1,
template< typename > class LOperation,
typename Parameter >
-typename Containers::Expressions::UnaryExpressionTemplate< L1, LOperation, Parameter >::RealType
+//typename Containers::Expressions::UnaryExpressionTemplate< L1, LOperation, Parameter >::RealType
+auto
max( const Containers::Expressions::UnaryExpressionTemplate< L1, LOperation, Parameter >& a )
{
return ExpressionMax( a );
@@ -1973,8 +1977,9 @@ max( const Containers::Expressions::UnaryExpressionTemplate< L1, LOperation, Par
template< typename L1,
typename L2,
template< typename, typename > class LOperation >
-typename Containers::Expressions::BinaryExpressionTemplate< L1, L2, LOperation >::RealType
-sum( const Containers::Expressions::BinaryExpressionTemplate< L1, L2, LOperation >& a )
+//typename Containers::Expressions::BinaryExpressionTemplate< L1, L2, LOperation >::RealType
+auto
+sum( const Containers::Expressions::BinaryExpressionTemplate< L1, L2, LOperation >& a ) -> decltype( ExpressionSum( a ) )
{
return ExpressionSum( a );
}
@@ -1982,8 +1987,9 @@ sum( const Containers::Expressions::BinaryExpressionTemplate< L1, L2, LOperation
template< typename L1,
template< typename > class LOperation,
typename Parameter >
-typename Containers::Expressions::UnaryExpressionTemplate< L1, LOperation, Parameter >::RealType
-sum( const Containers::Expressions::UnaryExpressionTemplate< L1, LOperation, Parameter >& a )
+//typename Containers::Expressions::UnaryExpressionTemplate< L1, LOperation, Parameter >::RealType
+auto
+sum( const Containers::Expressions::UnaryExpressionTemplate< L1, LOperation, Parameter >& a ) -> decltype( ExpressionSum( a ) )
{
return ExpressionSum( a );
}
@@ -1992,8 +1998,9 @@ template< typename L1,
typename L2,
template< typename, typename > class LOperation,
typename Real >
-typename Containers::Expressions::BinaryExpressionTemplate< L1, L2, LOperation >::RealType
-lpNorm( const Containers::Expressions::BinaryExpressionTemplate< L1, L2, LOperation >& a, const Real& p )
+//typename Containers::Expressions::BinaryExpressionTemplate< L1, L2, LOperation >::RealType
+auto
+lpNorm( const Containers::Expressions::BinaryExpressionTemplate< L1, L2, LOperation >& a, const Real& p ) -> decltype( ExpressionLpNorm( a, p ) )
{
return ExpressionLpNorm( a, p );
}
@@ -2002,8 +2009,9 @@ template< typename L1,
template< typename > class LOperation,
typename Parameter,
typename Real >
-typename Containers::Expressions::UnaryExpressionTemplate< L1, LOperation, Parameter >::RealType
-lpNorm( const Containers::Expressions::UnaryExpressionTemplate< L1, LOperation, Parameter >& a, const Real& p )
+//typename Containers::Expressions::UnaryExpressionTemplate< L1, LOperation, Parameter >::RealType
+auto
+lpNorm( const Containers::Expressions::UnaryExpressionTemplate< L1, LOperation, Parameter >& a, const Real& p ) -> decltype( ExpressionLpNorm( a, p ) )
{
return ExpressionLpNorm( a, p );
}
@@ -2011,8 +2019,9 @@ lpNorm( const Containers::Expressions::UnaryExpressionTemplate< L1, LOperation,
template< typename L1,
typename L2,
template< typename, typename > class LOperation >
-typename Containers::Expressions::BinaryExpressionTemplate< L1, L2, LOperation >::RealType
-product( const Containers::Expressions::BinaryExpressionTemplate< L1, L2, LOperation >& a )
+//typename Containers::Expressions::BinaryExpressionTemplate< L1, L2, LOperation >::RealType
+auto
+product( const Containers::Expressions::BinaryExpressionTemplate< L1, L2, LOperation >& a ) -> decltype( ExpressionProduct( a ) )
{
return ExpressionProduct( a );
}
@@ -2020,8 +2029,9 @@ product( const Containers::Expressions::BinaryExpressionTemplate< L1, L2, LOpera
template< typename L1,
template< typename > class LOperation,
typename Parameter >
-typename Containers::Expressions::UnaryExpressionTemplate< L1, LOperation, Parameter >::RealType
-product( const Containers::Expressions::UnaryExpressionTemplate< L1, LOperation, Parameter >& a )
+//typename Containers::Expressions::UnaryExpressionTemplate< L1, LOperation, Parameter >::RealType
+auto
+product( const Containers::Expressions::UnaryExpressionTemplate< L1, LOperation, Parameter >& a ) -> decltype( ExpressionProduct( a ) )
{
return ExpressionProduct( a );
}
@@ -2047,8 +2057,9 @@ logicalAnd( const Containers::Expressions::UnaryExpressionTemplate< L1, LOperati
template< typename L1,
typename L2,
template< typename, typename > class LOperation >
-typename Containers::Expressions::BinaryExpressionTemplate< L1, L2, LOperation >::RealType
-binaryOr( const Containers::Expressions::BinaryExpressionTemplate< L1, L2, LOperation >& a )
+//typename Containers::Expressions::BinaryExpressionTemplate< L1, L2, LOperation >::RealType
+auto
+binaryOr( const Containers::Expressions::BinaryExpressionTemplate< L1, L2, LOperation >& a ) -> decltype( ExpressionBinaryOr( a ) )
{
return ExpressionBinaryOr( a );
}
@@ -2056,8 +2067,9 @@ binaryOr( const Containers::Expressions::BinaryExpressionTemplate< L1, L2, LOper
template< typename L1,
template< typename > class LOperation,
typename Parameter >
-typename Containers::Expressions::UnaryExpressionTemplate< L1, LOperation, Parameter >::RealType
-binaryAnd( const Containers::Expressions::UnaryExpressionTemplate< L1, LOperation, Parameter >& a )
+//typename Containers::Expressions::UnaryExpressionTemplate< L1, LOperation, Parameter >::RealType
+auto
+binaryAnd( const Containers::Expressions::UnaryExpressionTemplate< L1, LOperation, Parameter >& a ) -> decltype( ExpressionBinaryAnd( a ) )
{
return ExpressionBinaryAnd( a );
}
diff --git a/src/TNL/Containers/VectorExpressions.h b/src/TNL/Containers/VectorExpressions.h
index 379515d13f..ca8f8cd713 100644
--- a/src/TNL/Containers/VectorExpressions.h
+++ b/src/TNL/Containers/VectorExpressions.h
@@ -67,7 +67,7 @@ const Containers::Expressions::BinaryExpressionTemplate< Containers::VectorView<
operator-( const Containers::Vector< Real, Device, Index >& a, const ET& b )
{
using ConstView = typename Containers::Vector< Real, Device, Index >::ConstViewType;
- return Containers::Expressions::BinaryExpressionTemplate< Containers::VectorView< Real, Device, Index >, ET, Containers::Expressions::Subtraction >( a.getView(), b );
+ return Containers::Expressions::BinaryExpressionTemplate< ConstView, ET, Containers::Expressions::Subtraction >( a.getView(), b );
}
template< typename ET, typename Real, typename Device, typename Index >
@@ -75,7 +75,7 @@ const Containers::Expressions::BinaryExpressionTemplate< ET, Containers::VectorV
operator-( const ET& a, const Containers::Vector< Real, Device, Index >& b )
{
using ConstView = typename Containers::Vector< Real, Device, Index >::ConstViewType;
- return Containers::Expressions::BinaryExpressionTemplate< ET, Containers::VectorView< Real, Device, Index >, Containers::Expressions::Subtraction >( a, b.getView() );
+ return Containers::Expressions::BinaryExpressionTemplate< ET, ConstView, Containers::Expressions::Subtraction >( a, b.getView() );
}
template< typename Real1, typename Real2, typename Device, typename Index >
@@ -97,7 +97,7 @@ const Containers::Expressions::BinaryExpressionTemplate< Containers::VectorView<
operator*( const Containers::Vector< Real, Device, Index >& a, const ET& b )
{
using ConstView = typename Containers::Vector< Real, Device, Index >::ConstViewType;
- return Containers::Expressions::BinaryExpressionTemplate< Containers::VectorView< Real, Device, Index >, ET, Containers::Expressions::Multiplication >( a.getView(), b );
+ return Containers::Expressions::BinaryExpressionTemplate< ConstView, ET, Containers::Expressions::Multiplication >( a.getView(), b );
}
template< typename ET, typename Real, typename Device, typename Index >
@@ -105,7 +105,7 @@ const Containers::Expressions::BinaryExpressionTemplate< ET, Containers::VectorV
operator*( const ET& a, const Containers::Vector< Real, Device, Index >& b )
{
using ConstView = typename Containers::Vector< Real, Device, Index >::ConstViewType;
- return Containers::Expressions::BinaryExpressionTemplate< ET, Containers::VectorView< Real, Device, Index >, Containers::Expressions::Multiplication >( a, b.getView() );
+ return Containers::Expressions::BinaryExpressionTemplate< ET, ConstView, Containers::Expressions::Multiplication >( a, b.getView() );
}
template< typename Real1, typename Real2, typename Device, typename Index >
@@ -114,7 +114,7 @@ operator*( const Containers::Vector< Real1, Device, Index >& a, const Containers
{
using ConstView1 = typename Containers::Vector< Real1, Device, Index >::ConstViewType;
using ConstView2 = typename Containers::Vector< Real2, Device, Index >::ConstViewType;
- return Containers::Expressions::BinaryExpressionTemplate< Containers::VectorView< Real1, Device, Index >, Containers::VectorView< Real2, Device, Index >, Containers::Expressions::Multiplication >( a.getView(), b.getView() );
+ return Containers::Expressions::BinaryExpressionTemplate< ConstView1, ConstView2, Containers::Expressions::Multiplication >( a.getView(), b.getView() );
}
////
@@ -124,7 +124,7 @@ const Containers::Expressions::BinaryExpressionTemplate< Containers::VectorView<
operator/( const Containers::Vector< Real, Device, Index >& a, const ET& b )
{
using ConstView = typename Containers::Vector< Real, Device, Index >::ConstViewType;
- return Containers::Expressions::BinaryExpressionTemplate< Containers::VectorView< Real, Device, Index >, ET, Containers::Expressions::Division >( a.getView(), b );
+ return Containers::Expressions::BinaryExpressionTemplate< ConstView, ET, Containers::Expressions::Division >( a.getView(), b );
}
template< typename ET, typename Real, typename Device, typename Index >
@@ -132,7 +132,7 @@ const Containers::Expressions::BinaryExpressionTemplate< ET, Containers::VectorV
operator/( const ET& a, const Containers::Vector< Real, Device, Index >& b )
{
using ConstView = typename Containers::Vector< Real, Device, Index >::ConstViewType;
- return Containers::Expressions::BinaryExpressionTemplate< ET, Containers::VectorView< Real, Device, Index >, Containers::Expressions::Division >( a, b.getView() );
+ return Containers::Expressions::BinaryExpressionTemplate< ET, ConstView, Containers::Expressions::Division >( a, b.getView() );
}
template< typename Real1, typename Real2, typename Device, typename Index >
@@ -141,7 +141,7 @@ operator/( const Containers::Vector< Real1, Device, Index >& a, const Containers
{
using ConstView1 = typename Containers::Vector< Real1, Device, Index >::ConstViewType;
using ConstView2 = typename Containers::Vector< Real2, Device, Index >::ConstViewType;
- return Containers::Expressions::BinaryExpressionTemplate< Containers::VectorView< Real1, Device, Index >, Containers::VectorView< Real2, Device, Index >, Containers::Expressions::Division >( a.getView(), b.getView() );
+ return Containers::Expressions::BinaryExpressionTemplate< ConstView1, ConstView2, Containers::Expressions::Division >( a.getView(), b.getView() );
}
////
@@ -151,7 +151,7 @@ const Containers::Expressions::BinaryExpressionTemplate< Containers::VectorView<
min( const Containers::Vector< Real, Device, Index >& a, const ET& b )
{
using ConstView = typename Containers::Vector< Real, Device, Index >::ConstViewType;
- return Containers::Expressions::BinaryExpressionTemplate< Containers::VectorView< Real, Device, Index >, ET, Containers::Expressions::Min >( a.getView(), b );
+ return Containers::Expressions::BinaryExpressionTemplate< ConstView, ET, Containers::Expressions::Min >( a.getView(), b );
}
template< typename ET, typename Real, typename Device, typename Index >
@@ -159,7 +159,7 @@ const Containers::Expressions::BinaryExpressionTemplate< ET, Containers::VectorV
min( const ET& a, const Containers::Vector< Real, Device, Index >& b )
{
using ConstView = typename Containers::Vector< Real, Device, Index >::ConstViewType;
- return Containers::Expressions::BinaryExpressionTemplate< ET, Containers::VectorView< Real, Device, Index >, Containers::Expressions::Min >( a, b.getView() );
+ return Containers::Expressions::BinaryExpressionTemplate< ET, ConstView, Containers::Expressions::Min >( a, b.getView() );
}
template< typename Real1, typename Real2, typename Device, typename Index >
@@ -168,7 +168,7 @@ min( const Containers::Vector< Real1, Device, Index >& a, const Containers::Vect
{
using ConstView1 = typename Containers::Vector< Real1, Device, Index >::ConstViewType;
using ConstView2 = typename Containers::Vector< Real2, Device, Index >::ConstViewType;
- return Containers::Expressions::BinaryExpressionTemplate< Containers::VectorView< Real1, Device, Index >, Containers::VectorView< Real2, Device, Index >, Containers::Expressions::Min >( a.getView(), b.getView() );
+ return Containers::Expressions::BinaryExpressionTemplate< ConstView1, ConstView2, Containers::Expressions::Min >( a.getView(), b.getView() );
}
////
@@ -178,7 +178,7 @@ const Containers::Expressions::BinaryExpressionTemplate< Containers::VectorView<
max( const Containers::Vector< Real, Device, Index >& a, const ET& b )
{
using ConstView = typename Containers::Vector< Real, Device, Index >::ConstViewType;
- return Containers::Expressions::BinaryExpressionTemplate< Containers::VectorView< Real, Device, Index >, ET, Containers::Expressions::Max >( a.getView(), b );
+ return Containers::Expressions::BinaryExpressionTemplate< ConstView, ET, Containers::Expressions::Max >( a.getView(), b );
}
template< typename ET, typename Real, typename Device, typename Index >
@@ -186,7 +186,7 @@ const Containers::Expressions::BinaryExpressionTemplate< ET, Containers::VectorV
max( const ET& a, const Containers::Vector< Real, Device, Index >& b )
{
using ConstView = typename Containers::Vector< Real, Device, Index >::ConstViewType;
- return Containers::Expressions::BinaryExpressionTemplate< ET, Containers::VectorView< Real, Device, Index >, Containers::Expressions::Max >( a, b.getView() );
+ return Containers::Expressions::BinaryExpressionTemplate< ET, ConstView, Containers::Expressions::Max >( a, b.getView() );
}
template< typename Real1, typename Real2, typename Device, typename Index >
@@ -195,7 +195,7 @@ max( const Containers::Vector< Real1, Device, Index >& a, const Containers::Vect
{
using ConstView1 = typename Containers::Vector< Real1, Device, Index >::ConstViewType;
using ConstView2 = typename Containers::Vector< Real2, Device, Index >::ConstViewType;
- return Containers::Expressions::BinaryExpressionTemplate< Containers::VectorView< Real1, Device, Index >, Containers::VectorView< Real2, Device, Index >, Containers::Expressions::Max >( a.getView(), b.getView() );
+ return Containers::Expressions::BinaryExpressionTemplate< ConstView1, ConstView2, Containers::Expressions::Max >( a.getView(), b.getView() );
}
////
@@ -339,7 +339,7 @@ const Containers::Expressions::UnaryExpressionTemplate< Containers::VectorView<
operator-( const Containers::Vector< Real, Device, Index >& a )
{
using ConstView = typename Containers::Vector< Real, Device, Index >::ConstViewType;
- return Containers::Expressions::UnaryExpressionTemplate< Containers::VectorView< Real, Device, Index >, Containers::Expressions::Minus >( a.getView() );
+ return Containers::Expressions::UnaryExpressionTemplate< ConstView, Containers::Expressions::Minus >( a.getView() );
}
////
@@ -349,7 +349,7 @@ const Containers::Expressions::UnaryExpressionTemplate< Containers::VectorView<
abs( const Containers::Vector< Real, Device, Index >& a )
{
using ConstView = typename Containers::Vector< Real, Device, Index >::ConstViewType;
- return Containers::Expressions::UnaryExpressionTemplate< Containers::VectorView< Real, Device, Index >, Containers::Expressions::Abs >( a.getView() );
+ return Containers::Expressions::UnaryExpressionTemplate< ConstView, Containers::Expressions::Abs >( a.getView() );
}
////
@@ -359,7 +359,7 @@ const Containers::Expressions::UnaryExpressionTemplate< Containers::VectorView<
sin( const Containers::Vector< Real, Device, Index >& a )
{
using ConstView = typename Containers::Vector< Real, Device, Index >::ConstViewType;
- return Containers::Expressions::UnaryExpressionTemplate< Containers::VectorView< Real, Device, Index >, Containers::Expressions::Sin >( a.getView() );
+ return Containers::Expressions::UnaryExpressionTemplate< ConstView, Containers::Expressions::Sin >( a.getView() );
}
////
@@ -369,7 +369,7 @@ const Containers::Expressions::UnaryExpressionTemplate< Containers::VectorView<
cos( const Containers::Vector< Real, Device, Index >& a )
{
using ConstView = typename Containers::Vector< Real, Device, Index >::ConstViewType;
- return Containers::Expressions::UnaryExpressionTemplate< Containers::VectorView< Real, Device, Index >, Containers::Expressions::Cos >( a.getView() );
+ return Containers::Expressions::UnaryExpressionTemplate< ConstView, Containers::Expressions::Cos >( a.getView() );
}
////
@@ -379,7 +379,7 @@ const Containers::Expressions::UnaryExpressionTemplate< Containers::VectorView<
tan( const Containers::Vector< Real, Device, Index >& a )
{
using ConstView = typename Containers::Vector< Real, Device, Index >::ConstViewType;
- return Containers::Expressions::UnaryExpressionTemplate< Containers::VectorView< Real, Device, Index >, Containers::Expressions::Tan >( a.getView() );
+ return Containers::Expressions::UnaryExpressionTemplate< ConstView, Containers::Expressions::Tan >( a.getView() );
}
////
@@ -389,7 +389,7 @@ const Containers::Expressions::UnaryExpressionTemplate< Containers::VectorView<
sqrt( const Containers::Vector< Real, Device, Index >& a )
{
using ConstView = typename Containers::Vector< Real, Device, Index >::ConstViewType;
- return Containers::Expressions::UnaryExpressionTemplate< Containers::VectorView< Real, Device, Index >, Containers::Expressions::Sqrt >( a.getView() );
+ return Containers::Expressions::UnaryExpressionTemplate< ConstView, Containers::Expressions::Sqrt >( a.getView() );
}
////
@@ -399,7 +399,7 @@ const Containers::Expressions::UnaryExpressionTemplate< Containers::VectorView<
cbrt( const Containers::Vector< Real, Device, Index >& a )
{
using ConstView = typename Containers::Vector< Real, Device, Index >::ConstViewType;
- return Containers::Expressions::UnaryExpressionTemplate< Containers::VectorView< Real, Device, Index >, Containers::Expressions::Cbrt >( a.getView() );
+ return Containers::Expressions::UnaryExpressionTemplate< ConstView, Containers::Expressions::Cbrt >( a.getView() );
}
////
@@ -409,7 +409,7 @@ const Containers::Expressions::UnaryExpressionTemplate< Containers::VectorView<
pow( const Containers::Vector< Real, Device, Index >& a, const ExpType& exp )
{
using ConstView = typename Containers::Vector< Real, Device, Index >::ConstViewType;
- return Containers::Expressions::UnaryExpressionTemplate< Containers::VectorView< Real, Device, Index >, Containers::Expressions::Pow, ExpType >( a.getView(), exp );
+ return Containers::Expressions::UnaryExpressionTemplate< ConstView, Containers::Expressions::Pow, ExpType >( a.getView(), exp );
}
////
@@ -419,7 +419,7 @@ const Containers::Expressions::UnaryExpressionTemplate< Containers::VectorView<
floor( const Containers::Vector< Real, Device, Index >& a )
{
using ConstView = typename Containers::Vector< Real, Device, Index >::ConstViewType;
- return Containers::Expressions::UnaryExpressionTemplate< Containers::VectorView< Real, Device, Index >, Containers::Expressions::Floor >( a.getView() );
+ return Containers::Expressions::UnaryExpressionTemplate< ConstView, Containers::Expressions::Floor >( a.getView() );
}
////
@@ -429,7 +429,7 @@ const Containers::Expressions::UnaryExpressionTemplate< Containers::VectorView<
ceil( const Containers::Vector< Real, Device, Index >& a )
{
using ConstView = typename Containers::Vector< Real, Device, Index >::ConstViewType;
- return Containers::Expressions::UnaryExpressionTemplate< Containers::VectorView< Real, Device, Index >, Containers::Expressions::Ceil >( a.getView() );
+ return Containers::Expressions::UnaryExpressionTemplate< ConstView, Containers::Expressions::Ceil >( a.getView() );
}
////
@@ -439,7 +439,7 @@ const Containers::Expressions::UnaryExpressionTemplate< Containers::VectorView<
acos( const Containers::Vector< Real, Device, Index >& a )
{
using ConstView = typename Containers::Vector< Real, Device, Index >::ConstViewType;
- return Containers::Expressions::UnaryExpressionTemplate< Containers::VectorView< Real, Device, Index >, Containers::Expressions::Acos >( a.getView() );
+ return Containers::Expressions::UnaryExpressionTemplate< ConstView, Containers::Expressions::Acos >( a.getView() );
}
////
@@ -449,7 +449,7 @@ const Containers::Expressions::UnaryExpressionTemplate< Containers::VectorView<
asin( const Containers::Vector< Real, Device, Index >& a )
{
using ConstView = typename Containers::Vector< Real, Device, Index >::ConstViewType;
- return Containers::Expressions::UnaryExpressionTemplate< Containers::VectorView< Real, Device, Index >, Containers::Expressions::Asin >( a.getView() );
+ return Containers::Expressions::UnaryExpressionTemplate< ConstView, Containers::Expressions::Asin >( a.getView() );
}
////
@@ -459,7 +459,7 @@ const Containers::Expressions::UnaryExpressionTemplate< Containers::VectorView<
atan( const Containers::Vector< Real, Device, Index >& a )
{
using ConstView = typename Containers::Vector< Real, Device, Index >::ConstViewType;
- return Containers::Expressions::UnaryExpressionTemplate< Containers::VectorView< Real, Device, Index >, Containers::Expressions::Atan >( a.getView() );
+ return Containers::Expressions::UnaryExpressionTemplate< ConstView, Containers::Expressions::Atan >( a.getView() );
}
////
@@ -469,7 +469,7 @@ const Containers::Expressions::UnaryExpressionTemplate< Containers::VectorView<
cosh( const Containers::Vector< Real, Device, Index >& a )
{
using ConstView = typename Containers::Vector< Real, Device, Index >::ConstViewType;
- return Containers::Expressions::UnaryExpressionTemplate< Containers::VectorView< Real, Device, Index >, Containers::Expressions::Cosh >( a.getView() );
+ return Containers::Expressions::UnaryExpressionTemplate< ConstView, Containers::Expressions::Cosh >( a.getView() );
}
////
@@ -479,7 +479,7 @@ const Containers::Expressions::UnaryExpressionTemplate< Containers::VectorView<
tanh( const Containers::Vector< Real, Device, Index >& a )
{
using ConstView = typename Containers::Vector< Real, Device, Index >::ConstViewType;
- return Containers::Expressions::UnaryExpressionTemplate< Containers::VectorView< Real, Device, Index >, Containers::Expressions::Tanh >( a.getView() );
+ return Containers::Expressions::UnaryExpressionTemplate< ConstView, Containers::Expressions::Tanh >( a.getView() );
}
////
@@ -489,7 +489,7 @@ const Containers::Expressions::UnaryExpressionTemplate< Containers::VectorView<
log( const Containers::Vector< Real, Device, Index >& a )
{
using ConstView = typename Containers::Vector< Real, Device, Index >::ConstViewType;
- return Containers::Expressions::UnaryExpressionTemplate< Containers::VectorView< Real, Device, Index >, Containers::Expressions::Log >( a.getView() );
+ return Containers::Expressions::UnaryExpressionTemplate< ConstView, Containers::Expressions::Log >( a.getView() );
}
////
@@ -499,7 +499,7 @@ const Containers::Expressions::UnaryExpressionTemplate< Containers::VectorView<
log10( const Containers::Vector< Real, Device, Index >& a )
{
using ConstView = typename Containers::Vector< Real, Device, Index >::ConstViewType;
- return Containers::Expressions::UnaryExpressionTemplate< Containers::VectorView< Real, Device, Index >, Containers::Expressions::Log10 >( a.getView() );
+ return Containers::Expressions::UnaryExpressionTemplate< ConstView, Containers::Expressions::Log10 >( a.getView() );
}
////
@@ -509,7 +509,7 @@ const Containers::Expressions::UnaryExpressionTemplate< Containers::VectorView<
log2( const Containers::Vector< Real, Device, Index >& a )
{
using ConstView = typename Containers::Vector< Real, Device, Index >::ConstViewType;
- return Containers::Expressions::UnaryExpressionTemplate< Containers::VectorView< Real, Device, Index >, Containers::Expressions::Log2 >( a.getView() );
+ return Containers::Expressions::UnaryExpressionTemplate< ConstView, Containers::Expressions::Log2 >( a.getView() );
}
////
@@ -519,7 +519,7 @@ const Containers::Expressions::UnaryExpressionTemplate< Containers::VectorView<
exp( const Containers::Vector< Real, Device, Index >& a )
{
using ConstView = typename Containers::Vector< Real, Device, Index >::ConstViewType;
- return Containers::Expressions::UnaryExpressionTemplate< Containers::VectorView< Real, Device, Index >, Containers::Expressions::Exp >( a.getView() );
+ return Containers::Expressions::UnaryExpressionTemplate< ConstView, Containers::Expressions::Exp >( a.getView() );
}
////
@@ -529,7 +529,7 @@ const Containers::Expressions::UnaryExpressionTemplate< Containers::VectorView<
sign( const Containers::Vector< Real, Device, Index >& a )
{
using ConstView = typename Containers::Vector< Real, Device, Index >::ConstViewType;
- return Containers::Expressions::UnaryExpressionTemplate< Containers::VectorView< Real, Device, Index >, Containers::Expressions::Sign >( a.getView() );
+ return Containers::Expressions::UnaryExpressionTemplate< ConstView, Containers::Expressions::Sign >( a.getView() );
}
////
@@ -573,8 +573,9 @@ argMax( const Containers::Vector< Real, Device, Index >& a, Index& arg )
template< typename Real,
typename Device,
typename Index >
-typename Containers::VectorView< Real, Device, Index >::RealType
-sum( const Containers::Vector< Real, Device, Index >& a )
+//typename Containers::VectorView< Real, Device, Index >::RealType
+auto
+sum( const Containers::Vector< Real, Device, Index >& a ) -> decltype( Containers::Expressions::ExpressionSum( a.getView() ) )
{
return Containers::Expressions::ExpressionSum( a.getView() );
}
@@ -583,8 +584,9 @@ template< typename Real,
typename Device,
typename Index,
typename Real2 >
-typename Containers::VectorView< Real, Device, Index >::RealType
-lpNorm( const Containers::Vector< Real, Device, Index >& a, const Real2& p )
+//typename Containers::VectorView< Real, Device, Index >::RealType
+auto
+lpNorm( const Containers::Vector< Real, Device, Index >& a, const Real2& p ) -> decltype( Containers::Expressions::ExpressionLpNorm( a.getView(), p ) )
{
return Containers::Expressions::ExpressionLpNorm( a.getView(), p );
}
@@ -592,8 +594,9 @@ lpNorm( const Containers::Vector< Real, Device, Index >& a, const Real2& p )
template< typename Real,
typename Device,
typename Index >
-typename Containers::VectorView< Real, Device, Index >::RealType
-product( const Containers::Vector< Real, Device, Index >& a )
+//typename Containers::VectorView< Real, Device, Index >::RealType
+auto
+product( const Containers::Vector< Real, Device, Index >& a ) -> decltype( Containers::Expressions::ExpressionProduct( a.getView() ) )
{
return Containers::Expressions::ExpressionProduct( a.getView() );
}
@@ -610,8 +613,9 @@ logicalOr( const Containers::Vector< Real, Device, Index >& a )
template< typename Real,
typename Device,
typename Index >
-typename Containers::VectorView< Real, Device, Index >::RealType
-binaryOr( const Containers::Vector< Real, Device, Index >& a )
+//typename Containers::VectorView< Real, Device, Index >::RealType
+auto
+binaryOr( const Containers::Vector< Real, Device, Index >& a ) -> decltype( Containers::Expressions::ExpressionBinaryOr( a.getView() ) )
{
return Containers::Expressions::ExpressionBinaryOr( a.getView() );
}
@@ -628,8 +632,9 @@ logicalAnd( const Containers::Vector< Real, Device, Index >& a )
template< typename Real,
typename Device,
typename Index >
-typename Containers::VectorView< Real, Device, Index >::RealType
-binaryAnd( const Containers::Vector< Real, Device, Index >& a )
+//typename Containers::VectorView< Real, Device, Index >::RealType
+auto
+binaryAnd( const Containers::Vector< Real, Device, Index >& a ) -> decltype( Containers::Expressions::ExpressionBinaryAnd( a.getView() ) )
{
return Containers::Expressions::ExpressionBinaryAnd( a.getView() );
}
@@ -658,13 +663,13 @@ auto operator,( const Containers::Vector< Real1, Device, Index >& a, const Conta
////
// Dot product - the same as scalar product, just for convenience
template< typename Real, typename Device, typename Index, typename ET >
-Real dot( const Containers::Vector< Real, Device, Index >& a, const ET& b )
+auto dot( const Containers::Vector< Real, Device, Index >& a, const ET& b )->decltype( TNL::sum( a.getView() * b ) )
{
return TNL::sum( a.getView() * b );
}
template< typename ET, typename Real, typename Device, typename Index >
-Real dot( const ET& a, const Containers::Vector< Real, Device, Index >& b )
+auto dot( const ET& a, const Containers::Vector< Real, Device, Index >& b )->decltype( TNL::sum( a * b.getView() ) )
{
return TNL::sum( a * b.getView() );
}
diff --git a/src/TNL/Containers/VectorViewExpressions.h b/src/TNL/Containers/VectorViewExpressions.h
index 2fc1b53aec..46a9d05ca5 100644
--- a/src/TNL/Containers/VectorViewExpressions.h
+++ b/src/TNL/Containers/VectorViewExpressions.h
@@ -515,8 +515,9 @@ argMax( const Containers::VectorView< Real, Device, Index >& a, Index& arg )
template< typename Real,
typename Device,
typename Index >
-typename Containers::VectorView< Real, Device, Index >::RealType
-sum( const Containers::VectorView< Real, Device, Index >& a )
+//typename Containers::VectorView< Real, Device, Index >::RealType
+auto
+sum( const Containers::VectorView< Real, Device, Index >& a ) -> decltype( Containers::Expressions::ExpressionSum( a ) )
{
return Containers::Expressions::ExpressionSum( a );
}
@@ -525,8 +526,9 @@ template< typename Real,
typename Device,
typename Index,
typename Real2 >
-typename Containers::VectorView< Real, Device, Index >::RealType
-lpNorm( const Containers::VectorView< Real, Device, Index >& a, const Real2& p )
+//typename Containers::VectorView< Real, Device, Index >::RealType
+auto
+lpNorm( const Containers::VectorView< Real, Device, Index >& a, const Real2& p ) -> decltype( Containers::Expressions::ExpressionLpNorm( a, p ) )
{
return Containers::Expressions::ExpressionLpNorm( a, p );
}
@@ -534,8 +536,9 @@ lpNorm( const Containers::VectorView< Real, Device, Index >& a, const Real2& p )
template< typename Real,
typename Device,
typename Index >
-typename Containers::VectorView< Real, Device, Index >::RealType
-product( const Containers::VectorView< Real, Device, Index >& a )
+//typename Containers::VectorView< Real, Device, Index >::RealType
+auto
+product( const Containers::VectorView< Real, Device, Index >& a ) -> decltype( Containers::Expressions::ExpressionProduct( a ) )
{
return Containers::Expressions::ExpressionProduct( a );
}
@@ -552,8 +555,9 @@ logicalOr( const Containers::VectorView< Real, Device, Index >& a )
template< typename Real,
typename Device,
typename Index >
-typename Containers::VectorView< Real, Device, Index >::RealType
-binaryOr( const Containers::VectorView< Real, Device, Index >& a )
+//typename Containers::VectorView< Real, Device, Index >::RealType
+auto
+binaryOr( const Containers::VectorView< Real, Device, Index >& a ) -> decltype( Containers::Expressions::ExpressionBinaryOr( a ) )
{
return Containers::Expressions::ExpressionBinaryOr( a );
}
@@ -570,8 +574,9 @@ logicalAnd( const Containers::VectorView< Real, Device, Index >& a )
template< typename Real,
typename Device,
typename Index >
-typename Containers::VectorView< Real, Device, Index >::RealType
-binaryAnd( const Containers::VectorView< Real, Device, Index >& a )
+//typename Containers::VectorView< Real, Device, Index >::RealType
+auto
+binaryAnd( const Containers::VectorView< Real, Device, Index >& a ) -> decltype( Containers::Expressions::ExpressionBinaryAnd( a ) )
{
return Containers::Expressions::ExpressionBinaryAnd( a );
}
@@ -579,13 +584,17 @@ binaryAnd( const Containers::VectorView< Real, Device, Index >& a )
////
// Scalar product
template< typename Real, typename Device, typename Index, typename ET >
-Real operator,( const Containers::VectorView< Real, Device, Index >& a, const ET& b )
+//Real
+auto
+operator,( const Containers::VectorView< Real, Device, Index >& a, const ET& b )->decltype( TNL::sum( a * b ) )
{
return TNL::sum( a * b );
}
template< typename ET, typename Real, typename Device, typename Index >
-Real operator,( const ET& a, const Containers::VectorView< Real, Device, Index >& b )
+//Real
+auto
+operator,( const ET& a, const Containers::VectorView< Real, Device, Index >& b )->decltype( TNL::sum( a * b ) )
{
return TNL::sum( a * b );
}
@@ -600,13 +609,17 @@ auto operator,( const Containers::VectorView< Real1, Device, Index >& a, const C
////
// Dot product - the same as scalar product, just for convenience
template< typename Real, typename Device, typename Index, typename ET >
-Real dot( const Containers::VectorView< Real, Device, Index >& a, const ET& b )
+//Real
+auto
+dot( const Containers::VectorView< Real, Device, Index >& a, const ET& b )->decltype( TNL::sum( a * b ) )
{
return TNL::sum( a * b );
}
template< typename ET, typename Real, typename Device, typename Index >
-Real dot( const ET& a, const Containers::VectorView< Real, Device, Index >& b )
+//Real
+auto
+dot( const ET& a, const Containers::VectorView< Real, Device, Index >& b )->decltype( TNL::sum( a * b ) )
{
return TNL::sum( a * b );
}
diff --git a/src/UnitTests/Containers/VectorTest-6.h b/src/UnitTests/Containers/VectorTest-6.h
index 6b04d4083f..86da65267b 100644
--- a/src/UnitTests/Containers/VectorTest-6.h
+++ b/src/UnitTests/Containers/VectorTest-6.h
@@ -79,6 +79,146 @@ TYPED_TEST( VectorTest, verticalOperations )
EXPECT_EQ( argMin, wArgMin );
EXPECT_NEAR( TNL::argMax( w, wArgMax ), argMaxValue, 2.0e-5 );
EXPECT_EQ( argMax, wArgMax );
+
+ //EXPECT_EQ( sign( u ), v );
+ for( int i = 0; i < size; i++ )
+ EXPECT_NEAR( sign( u ).getElement( i ), v.getElement( i ), 1.0e-6 );
+}
+
+// TODO: test prefix sum with custom begin and end parameters
+
+TEST( VectorSpecialCasesTest, sumOfBoolVector )
+{
+ using VectorType = Containers::Vector< bool, Devices::Host >;
+ using ViewType = VectorView< bool, Devices::Host >;
+ const float epsilon = 64 * std::numeric_limits< float >::epsilon();
+
+ VectorType v( 512 ), w( 512 );
+ ViewType v_view( v ), w_view( w );
+ v.setValue( true );
+ w.setValue( false );
+
+ const int sum = TNL::sum( v );
+ const int l1norm = v.lpNorm< int >( 1.0 );
+ const float l2norm = v.lpNorm< float >( 2.0 );
+ const float l3norm = v.lpNorm< float >( 3.0 );
+ EXPECT_EQ( sum, 512 );
+ EXPECT_EQ( l1norm, 512 );
+ EXPECT_NEAR( l2norm, std::sqrt( 512 ), epsilon );
+ EXPECT_NEAR( l3norm, std::cbrt( 512 ), epsilon );
+
+ const int diff_sum = TNL::sum( v - w ); //v.differenceSum< int >( w );
+ const int diff_l1norm = v.differenceLpNorm< int >( w, 1.0 );
+ const float diff_l2norm = v.differenceLpNorm< float >( w, 2.0 );
+ const float diff_l3norm = v.differenceLpNorm< float >( w, 3.0 );
+ EXPECT_EQ( diff_sum, 512 );
+ EXPECT_EQ( diff_l1norm, 512 );
+ EXPECT_NEAR( diff_l2norm, std::sqrt( 512 ), epsilon );
+ EXPECT_NEAR( diff_l3norm, std::cbrt( 512 ), epsilon );
+
+ // test views
+ const int sum_view = v_view.sum< int >();
+ const int l1norm_view = v_view.lpNorm< int >( 1.0 );
+ const float l2norm_view = v_view.lpNorm< float >( 2.0 );
+ const float l3norm_view = v_view.lpNorm< float >( 3.0 );
+ EXPECT_EQ( sum_view, 512 );
+ EXPECT_EQ( l1norm_view, 512 );
+ EXPECT_NEAR( l2norm_view, std::sqrt( 512 ), epsilon );
+ EXPECT_NEAR( l3norm_view, std::cbrt( 512 ), epsilon );
+
+ const int diff_sum_view = v_view.differenceSum< int >( w_view );
+ const int diff_l1norm_view = v_view.differenceLpNorm< int >( w_view, 1.0 );
+ const float diff_l2norm_view = v_view.differenceLpNorm< float >( w_view, 2.0 );
+ const float diff_l3norm_view = v_view.differenceLpNorm< float >( w_view, 3.0 );
+ EXPECT_EQ( diff_sum_view, 512 );
+ EXPECT_EQ( diff_l1norm_view, 512 );
+ EXPECT_NEAR( diff_l2norm_view, std::sqrt( 512 ), epsilon );
+ EXPECT_NEAR( diff_l3norm_view, std::cbrt( 512 ), epsilon );
+}
+
+TEST( VectorSpecialCasesTest, assignmentThroughView )
+{
+ using VectorType = Containers::Vector< int, Devices::Host >;
+ using ViewType = VectorView< int, Devices::Host >;
+
+ static_assert( Algorithms::Details::HasSubscriptOperator< VectorType >::value, "Subscript operator detection by SFINAE does not work for Vector." );
+ static_assert( Algorithms::Details::HasSubscriptOperator< ViewType >::value, "Subscript operator detection by SFINAE does not work for VectorView." );
+
+ VectorType u( 100 ), v( 100 );
+ ViewType u_view( u ), v_view( v );
+
+ u.setValue( 42 );
+ v.setValue( 0 );
+ v_view = u_view;
+ EXPECT_EQ( u_view.getData(), u.getData() );
+ EXPECT_EQ( v_view.getData(), v.getData() );
+ for( int i = 0; i < 100; i++ )
+ EXPECT_EQ( v_view[ i ], 42 );
+
+ u.setValue( 42 );
+ v.setValue( 0 );
+ v_view = u;
+ EXPECT_EQ( u_view.getData(), u.getData() );
+ EXPECT_EQ( v_view.getData(), v.getData() );
+ for( int i = 0; i < 100; i++ )
+ EXPECT_EQ( v_view[ i ], 42 );
+}
+
+TEST( VectorSpecialCasesTest, operationsOnConstView )
+{
+ using VectorType = Containers::Vector< int, Devices::Host >;
+ using ViewType = VectorView< const int, Devices::Host >;
+
+ VectorType u( 100 ), v( 100 );
+ ViewType u_view( u ), v_view( v );
+
+ u.setValue( 1 );
+ v.setValue( 1 );
+
+ EXPECT_EQ( u_view.max(), 1 );
+ EXPECT_EQ( u_view.min(), 1 );
+ EXPECT_EQ( u_view.absMax(), 1 );
+ EXPECT_EQ( u_view.absMin(), 1 );
+ EXPECT_EQ( u_view.lpNorm( 1 ), 100 );
+ EXPECT_EQ( u_view.differenceMax( v_view ), 0 );
+ EXPECT_EQ( u_view.differenceMin( v_view ), 0 );
+ EXPECT_EQ( u_view.differenceAbsMax( v_view ), 0 );
+ EXPECT_EQ( u_view.differenceAbsMin( v_view ), 0 );
+ EXPECT_EQ( u_view.differenceLpNorm( v_view, 1 ), 0 );
+ EXPECT_EQ( u_view.differenceSum( v_view ), 0 );
+ EXPECT_EQ( u_view.scalarProduct( v_view ), 100 );
+}
+
+TEST( VectorSpecialCasesTest, initializationOfVectorViewByArrayView )
+{
+ using ArrayType = Containers::Array< int, Devices::Host >;
+ using VectorViewType = VectorView< const int, Devices::Host >;
+ using ArrayViewType = ArrayView< int, Devices::Host >;
+
+ ArrayType a( 100 );
+ a.setValue( 0 );
+ ArrayViewType a_view( a );
+
+ VectorViewType v_view( a_view );
+ EXPECT_EQ( v_view.getData(), a_view.getData() );
+ EXPECT_EQ( v_view.sum(), 0 );
+}
+
+TEST( VectorSpecialCasesTest, defaultConstructors )
+{
+ using ArrayType = Containers::Array< int, Devices::Host >;
+ using VectorViewType = VectorView< int, Devices::Host >;
+ using ArrayViewType = ArrayView< int, Devices::Host >;
+
+ ArrayType a( 100 );
+ a.setValue( 0 );
+
+ ArrayViewType a_view;
+ a_view.bind( a );
+
+ VectorViewType v_view;
+ v_view.bind( a );
+ EXPECT_EQ( v_view.getData(), a_view.getData() );
}
#endif // HAVE_GTEST
--
GitLab