Mercurial > octave-nkf
diff liboctave/floatQR.cc @ 11586:12df7854fa7c
strip trailing whitespace from source files
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 20 Jan 2011 17:24:59 -0500 |
| parents | fd0a3ac60b0e |
| children | 72c96de7a403 |
line wrap: on
line diff
--- a/liboctave/floatQR.cc Thu Jan 20 17:21:27 2011 -0500 +++ b/liboctave/floatQR.cc Thu Jan 20 17:24:59 2011 -0500 @@ -42,7 +42,7 @@ F77_RET_T F77_FUNC (sgeqrf, SGEQRF) (const octave_idx_type&, const octave_idx_type&, float*, const octave_idx_type&, float*, float*, - const octave_idx_type&, octave_idx_type&); + const octave_idx_type&, octave_idx_type&); F77_RET_T F77_FUNC (sorgqr, SORGQR) (const octave_idx_type&, const octave_idx_type&, @@ -73,13 +73,13 @@ const octave_idx_type&, float*); F77_RET_T - F77_FUNC (sqrinr, SQRINR) (const octave_idx_type&, const octave_idx_type&, + F77_FUNC (sqrinr, SQRINR) (const octave_idx_type&, const octave_idx_type&, float*, const octave_idx_type&, float*, const octave_idx_type&, const octave_idx_type&, const float*, float*); F77_RET_T - F77_FUNC (sqrder, SQRDER) (const octave_idx_type&, const octave_idx_type&, + F77_FUNC (sqrder, SQRDER) (const octave_idx_type&, const octave_idx_type&, float*, const octave_idx_type&, float*, const octave_idx_type&, const octave_idx_type&, float*); @@ -131,7 +131,7 @@ form (n, afact, tau, qr_type); } -void FloatQR::form (octave_idx_type n, FloatMatrix& afact, +void FloatQR::form (octave_idx_type n, FloatMatrix& afact, float *tau, qr_type_t qr_type) { octave_idx_type m = afact.rows (), min_mn = std::min (m, n); @@ -249,7 +249,7 @@ if (u.length () != m) (*current_liboctave_error_handler) ("qrinsert: dimensions mismatch"); - else if (j < 0 || j > n) + else if (j < 0 || j > n) (*current_liboctave_error_handler) ("qrinsert: index out of range"); else { @@ -266,7 +266,7 @@ FloatColumnVector utmp = u; OCTAVE_LOCAL_BUFFER (float, w, k); F77_XFCN (sqrinc, SQRINC, (m, n, k, q.fortran_vec (), q.rows (), - r.fortran_vec (), r.rows (), j + 1, + r.fortran_vec (), r.rows (), j + 1, utmp.data (), w)); } } @@ -309,9 +309,9 @@ { octave_idx_type ii = i; FloatColumnVector utmp = u.column (jsi(i)); - F77_XFCN (sqrinc, SQRINC, (m, n + ii, std::min (kmax, k + ii), + F77_XFCN (sqrinc, SQRINC, (m, n + ii, std::min (kmax, k + ii), q.fortran_vec (), q.rows (), - r.fortran_vec (), r.rows (), js(ii) + 1, + r.fortran_vec (), r.rows (), js(ii) + 1, utmp.data (), w)); } } @@ -324,7 +324,7 @@ octave_idx_type k = r.rows (); octave_idx_type n = r.columns (); - if (j < 0 || j > n-1) + if (j < 0 || j > n-1) (*current_liboctave_error_handler) ("qrdelete: index out of range"); else { @@ -368,7 +368,7 @@ for (volatile octave_idx_type i = 0; i < js.length (); i++) { octave_idx_type ii = i; - F77_XFCN (sqrdec, SQRDEC, (m, n - ii, k == m ? k : k - ii, + F77_XFCN (sqrdec, SQRDEC, (m, n - ii, k == m ? k : k - ii, q.fortran_vec (), q.rows (), r.fortran_vec (), r.rows (), js(ii) + 1, w)); } @@ -394,7 +394,7 @@ if (! q.is_square () || u.length () != n) (*current_liboctave_error_handler) ("qrinsert: dimensions mismatch"); - else if (j < 0 || j > m) + else if (j < 0 || j > m) (*current_liboctave_error_handler) ("qrinsert: index out of range"); else { @@ -403,7 +403,7 @@ FloatRowVector utmp = u; OCTAVE_LOCAL_BUFFER (float, w, k); F77_XFCN (sqrinr, SQRINR, (m, n, q.fortran_vec (), q.rows (), - r.fortran_vec (), r.rows (), + r.fortran_vec (), r.rows (), j + 1, utmp.fortran_vec (), w)); } @@ -417,7 +417,7 @@ if (! q.is_square ()) (*current_liboctave_error_handler) ("qrdelete: dimensions mismatch"); - else if (j < 0 || j > m-1) + else if (j < 0 || j > m-1) (*current_liboctave_error_handler) ("qrdelete: index out of range"); else { @@ -438,12 +438,12 @@ octave_idx_type k = r.rows (); octave_idx_type n = r.columns (); - if (i < 0 || i > n-1 || j < 0 || j > n-1) + if (i < 0 || i > n-1 || j < 0 || j > n-1) (*current_liboctave_error_handler) ("qrshift: index out of range"); else { OCTAVE_LOCAL_BUFFER (float, w, 2*k); - F77_XFCN (sqrshc, SQRSHC, (m, n, k, + F77_XFCN (sqrshc, SQRSHC, (m, n, k, q.fortran_vec (), q.rows (), r.fortran_vec (), r.rows (), i + 1, j + 1, w)); @@ -529,7 +529,7 @@ } static -FloatMatrix shift_cols (const FloatMatrix& a, +FloatMatrix shift_cols (const FloatMatrix& a, octave_idx_type i, octave_idx_type j) { octave_idx_type n = a.columns (); @@ -559,7 +559,7 @@ if (u.length () != m) (*current_liboctave_error_handler) ("qrinsert: dimensions mismatch"); - else if (j < 0 || j > n) + else if (j < 0 || j > n) (*current_liboctave_error_handler) ("qrinsert: index out of range"); else { @@ -605,7 +605,7 @@ octave_idx_type m = q.rows (); octave_idx_type n = r.columns (); - if (j < 0 || j > n-1) + if (j < 0 || j > n-1) (*current_liboctave_error_handler) ("qrdelete: index out of range"); else { @@ -651,7 +651,7 @@ if (! q.is_square () || u.length () != n) (*current_liboctave_error_handler) ("qrinsert: dimensions mismatch"); - else if (j < 0 || j > m) + else if (j < 0 || j > m) (*current_liboctave_error_handler) ("qrinsert: index out of range"); else { @@ -669,7 +669,7 @@ if (! q.is_square ()) (*current_liboctave_error_handler) ("qrdelete: dimensions mismatch"); - else if (j < 0 || j > m-1) + else if (j < 0 || j > m-1) (*current_liboctave_error_handler) ("qrdelete: index out of range"); else { @@ -685,7 +685,7 @@ octave_idx_type m = q.rows (); octave_idx_type n = r.columns (); - if (i < 0 || i > n-1 || j < 0 || j > n-1) + if (i < 0 || i > n-1 || j < 0 || j > n-1) (*current_liboctave_error_handler) ("qrshift: index out of range"); else {