Skip to content

Commit

Permalink
Merge pull request #77 from grahamlopez/reduce
Browse files Browse the repository at this point in the history
Reduce lines of code
  • Loading branch information
ye-luo authored Jan 3, 2018
2 parents 57f2aec + e1697ed commit cb9f441
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 6,571 deletions.
1,088 changes: 0 additions & 1,088 deletions src/Numerics/OhmmsPETE/OhmmsMatrixOperators.h

Large diffs are not rendered by default.

11 changes: 5 additions & 6 deletions src/Numerics/OhmmsPETE/OhmmsTinyMeta.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,13 @@ template<class T1, class T2> struct OTDot {};

////////////////////////////////////////////////////////////////////////////////
// TinyVectorOps.h assignment/unary and binary operators for TinyVector
// TensorOps.h assignment/unary and binary operators for Tensors TinyVectorTensorOps.h binary operators for TinyVector and Tensor combinations
// TinyMatrixOps.h assignment/unary and binary operators for TinyMatrix
// TensorOps.h assignment/unary and binary operators for Tensors
// TinyVectorTensorOps.h binary operators for TinyVector and Tensor combinations
////////////////////////////////////////////////////////////////////////////////
#define PAssert
#include "Numerics/OhmmsPETE/TinyVectorOps.h"
#include "Numerics/OhmmsPETE/TensorOps.h"
#include "Numerics/OhmmsPETE/TinyVectorTensorOps.h"
#include "Numerics/OhmmsPETE/TinyMatrixOps.h"

// macros to generate a set of binary and unary combintions for each operator
// e.g., OHMMS_META_BINARY_OPERATORS(TinyVector,operator+,OpAdd)
Expand Down Expand Up @@ -103,7 +102,7 @@ FUNC( const T1& x, const TENT<T2,D>& v2) \
{ \
return OTBinary<T1,TENT<T2,D>,TAG>::apply(x,v2,TAG()); \
} \

#define OHMMS_META_ACCUM_OPERATORS(TENT,FUNC,TAG) \
\
template <class T1, class T2, unsigned D> \
Expand All @@ -121,7 +120,7 @@ FUNC( TENT<T1,D>& v1, const T2& v2 ) \
OTAssign<TENT<T1,D>,T2,TAG>::apply(v1,v2,TAG()); \
return v1; \
} \

#define OHMMS_TINYMAT_BINARY_OPERATORS(TENT,FUNC,TAG) \
\
template <class T1, class T2, unsigned D1, unsigned D2> \
Expand Down Expand Up @@ -165,7 +164,7 @@ FUNC( const T1& x, const TENT<T2,D1,D2>& v2) \
{ \
return OTBinary<T1,TENT<T2,D1,D2>,TAG>::apply(x,v2,TAG()); \
} \

#define OHMMS_TINYMAT_ACCUM_OPERATORS(TENT,FUNC,TAG) \
\
template <class T1, class T2, unsigned D1, unsigned D2> \
Expand Down
Loading

0 comments on commit cb9f441

Please sign in to comment.