Mercurial > hg > octave-lyh
diff liboctave/CSparse.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/CSparse.cc +++ b/liboctave/CSparse.cc @@ -325,7 +325,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; @@ -480,7 +480,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; @@ -3922,7 +3922,7 @@ OCTAVE_LOCAL_BUFFER (Complex, DU, nr - 1); OCTAVE_LOCAL_BUFFER (Complex, D, nr); OCTAVE_LOCAL_BUFFER (Complex, 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 ()) @@ -4222,7 +4222,7 @@ OCTAVE_LOCAL_BUFFER (Complex, DU, nr - 1); OCTAVE_LOCAL_BUFFER (Complex, D, nr); OCTAVE_LOCAL_BUFFER (Complex, 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 ()) @@ -4416,9 +4416,9 @@ { if (calc_cond) { - Array<Complex> z (2 * nr); + Array<Complex> z (2 * nr, 1); Complex *pz = z.fortran_vec (); - Array<double> iz (nr); + Array<double> iz (nr, 1); double *piz = iz.fortran_vec (); F77_XFCN (zpbcon, ZPBCON, @@ -4510,7 +4510,7 @@ } } - Array<octave_idx_type> ipvt (nr); + Array<octave_idx_type> ipvt (nr, 1); octave_idx_type *pipvt = ipvt.fortran_vec (); F77_XFCN (zgbtrf, ZGBTRF, (nr, nc, n_lower, n_upper, tmp_data, @@ -4537,9 +4537,9 @@ if (calc_cond) { char job = '1'; - Array<Complex> z (2 * nr); + Array<Complex> z (2 * nr, 1); Complex *pz = z.fortran_vec (); - Array<double> iz (nr); + Array<double> iz (nr, 1); double *piz = iz.fortran_vec (); F77_XFCN (zgbcon, ZGBCON, @@ -4663,9 +4663,9 @@ { if (calc_cond) { - Array<Complex> z (2 * nr); + Array<Complex> z (2 * nr, 1); Complex *pz = z.fortran_vec (); - Array<double> iz (nr); + Array<double> iz (nr, 1); double *piz = iz.fortran_vec (); F77_XFCN (zpbcon, ZPBCON, @@ -4792,7 +4792,7 @@ } } - Array<octave_idx_type> ipvt (nr); + Array<octave_idx_type> ipvt (nr, 1); octave_idx_type *pipvt = ipvt.fortran_vec (); F77_XFCN (zgbtrf, ZGBTRF, (nr, nr, n_lower, n_upper, tmp_data, @@ -4818,9 +4818,9 @@ if (calc_cond) { char job = '1'; - Array<Complex> z (2 * nr); + Array<Complex> z (2 * nr, 1); Complex *pz = z.fortran_vec (); - Array<double> iz (nr); + Array<double> iz (nr, 1); double *piz = iz.fortran_vec (); F77_XFCN (zgbcon, ZGBCON, @@ -4983,9 +4983,9 @@ { if (calc_cond) { - Array<Complex> z (2 * nr); + Array<Complex> z (2 * nr, 1); Complex *pz = z.fortran_vec (); - Array<double> iz (nr); + Array<double> iz (nr, 1); double *piz = iz.fortran_vec (); F77_XFCN (zpbcon, ZPBCON, @@ -5077,7 +5077,7 @@ } } - Array<octave_idx_type> ipvt (nr); + Array<octave_idx_type> ipvt (nr, 1); octave_idx_type *pipvt = ipvt.fortran_vec (); F77_XFCN (zgbtrf, ZGBTRF, (nr, nr, n_lower, n_upper, tmp_data, @@ -5102,9 +5102,9 @@ if (calc_cond) { char job = '1'; - Array<Complex> z (2 * nr); + Array<Complex> z (2 * nr, 1); Complex *pz = z.fortran_vec (); - Array<double> iz (nr); + Array<double> iz (nr, 1); double *piz = iz.fortran_vec (); F77_XFCN (zgbcon, ZGBCON, @@ -5230,9 +5230,9 @@ { if (calc_cond) { - Array<Complex> z (2 * nr); + Array<Complex> z (2 * nr, 1); Complex *pz = z.fortran_vec (); - Array<double> iz (nr); + Array<double> iz (nr, 1); double *piz = iz.fortran_vec (); F77_XFCN (zpbcon, ZPBCON, @@ -5364,7 +5364,7 @@ } } - Array<octave_idx_type> ipvt (nr); + Array<octave_idx_type> ipvt (nr, 1); octave_idx_type *pipvt = ipvt.fortran_vec (); F77_XFCN (zgbtrf, ZGBTRF, (nr, nr, n_lower, n_upper, tmp_data, @@ -5390,9 +5390,9 @@ if (calc_cond) { char job = '1'; - Array<Complex> z (2 * nr); + Array<Complex> z (2 * nr, 1); Complex *pz = z.fortran_vec (); - Array<double> iz (nr); + Array<double> iz (nr, 1); double *piz = iz.fortran_vec (); F77_XFCN (zgbcon, ZGBCON,