Mercurial > hg > octave-nkf
view scripts/time/etime.m @ 13848:40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
* datestr.m: Add millisecond FFF format. Change numerical formats 21,22,29
to match Matlab. Remove unused persistent variables. Vectorize some for
loops. Use strrep rather than regexp where possible for speed.
* datevec.m: Add millisecond FFF format. Use strrep rather than regexp where
possible for speed.
* datenum.m: Update docstring. Use modern coding style. Only calculate
second output argument if requested. Allow cellstr inputs.
author | Rik <octave@nomad.inbox5.com> |
---|---|
date | Wed, 09 Nov 2011 14:49:09 -0800 |
parents | c792872f8942 |
children | d490ca8ab1a5 |
line wrap: on
line source
## Copyright (C) 1996-2011 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 ## <http://www.gnu.org/licenses/>. ## -*- texinfo -*- ## @deftypefn {Function File} {} etime (@var{t2}, @var{t1}) ## Return the difference in seconds between two time values returned from ## @code{clock} (@math{@var{t2} - @var{t1}}). For example: ## ## @example ## @group ## t0 = clock (); ## # many computations later@dots{} ## elapsed_time = etime (clock (), t0); ## @end group ## @end example ## ## @noindent ## will set the variable @code{elapsed_time} to the number of seconds since ## the variable @code{t0} was set. ## @seealso{tic, toc, clock, cputime} ## @end deftypefn ## Author: jwe function secs = etime (t2, t1) if (nargin != 2) print_usage (); endif [~, s2] = datenum (t2); [~, s1] = datenum (t1); secs = s2 - s1; endfunction %!assert(etime([1900,12,31,23,59,59],[1901,1,1,0,0,0]),-1) %!assert(etime([1900,2,28,23,59,59],[1900,3,1,0,0,0]),-1) %!assert(etime([2000,2,28,23,59,59],[2000,3,1,0,0,0]),-86401) %!assert(etime([1996,2,28,23,59,59],[1996,3,1,0,0,0]),-86401) %!test %! t1 = [1900,12,31,23,59,59; 1900,2,28,23,59,59]; %! t2 = [1901,1,1,0,0,0; 1900,3,1,0,0,0]; %! assert(etime(t2, t1), [1;1]); %!test %! t1 = [1993, 8, 20, 4, 56, 1]; %! t2 = [1993, 8, 21, 4, 56, 1]; %! t3 = [1993, 8, 20, 5, 56, 1]; %! t4 = [1993, 8, 20, 4, 57, 1]; %! t5 = [1993, 8, 20, 4, 56, 14]; %! %! assert((etime (t2, t1) == 86400 && etime (t3, t1) == 3600 %! && etime (t4, t1) == 60 && etime (t5, t1) == 13)); %!error etime (); %!error etime (1, 2, 3);