Mercurial > jwe > octave

comparison liboctave/numeric/LSODE.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 1edf15793cac
children f7121e111991
comparison
equal deleted inserted replaced
21135:95da3bc8a281 21136:7cac4e7458f2
173 iwork(4) = maxord; 173 iwork(4) = maxord;
174 iopt = 1; 174 iopt = 1;
175 } 175 }
176 else 176 else
177 { 177 {
178 // FIXME: Should this be a warning?
178 (*current_liboctave_error_handler) 179 (*current_liboctave_error_handler)
179 ("lsode: invalid value for maximum order"); 180 ("lsode: invalid value for maximum order");
180 integration_error = true; 181 integration_error = true;
181 return retval; 182 return retval;
182 } 183 }
208 209
209 ColumnVector xdot = (*user_fun) (x, t); 210 ColumnVector xdot = (*user_fun) (x, t);
210 211
211 if (x.numel () != xdot.numel ()) 212 if (x.numel () != xdot.numel ())
212 { 213 {
214 // FIXME: Should this be a warning?
213 (*current_liboctave_error_handler) 215 (*current_liboctave_error_handler)
214 ("lsode: inconsistent sizes for state and derivative vectors"); 216 ("lsode: inconsistent sizes for state and derivative vectors");
215 217
216 integration_error = true; 218 integration_error = true;
217 return retval; 219 return retval;
230 itol = 1; 232 itol = 1;
231 else if (abs_tol_len == n) 233 else if (abs_tol_len == n)
232 itol = 2; 234 itol = 2;
233 else 235 else
234 { 236 {
237 // FIXME: Should this be a warning?
235 (*current_liboctave_error_handler) 238 (*current_liboctave_error_handler)
236 ("lsode: inconsistent sizes for state and absolute tolerance vectors"); 239 ("lsode: inconsistent sizes for state and absolute tolerance vectors");
237 240
238 integration_error = true; 241 integration_error = true;
239 return retval; 242 return retval;
302 break; 305 break;
303 306
304 default: 307 default:
305 integration_error = true; 308 integration_error = true;
306 (*current_liboctave_error_handler) 309 (*current_liboctave_error_handler)
307 ("unrecognized value of istate (= %d) returned from lsode", 310 ("unrecognized value of istate (= %d) returned from lsode", istate);
308 istate);
309 break; 311 break;
310 } 312 }
311 313
312 return retval; 314 return retval;
313 } 315 }