Mercurial > hg > octave-shane
changeset 5238:d432b7809fe5
[project @ 2005-03-23 21:40:29 by jwe]
author | jwe |
---|---|
date | Wed, 23 Mar 2005 21:40:30 +0000 |
parents | 652e8aa49fa7 |
children | 8a7224914e16 |
files | src/ChangeLog src/DLD-FUNCTIONS/__glpk__.cc |
diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -3,6 +3,7 @@ * DLD-FUNCTIONS/__glpk__.cc (F__glpk__): Accept lpsolver and save_pb in param arg instead of as separate args. Arg list now matches new interface for glpk.m. + Don't return lambda and redcosts fields in extra if isMIP. * toplev.cc (do_octave_atexit): Call reset_error_handler before each call to feval.
--- a/src/DLD-FUNCTIONS/__glpk__.cc +++ b/src/DLD-FUNCTIONS/__glpk__.cc @@ -761,8 +761,12 @@ Octave_map extra; - extra.assign ("lambda", octave_value (lambda)); - extra.assign ("redcosts", octave_value (redcosts)); + if (! isMIP) + { + extra.assign ("lambda", octave_value (lambda)); + extra.assign ("redcosts", octave_value (redcosts)); + } + extra.assign ("time", octave_value (time)); extra.assign ("mem", octave_value (mem));