From 709e30a4a168589e531905c2ab155560dd97f226 Mon Sep 17 00:00:00 2001 From: Christian Zimmermann Date: Tue, 19 Feb 2019 16:20:38 +0100 Subject: [PATCH] extra operation to function --- src/include/arith.h | 5 +++++ src/include/multi_array_operation.cc.h | 12 ++++++++++++ src/include/multi_array_operation.h | 4 ++++ 3 files changed, 21 insertions(+) diff --git a/src/include/arith.h b/src/include/arith.h index c3d94b7..713823f 100644 --- a/src/include/arith.h +++ b/src/include/arith.h @@ -86,6 +86,11 @@ namespace MultiArrayTools { return a1 + a2; } + + static inline T& selfApply(T& a1, const T& a2) + { + return a1 += a2; + } }; template diff --git a/src/include/multi_array_operation.cc.h b/src/include/multi_array_operation.cc.h index 4b1abed..86b77d4 100644 --- a/src/include/multi_array_operation.cc.h +++ b/src/include/multi_array_operation.cc.h @@ -97,6 +97,18 @@ namespace MultiArrayTools return out; } + template + template + auto OperationBase::oto(const AOp& aop, + const std::shared_ptr&... inds) const + -> MultiArray + { + MultiArray out(inds->range()..., + static_cast(0)); + AOp::selfApply(out(inds...), THIS()); + return out; + } + template template auto OperationBase::a(const std::shared_ptr>& ll, diff --git a/src/include/multi_array_operation.h b/src/include/multi_array_operation.h index a5a3dfe..143129a 100644 --- a/src/include/multi_array_operation.h +++ b/src/include/multi_array_operation.h @@ -69,6 +69,10 @@ namespace MultiArrayTools auto to(const std::shared_ptr&... inds) const -> MultiArray; + template + auto oto(const AOp& aop, const std::shared_ptr&... inds) const + -> MultiArray; + template // Args = Operation Classes auto a(const std::shared_ptr>& ll, const Args&... args) const -> Operation,OperationClass, Args...>;