Mercurial > hg > octave-lyh
diff liboctave/dSparse.cc @ 10350:12884915a8e4
merge MArray classes & improve Array interface
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Sat, 23 Jan 2010 21:41:03 +0100 |
| parents | 07ebe522dac2 |
| children | 99e9bae2d81e |
line wrap: on
line diff
--- a/liboctave/dSparse.cc +++ b/liboctave/dSparse.cc @@ -349,7 +349,7 @@ } else { - idx_arg.resize_fill (nr, 1, 0); + idx_arg.resize (nr, 1, 0); for (octave_idx_type i = cidx(0); i < cidx(1); i++) idx_arg.elem(ridx(i)) = -1; @@ -498,7 +498,7 @@ } else { - idx_arg.resize_fill (nr, 1, 0); + idx_arg.resize (nr, 1, 0); for (octave_idx_type i = cidx(0); i < cidx(1); i++) idx_arg.elem(ridx(i)) = -1; @@ -4019,7 +4019,7 @@ OCTAVE_LOCAL_BUFFER (double, DU, nr - 1); OCTAVE_LOCAL_BUFFER (double, D, nr); OCTAVE_LOCAL_BUFFER (double, DL, nr - 1); - Array<octave_idx_type> ipvt (nr); + Array<octave_idx_type> ipvt (nr, 1); octave_idx_type *pipvt = ipvt.fortran_vec (); if (mattype.is_dense ()) @@ -4318,7 +4318,7 @@ OCTAVE_LOCAL_BUFFER (double, DU, nr - 1); OCTAVE_LOCAL_BUFFER (double, D, nr); OCTAVE_LOCAL_BUFFER (double, DL, nr - 1); - Array<octave_idx_type> ipvt (nr); + Array<octave_idx_type> ipvt (nr, 1); octave_idx_type *pipvt = ipvt.fortran_vec (); if (mattype.is_dense ()) @@ -4533,9 +4533,9 @@ { if (calc_cond) { - Array<double> z (3 * nr); + Array<double> z (3 * nr, 1); double *pz = z.fortran_vec (); - Array<octave_idx_type> iz (nr); + Array<octave_idx_type> iz (nr, 1); octave_idx_type *piz = iz.fortran_vec (); F77_XFCN (dpbcon, DPBCON, @@ -4627,7 +4627,7 @@ } } - Array<octave_idx_type> ipvt (nr); + Array<octave_idx_type> ipvt (nr, 1); octave_idx_type *pipvt = ipvt.fortran_vec (); F77_XFCN (dgbtrf, DGBTRF, (nr, nr, n_lower, n_upper, tmp_data, @@ -4655,9 +4655,9 @@ if (calc_cond) { char job = '1'; - Array<double> z (3 * nr); + Array<double> z (3 * nr, 1); double *pz = z.fortran_vec (); - Array<octave_idx_type> iz (nr); + Array<octave_idx_type> iz (nr, 1); octave_idx_type *piz = iz.fortran_vec (); F77_XFCN (dgbcon, DGBCON, @@ -4781,9 +4781,9 @@ { if (calc_cond) { - Array<double> z (3 * nr); + Array<double> z (3 * nr, 1); double *pz = z.fortran_vec (); - Array<octave_idx_type> iz (nr); + Array<octave_idx_type> iz (nr, 1); octave_idx_type *piz = iz.fortran_vec (); F77_XFCN (dpbcon, DPBCON, @@ -4910,7 +4910,7 @@ } } - Array<octave_idx_type> ipvt (nr); + Array<octave_idx_type> ipvt (nr, 1); octave_idx_type *pipvt = ipvt.fortran_vec (); F77_XFCN (dgbtrf, DGBTRF, (nr, nr, n_lower, n_upper, tmp_data, @@ -4936,9 +4936,9 @@ if (calc_cond) { char job = '1'; - Array<double> z (3 * nr); + Array<double> z (3 * nr, 1); double *pz = z.fortran_vec (); - Array<octave_idx_type> iz (nr); + Array<octave_idx_type> iz (nr, 1); octave_idx_type *piz = iz.fortran_vec (); F77_XFCN (dgbcon, DGBCON, @@ -5101,9 +5101,9 @@ { if (calc_cond) { - Array<double> z (3 * nr); + Array<double> z (3 * nr, 1); double *pz = z.fortran_vec (); - Array<octave_idx_type> iz (nr); + Array<octave_idx_type> iz (nr, 1); octave_idx_type *piz = iz.fortran_vec (); F77_XFCN (dpbcon, DPBCON, @@ -5226,7 +5226,7 @@ } } - Array<octave_idx_type> ipvt (nr); + Array<octave_idx_type> ipvt (nr, 1); octave_idx_type *pipvt = ipvt.fortran_vec (); F77_XFCN (dgbtrf, DGBTRF, (nr, nr, n_lower, n_upper, tmp_data, @@ -5252,9 +5252,9 @@ if (calc_cond) { char job = '1'; - Array<double> z (3 * nr); + Array<double> z (3 * nr, 1); double *pz = z.fortran_vec (); - Array<octave_idx_type> iz (nr); + Array<octave_idx_type> iz (nr, 1); octave_idx_type *piz = iz.fortran_vec (); F77_XFCN (dpbcon, DPBCON, @@ -5401,9 +5401,9 @@ { if (calc_cond) { - Array<double> z (3 * nr); + Array<double> z (3 * nr, 1); double *pz = z.fortran_vec (); - Array<octave_idx_type> iz (nr); + Array<octave_idx_type> iz (nr, 1); octave_idx_type *piz = iz.fortran_vec (); F77_XFCN (dpbcon, DPBCON, @@ -5556,7 +5556,7 @@ } } - Array<octave_idx_type> ipvt (nr); + Array<octave_idx_type> ipvt (nr, 1); octave_idx_type *pipvt = ipvt.fortran_vec (); F77_XFCN (dgbtrf, DGBTRF, (nr, nr, n_lower, n_upper, tmp_data, @@ -5582,9 +5582,9 @@ if (calc_cond) { char job = '1'; - Array<double> z (3 * nr); + Array<double> z (3 * nr, 1); double *pz = z.fortran_vec (); - Array<octave_idx_type> iz (nr); + Array<octave_idx_type> iz (nr, 1); octave_idx_type *piz = iz.fortran_vec (); F77_XFCN (dgbcon, DGBCON,