From bb515b8a1ffa5796d82134cd07b75797f47000fd Mon Sep 17 00:00:00 2001 From: conrad Date: Fri, 17 Jan 2025 21:33:16 +1000 Subject: [PATCH] simplifications --- include/armadillo_bits/op_misc_bones.hpp | 6 --- include/armadillo_bits/op_misc_meat.hpp | 50 +----------------------- 2 files changed, 2 insertions(+), 54 deletions(-) diff --git a/include/armadillo_bits/op_misc_bones.hpp b/include/armadillo_bits/op_misc_bones.hpp index 26dff674..5fd15714 100644 --- a/include/armadillo_bits/op_misc_bones.hpp +++ b/include/armadillo_bits/op_misc_bones.hpp @@ -43,14 +43,8 @@ class op_imag template inline static void apply( Mat& out, const mtOp& X); - template - inline static void apply_noalias(Mat& out, const Proxy& P); - template inline static void apply( Cube& out, const mtOpCube& X); - - template - inline static void apply_noalias(Cube& out, const ProxyCube& P); }; diff --git a/include/armadillo_bits/op_misc_meat.hpp b/include/armadillo_bits/op_misc_meat.hpp index a1064027..69c837ca 100644 --- a/include/armadillo_bits/op_misc_meat.hpp +++ b/include/armadillo_bits/op_misc_meat.hpp @@ -123,30 +123,7 @@ op_imag::apply( Mat& out, const mtOp::no) { out.zeros(P.get_n_rows(), P.get_n_cols()); return; } - if(P.is_alias(out)) - { - Mat tmp; - - op_imag::apply_noalias(tmp, P); - - out.steal_mem(tmp); - } - else - { - op_imag::apply_noalias(out, P); - } - } - - - -template -inline -void -op_imag::apply_noalias(Mat& out, const Proxy& P) - { - arma_debug_sigprint(); - - typedef typename T1::pod_type T; + // aliasing not possible at this point, as eT must be std::complex const uword n_rows = P.get_n_rows(); const uword n_cols = P.get_n_cols(); @@ -194,30 +171,7 @@ op_imag::apply( Cube& out, const mtOpCube::no) { out.zeros(P.get_n_rows(), P.get_n_cols(), P.get_n_slices()); return; } - if(P.is_alias(out)) - { - Cube tmp; - - op_imag::apply_noalias(tmp, P); - - out.steal_mem(tmp); - } - else - { - op_imag::apply_noalias(out, P); - } - } - - - -template -inline -void -op_imag::apply_noalias(Cube& out, const ProxyCube& P) - { - arma_debug_sigprint(); - - typedef typename T1::pod_type T; + // aliasing not possible at this point, as eT must be std::complex const uword n_rows = P.get_n_rows(); const uword n_cols = P.get_n_cols();