Mercurial > jwe > octave

comparison liboctave/numeric/fCmplxLU.cc @ 21136:7cac4e7458f2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: clean up code around calls to current_liboctave_error_handler. Remove statements after call to handler that are no longer reachable. Place input validation first and immediately call handler if necessary. Change if/error_handler/else to if/error_handler and re-indent code. * Array-util.cc, Array.cc, CColVector.cc, CDiagMatrix.cc, CMatrix.cc, CNDArray.cc, CRowVector.cc, CSparse.cc, DiagArray2.cc, MArray.cc, PermMatrix.cc, Sparse.cc, Sparse.h, chMatrix.cc, chNDArray.cc, dColVector.cc, dDiagMatrix.cc, dMatrix.cc, dNDArray.cc, dRowVector.cc, dSparse.cc, fCColVector.cc, fCDiagMatrix.cc, fCMatrix.cc, fCNDArray.cc, fCRowVector.cc, fColVector.cc, fDiagMatrix.cc, fMatrix.cc, fNDArray.cc, fRowVector.cc, idx-vector.cc, CmplxAEPBAL.cc, CmplxCHOL.cc, CmplxGEPBAL.cc, CmplxHESS.cc, CmplxLU.cc, CmplxQR.cc, CmplxSCHUR.cc, CmplxSVD.cc, DASPK.cc, EIG.cc, LSODE.cc, Quad.cc, SparseCmplxCHOL.cc, SparseCmplxLU.cc, SparseCmplxQR.cc, SparseQR.cc, SparsedbleCHOL.cc, SparsedbleLU.cc, base-lu.cc, bsxfun-defs.cc, dbleAEPBAL.cc, dbleCHOL.cc, dbleGEPBAL.cc, dbleHESS.cc, dbleLU.cc, dbleQR.cc, dbleSCHUR.cc, dbleSVD.cc, eigs-base.cc, fCmplxAEPBAL.cc, fCmplxCHOL.cc, fCmplxLU.cc, fCmplxQR.cc, fCmplxSCHUR.cc, fEIG.cc, floatAEPBAL.cc, floatCHOL.cc, floatGEPBAL.cc, floatHESS.cc, floatLU.cc, floatQR.cc, floatSCHUR.cc, floatSVD.cc, lo-specfun.cc, oct-fftw.cc, oct-rand.cc, oct-spparms.cc, sparse-base-chol.cc, sparse-dmsolve.cc, file-ops.cc, lo-sysdep.cc, mach-info.cc, oct-env.cc, oct-syscalls.cc, cmd-edit.cc, cmd-hist.cc, data-conv.cc, lo-ieee.cc, lo-regexp.cc, oct-base64.cc, oct-shlib.cc, pathsearch.cc, singleton-cleanup.cc, sparse-util.cc, unwind-prot.cc: Remove statements after call to handler that are no longer reachable. Place input validation first and immediately call handler if necessary. Change if/error_handler/else to if/error_handler and re-indent code.
author Rik <rik@octave.org>
date Sat, 23 Jan 2016 13:52:03 -0800
parents a9574e3c6e9e
children e2fca7d79169
comparison
equal deleted inserted replaced
21135:95da3bc8a281 21136:7cac4e7458f2
120 120
121 octave_idx_type m = l.rows (); 121 octave_idx_type m = l.rows ();
122 octave_idx_type n = r.columns (); 122 octave_idx_type n = r.columns ();
123 octave_idx_type k = l.columns (); 123 octave_idx_type k = l.columns ();
124 124
125 if (u.rows () == m && v.rows () == n && u.cols () == v.cols ()) 125 if (u.rows () != m || v.rows () != n || u.cols () != v.cols ())
126 (*current_liboctave_error_handler) ("luupdate: dimensions mismatch");
127
128 for (volatile octave_idx_type i = 0; i < u.cols (); i++)
126 { 129 {
127 for (volatile octave_idx_type i = 0; i < u.cols (); i++) 130 FloatComplexColumnVector utmp = u.column (i);
128 { 131 FloatComplexColumnVector vtmp = v.column (i);
129 FloatComplexColumnVector utmp = u.column (i); 132 F77_XFCN (clu1up, CLU1UP, (m, n, l.fortran_vec (),
130 FloatComplexColumnVector vtmp = v.column (i); 133 m, r.fortran_vec (), k,
131 F77_XFCN (clu1up, CLU1UP, (m, n, l.fortran_vec (), 134 utmp.fortran_vec (), vtmp.fortran_vec ()));
132 m, r.fortran_vec (), k,
133 utmp.fortran_vec (), vtmp.fortran_vec ()));
134 }
135 } 135 }
136 else
137 (*current_liboctave_error_handler) ("luupdate: dimensions mismatch");
138 } 136 }
139 137
140 void FloatComplexLU::update_piv (const FloatComplexColumnVector& u, 138 void FloatComplexLU::update_piv (const FloatComplexColumnVector& u,
141 const FloatComplexColumnVector& v) 139 const FloatComplexColumnVector& v)
142 { 140 {
148 146
149 octave_idx_type m = l.rows (); 147 octave_idx_type m = l.rows ();
150 octave_idx_type n = r.columns (); 148 octave_idx_type n = r.columns ();
151 octave_idx_type k = l.columns (); 149 octave_idx_type k = l.columns ();
152 150
153 if (u.numel () == m && v.numel () == n) 151 if (u.numel () != m || v.numel () != n)
152 (*current_liboctave_error_handler) ("luupdate: dimensions mismatch");
153
154 FloatComplexColumnVector utmp = u;
155 FloatComplexColumnVector vtmp = v;
156 OCTAVE_LOCAL_BUFFER (FloatComplex, w, m);
157 for (octave_idx_type i = 0; i < m; i++) ipvt(i) += 1; // increment
158 F77_XFCN (clup1up, CLUP1UP, (m, n, l.fortran_vec (),
159 m, r.fortran_vec (), k,
160 ipvt.fortran_vec (),
161 utmp.data (), vtmp.data (), w));
162 for (octave_idx_type i = 0; i < m; i++) ipvt(i) -= 1; // decrement
163 }
164
165 void FloatComplexLU::update_piv (const FloatComplexMatrix& u,
166 const FloatComplexMatrix& v)
167 {
168 if (packed ())
169 unpack ();
170
171 FloatComplexMatrix& l = l_fact;
172 FloatComplexMatrix& r = a_fact;
173
174 octave_idx_type m = l.rows ();
175 octave_idx_type n = r.columns ();
176 octave_idx_type k = l.columns ();
177
178 if (u.rows () != m || v.rows () != n || u.cols () != v.cols ())
179 (*current_liboctave_error_handler) ("luupdate: dimensions mismatch");
180
181 OCTAVE_LOCAL_BUFFER (FloatComplex, w, m);
182 for (octave_idx_type i = 0; i < m; i++) ipvt(i) += 1; // increment
183 for (volatile octave_idx_type i = 0; i < u.cols (); i++)
154 { 184 {
155 FloatComplexColumnVector utmp = u; 185 FloatComplexColumnVector utmp = u.column (i);
156 FloatComplexColumnVector vtmp = v; 186 FloatComplexColumnVector vtmp = v.column (i);
157 OCTAVE_LOCAL_BUFFER (FloatComplex, w, m);
158 for (octave_idx_type i = 0; i < m; i++) ipvt(i) += 1; // increment
159 F77_XFCN (clup1up, CLUP1UP, (m, n, l.fortran_vec (), 187 F77_XFCN (clup1up, CLUP1UP, (m, n, l.fortran_vec (),
160 m, r.fortran_vec (), k, 188 m, r.fortran_vec (), k,
161 ipvt.fortran_vec (), 189 ipvt.fortran_vec (),
162 utmp.data (), vtmp.data (), w)); 190 utmp.data (), vtmp.data (), w));
163 for (octave_idx_type i = 0; i < m; i++) ipvt(i) -= 1; // decrement
164 } 191 }
165 else 192 for (octave_idx_type i = 0; i < m; i++) ipvt(i) -= 1; // decrement
166 (*current_liboctave_error_handler) ("luupdate: dimensions mismatch");
167 }
168
169 void FloatComplexLU::update_piv (const FloatComplexMatrix& u,
170 const FloatComplexMatrix& v)
171 {
172 if (packed ())
173 unpack ();
174
175 FloatComplexMatrix& l = l_fact;
176 FloatComplexMatrix& r = a_fact;
177
178 octave_idx_type m = l.rows ();
179 octave_idx_type n = r.columns ();
180 octave_idx_type k = l.columns ();
181
182 if (u.rows () == m && v.rows () == n && u.cols () == v.cols ())
183 {
184 OCTAVE_LOCAL_BUFFER (FloatComplex, w, m);
185 for (octave_idx_type i = 0; i < m; i++) ipvt(i) += 1; // increment
186 for (volatile octave_idx_type i = 0; i < u.cols (); i++)
187 {
188 FloatComplexColumnVector utmp = u.column (i);
189 FloatComplexColumnVector vtmp = v.column (i);
190 F77_XFCN (clup1up, CLUP1UP, (m, n, l.fortran_vec (),
191 m, r.fortran_vec (), k,
192 ipvt.fortran_vec (),
193 utmp.data (), vtmp.data (), w));
194 }
195 for (octave_idx_type i = 0; i < m; i++) ipvt(i) -= 1; // decrement
196 }
197 else
198 (*current_liboctave_error_handler) ("luupdate: dimensions mismatch");
199 } 193 }
200 194
201 #else 195 #else
202 196
203 void FloatComplexLU::update (const FloatComplexColumnVector&, 197 void FloatComplexLU::update (const FloatComplexColumnVector&,