archived
/
php-armadillo
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update

This commit is contained in:
CismonX 2019-09-04 02:41:08 +08:00
parent f140654916
commit 16acf35c37
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -10,7 +10,7 @@ php:
env:
global:
- ARMA_VERSION="9.600.6"
- ARMA_VERSION="9.700.2"
- ARMA_SRC="http://sourceforge.net/projects/arma/files/armadillo-${ARMA_VERSION}.tar.xz"
before_install:

6
src/dense_matrix.cc
View File

@ -35,7 +35,8 @@ namespace php_arma
zobj = mapval_dense<T>::create(&native->operator()(i, j));
}
} catch (const std::logic_error& err) {
throw_exception("index out of bounds");
// Index out of bounds.
throw_exception(err.what());
return;
}
@ -167,7 +168,8 @@ namespace php_arma
zobj = ret_t::create(std::move(native->i().eval()));
}
} catch (const std::logic_error& err) {
throw_error("matrix is not square sized");
// Matrix not square sized.
throw_error(err.what());
} catch (const std::runtime_error& err) {
if (inv_sympd) {
throw_exception("matrix is singular or not positive definite");

6
src/dense_resizable_matrix.cc
View File

@ -140,14 +140,14 @@ namespace php_arma
ZEND_PARSE_PARAMETERS_START(1, 1)
Z_PARAM_OBJECT(other)
ZEND_PARSE_PARAMETERS_END();
auto native = THIS_NATIVE;
if (UNEXPECTED(ChildT::ce != Z_OBJCE_P(other))) {
ex_bad_type(zval_get_type_name(&EX(This)), zval_get_type_name(other));
ex_bad_type(get_type_name<ChildT>(), zval_get_type_name(other));
return;
}
auto native = THIS_NATIVE;
native->swap(*Z_NATIVE_OBJ_P(other));
}