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

catch size errors early

Browse Source
This commit is contained in:
conrad
2024-06-24 00:18:10 +10:00
parent 982e8b12ae
commit d4ac8e535e
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/armadillo_bits/op_reshape_meat.hpp
+3
View File
@@ -81,6 +81,9 @@ op_reshape::apply_mat_inplace(Mat<eT>& A, const uword new_n_rows, const uword ne
{
arma_debug_sigprint();
arma_conform_check( (A.vec_state == 1) && (new_n_cols != 1), "reshape(): requested size is not compatible with column vector layout" );
arma_conform_check( (A.vec_state == 2) && (new_n_rows != 1), "reshape(): requested size is not compatible with row vector layout" );
const uword new_n_elem = new_n_rows * new_n_cols;
if(A.n_elem == new_n_elem) { A.set_size(new_n_rows, new_n_cols); return; }
include/armadillo_bits/op_resize_meat.hpp
+3
View File
@@ -58,6 +58,9 @@ op_resize::apply_mat_inplace(Mat<eT>& A, const uword new_n_rows, const uword new
if( (A.n_rows == new_n_rows) && (A.n_cols == new_n_cols) ) { return; }
arma_conform_check( (A.vec_state == 1) && (new_n_cols != 1), "resize(): requested size is not compatible with column vector layout" );
arma_conform_check( (A.vec_state == 2) && (new_n_rows != 1), "resize(): requested size is not compatible with row vector layout" );
if(A.is_empty()) { A.zeros(new_n_rows, new_n_cols); return; }
Mat<eT> B;