Mercurial > hg > octave-lyh
changeset 4625:87c01a296263
[project @ 2003-11-15 12:51:20 by jwe]
| author | jwe |
|---|---|
| date | Sat, 15 Nov 2003 12:51:20 +0000 |
| parents | 372fc47d1153 |
| children | 1ba089061bfe |
| files | liboctave/Array.h liboctave/ChangeLog liboctave/DASRT.cc liboctave/MArray.h liboctave/MArray2.h liboctave/ODESSA.cc src/Cell.cc src/ChangeLog src/oct-map.cc src/ov-typeinfo.cc |
| diffstat | 10 files changed, 23 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/Array.h +++ b/liboctave/Array.h @@ -435,7 +435,7 @@ void resize (int n) { resize_no_fill (n); } - // void resize (int n, const T& val) { resize_and_fill (n, val); } + void resize (int n, const T& val) { resize_and_fill (n, val); } void resize (const dim_vector& dv) { resize_no_fill (dv); }
--- a/liboctave/ChangeLog +++ b/liboctave/ChangeLog @@ -1,3 +1,11 @@ +2003-11-15 John W. Eaton <jwe@bevo.che.wisc.edu> + + * Array.h (Array<T>::resize (int, const T&)): Reinstate. + * MArray.h (resize): Delete. + * MArray2.h (resize): Delete. + * DASRT.cc (DASRT::integrate): Use resize, not resize_and_fill. + * ODESSA (ODESSA::integrate): Likewise. + 2003-11-14 John W. Eaton <jwe@bevo.che.wisc.edu> * Makefile.in (dist): Depend on stamp-prereq.
--- a/liboctave/DASRT.cc +++ b/liboctave/DASRT.cc @@ -256,7 +256,7 @@ DAEFunc::reset = false; - jroot.resize_and_fill (ng, 1); + jroot.resize (ng, 1); pjroot = jroot.fortran_vec ();
--- a/liboctave/MArray.h +++ b/liboctave/MArray.h @@ -66,10 +66,6 @@ return *this; } - void resize (int n) { Array<T>::resize_no_fill (n); } - - void resize (int n, const T& val) { Array<T>::resize_and_fill (n, val); } - // Currently, the OPS functions don't need to be friends, but that // may change.
--- a/liboctave/MArray2.h +++ b/liboctave/MArray2.h @@ -66,13 +66,6 @@ return *this; } - void resize (int r, int c) { Array2<T>::resize_no_fill (r, c); } - - void resize (int r, int c, const T& val) - { - Array<T>::resize_and_fill (r, c, val); - } - MArray2<T>& insert (const Array2<T>& a, int r, int c) { Array2<T>::insert (a, r, c);
--- a/liboctave/ODESSA.cc +++ b/liboctave/ODESSA.cc @@ -581,7 +581,7 @@ { x_out.resize (n_out, n); - x_s_out.resize_and_fill (npar, Matrix (n_out, n, 0.0)); + x_s_out.resize (npar, Matrix (n_out, n, 0.0)); for (int j = 0; j < n_out; j++) { @@ -625,7 +625,7 @@ { x_out.resize (n_out, n); - x_s_out.resize_and_fill (npar, Matrix (n_out, n, 0.0)); + x_s_out.resize (npar, Matrix (n_out, n, 0.0)); int n_crit = tcrit.capacity ();
--- a/src/Cell.cc +++ b/src/Cell.cc @@ -39,7 +39,7 @@ if (n > 0) { - resize_no_fill (n, 1); + resize (dim_vector (n, 1)); for (int i = 0; i < n; i++) elem(i,0) = sv[i];
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2003-11-15 John W. Eaton <jwe@bevo.che.wisc.edu> + + * oct-map.cc (Octave_map::assign): Use resize, not resize and fill. + * ov-typeinfo.cc (octave_value_typeinfo::do_register_type): Likewise. + + * Cell.cc (Cell::Cell): Pass dim_vector to resize instead of two ints. + 2003-11-14 John W. Eaton <jwe@bevo.che.wisc.edu> * Makefile.in (stamp-liboctave-prereq): New target.
--- a/src/oct-map.cc +++ b/src/oct-map.cc @@ -190,12 +190,12 @@ if (new_dims != rhs_dims) { - tmp.resize_and_fill (new_dims, fill_value); + tmp.resize (new_dims, fill_value); } else if (new_dims != curr_dims) { for (iterator p = begin (); p != end (); p++) - contents(p).resize_and_fill (rhs_dims, fill_value); + contents(p).resize (rhs_dims, fill_value); } dimensions = new_dims;