# HG changeset patch # User jwe # Date 1111614030 0 # Node ID d432b7809fe513cccef4c1399828b81b90c8f52a # Parent 652e8aa49fa7e99db3cdeb4a982a5e9a804bdead [project @ 2005-03-23 21:40:29 by jwe] diff -r 652e8aa49fa7 -r d432b7809fe5 src/ChangeLog --- a/src/ChangeLog Wed Mar 23 21:28:46 2005 +0000 +++ b/src/ChangeLog Wed Mar 23 21:40:30 2005 +0000 @@ -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. diff -r 652e8aa49fa7 -r d432b7809fe5 src/DLD-FUNCTIONS/__glpk__.cc --- a/src/DLD-FUNCTIONS/__glpk__.cc Wed Mar 23 21:28:46 2005 +0000 +++ b/src/DLD-FUNCTIONS/__glpk__.cc Wed Mar 23 21:40:30 2005 +0000 @@ -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));