Mercurial > octave

changeset 25652:b400ad33d92d

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 Fri, 20 Jul 2018 13:09:19 -0700
parents 336267b16a3d (current diff) c759aa39c23a (diff)
children b3d357990b52
files libinterp/corefcn/rand.cc libinterp/op-kw-docs
diffstat 2 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/rand.cc	Fri Jul 20 10:25:45 2018 -0700
+++ b/libinterp/corefcn/rand.cc	Fri Jul 20 13:09:19 2018 -0700
@@ -266,7 +266,13 @@
                 else
                   {
                     ColumnVector s =
-                      ColumnVector (args(idx+1).vector_value(false, true));
+                      ColumnVector (args(idx+1).vector_value (false, true));
+                   
+                    // Backwards compatibility with previous versions of
+                    // Octave which mapped Inf to 0.
+                    for (octave_idx_type i = 0; i < s.numel (); i++)
+                      if (octave::math::isinf (s.xelem (i)))
+                        s.xelem (i) = 0.0;
 
                     octave::rand::state (s, fcn);
                   }
@@ -528,7 +534,7 @@
 %!assert (__rand_sample__ (-1), __rand_sample__ (0))
 %!assert (__rand_sample__ (-Inf), __rand_sample__ (0))
 %!assert (__rand_sample__ (2^33), __rand_sample__ (intmax ("uint32")))
-%!assert (__rand_sample__ (Inf), __rand_sample__ (intmax ("uint32")))
+%!assert (__rand_sample__ (Inf), __rand_sample__ (0))
 %!assert (__rand_sample__ (NaN), __rand_sample__ (0))
 */
 
--- a/libinterp/op-kw-docs	Fri Jul 20 10:25:45 2018 -0700
+++ b/libinterp/op-kw-docs	Fri Jul 20 13:09:19 2018 -0700
@@ -178,7 +178,7 @@
 Power operator.
 
 This may return complex results for real inputs.  Use @code{realsqrt},
-@code{cbrt}, @code{nthroot}, or @code{realroot} to obtain real results when
+@code{cbrt}, @code{nthroot}, or @code{realpow} to obtain real results when
 possible.
 @seealso{power, ^, .**, .^, realpow, realsqrt, cbrt, nthroot}
 @end deftypefn
@@ -189,7 +189,7 @@
 Power operator.
 
 This may return complex results for real inputs.  Use @code{realsqrt},
-@code{cbrt}, @code{nthroot}, or @code{realroot} to obtain real results when
+@code{cbrt}, @code{nthroot}, or @code{realpow} to obtain real results when
 possible.
 @seealso{power, **, .^, .**, realpow, realsqrt, cbrt, nthroot}
 @end deftypefn