Mercurial > hg > octave-nkf
annotate scripts/time/datevec.m @ 15880:df1aceb8f0bc ss-3-7-1
snapshot version 3.7.1
* configure.ac (AC_INIT): Set version to 3.7.1.
(OCTAVE_RELEASE_DATE): Set to 2013-01-02.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 02 Jan 2013 15:16:08 -0500 |
parents | 53d2c3598d33 |
children | d63878346099 |
rev | line source |
---|---|
14138
72c96de7a403
maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents:
13856
diff
changeset
|
1 ## Copyright (C) 2000-2012 Paul Kienzle |
5687 | 2 ## |
3 ## This file is part of Octave. | |
4 ## | |
5 ## Octave is free software; you can redistribute it and/or modify it | |
6 ## under the terms of the GNU General Public License as published by | |
7016 | 7 ## the Free Software Foundation; either version 3 of the License, or (at |
8 ## your option) any later version. | |
5687 | 9 ## |
10 ## Octave is distributed in the hope that it will be useful, but | |
11 ## WITHOUT ANY WARRANTY; without even the implied warranty of | |
12 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
13 ## General Public License for more details. | |
14 ## | |
15 ## You should have received a copy of the GNU General Public License | |
7016 | 16 ## along with Octave; see the file COPYING. If not, see |
17 ## <http://www.gnu.org/licenses/>. | |
5687 | 18 |
19 ## -*- texinfo -*- | |
10793
be55736a0783
Grammarcheck the documentation from m-files.
Rik <octave@nomad.inbox5.com>
parents:
9051
diff
changeset
|
20 ## @deftypefn {Function File} {@var{v} =} datevec (@var{date}) |
5687 | 21 ## @deftypefnx {Function File} {@var{v} =} datevec (@var{date}, @var{f}) |
22 ## @deftypefnx {Function File} {@var{v} =} datevec (@var{date}, @var{p}) | |
23 ## @deftypefnx {Function File} {@var{v} =} datevec (@var{date}, @var{f}, @var{p}) | |
24 ## @deftypefnx {Function File} {[@var{y}, @var{m}, @var{d}, @var{h}, @var{mi}, @var{s}] =} datevec (@dots{}) | |
25 ## Convert a serial date number (see @code{datenum}) or date string (see | |
26 ## @code{datestr}) into a date vector. | |
27 ## | |
28 ## A date vector is a row vector with six members, representing the year, | |
29 ## month, day, hour, minute, and seconds respectively. | |
30 ## | |
31 ## @var{f} is the format string used to interpret date strings | |
14743
b7675598094a
datevec.m: Support more date string input formats for Matlab compatibility (bug #36563)
Rik <octave@nomad.inbox5.com>
parents:
14363
diff
changeset
|
32 ## (see @code{datestr}). If @var{date} is a string, but no format is |
b7675598094a
datevec.m: Support more date string input formats for Matlab compatibility (bug #36563)
Rik <octave@nomad.inbox5.com>
parents:
14363
diff
changeset
|
33 ## specified, then a relatively slow search is performed through various |
14852
53d2c3598d33
doc: Periodic spellcheck of documentation.
Rik <octave@nomad.inbox5.com>
parents:
14743
diff
changeset
|
34 ## formats. It is always preferable to specify the format string @var{f} |
14743
b7675598094a
datevec.m: Support more date string input formats for Matlab compatibility (bug #36563)
Rik <octave@nomad.inbox5.com>
parents:
14363
diff
changeset
|
35 ## if it is known. Formats which do not specify a particular time component |
b7675598094a
datevec.m: Support more date string input formats for Matlab compatibility (bug #36563)
Rik <octave@nomad.inbox5.com>
parents:
14363
diff
changeset
|
36 ## will have the value set to zero. Formats which do not specify a date will |
b7675598094a
datevec.m: Support more date string input formats for Matlab compatibility (bug #36563)
Rik <octave@nomad.inbox5.com>
parents:
14363
diff
changeset
|
37 ## default to January 1st of the current year. |
5687 | 38 ## |
13848
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
39 ## @var{p} is the year at the start of the century to which two-digit years |
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
40 ## will be referenced. If not specified, it defaults to the current year |
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
41 ## minus 50. |
13856
d490ca8ab1a5
Modernize function implementations and docstrings in scripts/time.
Rik <octave@nomad.inbox5.com>
parents:
13848
diff
changeset
|
42 ## @seealso{datenum, datestr, clock, now, date} |
5687 | 43 ## @end deftypefn |
44 | |
45 ## Algorithm: Peter Baum (http://vsg.cape.com/~pbaum/date/date0.htm) | |
46 | |
47 ## Author: pkienzle <pkienzle@users.sf.net> | |
48 ## Modified: bdenney <bill@givebillmoney.com> | |
49 ## Created: 10 October 2001 (CVS) | |
50 ## Adapted-By: William Poetra Yoga Hadisoeseno <williampoetra@gmail.com> | |
51 | |
52 ## The function __date_str2vec__ is based on datesplit by Bill Denney. | |
53 | |
13848
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
54 function [y, m, d, h, mi, s] = datevec (date, f = [], p = []) |
5687 | 55 |
56 persistent std_formats nfmt; | |
57 | |
58 if (isempty (std_formats)) | |
59 std_formats = cell (); | |
60 nfmt = 0; | |
14743
b7675598094a
datevec.m: Support more date string input formats for Matlab compatibility (bug #36563)
Rik <octave@nomad.inbox5.com>
parents:
14363
diff
changeset
|
61 ## These formats are specified by Matlab documentation to be parsed |
13848
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
62 ## The '# XX' refers to the datestr numerical format code |
5687 | 63 std_formats{++nfmt} = "dd-mmm-yyyy HH:MM:SS"; # 0 |
64 std_formats{++nfmt} = "dd-mmm-yyyy"; # 1 | |
65 std_formats{++nfmt} = "mm/dd/yy"; # 2 | |
66 std_formats{++nfmt} = "mm/dd"; # 6 | |
67 std_formats{++nfmt} = "HH:MM:SS"; # 13 | |
68 std_formats{++nfmt} = "HH:MM:SS PM"; # 14 | |
69 std_formats{++nfmt} = "HH:MM"; # 15 | |
70 std_formats{++nfmt} = "HH:MM PM"; # 16 | |
71 std_formats{++nfmt} = "mm/dd/yyyy"; # 23 | |
13848
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
72 |
14743
b7675598094a
datevec.m: Support more date string input formats for Matlab compatibility (bug #36563)
Rik <octave@nomad.inbox5.com>
parents:
14363
diff
changeset
|
73 ## These formats are undocumented but parsed by Matlab |
b7675598094a
datevec.m: Support more date string input formats for Matlab compatibility (bug #36563)
Rik <octave@nomad.inbox5.com>
parents:
14363
diff
changeset
|
74 std_formats{++nfmt} = "mmmyy"; # 12 |
b7675598094a
datevec.m: Support more date string input formats for Matlab compatibility (bug #36563)
Rik <octave@nomad.inbox5.com>
parents:
14363
diff
changeset
|
75 std_formats{++nfmt} = "mmm.dd,yyyy HH:MM:SS"; # 21 |
b7675598094a
datevec.m: Support more date string input formats for Matlab compatibility (bug #36563)
Rik <octave@nomad.inbox5.com>
parents:
14363
diff
changeset
|
76 std_formats{++nfmt} = "mmm.dd,yyyy"; # 22 |
b7675598094a
datevec.m: Support more date string input formats for Matlab compatibility (bug #36563)
Rik <octave@nomad.inbox5.com>
parents:
14363
diff
changeset
|
77 std_formats{++nfmt} = "yyyy/mm/dd"; # 26 |
b7675598094a
datevec.m: Support more date string input formats for Matlab compatibility (bug #36563)
Rik <octave@nomad.inbox5.com>
parents:
14363
diff
changeset
|
78 std_formats{++nfmt} = "yyyy-mm-dd"; # 29 |
b7675598094a
datevec.m: Support more date string input formats for Matlab compatibility (bug #36563)
Rik <octave@nomad.inbox5.com>
parents:
14363
diff
changeset
|
79 std_formats{++nfmt} = "yyyy-mm-dd HH:MM:SS"; # 31 |
b7675598094a
datevec.m: Support more date string input formats for Matlab compatibility (bug #36563)
Rik <octave@nomad.inbox5.com>
parents:
14363
diff
changeset
|
80 |
13848
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
81 ## These are other formats that Octave tries |
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
82 std_formats{++nfmt} = "mmm-dd-yyyy HH:MM:SS"; |
6044 | 83 std_formats{++nfmt} = "mmm-dd-yyyy"; |
84 std_formats{++nfmt} = "dd mmm yyyy HH:MM:SS"; | |
85 std_formats{++nfmt} = "dd mmm yyyy"; | |
86 std_formats{++nfmt} = "mmm dd yyyy HH:MM:SS"; | |
87 std_formats{++nfmt} = "mmm dd yyyy"; | |
88 std_formats{++nfmt} = "dd.mmm.yyyy HH:MM:SS"; | |
89 std_formats{++nfmt} = "dd.mmm.yyyy"; | |
90 std_formats{++nfmt} = "mmm.dd.yyyy HH:MM:SS"; | |
91 std_formats{++nfmt} = "mmm.dd.yyyy"; | |
5687 | 92 std_formats{++nfmt} = "mm/dd/yyyy HH:MM"; |
93 endif | |
94 | |
95 if (nargin < 1 || nargin > 3) | |
6046 | 96 print_usage (); |
5687 | 97 endif |
98 | |
13848
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
99 if (ischar (date)) |
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
100 date = cellstr (date); |
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
101 endif |
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
102 |
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
103 if (isnumeric (f)) |
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
104 p = f; |
5687 | 105 f = []; |
13848
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
106 endif |
5687 | 107 |
108 if (isempty (f)) | |
109 f = -1; | |
110 endif | |
111 | |
112 if (isempty (p)) | |
11400 | 113 p = (localtime (time ())).year + 1900 - 50; |
5687 | 114 endif |
115 | |
116 if (iscell (date)) | |
117 | |
118 nd = numel (date); | |
119 | |
120 y = m = d = h = mi = s = zeros (nd, 1); | |
121 | |
122 if (f == -1) | |
123 for k = 1:nd | |
124 found = false; | |
125 for l = 1:nfmt | |
8411
69d45a4c7d94
avoid repeated parsing of format string in datevec
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
7044
diff
changeset
|
126 [f, rY, ry, fy, fm, fd, fh, fmi, fs] = __date_vfmt2sfmt__ (std_formats{l}); |
69d45a4c7d94
avoid repeated parsing of format string in datevec
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
7044
diff
changeset
|
127 [found y(k) m(k) d(k) h(k) mi(k) s(k)] = __date_str2vec__ (date{k}, p, f, rY, ry, fy, fm, fd, fh, fmi, fs); |
5687 | 128 if (found) |
129 break; | |
130 endif | |
131 endfor | |
132 if (! found) | |
11472
1740012184f9
Use uppercase for variable names in error() strings to match Info documentation. Only m-files done.
Rik <octave@nomad.inbox5.com>
parents:
11400
diff
changeset
|
133 error ("datevec: none of the standard formats match the DATE string"); |
5687 | 134 endif |
135 endfor | |
136 else | |
13848
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
137 ## Decipher the format string just once for speed. |
8411
69d45a4c7d94
avoid repeated parsing of format string in datevec
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
7044
diff
changeset
|
138 [f, rY, ry, fy, fm, fd, fh, fmi, fs] = __date_vfmt2sfmt__ (f); |
5687 | 139 for k = 1:nd |
8411
69d45a4c7d94
avoid repeated parsing of format string in datevec
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
7044
diff
changeset
|
140 [found y(k) m(k) d(k) h(k) mi(k) s(k)] = __date_str2vec__ (date{k}, p, f, rY, ry, fy, fm, fd, fh, fmi, fs); |
5687 | 141 if (! found) |
11472
1740012184f9
Use uppercase for variable names in error() strings to match Info documentation. Only m-files done.
Rik <octave@nomad.inbox5.com>
parents:
11400
diff
changeset
|
142 error ("datevec: DATE not parsed correctly with given format"); |
5687 | 143 endif |
144 endfor | |
145 endif | |
146 | |
13848
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
147 else # datenum input |
5687 | 148 |
149 date = date(:); | |
150 | |
151 ## Move day 0 from midnight -0001-12-31 to midnight 0000-3-1 | |
152 z = floor (date) - 60; | |
153 ## Calculate number of centuries; K1 = 0.25 is to avoid rounding problems. | |
154 a = floor ((z - 0.25) / 36524.25); | |
155 ## Days within century; K2 = 0.25 is to avoid rounding problems. | |
156 b = z - 0.25 + a - floor (a / 4); | |
157 ## Calculate the year (year starts on March 1). | |
158 y = floor (b / 365.25); | |
159 ## Calculate day in year. | |
160 c = fix (b - floor (365.25 * y)) + 1; | |
161 ## Calculate month in year. | |
162 m = fix ((5 * c + 456) / 153); | |
163 d = c - fix ((153 * m - 457) / 5); | |
164 ## Move to Jan 1 as start of year. | |
165 ++y(m > 12); | |
166 m(m > 12) -= 12; | |
167 | |
5859 | 168 ## Convert hour-minute-seconds. Attempt to account for precision of |
169 ## datenum format. | |
170 | |
171 fracd = date - floor (date); | |
5873 | 172 tmps = abs (eps*86400*date); |
173 tmps(tmps == 0) = 1; | |
174 srnd = 2 .^ floor (- log2 (tmps)); | |
175 s = round (86400 * fracd .* srnd) ./ srnd; | |
5687 | 176 h = floor (s / 3600); |
177 s = s - 3600 * h; | |
178 mi = floor (s / 60); | |
179 s = s - 60 * mi; | |
180 | |
181 endif | |
182 | |
183 if (nargout <= 1) | |
5873 | 184 y = [y, m, d, h, mi, s]; |
5687 | 185 endif |
186 | |
11086
af03ff97df7b
datevec.m: use endfunction to mark end of primary function and subfunctions
John W. Eaton <jwe@octave.org>
parents:
10793
diff
changeset
|
187 endfunction |
5687 | 188 |
8411
69d45a4c7d94
avoid repeated parsing of format string in datevec
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
7044
diff
changeset
|
189 function [f, rY, ry, fy, fm, fd, fh, fmi, fs] = __date_vfmt2sfmt__ (f) |
5687 | 190 |
8506 | 191 ## Play safe with percent signs. |
13848
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
192 f = strrep (f, "%", "%%"); |
5687 | 193 |
194 if (! isempty (strfind (f, "PM")) || ! isempty (strfind (f, "AM"))) | |
195 ampm = true; | |
196 else | |
197 ampm = false; | |
198 endif | |
199 | |
8506 | 200 ## Date part. |
13848
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
201 f = regexprep (f, '[Yy][Yy][Yy][Yy]', "%Y"); |
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
202 f = regexprep (f, '[Yy][Yy]', "%y"); |
5687 | 203 f = strrep (f, "mmmm", "%B"); |
204 f = strrep (f, "mmm", "%b"); | |
205 f = strrep (f, "mm", "%m"); | |
13848
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
206 f = regexprep (f, '[Dd][Dd][Dd][Dd]', "%A"); |
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
207 f = regexprep (f, '[Dd][Dd][Dd]', "%a"); |
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
208 f = regexprep (f, '[Dd][Dd]', "%d"); |
5687 | 209 |
8506 | 210 ## Time part. |
5687 | 211 if (ampm) |
212 f = strrep (f, "HH", "%I"); | |
213 f = strrep (f, "PM", "%p"); | |
214 f = strrep (f, "AM", "%p"); | |
215 else | |
216 f = strrep (f, "HH", "%H"); | |
217 endif | |
218 f = strrep (f, "MM", "%M"); | |
13848
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
219 f = regexprep (f, '[Ss][Ss]', "%S"); |
5687 | 220 |
8411
69d45a4c7d94
avoid repeated parsing of format string in datevec
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
7044
diff
changeset
|
221 rY = rindex (f, "%Y"); |
69d45a4c7d94
avoid repeated parsing of format string in datevec
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
7044
diff
changeset
|
222 ry = rindex (f, "%y"); |
69d45a4c7d94
avoid repeated parsing of format string in datevec
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
7044
diff
changeset
|
223 |
8506 | 224 ## Check whether we need to give default values. |
225 ## Possible error when string contains "%%". | |
8411
69d45a4c7d94
avoid repeated parsing of format string in datevec
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
7044
diff
changeset
|
226 fy = rY || ry; |
69d45a4c7d94
avoid repeated parsing of format string in datevec
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
7044
diff
changeset
|
227 fm = index (f, "%m") || index (f, "%b") || index (f, "%B"); |
69d45a4c7d94
avoid repeated parsing of format string in datevec
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
7044
diff
changeset
|
228 fd = index (f, "%d") || index (f, "%a") || index (f, "%A"); |
69d45a4c7d94
avoid repeated parsing of format string in datevec
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
7044
diff
changeset
|
229 fh = index (f, "%H") || index (f, "%I"); |
69d45a4c7d94
avoid repeated parsing of format string in datevec
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
7044
diff
changeset
|
230 fmi = index (f, "%M"); |
69d45a4c7d94
avoid repeated parsing of format string in datevec
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
7044
diff
changeset
|
231 fs = index (f, "%S"); |
69d45a4c7d94
avoid repeated parsing of format string in datevec
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
7044
diff
changeset
|
232 |
11086
af03ff97df7b
datevec.m: use endfunction to mark end of primary function and subfunctions
John W. Eaton <jwe@octave.org>
parents:
10793
diff
changeset
|
233 endfunction |
8411
69d45a4c7d94
avoid repeated parsing of format string in datevec
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
7044
diff
changeset
|
234 |
69d45a4c7d94
avoid repeated parsing of format string in datevec
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
7044
diff
changeset
|
235 function [found, y, m, d, h, mi, s] = __date_str2vec__ (ds, p, f, rY, ry, fy, fm, fd, fh, fmi, fs) |
69d45a4c7d94
avoid repeated parsing of format string in datevec
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
7044
diff
changeset
|
236 |
13848
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
237 idx = strfind (f, "FFF"); |
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
238 if (! isempty (idx)) |
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
239 ## Kludge to handle FFF millisecond format since strptime does not |
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
240 f(idx:idx+2) = []; |
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
241 [~, nc] = strptime (ds, f); |
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
242 if (nc > 0) |
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
243 msec = ds(nc:min(nc+2, end)); |
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
244 f = [f(1:idx-1) msec f(idx:end)]; |
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
245 [tm, nc] = strptime (ds, f); |
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
246 tm.usec = 1000 * str2double (msec); |
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
247 endif |
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
248 else |
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
249 [tm, nc] = strptime (ds, f); |
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
250 endif |
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
251 |
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
252 if (nc == columns (ds) + 1) |
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
253 found = true; |
5687 | 254 y = tm.year + 1900; m = tm.mon + 1; d = tm.mday; |
255 h = tm.hour; mi = tm.min; s = tm.sec + tm.usec / 1e6; | |
256 if (rY < ry) | |
257 if (y > 1999) | |
258 y -= 2000; | |
259 else | |
260 y -= 1900; | |
261 endif | |
262 y += p - mod (p, 100); | |
263 if (y < p) | |
264 y += 100; | |
265 endif | |
266 endif | |
267 if (! fy && ! fm && ! fd) | |
8506 | 268 tmp = localtime (time ()); |
14743
b7675598094a
datevec.m: Support more date string input formats for Matlab compatibility (bug #36563)
Rik <octave@nomad.inbox5.com>
parents:
14363
diff
changeset
|
269 ## default is January 1st of current year |
8506 | 270 y = tmp.year + 1900; |
14743
b7675598094a
datevec.m: Support more date string input formats for Matlab compatibility (bug #36563)
Rik <octave@nomad.inbox5.com>
parents:
14363
diff
changeset
|
271 m = 1; |
b7675598094a
datevec.m: Support more date string input formats for Matlab compatibility (bug #36563)
Rik <octave@nomad.inbox5.com>
parents:
14363
diff
changeset
|
272 d = 1; |
5687 | 273 elseif (! fy && fm && fd) |
8506 | 274 tmp = localtime (time ()); |
275 y = tmp.year + 1900; | |
5687 | 276 elseif (fy && fm && ! fd) |
277 d = 1; | |
278 endif | |
279 if (! fh && ! fmi && ! fs) | |
280 h = mi = s = 0; | |
281 elseif (fh && fmi && ! fs) | |
282 s = 0; | |
283 endif | |
284 else | |
285 y = m = d = h = mi = s = 0; | |
286 found = false; | |
287 endif | |
288 | |
11086
af03ff97df7b
datevec.m: use endfunction to mark end of primary function and subfunctions
John W. Eaton <jwe@octave.org>
parents:
10793
diff
changeset
|
289 endfunction |
5687 | 290 |
13848
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
291 |
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
292 %!demo |
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
293 %! ## Current date and time |
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
294 %! datevec (now ()) |
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
295 |
14743
b7675598094a
datevec.m: Support more date string input formats for Matlab compatibility (bug #36563)
Rik <octave@nomad.inbox5.com>
parents:
14363
diff
changeset
|
296 %!shared yr |
b7675598094a
datevec.m: Support more date string input formats for Matlab compatibility (bug #36563)
Rik <octave@nomad.inbox5.com>
parents:
14363
diff
changeset
|
297 %! yr = datevec (now)(1); # Some tests could fail around midnight! |
b7675598094a
datevec.m: Support more date string input formats for Matlab compatibility (bug #36563)
Rik <octave@nomad.inbox5.com>
parents:
14363
diff
changeset
|
298 ## tests for standard formats: 0, 1, 2, 6, 13, 14, 15, 16, 23 |
13848
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
299 %!assert (datevec ("07-Sep-2000 15:38:09"), [2000,9,7,15,38,9]) |
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
300 %!assert (datevec ("07-Sep-2000"), [2000,9,7,0,0,0]) |
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
301 %!assert (datevec ("09/07/00"), [2000,9,7,0,0,0]) |
14743
b7675598094a
datevec.m: Support more date string input formats for Matlab compatibility (bug #36563)
Rik <octave@nomad.inbox5.com>
parents:
14363
diff
changeset
|
302 %!assert (datevec ("09/13"), [yr,9,13,0,0,0]) |
b7675598094a
datevec.m: Support more date string input formats for Matlab compatibility (bug #36563)
Rik <octave@nomad.inbox5.com>
parents:
14363
diff
changeset
|
303 %!assert (datevec ("15:38:09"), [yr,1,1,15,38,9]) |
b7675598094a
datevec.m: Support more date string input formats for Matlab compatibility (bug #36563)
Rik <octave@nomad.inbox5.com>
parents:
14363
diff
changeset
|
304 %!assert (datevec ("3:38:09 PM"), [yr,1,1,15,38,9]) |
b7675598094a
datevec.m: Support more date string input formats for Matlab compatibility (bug #36563)
Rik <octave@nomad.inbox5.com>
parents:
14363
diff
changeset
|
305 %!assert (datevec ("15:38"), [yr,1,1,15,38,0]) |
b7675598094a
datevec.m: Support more date string input formats for Matlab compatibility (bug #36563)
Rik <octave@nomad.inbox5.com>
parents:
14363
diff
changeset
|
306 %!assert (datevec ("03:38 PM"), [yr,1,1,15,38,0]) |
13848
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
307 %!assert (datevec ("03/13/1962"), [1962,3,13,0,0,0]) |
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
308 |
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
309 %% Test millisecond format FFF |
14743
b7675598094a
datevec.m: Support more date string input formats for Matlab compatibility (bug #36563)
Rik <octave@nomad.inbox5.com>
parents:
14363
diff
changeset
|
310 %!assert (datevec ("15:38:21.25", "HH:MM:SS.FFF"), [yr,1,1,15,38,21.025]) |
13848
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
311 |
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
312 # Other tests |
14363
f3d52523cde1
Use Octave coding conventions in all m-file %!test blocks
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
313 %!assert (datenum (datevec ([-1e4:1e4])), [-1e4:1e4]'); |
5687 | 314 %!test |
315 %! t = linspace (-2e5, 2e5, 10993); | |
5860 | 316 %! assert (all (abs (datenum (datevec (t)) - t') < 1e-5)); |
13848
40e32fe44aaa
Ugrade time functions to accept millisecond format string FFF (Bug #34586)
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
317 |