Mercurial > octave
changeset 21308:c53bfd6d8e08
maint: Use American spelling for "behavior".
* Array.cc, randmtzig.c, file-ops.cc, oct-inttypes.h, cross.m, bicgstab.m,
kurtosis.m, skewness.m, build-sparse-tests.sh, __ilu__.cc, __magick_read__.cc:
Use American spelling for "behavior".
| author | Rik <rik@octave.org> |
|---|---|
| date | Fri, 19 Feb 2016 09:40:59 -0800 |
| parents | 61c96c37ce69 |
| children | 7fbecef105ca |
| files | NEWS libinterp/corefcn/__ilu__.cc libinterp/dldfcn/__magick_read__.cc liboctave/array/Array.cc liboctave/numeric/randmtzig.c liboctave/system/file-ops.cc liboctave/util/oct-inttypes.h scripts/linear-algebra/cross.m scripts/sparse/bicgstab.m scripts/statistics/base/kurtosis.m scripts/statistics/base/skewness.m test/build-sparse-tests.sh |
| diffstat | 12 files changed, 18 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/NEWS Fri Feb 19 09:41:41 2016 -0800 +++ b/NEWS Fri Feb 19 09:40:59 2016 -0800 @@ -207,10 +207,10 @@ change was made for Matlab compatibility. ** For compatibility with Matlab, the "ismatrix (x)" function now only - checks the dimension of "x". The old behaviour of "ismatrix" is + checks the dimension of "x". The old behavior of "ismatrix" is obtained by "isnumeric (x) || islogical (x) || ischar (x)". - ** The nextpow2 function behaviour has been changed for vector inputs. + ** The nextpow2 function behavior has been changed for vector inputs. Instead of computing `nextpow2 (length (x))', it will now compute nextpow2 for each element of the input. This change is Matlab compatible, and also prevents bugs for "vectors" of length 1.
--- a/libinterp/corefcn/__ilu__.cc Fri Feb 19 09:41:41 2016 -0800 +++ b/libinterp/corefcn/__ilu__.cc Fri Feb 19 09:40:59 2016 -0800 @@ -32,7 +32,7 @@ #include "parse.h" // That function implements the IKJ and JKI variants of Gaussian elimination to -// perform the ILUTP decomposition. The behaviour is controlled by milu +// perform the ILUTP decomposition. The behavior is controlled by milu // parameter. If milu = ['off'|'col'] the JKI version is performed taking // advantage of CCS format of the input matrix. If milu = 'row' the input // matrix has to be transposed to obtain the equivalent CRS structure so we can @@ -528,7 +528,7 @@ } // That function implements the IKJ and JKI variants of gaussian elimination -// to perform the ILUTP decomposition. The behaviour is controlled by milu +// to perform the ILUTP decomposition. The behavior is controlled by milu // parameter. If milu = ['off'|'col'] the JKI version is performed taking // advantage of CCS format of the input matrix. Row pivoting is performed. // If milu = 'row' the input matrix has to be transposed to obtain the
--- a/libinterp/dldfcn/__magick_read__.cc Fri Feb 19 09:41:41 2016 -0800 +++ b/libinterp/dldfcn/__magick_read__.cc Fri Feb 19 09:40:59 2016 -0800 @@ -138,7 +138,7 @@ // We need this in case one of the sides of the image being read has // width 1. In those cases, the type will come as scalar instead of range -// since that's the behaviour of the colon operator (1:1:1 will be a scalar, +// since that's the behavior of the colon operator (1:1:1 will be a scalar, // not a range). static Range get_region_range (const octave_value& region)
--- a/liboctave/array/Array.cc Fri Feb 19 09:41:41 2016 -0800 +++ b/liboctave/array/Array.cc Fri Feb 19 09:40:59 2016 -0800 @@ -738,7 +738,7 @@ // b(1:2) gives ones (2,1) // b(ones (2)) gives ones (2) etc. // - // As you can see, the behaviour is weird, but the tests end up pretty + // As you can see, the behavior is weird, but the tests end up pretty // simple. Nah, I don't want to suggest that this is ad hoc :) if (ndims () == 2 && n != 1 && rd.is_vector ()) @@ -908,7 +908,7 @@ err_invalid_resize (); dim_vector dv; - // This is driven by Matlab's behaviour of giving a *row* vector + // This is driven by Matlab's behavior of giving a *row* vector // on some out-of-bounds assignments. Specifically, Matlab // allows a(i) with out-of-bouds i when a is either of 0x0, 1x0, // 1x1, 0xN, and gives a row vector in all cases (yes, even the
--- a/liboctave/numeric/randmtzig.c Fri Feb 19 09:41:41 2016 -0800 +++ b/liboctave/numeric/randmtzig.c Fri Feb 19 09:40:59 2016 -0800 @@ -102,7 +102,7 @@ /dev/urandom defined. Uses implicit -Di386 or explicit -DHAVE_X86_32 to determine if CPU=x86. - You can force X86 behaviour with -DUSE_X86_32=1, or suppress it with + You can force X86 behavior with -DUSE_X86_32=1, or suppress it with -DUSE_X86_32=0. You should also consider -march=i686 or similar for extra performance. Check whether -DUSE_X86_32=0 is faster on 64-bit x86 architectures.
--- a/liboctave/system/file-ops.cc Fri Feb 19 09:41:41 2016 -0800 +++ b/liboctave/system/file-ops.cc Fri Feb 19 09:40:59 2016 -0800 @@ -99,12 +99,12 @@ // The default value of tilde_additional_prefixes. This is set to // whitespace preceding a tilde so that simple programs which do not -// perform any word separation get desired behaviour. +// perform any word separation get desired behavior. static const char *default_prefixes[] = { " ~", "\t~", ":~", 0 }; // The default value of tilde_additional_suffixes. This is set to // whitespace or newline so that simple programs which do not perform -// any word separation get desired behaviour. +// any word separation get desired behavior. static const char *default_suffixes[] = { " ", "\n", ":", 0 }; // If non-null, this contains the address of a function that the
--- a/liboctave/util/oct-inttypes.h Fri Feb 19 09:41:41 2016 -0800 +++ b/liboctave/util/oct-inttypes.h Fri Feb 19 09:40:59 2016 -0800 @@ -382,7 +382,7 @@ return static_cast<T> (0); } - // the overflow behaviour for unsigned integers is guaranteed by C/C++, + // the overflow behavior for unsigned integers is guaranteed by C/C++, // so the following should always work. static T add (T x, T y) @@ -548,7 +548,7 @@ { #if defined (OCTAVE_HAVE_FAST_INT_OPS) // This is close to how GCC does std::abs, but we can't just use std::abs, - // because its behaviour for INT_MIN is undefined and the compiler could + // because its behavior for INT_MIN is undefined and the compiler could // discard the following test. T m = x >> std::numeric_limits<T>::digits; T y = (x ^ m) - m;
--- a/scripts/linear-algebra/cross.m Fri Feb 19 09:41:41 2016 -0800 +++ b/scripts/linear-algebra/cross.m Fri Feb 19 09:40:59 2016 -0800 @@ -51,8 +51,8 @@ endif if (ndims (x) < 3 && ndims (y) < 3 && nargin < 3) - ## COMPATIBILITY -- opposite behaviour for cross(row,col) - ## Swap x and y in the assignments below to get the matlab behaviour. + ## COMPATIBILITY -- opposite behavior for cross(row,col) + ## Swap x and y in the assignments below to get the matlab behavior. ## Better yet, fix the calling code so that it uses conformant vectors. if (columns (x) == 1 && rows (y) == 1) warning ("cross: taking cross product of column by row");
--- a/scripts/sparse/bicgstab.m Fri Feb 19 09:41:41 2016 -0800 +++ b/scripts/sparse/bicgstab.m Fri Feb 19 09:40:59 2016 -0800 @@ -137,7 +137,7 @@ ## Vector of the residual norms for each iteration. resvec = norm (res) / norm_b; - ## Default behaviour we don't reach tolerance tol within maxit iterations. + ## Default behavior we don't reach tolerance tol within maxit iterations. flag = 1; for iter = 1:maxit
--- a/scripts/statistics/base/kurtosis.m Fri Feb 19 09:41:41 2016 -0800 +++ b/scripts/statistics/base/kurtosis.m Fri Feb 19 09:40:59 2016 -0800 @@ -145,7 +145,7 @@ %!assert (kurtosis ([1:5 10; 1:5 10], 1, 2), 2.9786509002956195 * [1; 1], 8 * eps) %!assert (kurtosis ([1:5 10; 1:5 10], [], 2), 2.9786509002956195 * [1; 1], 8 * eps) -## Test behaviour on single input +## Test behavior on single input %!assert (kurtosis (single ([1:5 10])), single (2.9786513), eps ("single")) %!assert (kurtosis (single ([1 2]), 0), single (NaN))
--- a/scripts/statistics/base/skewness.m Fri Feb 19 09:41:41 2016 -0800 +++ b/scripts/statistics/base/skewness.m Fri Feb 19 09:40:59 2016 -0800 @@ -146,7 +146,7 @@ %!assert (skewness ([1:5 10; 1:5 10], 1, 2), 1.051328089232020 * [1; 1], 2*eps) %!assert (skewness ([1:5 10; 1:5 10], [], 2), 1.051328089232020 * [1; 1], 2*eps) -## Test behaviour on single input +## Test behavior on single input %!assert (skewness (single ([1:5 10])), single (1.0513283), eps ("single")) %!assert (skewness (single ([1 2]), 0), single (NaN))
--- a/test/build-sparse-tests.sh Fri Feb 19 09:41:41 2016 -0800 +++ b/test/build-sparse-tests.sh Fri Feb 19 09:40:59 2016 -0800 @@ -174,7 +174,7 @@ %% segfault tests from Fabian@isas-berlin.de %% Note that the last four do not fail, but rather give a warning %% of a singular matrix, which is consistent with the full matrix -%% behaviour. They are therefore disabled. +%% behavior. They are therefore disabled. %!testif HAVE_UMFPACK %! assert (inv (sparse ([1,1;1,1+i])), sparse ([1-1i,1i;1i,-1i]), 10*eps); %#!error inv ( sparse ([1,1;1,1] ) );