Mercurial > jwe > octave
changeset 21005:936b88598a0b
maint: Periodic merge of stable to default.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 29 Dec 2015 11:08:04 -0500 |
parents | b51078f07886 (current diff) f7e416862e90 (diff) |
children | ea779f11deae |
files | libinterp/corefcn/error.cc libinterp/corefcn/urlwrite.cc libinterp/octave-value/ov-oncleanup.cc scripts/gui/errordlg.m scripts/gui/warndlg.m |
diffstat | 9 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/etc/OLD-ChangeLogs/scripts-ChangeLog Mon Dec 28 16:30:08 2015 -0800 +++ b/etc/OLD-ChangeLogs/scripts-ChangeLog Tue Dec 29 11:08:04 2015 -0500 @@ -5568,7 +5568,7 @@ * optimization/fsolve.m: Avoid redundant reevaluation when using FD jacobians. Document how it can be done with user jacobians. Make first iteration special and call outputfcn after it. Skip updates - unless two successful iterations have occured. + unless two successful iterations have occurred. * optimization/__dogleg__.m: Add missing alpha in the zero-gradient case. * optimization/fsolve.m: Remove autodg (not used), simplify.
--- a/libinterp/corefcn/error.cc Mon Dec 28 16:30:08 2015 -0800 +++ b/libinterp/corefcn/error.cc Tue Dec 29 11:08:04 2015 -0500 @@ -86,7 +86,7 @@ // The last error message id. static std::string Vlast_error_id; -// The last file in which an error occured +// The last file in which an error occurred static octave_map Vlast_error_stack; // Current error state.
--- a/libinterp/octave-value/ov-oncleanup.cc Mon Dec 28 16:30:08 2015 -0800 +++ b/libinterp/octave-value/ov-oncleanup.cc Tue Dec 29 11:08:04 2015 -0500 @@ -85,7 +85,7 @@ { recover_from_exception (); - warning ("onCleanup: interrupt occured in cleanup action"); + warning ("onCleanup: interrupt occurred in cleanup action"); } catch (const octave_execution_exception&) {
--- a/liboctave/cruft/dassl/ddastp.f Mon Dec 28 16:30:08 2015 -0800 +++ b/liboctave/cruft/dassl/ddastp.f Tue Dec 29 11:08:04 2015 -0500 @@ -543,7 +543,7 @@ C THE NEWTON ITERATION FAILED TO CONVERGE FOR A REASON C OTHER THAN A SINGULAR ITERATION MATRIX. IF IRES = -2, THEN C RETURN. OTHERWISE, REDUCE THE STEPSIZE AND TRY AGAIN, UNLESS -C TOO MANY FAILURES HAVE OCCURED. +C TOO MANY FAILURES HAVE OCCURRED. 650 CONTINUE IF (IRES .GT. -2) GO TO 655 IDID = -11
--- a/liboctave/cruft/odepack/sstode.f Mon Dec 28 16:30:08 2015 -0800 +++ b/liboctave/cruft/odepack/sstode.f Tue Dec 29 11:08:04 2015 -0500 @@ -451,7 +451,7 @@ IRET = 2 GO TO 150 C----------------------------------------------------------------------- -C Control reaches this section if 3 or more failures have occured. +C Control reaches this section if 3 or more failures have occurred. C If 10 failures have occurred, exit with KFLAG = -1. C It is assumed that the derivatives that have accumulated in the C YH array have errors of the wrong order. Hence the first
--- a/liboctave/cruft/odepack/stode.f Mon Dec 28 16:30:08 2015 -0800 +++ b/liboctave/cruft/odepack/stode.f Tue Dec 29 11:08:04 2015 -0500 @@ -435,7 +435,7 @@ IRET = 2 GO TO 150 C----------------------------------------------------------------------- -C CONTROL REACHES THIS SECTION IF 3 OR MORE FAILURES HAVE OCCURED. +C CONTROL REACHES THIS SECTION IF 3 OR MORE FAILURES HAVE OCCURRED. C IF 10 FAILURES HAVE OCCURRED, EXIT WITH KFLAG = -1. C IT IS ASSUMED THAT THE DERIVATIVES THAT HAVE ACCUMULATED IN THE C YH ARRAY HAVE ERRORS OF THE WRONG ORDER. HENCE THE FIRST
--- a/liboctave/util/oct-inttypes.cc Mon Dec 28 16:30:08 2015 -0800 +++ b/liboctave/util/oct-inttypes.cc Tue Dec 29 11:08:04 2015 -0500 @@ -201,7 +201,7 @@ return xop::op (xx, y); else { - // If equality occured we compare as integers. + // If equality occurred we compare as integers. if (xx == xxup) return xop::gtval; else @@ -222,7 +222,7 @@ return xop::op (xx, y); else { - // If equality occured we compare as integers. + // If equality occurred we compare as integers. if (xx == xxup) return xop::gtval; else if (xx == xxlo)
--- a/scripts/gui/errordlg.m Mon Dec 28 16:30:08 2015 -0800 +++ b/scripts/gui/errordlg.m Tue Dec 29 11:08:04 2015 -0500 @@ -49,7 +49,7 @@ %!demo %! disp ('- test errordlg with prompt only.'); -%! errordlg ('Oops, an expected error occured'); +%! errordlg ('Oops, an expected error occurred'); %!demo %! disp ('- test errordlg with prompt and caption.');
--- a/scripts/gui/warndlg.m Mon Dec 28 16:30:08 2015 -0800 +++ b/scripts/gui/warndlg.m Tue Dec 29 11:08:04 2015 -0500 @@ -49,7 +49,7 @@ %!demo %! disp ('- test warndlg with prompt only.'); -%! warndlg ('Oh, a warning occured'); +%! warndlg ('Oh, a warning occurred'); %!demo %! disp ('- test warndlg with prompt and caption.');