mirror of
https://github.com/paboyle/Grid.git
synced 2024-11-14 01:35:36 +00:00
bb73569fd6
Merge remote-tracking branch 'upstream/master' Conflicts: configure
119 lines
4.2 KiB
C++
119 lines
4.2 KiB
C++
#ifndef GRID_MATH_ARITH_ADD_H
|
|
#define GRID_MATH_ARITH_ADD_H
|
|
|
|
namespace Grid {
|
|
|
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
|
/////////////////////////////////////////// ADD ///////////////////////////////////////////
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
// ADD is simple for now; cannot mix types and straightforward template
|
|
// Scalar +/- Scalar
|
|
// Vector +/- Vector
|
|
// Matrix +/- Matrix
|
|
template<class vtype,class ltype,class rtype> strong_inline void add(iScalar<vtype> * __restrict__ ret,
|
|
const iScalar<ltype> * __restrict__ lhs,
|
|
const iScalar<rtype> * __restrict__ rhs)
|
|
{
|
|
add(&ret->_internal,&lhs->_internal,&rhs->_internal);
|
|
}
|
|
template<class vtype,class ltype,class rtype,int N> strong_inline void add(iVector<vtype,N> * __restrict__ ret,
|
|
const iVector<ltype,N> * __restrict__ lhs,
|
|
const iVector<rtype,N> * __restrict__ rhs)
|
|
{
|
|
for(int c=0;c<N;c++){
|
|
ret->_internal[c]=lhs->_internal[c]+rhs->_internal[c];
|
|
}
|
|
return;
|
|
}
|
|
|
|
template<class vtype,class ltype,class rtype, int N> strong_inline void add(iMatrix<vtype,N> * __restrict__ ret,
|
|
const iMatrix<ltype,N> * __restrict__ lhs,
|
|
const iMatrix<rtype,N> * __restrict__ rhs)
|
|
{
|
|
for(int c2=0;c2<N;c2++){
|
|
for(int c1=0;c1<N;c1++){
|
|
add(&ret->_internal[c1][c2],&lhs->_internal[c1][c2],&rhs->_internal[c1][c2]);
|
|
}}
|
|
return;
|
|
}
|
|
template<class vtype,class ltype,class rtype, int N> strong_inline void add(iMatrix<vtype,N> * __restrict__ ret,
|
|
const iScalar<ltype> * __restrict__ lhs,
|
|
const iMatrix<rtype,N> * __restrict__ rhs)
|
|
{
|
|
for(int c2=0;c2<N;c2++){
|
|
for(int c1=0;c1<N;c1++){
|
|
if ( c1==c2)
|
|
add(&ret->_internal[c1][c2],&lhs->_internal,&rhs->_internal[c1][c2]);
|
|
else
|
|
ret->_internal[c1][c2]=lhs->_internal[c1][c2];
|
|
}}
|
|
return;
|
|
}
|
|
template<class vtype,class ltype,class rtype, int N> strong_inline void add(iMatrix<vtype,N> * __restrict__ ret,
|
|
const iMatrix<ltype,N> * __restrict__ lhs,
|
|
const iScalar<rtype> * __restrict__ rhs)
|
|
{
|
|
for(int c2=0;c2<N;c2++){
|
|
for(int c1=0;c1<N;c1++){
|
|
if ( c1==c2)
|
|
add(&ret->_internal[c1][c2],&lhs->_internal[c1][c2],&rhs->_internal);
|
|
else
|
|
ret->_internal[c1][c2]=lhs->_internal[c1][c2];
|
|
}}
|
|
return;
|
|
}
|
|
|
|
|
|
// + operator for scalar, vector, matrix
|
|
template<class ltype,class rtype>
|
|
//strong_inline auto operator + (iScalar<ltype>& lhs,iScalar<rtype>&& rhs) -> iScalar<decltype(lhs._internal + rhs._internal)>
|
|
strong_inline auto operator + (const iScalar<ltype>& lhs,const iScalar<rtype>& rhs) -> iScalar<decltype(lhs._internal + rhs._internal)>
|
|
{
|
|
typedef iScalar<decltype(lhs._internal+rhs._internal)> ret_t;
|
|
ret_t ret;
|
|
add(&ret,&lhs,&rhs);
|
|
return ret;
|
|
}
|
|
template<class ltype,class rtype,int N>
|
|
strong_inline auto operator + (const iVector<ltype,N>& lhs,const iVector<rtype,N>& rhs) ->iVector<decltype(lhs._internal[0]+rhs._internal[0]),N>
|
|
{
|
|
typedef iVector<decltype(lhs._internal[0]+rhs._internal[0]),N> ret_t;
|
|
ret_t ret;
|
|
add(&ret,&lhs,&rhs);
|
|
return ret;
|
|
}
|
|
template<class ltype,class rtype,int N>
|
|
strong_inline auto operator + (const iMatrix<ltype,N>& lhs,const iMatrix<rtype,N>& rhs) ->iMatrix<decltype(lhs._internal[0][0]+rhs._internal[0][0]),N>
|
|
{
|
|
typedef iMatrix<decltype(lhs._internal[0][0]+rhs._internal[0][0]),N> ret_t;
|
|
ret_t ret;
|
|
add(&ret,&lhs,&rhs);
|
|
return ret;
|
|
}
|
|
template<class ltype,class rtype,int N>
|
|
strong_inline auto operator + (const iScalar<ltype>& lhs,const iMatrix<rtype,N>& rhs)->iMatrix<decltype(lhs._internal+rhs._internal[0][0]),N>
|
|
{
|
|
typedef iMatrix<decltype(lhs._internal+rhs._internal[0][0]),N> ret_t;
|
|
ret_t ret;
|
|
add(&ret,&lhs,&rhs);
|
|
return ret;
|
|
}
|
|
|
|
template<class ltype,class rtype,int N>
|
|
strong_inline auto operator + (const iMatrix<ltype,N>& lhs,const iScalar<rtype>& rhs)->iMatrix<decltype(lhs._internal[0][0]+rhs._internal),N>
|
|
{
|
|
typedef iMatrix<decltype(lhs._internal[0][0]+rhs._internal),N> ret_t;
|
|
ret_t ret;
|
|
add(&ret,&lhs,&rhs);
|
|
return ret;
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
#endif
|