portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2024-09-20 17:25:37 +01:00
Code Releases Activity

Rely on default constructors

Browse Source
This commit is contained in:
Peter Boyle 2015-05-23 09:33:42 +01:00
parent 3954792f37
commit 0b165afd9e
1 changed files with 66 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
lib/math/Grid_math_tensors.h
View File

@ -34,62 +34,64 @@ public:
// Scalar no action // Scalar no action
// template<int Level> using tensor_reduce_level = typename iScalar<GridTypeMapper<vtype>::tensor_reduce_level<Level> >; // template<int Level> using tensor_reduce_level = typename iScalar<GridTypeMapper<vtype>::tensor_reduce_level<Level> >;
iScalar()=default; iScalar() = default;
/*
iScalar(const iScalar<vtype> &copyme)=default;
iScalar(iScalar<vtype> &&copyme)=default;
iScalar<vtype> & operator= (const iScalar<vtype> &copyme) = default;
iScalar<vtype> & operator= (iScalar<vtype> &&copyme) = default;
*/
iScalar(scalar_type s) : _internal(s) {};// recurse down and hit the constructor for vector_type iScalar(scalar_type s) : _internal(s) {};// recurse down and hit the constructor for vector_type
iScalar(const Zero &z){ *this = zero; }; iScalar(const Zero &z){ *this = zero; };
iScalar<vtype> & operator= (const Zero &hero){ iScalar<vtype> & operator= (const Zero &hero){
zeroit(*this); zeroit(*this);
return *this; return *this;
} }
friend strong_inline void vstream(iScalar<vtype> &out,const iScalar<vtype> &in){ friend strong_inline void vstream(iScalar<vtype> &out,const iScalar<vtype> &in){
vstream(out._internal,in._internal); vstream(out._internal,in._internal);
} }
friend strong_inline void zeroit(iScalar<vtype> &that){
zeroit(that._internal);
}
friend strong_inline void prefetch(iScalar<vtype> &that){
prefetch(that._internal);
}
friend strong_inline void permute(iScalar<vtype> &out,const iScalar<vtype> &in,int permutetype){
permute(out._internal,in._internal,permutetype);
}
// Unary negation
friend strong_inline void zeroit(iScalar<vtype> &that){ friend strong_inline iScalar<vtype> operator -(const iScalar<vtype> &r) {
zeroit(that._internal); iScalar<vtype> ret;
} ret._internal= -r._internal;
friend strong_inline void prefetch(iScalar<vtype> &that){ return ret;
prefetch(that._internal); }
} // *=,+=,-= operators inherit from corresponding "*,-,+" behaviour
friend strong_inline void permute(iScalar<vtype> &out,const iScalar<vtype> &in,int permutetype){ strong_inline iScalar<vtype> &operator *=(const iScalar<vtype> &r) {
permute(out._internal,in._internal,permutetype); *this = (*this)*r;
} return *this;
}
// Unary negation strong_inline iScalar<vtype> &operator -=(const iScalar<vtype> &r) {
friend strong_inline iScalar<vtype> operator -(const iScalar<vtype> &r) { *this = (*this)-r;
iScalar<vtype> ret; return *this;
ret._internal= -r._internal; }
return ret; strong_inline iScalar<vtype> &operator +=(const iScalar<vtype> &r) {
} *this = (*this)+r;
// *=,+=,-= operators inherit from corresponding "*,-,+" behaviour return *this;
strong_inline iScalar<vtype> &operator *=(const iScalar<vtype> &r) { }
*this = (*this)*r; strong_inline vtype & operator ()(void) {
return *this; return _internal;
} }
strong_inline iScalar<vtype> &operator -=(const iScalar<vtype> &r) { strong_inline const vtype & operator ()(void) const {
*this = (*this)-r; return _internal;
return *this; }
}
strong_inline iScalar<vtype> &operator +=(const iScalar<vtype> &r) { operator ComplexD () const { return(TensorRemove(_internal)); };
*this = (*this)+r; operator RealD () const { return(real(TensorRemove(_internal))); }
return *this;
} // convert from a something to a scalar
template<class T,typename std::enable_if<!isGridTensor<T>::value, T>::type* = nullptr > strong_inline auto operator = (T arg) -> iScalar<vtype>
strong_inline vtype & operator ()(void) {
return _internal;
}
strong_inline const vtype & operator ()(void) const {
return _internal;
}
operator ComplexD () const { return(TensorRemove(_internal)); };
operator RealD () const { return(real(TensorRemove(_internal))); }
// convert from a something to a scalar
template<class T,typename std::enable_if<!isGridTensor<T>::value, T>::type* = nullptr > strong_inline auto operator = (T arg) -> iScalar<vtype>
{ {
_internal = vtype(arg); _internal = vtype(arg);
return *this; return *this;
@ -125,6 +127,12 @@ public:
enum { TensorLevel = GridTypeMapper<vtype>::TensorLevel + 1}; enum { TensorLevel = GridTypeMapper<vtype>::TensorLevel + 1};
iVector(const Zero &z){ *this = zero; }; iVector(const Zero &z){ *this = zero; };
iVector() =default; iVector() =default;
/*
iVector(const iVector<vtype,N> &copyme)=default;
iVector(iVector<vtype,N> &&copyme)=default;
iVector<vtype,N> & operator= (const iVector<vtype,N> &copyme) = default;
iVector<vtype,N> & operator= (iVector<vtype,N> &&copyme) = default;
*/
iVector<vtype,N> & operator= (const Zero &hero){ iVector<vtype,N> & operator= (const Zero &hero){
zeroit(*this); zeroit(*this);
@ -205,8 +213,12 @@ public:
iMatrix(const Zero &z){ *this = zero; }; iMatrix(const Zero &z){ *this = zero; };
iMatrix() =default; iMatrix() =default;
/*
iMatrix(const iMatrix<vtype,N> &copyme)=default;
iMatrix(iMatrix<vtype,N> &&copyme)=default;
iMatrix<vtype,N> & operator= (const iMatrix<vtype,N> &copyme) = default;
iMatrix<vtype,N> & operator= (iMatrix<vtype,N> &&copyme) = default;
*/
iMatrix<vtype,N> & operator= (const Zero &hero){ iMatrix<vtype,N> & operator= (const Zero &hero){
zeroit(*this); zeroit(*this);
return *this; return *this;