Mercurial > hg > octave-terminal
changeset 4842:fafc79eeaebb
[project @ 2004-03-19 22:31:25 by jwe]
author | jwe |
---|---|
date | Fri, 19 Mar 2004 22:31:25 +0000 |
parents | 66fb9f8c66c8 |
children | 7b4e76100964 |
files | liboctave/ChangeLog liboctave/DASPK.cc src/ChangeLog src/ov-list.cc |
diffstat | 4 files changed, 17 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/ChangeLog +++ b/liboctave/ChangeLog @@ -1,3 +1,8 @@ +2004-03-17 David Hoover <jazzdaq@yahoo.com> + + * DASPK.cc (DASPK::do_integrate): Always add n*n elements to the + work vector, not just when using a numerical Jacobian. + 2004-03-11 John W. Eaton <jwe@bevo.che.wisc.edu> * so-array.cc (SND_CMP_OP, NDS_CMP_OP, NDND_CMP_OP):
--- a/liboctave/DASPK.cc +++ b/liboctave/DASPK.cc @@ -229,9 +229,7 @@ if (ccic == 1 || eavfet == 1) liw += n; - lrw = 50 + 9*n; - if (! user_jac) - lrw += n*n; + lrw = 50 + 9*n + n*n; if (eavfet == 1) lrw += n;
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2004-03-19 John W. Eaton <jwe@bevo.che.wisc.edu> + + * ov-list.cc (octave_list::subsref): Correctly create return value. + Return comma-separate list if {-style indexing extracts more than + one value. + 2004-03-12 John W. Eaton <jwe@bevo.che.wisc.edu> * ov-cell.cc (octave_cell::save_hdf5): Handle empty cells.
--- a/src/ov-list.cc +++ b/src/ov-list.cc @@ -76,7 +76,9 @@ { idx_vector i = tmp_idx (0).index_vector (); - retval = octave_list (data.index (i)); + Cell tmp = data.index (i); + + retval = octave_value (new octave_list (tmp)); } else error ("only one index allowed for lists"); @@ -95,6 +97,8 @@ if (tmp.length () == 1) retval = tmp(0); + else + retval = octave_value (tmp, true); } else error ("only one index allowed for lists");