glue_quantile_meat.hpp (armadillo-10.8.2.tar.xz) | : | glue_quantile_meat.hpp (armadillo-11.0.0.tar.xz) | ||
---|---|---|---|---|
skipping to change at line 175 | skipping to change at line 175 | |||
typedef typename T2::elem_type eTb; | typedef typename T2::elem_type eTb; | |||
const uword dim = expr.aux_uword; | const uword dim = expr.aux_uword; | |||
arma_debug_check( (dim > 1), "quantile(): parameter 'dim' must be 0 or 1" ); | arma_debug_check( (dim > 1), "quantile(): parameter 'dim' must be 0 or 1" ); | |||
const quasi_unwrap<T1> UA(expr.A); | const quasi_unwrap<T1> UA(expr.A); | |||
const quasi_unwrap<T2> UB(expr.B); | const quasi_unwrap<T2> UB(expr.B); | |||
arma_debug_check((UA.M.has_nan() || UB.M.has_nan()), "quantile(): detected NaN | ||||
"); | ||||
if(UA.is_alias(out) || UB.is_alias(out)) | if(UA.is_alias(out) || UB.is_alias(out)) | |||
{ | { | |||
Mat<eTb> tmp; | Mat<eTb> tmp; | |||
glue_quantile::apply_noalias(tmp, UA.M, UB.M, dim); | glue_quantile::apply_noalias(tmp, UA.M, UB.M, dim); | |||
out.steal_mem(tmp); | out.steal_mem(tmp); | |||
} | } | |||
else | else | |||
{ | { | |||
skipping to change at line 203 | skipping to change at line 205 | |||
{ | { | |||
arma_extra_debug_sigprint(); | arma_extra_debug_sigprint(); | |||
typedef typename T2::elem_type eTb; | typedef typename T2::elem_type eTb; | |||
const quasi_unwrap<T1> UA(expr.A); | const quasi_unwrap<T1> UA(expr.A); | |||
const quasi_unwrap<T2> UB(expr.B); | const quasi_unwrap<T2> UB(expr.B); | |||
const uword dim = (T1::is_xvec) ? uword(UA.M.is_rowvec() ? 1 : 0) : uword((T1: :is_row) ? 1 : 0); | const uword dim = (T1::is_xvec) ? uword(UA.M.is_rowvec() ? 1 : 0) : uword((T1: :is_row) ? 1 : 0); | |||
arma_debug_check((UA.M.has_nan() || UB.M.has_nan()), "quantile(): detected NaN | ||||
"); | ||||
if(UA.is_alias(out) || UB.is_alias(out)) | if(UA.is_alias(out) || UB.is_alias(out)) | |||
{ | { | |||
Mat<eTb> tmp; | Mat<eTb> tmp; | |||
glue_quantile::apply_noalias(tmp, UA.M, UB.M, dim); | glue_quantile::apply_noalias(tmp, UA.M, UB.M, dim); | |||
out.steal_mem(tmp); | out.steal_mem(tmp); | |||
} | } | |||
else | else | |||
{ | { | |||
End of changes. 2 change blocks. | ||||
0 lines changed or deleted | 6 lines changed or added |