annotate scripts/time/datenum.m @ 10793:be55736a0783

Grammarcheck the documentation from m-files.
author Rik <octave@nomad.inbox5.com>
date Sun, 18 Jul 2010 20:35:16 -0700
parents d1978e7364ad
children 693e22af08ae
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
7659
4ab2488ab2b4 datenum: allow vector inputs in any orientation
Bill Denny
parents: 7017
diff changeset
1 ## Copyright (C) 2006, 2007, 2008 Paul Kienzle
5661
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
2 ##
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
3 ## This file is part of Octave.
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
4 ##
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
5 ## Octave is free software; you can redistribute it and/or modify it
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
6 ## under the terms of the GNU General Public License as published by
7016
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6046
diff changeset
7 ## the Free Software Foundation; either version 3 of the License, or (at
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6046
diff changeset
8 ## your option) any later version.
5661
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
9 ##
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
10 ## Octave is distributed in the hope that it will be useful, but
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
11 ## WITHOUT ANY WARRANTY; without even the implied warranty of
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
12 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
13 ## General Public License for more details.
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
14 ##
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
15 ## You should have received a copy of the GNU General Public License
7016
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6046
diff changeset
16 ## along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6046
diff changeset
17 ## <http://www.gnu.org/licenses/>.
5661
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
18
5660
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
19 ## -*- texinfo -*-
10793
be55736a0783 Grammarcheck the documentation from m-files.
Rik <octave@nomad.inbox5.com>
parents: 10635
diff changeset
20 ## @deftypefn {Function File} {} datenum (@var{year}, @var{month}, @var{day})
5661
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
21 ## @deftypefnx {Function File} {} datenum (@var{year}, @var{month}, @var{day}, @var{hour})
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
22 ## @deftypefnx {Function File} {} datenum (@var{year}, @var{month}, @var{day}, @var{hour}, @var{minute})
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
23 ## @deftypefnx {Function File} {} datenum (@var{year}, @var{month}, @var{day}, @var{hour}, @var{minute}, @var{second})
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
24 ## @deftypefnx {Function File} {} datenum (@code{"date"})
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
25 ## @deftypefnx {Function File} {} datenum (@code{"date"}, @var{p})
5660
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
26 ## Returns the specified local time as a day number, with Jan 1, 0000
5661
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
27 ## being day 1. By this reckoning, Jan 1, 1970 is day number 719529.
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
28 ## The fractional portion, @var{p}, corresponds to the portion of the
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
29 ## specified day.
5660
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
30 ##
5661
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
31 ## Notes:
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
32 ##
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
33 ## @itemize
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
34 ## @item
5660
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
35 ## Years can be negative and/or fractional.
5661
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
36 ## @item
5660
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
37 ## Months below 1 are considered to be January.
5661
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
38 ## @item
5660
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
39 ## Days of the month start at 1.
5661
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
40 ## @item
5660
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
41 ## Days beyond the end of the month go into subsequent months.
5661
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
42 ## @item
5660
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
43 ## Days before the beginning of the month go to the previous month.
5661
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
44 ## @item
5660
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
45 ## Days can be fractional.
5661
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
46 ## @end itemize
5660
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
47 ##
5661
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
48 ## @strong{Warning:} this function does not attempt to handle Julian
5660
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
49 ## calendars so dates before Octave 15, 1582 are wrong by as much
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
50 ## as eleven days. Also be aware that only Roman Catholic countries
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
51 ## adopted the calendar in 1582. It took until 1924 for it to be
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
52 ## adopted everywhere. See the Wikipedia entry on the Gregorian
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
53 ## calendar for more details.
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
54 ##
5661
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
55 ## @strong{Warning:} leap seconds are ignored. A table of leap seconds
5660
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
56 ## is available on the Wikipedia entry for leap seconds.
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
57 ## @seealso{date, clock, now, datestr, datevec, calendar, weekday}
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
58 ## @end deftypefn
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
59
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
60 ## Algorithm: Peter Baum (http://vsg.cape.com/~pbaum/date/date0.htm)
5687
a2902024bc4e [project @ 2006-03-16 20:22:40 by jwe]
jwe
parents: 5661
diff changeset
61 ## Author: pkienzle <pkienzle@users.sf.net>
5660
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
62
5661
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
63 function [days, secs] = datenum (Y, M, D, h, m, s)
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
64
5660
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
65 ## Days until start of month assuming year starts March 1.
5661
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
66 persistent monthstart = [306; 337; 0; 31; 61; 92; 122; 153; 184; 214; 245; 275];
5660
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
67
5661
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
68 if (nargin == 0 || (nargin > 2 && ischar (Y)) || nargin > 6)
6046
34f96dd5441b [project @ 2006-10-10 16:10:25 by jwe]
jwe
parents: 5973
diff changeset
69 print_usage ();
5660
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
70 endif
5661
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
71 if (ischar (Y))
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
72 if (nargin < 2)
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
73 M = [];
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
74 endif
5973
3cbefe88edc6 [project @ 2006-08-26 03:12:04 by jwe]
jwe
parents: 5687
diff changeset
75 [Y, M, D, h, m, s] = datevec (Y, M);
5660
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
76 else
5661
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
77 if (nargin < 6) s = 0; endif
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
78 if (nargin < 5) m = 0; endif
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
79 if (nargin < 4) h = 0; endif
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
80 if (nargin == 1)
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
81 nc = columns (Y);
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
82 if (nc > 6 || nc < 3)
10635
d1978e7364ad Print name of function in error() string messages.
Rik <octave@nomad.inbox5.com>
parents: 7782
diff changeset
83 error ("datenum: expected date vector containing [Y, M, D, h, m, s]");
5660
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
84 endif
5661
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
85 s = m = h = 0;
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
86 if (nc >= 6) s = Y(:,6); endif
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
87 if (nc >= 5) m = Y(:,5); endif
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
88 if (nc >= 4) h = Y(:,4); endif
5660
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
89 D = Y(:,3);
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
90 M = Y(:,2);
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
91 Y = Y(:,1);
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
92 endif
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
93 endif
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
94
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
95 M(M<1) = 1; ## For compatibility. Otherwise allow negative months.
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
96
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
97 ## Set start of year to March by moving Jan. and Feb. to previous year.
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
98 ## Correct for months > 12 by moving to subsequent years.
5661
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
99 Y += fix ((M-14)/12);
5660
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
100
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
101 ## Lookup number of days since start of the current year.
7782
bfd8d804e6d3 datenum\: fixed combination of scalar and vector/matrix input bug
bill@denney.ws
parents: 7659
diff changeset
102 if (numel (M) == 1 || numel (D) == 1)
bfd8d804e6d3 datenum\: fixed combination of scalar and vector/matrix input bug
bill@denney.ws
parents: 7659
diff changeset
103 ## Allow M or D to be scalar while other values may be vectors or
bfd8d804e6d3 datenum\: fixed combination of scalar and vector/matrix input bug
bill@denney.ws
parents: 7659
diff changeset
104 ## matrices.
bfd8d804e6d3 datenum\: fixed combination of scalar and vector/matrix input bug
bill@denney.ws
parents: 7659
diff changeset
105 D += monthstart (mod (M-1,12) + 1) + 60;
bfd8d804e6d3 datenum\: fixed combination of scalar and vector/matrix input bug
bill@denney.ws
parents: 7659
diff changeset
106 if (numel (M) > 1)
bfd8d804e6d3 datenum\: fixed combination of scalar and vector/matrix input bug
bill@denney.ws
parents: 7659
diff changeset
107 D = reshape (D, size (M));
bfd8d804e6d3 datenum\: fixed combination of scalar and vector/matrix input bug
bill@denney.ws
parents: 7659
diff changeset
108 endif
bfd8d804e6d3 datenum\: fixed combination of scalar and vector/matrix input bug
bill@denney.ws
parents: 7659
diff changeset
109 else
bfd8d804e6d3 datenum\: fixed combination of scalar and vector/matrix input bug
bill@denney.ws
parents: 7659
diff changeset
110 D += reshape (monthstart (mod (M-1,12) + 1), size (D)) + 60;
bfd8d804e6d3 datenum\: fixed combination of scalar and vector/matrix input bug
bill@denney.ws
parents: 7659
diff changeset
111 endif
5660
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
112
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
113 ## Add number of days to the start of the current year. Correct
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
114 ## for leap year every 4 years except centuries not divisible by 400.
5661
13be36ec8279 [project @ 2006-03-10 17:43:38 by jwe]
jwe
parents: 5660
diff changeset
115 D += 365*Y + floor (Y/4) - floor (Y/100) + floor (Y/400);
5660
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
116
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
117 ## Add fraction representing current second of the day.
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
118 days = D + (h+(m+s/60)/60)/24;
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
119
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
120 ## Output seconds if asked so that etime can be more accurate
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
121 secs = 86400*D + h*3600 + m*60 + s;
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
122
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
123 endfunction
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
124
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
125 %!shared part
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
126 %! part = 0.514623842592593;
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
127 %!assert(datenum(2001,5,19), 730990)
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
128 %!assert(datenum([1417,6,12]), 517712)
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
129 %!assert(datenum([2001,5,19;1417,6,12]), [730990;517712])
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
130 %!assert(datenum(2001,5,19,12,21,3.5), 730990+part, eps)
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
131 %!assert(datenum([1417,6,12,12,21,3.5]), 517712+part, eps)
7659
4ab2488ab2b4 datenum: allow vector inputs in any orientation
Bill Denny
parents: 7017
diff changeset
132 ## Test vector inputs
5660
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
133 %!test
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
134 %! t = [2001,5,19,12,21,3.5; 1417,6,12,12,21,3.5];
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
135 %! n = [730990; 517712] + part;
4c4d31ecb0e4 [project @ 2006-03-10 17:27:50 by jwe]
jwe
parents:
diff changeset
136 %! assert(datenum(t), n, 2*eps);
7659
4ab2488ab2b4 datenum: allow vector inputs in any orientation
Bill Denny
parents: 7017
diff changeset
137 ## Make sure that the vectors can have either orientation
4ab2488ab2b4 datenum: allow vector inputs in any orientation
Bill Denny
parents: 7017
diff changeset
138 %!test
4ab2488ab2b4 datenum: allow vector inputs in any orientation
Bill Denny
parents: 7017
diff changeset
139 %! t = [2001,5,19,12,21,3.5; 1417,6,12,12,21,3.5]';
4ab2488ab2b4 datenum: allow vector inputs in any orientation
Bill Denny
parents: 7017
diff changeset
140 %! n = [730990 517712] + part;
4ab2488ab2b4 datenum: allow vector inputs in any orientation
Bill Denny
parents: 7017
diff changeset
141 %! assert(datenum(t(1,:), t(2,:), t(3,:), t(4,:), t(5,:), t(6,:)), n, 2*eps);
7782
bfd8d804e6d3 datenum\: fixed combination of scalar and vector/matrix input bug
bill@denney.ws
parents: 7659
diff changeset
142
bfd8d804e6d3 datenum\: fixed combination of scalar and vector/matrix input bug
bill@denney.ws
parents: 7659
diff changeset
143 ## Test mixed vectors and scalars
bfd8d804e6d3 datenum\: fixed combination of scalar and vector/matrix input bug
bill@denney.ws
parents: 7659
diff changeset
144 %!assert (datenum([2008;2009], 1, 1), [datenum(2008, 1, 1);datenum(2009, 1, 1)]);
bfd8d804e6d3 datenum\: fixed combination of scalar and vector/matrix input bug
bill@denney.ws
parents: 7659
diff changeset
145 %!assert (datenum(2008, [1;2], 1), [datenum(2008, 1, 1);datenum(2008, 2, 1)]);
bfd8d804e6d3 datenum\: fixed combination of scalar and vector/matrix input bug
bill@denney.ws
parents: 7659
diff changeset
146 %!assert (datenum(2008, 1, [1;2]), [datenum(2008, 1, 1);datenum(2008, 1, 2)]);
bfd8d804e6d3 datenum\: fixed combination of scalar and vector/matrix input bug
bill@denney.ws
parents: 7659
diff changeset
147 %!assert (datenum([2008;2009], [1;2], 1), [datenum(2008, 1, 1);datenum(2009, 2, 1)]);
bfd8d804e6d3 datenum\: fixed combination of scalar and vector/matrix input bug
bill@denney.ws
parents: 7659
diff changeset
148 %!assert (datenum([2008;2009], 1, [1;2]), [datenum(2008, 1, 1);datenum(2009, 1, 2)]);
bfd8d804e6d3 datenum\: fixed combination of scalar and vector/matrix input bug
bill@denney.ws
parents: 7659
diff changeset
149 %!assert (datenum(2008, [1;2], [1;2]), [datenum(2008, 1, 1);datenum(2008, 2, 2)]);
bfd8d804e6d3 datenum\: fixed combination of scalar and vector/matrix input bug
bill@denney.ws
parents: 7659
diff changeset
150 ## And the other orientation
bfd8d804e6d3 datenum\: fixed combination of scalar and vector/matrix input bug
bill@denney.ws
parents: 7659
diff changeset
151 %!assert (datenum([2008 2009], 1, 1), [datenum(2008, 1, 1) datenum(2009, 1, 1)]);
bfd8d804e6d3 datenum\: fixed combination of scalar and vector/matrix input bug
bill@denney.ws
parents: 7659
diff changeset
152 %!assert (datenum(2008, [1 2], 1), [datenum(2008, 1, 1) datenum(2008, 2, 1)]);
bfd8d804e6d3 datenum\: fixed combination of scalar and vector/matrix input bug
bill@denney.ws
parents: 7659
diff changeset
153 %!assert (datenum(2008, 1, [1 2]), [datenum(2008, 1, 1) datenum(2008, 1, 2)]);
bfd8d804e6d3 datenum\: fixed combination of scalar and vector/matrix input bug
bill@denney.ws
parents: 7659
diff changeset
154 %!assert (datenum([2008 2009], [1 2], 1), [datenum(2008, 1, 1) datenum(2009, 2, 1)]);
bfd8d804e6d3 datenum\: fixed combination of scalar and vector/matrix input bug
bill@denney.ws
parents: 7659
diff changeset
155 %!assert (datenum([2008 2009], 1, [1 2]), [datenum(2008, 1, 1) datenum(2009, 1, 2)]);
bfd8d804e6d3 datenum\: fixed combination of scalar and vector/matrix input bug
bill@denney.ws
parents: 7659
diff changeset
156 %!assert (datenum(2008, [1 2], [1 2]), [datenum(2008, 1, 1) datenum(2008, 2, 2)]);