Mercurial > octave
view scripts/general/logspace.m @ 25237:ca022a8c4015
linspace: handle ranges with equal Inf endpoints (bug #53489)
* CMatrix.cc (ComplexMatrix::linspace): Change delta calculation to yield 0 if
endpoints are the same, otherwise calculate delta as normal.
* CRowVector.cc (ComplexRowVector::linspace): Likewise.
* dMatrix.cc (Matrix::linspace): Likewise.
* dRowVector.cc (RowVector::linspace): Likewise.
* fCMatrix.cc (FloatComplexMatrix::linspace): Likewise.
* fCRowVector.cc (FloatComplexRowVector::linspace): Likewise.
* fMatrix.cc (FloatMatrix::linspace): Likewise.
* fRowVector.cc (FloatRowVector::linspace): Likewise.
* data.cc (Flinspace): Added Matlab compatibility tests.
* logspace.m: Added same tests as in linspace containing Inf in endpoints.
author | Maor Shutman <maorus12@gmail.com> |
---|---|
date | Fri, 06 Apr 2018 20:25:05 +0300 |
parents | 6652d3823428 |
children | 592a4258b237 |
line wrap: on
line source
## Copyright (C) 1993-2018 John W. Eaton ## ## This file is part of Octave. ## ## Octave is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by ## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## Octave is distributed in the hope that it will be useful, but ## WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License ## along with Octave; see the file COPYING. If not, see ## <https://www.gnu.org/licenses/>. ## -*- texinfo -*- ## @deftypefn {} {} logspace (@var{a}, @var{b}) ## @deftypefnx {} {} logspace (@var{a}, @var{b}, @var{n}) ## @deftypefnx {} {} logspace (@var{a}, pi, @var{n}) ## Return a row vector with @var{n} elements logarithmically spaced from ## @tex ## $10^{a}$ to $10^{b}$. ## @end tex ## @ifnottex ## 10^@var{a} to 10^@var{b}. ## @end ifnottex ## ## If @var{n} is unspecified it defaults to 50. ## ## If @var{b} is equal to ## @tex ## $\pi$, ## @end tex ## @ifnottex ## pi, ## @end ifnottex ## the points are between ## @tex ## $10^{a}$ and $\pi$, ## @end tex ## @ifnottex ## 10^@var{a} and pi, ## @end ifnottex ## @emph{not} ## @tex ## $10^{a}$ and $10^{\pi}$, ## @end tex ## @ifnottex ## 10^@var{a} and 10^pi, ## @end ifnottex ## in order to be compatible with the corresponding @sc{matlab} function. ## ## Also for compatibility with @sc{matlab}, return the right-hand side of ## the range ## @tex ## ($10^{b}$) ## @end tex ## @ifnottex ## (10^@var{b}) ## @end ifnottex ## when just a single value is requested. ## @seealso{linspace} ## @end deftypefn ## Author: jwe function retval = logspace (a, b, n = 50) if (nargin != 2 && nargin != 3) print_usage (); endif if (! (isscalar (a) && isscalar (b) && isscalar (n))) error ("logspace: arguments A, B, and N must be scalars"); endif npoints = fix (n); if (b == pi) b = log10 (pi); endif retval = 10 .^ (linspace (a, b, npoints)); endfunction %!test %! x1 = logspace (1, 2); %! x2 = logspace (1, 2, 10.1); %! x3 = logspace (1, -2, 10); %! x4 = logspace (1, pi, 10); %! assert (size (x1) == [1, 50] && abs (x1(1) - 10) < eps && abs (x1(50) - 100) < eps); %! assert (size (x2) == [1, 10] && abs (x2(1) - 10) < eps && abs (x2(10) - 100) < eps); %! assert (size (x3) == [1, 10] && abs (x3(1) - 10) < eps && abs (x3(10) - 0.01) < eps); %! assert (size (x4) == [1, 10] && abs (x4(1) - 10) < eps && abs (x4(10) - pi) < sqrt (eps)); %!assert (logspace (Inf, Inf, 3), [Inf, Inf, Inf]) %!assert (logspace (-Inf, -Inf, 3), [0, 0, 0]) %!assert (logspace (-Inf, Inf, 3), [0, NaN, Inf]) %!assert (logspace (Inf + 1i, Inf + 1i, 3), [-Inf + Inf * 1i, -Inf + Inf * 1i, -Inf + Inf * 1i]) %!assert (logspace (-Inf + 1i, Inf + 1i, 3), [0, NaN + NaN * 1i, -Inf + Inf * 1i]) %!assert (logspace (0, Inf, 3), [1, Inf, Inf]) %!assert (logspace (0, -Inf, 3), [1, 0, 0]) %!assert (logspace (-Inf, 0, 3), [0, NaN, 1]) %!assert (logspace (Inf, 0, 3), [Inf, NaN, 1]) %!assert (logspace (Inf, -Inf, 3), [Inf, NaN, 0]) ## Test input validation %!error logspace () %!error logspace (1, 2, 3, 4) %!error logspace ([1, 2; 3, 4], 5, 6) %!error logspace (1, [1, 2; 3, 4], 6) %!error logspace (1, 2, [1, 2; 3, 4])