Mercurial > octave

changeset 30401:e52c8171ff34

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: merge stable to default.
author Rik <rik@octave.org>
date Mon, 29 Nov 2021 16:44:12 -0800
parents 97aa9337c776 (current diff) 168da23530b4 (diff)
children 1ef9fca2db06
files
diffstat 6 files changed, 21 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/external/odepack/dlsode.f	Mon Nov 29 16:12:32 2021 -0800
+++ b/liboctave/external/odepack/dlsode.f	Mon Nov 29 16:44:12 2021 -0800
@@ -294,10 +294,10 @@
 C     on the interval from t = 0.0 to t = 4.E10, with initial conditions
 C     y1 = 1.0, y2 = y3 = 0. The problem is stiff.
 C
-C     The following coding solves this problem with DLSODE, using 
-C     MF = 21 and printing results at t = .4, 4., ..., 4.E10.  It uses 
-C     ITOL = 2 and ATOL much smaller for y2 than for y1 or y3 because y2 
-C     has much smaller values.  At the end of the run, statistical 
+C     The following coding solves this problem with DLSODE, using
+C     MF = 21 and printing results at t = .4, 4., ..., 4.E10.  It uses
+C     ITOL = 2 and ATOL much smaller for y2 than for y1 or y3 because y2
+C     has much smaller values.  At the end of the run, statistical
 C     quantities of interest are printed.
 C
 C        EXTERNAL  FEX, JEX
@@ -388,7 +388,7 @@
 C
 C *Portability:
 C     Since NEQ is dimensioned inside DLSODE, some compilers may object
-C     to a call to DLSODE with NEQ a scalar variable.  In this event, 
+C     to a call to DLSODE with NEQ a scalar variable.  In this event,
 C     use DIMENSION NEQ(1).  Similar remarks apply to RTOL and ATOL.
 C
 C     Note to Cray users:
@@ -876,9 +876,9 @@
 C     Optional Outputs
 C     ----------------
 C     As optional additional output from DLSODE, the variables listed
-C     below are quantities related to the performance of DLSODE which 
+C     below are quantities related to the performance of DLSODE which
 C     are available to the user.  These are communicated by way of the
-C     work arrays, but also have internal mnemonic names as shown. 
+C     work arrays, but also have internal mnemonic names as shown.
 C     Except where stated otherwise, all of these outputs are defined on
 C     any successful return from DLSODE, and on any return with ISTATE =
 C     -1, -2, -4, -5, or -6.  On an illegal input return (ISTATE = -3),
@@ -1020,7 +1020,7 @@
 C     If DLSODE is to be used in an overlay situation, the user must
 C     declare, in the primary overlay, the variables in:
 C     (1) the call sequence to DLSODE,
-C     (2) the internal COMMON block /DLS001/, of length 255 
+C     (2) the internal COMMON block /DLS001/, of length 255
 C         (218 double precision words followed by 37 integer words).
 C
 C     If DLSODE is used on a system in which the contents of internal
@@ -1156,7 +1156,7 @@
 C 19930723  Changed D1MACH to DUMACH. (FNF)
 C 19930801  Removed ILLIN and NTREP from Common (affects driver logic);
 C           minor changes to prologue and internal comments;
-C           changed Hollerith strings to quoted strings; 
+C           changed Hollerith strings to quoted strings;
 C           changed internal comments to mixed case;
 C           replaced XERRWD with new version using character type;
 C           changed dummy dimensions from 1 to *. (ACH)
@@ -1650,7 +1650,7 @@
 C Block I.
 C The following block handles all error returns due to illegal input
 C (ISTATE = -3), as detected before calling the core integrator.
-C First the error message routine is called.  If the illegal input 
+C First the error message routine is called.  If the illegal input
 C is a negative ISTATE, the run is aborted (apparent infinite loop).
 C-----------------------------------------------------------------------
  601  MSG = 'DLSODE-  ISTATE (=I1) illegal '
--- a/scripts/general/dblquad.m	Mon Nov 29 16:12:32 2021 -0800
+++ b/scripts/general/dblquad.m	Mon Nov 29 16:44:12 2021 -0800
@@ -91,5 +91,5 @@
 %!        pi * erf (1).^2, 1e-6)
 %!assert (dblquad (@(x,y) exp (-x.^2 - y.^2) , -1, 1, -1, 1, 1e-6, @quadl),
 %!        pi * erf (1).^2, 1e-6)
-%!assert (dblquad (@(x,y) exp (-x.^2 - y.^2) , -1, 1, -1, 1, 1e-6, @quadv), 
+%!assert (dblquad (@(x,y) exp (-x.^2 - y.^2) , -1, 1, -1, 1, 1e-6, @quadv),
 %!        pi * erf (1).^2, 1e-6)
--- a/scripts/miscellaneous/open.m	Mon Nov 29 16:12:32 2021 -0800
+++ b/scripts/miscellaneous/open.m	Mon Nov 29 16:44:12 2021 -0800
@@ -43,7 +43,7 @@
 ## @xref{XREFload,,load function}.
 ##
 ## @item .ofig
-## Open the figure with @code{hgload}.  
+## Open the figure with @code{hgload}.
 ## @xref{XREFhgload,,hgload function}.
 ##
 ## @item .fig, .ofig
--- a/scripts/specfun/betainc.m	Mon Nov 29 16:12:32 2021 -0800
+++ b/scripts/specfun/betainc.m	Mon Nov 29 16:44:12 2021 -0800
@@ -136,7 +136,7 @@
   non_trivial = a_not_one & b_not_one;
   a_one &= b_not_one;
   b_one &= a_not_one;
-  
+
   if (strcmpi (tail, "lower"))
     y(a_b_one) = x(a_b_one);
     y(a_one) = 1 - (1 - x(a_one)) .^ b(a_one);
@@ -146,13 +146,13 @@
     y(a_one) = (1 - x(a_one)) .^ b(a_one);
     y(b_one) = 1 - x(b_one) .^ a(b_one);
   endif
-  
+
   ## Non-Trivial cases
   ## In the following, we use the fact that the continued fraction Octave uses
   ## is more efficient when x <= a / (a + b).  Moreover, to compute the upper
   ## version, which is defined as I_x(a,b,"upper") = 1 - I_x(a,b) we use the
   ## property I_x(a,b) + I_(1-x) (b,a) = 1.
-  
+
   x = x(non_trivial);
   a = a(non_trivial);
   b = b(non_trivial);
@@ -182,7 +182,7 @@
          + (gammaln (a + b) - gammaln (a) - gammaln (b)) + log (f);
   y_nt = real (exp (y_nt));
   y_nt(fflag) = 1 - y_nt(fflag);
-  
+
   y(non_trivial) = y_nt;
 
   ## Restore original shape
--- a/scripts/specfun/isprime.m	Mon Nov 29 16:12:32 2021 -0800
+++ b/scripts/specfun/isprime.m	Mon Nov 29 16:44:12 2021 -0800
@@ -99,7 +99,7 @@
   ## Generate prime table of suitable length up to maxp.
   ## The value of maxp needs to be at least 37,
   ## because of the method used by __isprimelarge__ below.
-  maxp = 37;  
+  maxp = 37;
   pr = [2 3 5 7 11 13 17 19 23 29 31 37];
   t = lookup (pr, x, "b");  # quick search for table matches.
 
@@ -119,9 +119,9 @@
   ##         30e9       28.3848s       27.9982s
   ## which is close enough to interpolate, so final threshold = 29 billion.
   ##
-  ## The test code was this: 
-  ##   n = THRESHOLD - (1:1e7); tic; isprime(n); toc 
-  ##   n = THRESHOLD + (1:1e7); tic; isprime(n); toc 
+  ## The test code was this:
+  ##   n = THRESHOLD - (1:1e7); tic; isprime(n); toc
+  ##   n = THRESHOLD + (1:1e7); tic; isprime(n); toc
   ##
   ## Two notes for future programmers:
   ##
--- a/test/json/jsondecode_BIST.tst	Mon Nov 29 16:12:32 2021 -0800
+++ b/test/json/jsondecode_BIST.tst	Mon Nov 29 16:44:12 2021 -0800
@@ -602,7 +602,7 @@
 
 
 %%% Test 10: Decoding of objects inside an object without using makeValidName.
-%%%          Not Matlab compatible!       
+%%%          Not Matlab compatible!
 
 %!testif HAVE_RAPIDJSON
 %! json = ['{"object": {"  hi 1   ": 1, "%string.array": 2,' ...