Mercurial > octave
changeset 21091:72eefc36c6b7
use correct value extractor functions in glpk
* __glpk__.cc: Use x*_value functions when passing error message.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 15 Jan 2016 15:11:56 -0500 |
| parents | 93d294511277 |
| children | 429f83903400 |
| files | libinterp/dldfcn/__glpk__.cc |
| diffstat | 1 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/dldfcn/__glpk__.cc Fri Jan 15 15:13:28 2016 -0500 +++ b/libinterp/dldfcn/__glpk__.cc Fri Jan 15 15:11:56 2016 -0500 @@ -446,12 +446,12 @@ // 6th Input. A column array containing the sense of each constraint // in the constraint matrix. - charMatrix CTYPE = args(5).char_matrix_value ("__glpk__: invalid value of CTYPE"); + charMatrix CTYPE = args(5).xchar_matrix_value ("__glpk__: invalid value of CTYPE"); char *ctype = CTYPE.fortran_vec (); // 7th Input. A column array containing the types of the variables. - charMatrix VTYPE = args(6).char_matrix_value ("__glpk__: invalid value of VARTYPE"); + charMatrix VTYPE = args(6).xchar_matrix_value ("__glpk__: invalid value of VARTYPE"); Array<int> vartype (dim_vector (mrowsc, 1)); int isMIP = 0; @@ -594,10 +594,11 @@ int errnum = glpk (sense, mrowsc, mrowsA, c, nz, rn.fortran_vec (), cn.fortran_vec (), a.fortran_vec (), b, ctype, - freeLB.fortran_vec (), lb, freeUB.fortran_vec (), ub, - vartype.fortran_vec (), isMIP, lpsolver, save_pb, scale, - &par, xmin.fortran_vec (), &fmin, &status, - lambda.fortran_vec (), redcosts.fortran_vec (), &time); + freeLB.fortran_vec (), lb, freeUB.fortran_vec (), + ub, vartype.fortran_vec (), isMIP, lpsolver, + save_pb, scale, &par, xmin.fortran_vec (), &fmin, + &status, lambda.fortran_vec (), + redcosts.fortran_vec (), &time); octave_scalar_map extra;