phynexis-deps/armadillo-code
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

simplifications

Browse Source
This commit is contained in:
conrad
2022-09-16 14:30:23 +10:00
parent 88342ba388
commit 3032f25942
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/armadillo_bits/fn_powext.hpp
+11 -11
View File
@@ -27,18 +27,18 @@ arma_inline
typename
enable_if2
<
( is_arma_type<T1>::value && is_arma_type<T2>::value && is_same_type<typename T1::elem_type, typename T2::elem_type>::yes ),
is_arma_type<T1>::value,
const Glue<T1, T2, glue_powext>
>::result
pow
(
const T1& X,
const T2& Y
const T1& X,
const Base<typename T1::elem_type, T2>& Y
)
{
arma_extra_debug_sigprint();
return Glue<T1, T2, glue_powext>(X, Y);
return Glue<T1, T2, glue_powext>(X, Y.get_ref());
}
@@ -49,18 +49,18 @@ arma_inline
typename
enable_if2
<
( is_arma_type<T1>::value && is_arma_type<T2>::value && is_cx<typename T1::elem_type>::yes && is_same_type<typename T1::pod_type, typename T2::elem_type>::yes ),
( is_arma_type<T1>::value && is_cx<typename T1::elem_type>::yes ),
const mtGlue<typename T1::elem_type, T1, T2, glue_powext_cx>
>::result
pow
(
const T1& X,
const T2& Y
const T1& X,
const Base<typename T1::pod_type, T2>& Y
)
{
arma_extra_debug_sigprint();
return mtGlue<typename T1::elem_type, T1, T2, glue_powext_cx>(X, Y);
return mtGlue<typename T1::elem_type, T1, T2, glue_powext_cx>(X, Y.get_ref());
}
@@ -88,13 +88,13 @@ inline
typename
enable_if2
<
( is_cx<typename parent::elem_type>::yes && is_same_type<typename parent::pod_type, typename T2::elem_type>::yes ),
is_cx<typename parent::elem_type>::yes,
Mat<typename parent::elem_type>
>::result
pow
(
const subview_each1<parent,mode>& X,
const Base<typename T2::elem_type,T2>& Y
const subview_each1<parent,mode>& X,
const Base<typename parent::pod_type,T2>& Y
)
{
arma_extra_debug_sigprint();
include/armadillo_bits/glue_powext_bones.hpp
-1
View File
@@ -33,7 +33,6 @@ class glue_powext
template<typename eT> inline static void apply(Mat<eT>& out, const Mat<eT>& A, const Mat<eT>& B);
template<typename parent, unsigned int mode, typename T2> inline static Mat<typename parent::elem_type> apply(const subview_each1<parent,mode>& X, const Base<typename parent::elem_type,T2>& Y);
};