Mercurial > octave

changeset 22547:6b52d1e7ed56

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: merged remote before pushing changeset
author Carlo de Falco <carlo.defalco@polimi.it>
date Wed, 28 Sep 2016 18:34:40 +0200
parents dadcd4f21889 (current diff) 29dab5b8332a (diff)
children 73a85c6cacd1
files
diffstat 2 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/audio/@audioplayer/audioplayer.m	Wed Sep 28 18:30:33 2016 +0200
+++ b/scripts/audio/@audioplayer/audioplayer.m	Wed Sep 28 18:34:40 2016 +0200
@@ -82,8 +82,8 @@
 function player = audioplayer (varargin)
 
   if (nargin < 1 || nargin > 4
-      || (nargin < 2 && (isa (varargin{1}, "function_handle")
-                         || ischar (varargin{1}))))
+      || (nargin < 2 && ! (is_function_handle (varargin{1})
+                           || ischar (varargin{1}))))
     print_usage ();
   endif
 
--- a/test/system.tst	Wed Sep 28 18:30:33 2016 +0200
+++ b/test/system.tst	Wed Sep 28 18:34:40 2016 +0200
@@ -22,12 +22,11 @@
 %!   sin (i);
 %! endfor
 %! [t2, u2, s2] = cputime ();
-%! assert (t1, u1 + s1);
-%! assert (t2 == u2 + s2);
+%! assert (t1, u1 + s1, 2*eps (t1));
+%! assert (t2, u2 + s2, 2*eps (t2));
 %! assert (t2 >= t1);
 %! assert (u2 >= u2);
 %! assert (s2 >= s2);
-%!#assert (t1 == u1 + s1 && t2 == u2 + s2 && t2 >= t1 && u2 >= u2 && s2 >= s2);
 
 %!test
 %! tic ();