Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Dynare
dynare
Commits
8fedac4d
Commit
8fedac4d
authored
Nov 08, 2014
by
Stéphane Adjemian
Browse files
Replaced calls to dyn_assert by calls to dassert.
This routine is used to compare objects i -n unit tests.
parent
479189ef
Changes
88
Hide whitespace changes
Inline
Side-by-side
matlab/@dates/append.m
View file @
8fedac4d
...
...
@@ -71,9 +71,9 @@ B.time(A.ndat+1,:) = a.time;
%$ d = d.append(dates(B5));
%$
%$ % Check the results.
%$ t(1) = d
yn_
assert(d.time,e.time);
%$ t(2) = d
yn_
assert(d.freq,e.freq);
%$ t(3) = d
yn_
assert(d.ndat,e.ndat);
%$ t(1) = dassert(d.time,e.time);
%$ t(2) = dassert(d.freq,e.freq);
%$ t(3) = dassert(d.ndat,e.ndat);
%$ T = all(t);
%@eof:1
...
...
@@ -95,8 +95,8 @@ B.time(A.ndat+1,:) = a.time;
%$ d = d.append(B5);
%$
%$ % Check the results.
%$ t(1) = d
yn_
assert(d.time,e.time);
%$ t(2) = d
yn_
assert(d.freq,e.freq);
%$ t(3) = d
yn_
assert(d.ndat,e.ndat);
%$ t(1) = dassert(d.time,e.time);
%$ t(2) = dassert(d.freq,e.freq);
%$ t(3) = dassert(d.ndat,e.ndat);
%$ T = all(t);
%@eof:2
\ No newline at end of file
matlab/@dates/colon.m
View file @
8fedac4d
...
...
@@ -123,8 +123,8 @@ end
%$ d3 = d1:d2;
%$
%$ % Check the results.
%$ t(1) = d
yn_
assert(d3.time,e.time);
%$ t(2) = d
yn_
assert(d3.freq,e.freq);
%$ t(1) = dassert(d3.time,e.time);
%$ t(2) = dassert(d3.freq,e.freq);
%$ T = all(t);
%@eof:1
...
...
@@ -137,8 +137,8 @@ end
%$ d = dates('1950Q2'):dates('1951Q4');
%$
%$ % Check the results.
%$ t(1) = d
yn_
assert(d.time,e.time);
%$ t(2) = d
yn_
assert(d.freq,e.freq);
%$ t(1) = dassert(d.time,e.time);
%$ t(2) = dassert(d.freq,e.freq);
%$ T = all(t);
%@eof:2
...
...
@@ -151,8 +151,8 @@ end
%$ d = dates('1950Q2'):2:dates('1951Q4');
%$
%$ % Check the results.
%$ t(1) = d
yn_
assert(d.time,e.time);
%$ t(2) = d
yn_
assert(d.freq,e.freq);
%$ t(1) = dassert(d.time,e.time);
%$ t(2) = dassert(d.freq,e.freq);
%$ T = all(t);
%@eof:3
...
...
@@ -169,8 +169,8 @@ end
%$ d = qq(1950,2):qq(1951,4);
%$
%$ % Check the results.
%$ t(1) = d
yn_
assert(d.time,e.time);
%$ t(2) = d
yn_
assert(d.freq,e.freq);
%$ t(1) = dassert(d.time,e.time);
%$ t(2) = dassert(d.freq,e.freq);
%$ T = all(t);
%$ @eof:3
...
...
@@ -186,7 +186,7 @@ end
%$ d = qq(1950,1):qq(1950,3);
%$
%$ % Check the results.
%$ t(1) = d
yn_
assert(d.time,e.time);
%$ t(2) = d
yn_
assert(d.freq,e.freq);
%$ t(1) = dassert(d.time,e.time);
%$ t(2) = dassert(d.freq,e.freq);
%$ T = all(t);
%$ @eof:4
\ No newline at end of file
matlab/@dates/dates.m
View file @
8fedac4d
...
...
@@ -180,9 +180,9 @@ error('dates::dates: Wrong calling sequence!')
%
$
d
=
dates
(
B1
,
B2
,
B3
,
B4
);
%
$
%
$
%
Check
the
results
.
%
$
t
(
1
)
=
d
yn_
assert
(
d
.
time
,
e
.
time
);
%
$
t
(
2
)
=
d
yn_
assert
(
d
.
freq
,
e
.
freq
);
%
$
t
(
3
)
=
d
yn_
assert
(
d
.
ndat
,
e
.
ndat
);
%
$
t
(
1
)
=
dassert
(
d
.
time
,
e
.
time
);
%
$
t
(
2
)
=
dassert
(
d
.
freq
,
e
.
freq
);
%
$
t
(
3
)
=
dassert
(
d
.
ndat
,
e
.
ndat
);
%
$
T
=
all
(
t
);
%
@eof
:
1
...
...
@@ -202,9 +202,9 @@ error('dates::dates: Wrong calling sequence!')
%
$
d
=
dates
(
B1
,
B2
,
B3
,
B4
);
%
$
%
$
%
Check
the
results
.
%
$
t
(
1
)
=
d
yn_
assert
(
d
.
time
,
e
.
time
);
%
$
t
(
2
)
=
d
yn_
assert
(
d
.
freq
,
e
.
freq
);
%
$
t
(
3
)
=
d
yn_
assert
(
d
.
ndat
,
e
.
ndat
);
%
$
t
(
1
)
=
dassert
(
d
.
time
,
e
.
time
);
%
$
t
(
2
)
=
dassert
(
d
.
freq
,
e
.
freq
);
%
$
t
(
3
)
=
dassert
(
d
.
ndat
,
e
.
ndat
);
%
$
T
=
all
(
t
);
%
@eof
:
2
...
...
@@ -224,9 +224,9 @@ error('dates::dates: Wrong calling sequence!')
%
$
d
=
dates
(
B1
,
B2
,
B3
,
B4
);
%
$
%
$
%
Check
the
results
.
%
$
t
(
1
)
=
d
yn_
assert
(
d
.
time
,
e
.
time
);
%
$
t
(
2
)
=
d
yn_
assert
(
d
.
freq
,
e
.
freq
);
%
$
t
(
3
)
=
d
yn_
assert
(
d
.
ndat
,
e
.
ndat
);
%
$
t
(
1
)
=
dassert
(
d
.
time
,
e
.
time
);
%
$
t
(
2
)
=
dassert
(
d
.
freq
,
e
.
freq
);
%
$
t
(
3
)
=
dassert
(
d
.
ndat
,
e
.
ndat
);
%
$
T
=
all
(
t
);
%
@eof
:
3
...
...
@@ -244,8 +244,8 @@ error('dates::dates: Wrong calling sequence!')
%
$
end
%
$
%
$
if
t
(
1
)
%
$
t
(
2
)
=
d
yn_
assert
(
d
.
freq
,
B
.
freq
);
%
$
t
(
3
)
=
d
yn_
assert
(
d
.
time
,[
1950
2
]);
%
$
t
(
2
)
=
dassert
(
d
.
freq
,
B
.
freq
);
%
$
t
(
3
)
=
dassert
(
d
.
time
,[
1950
2
]);
%
$
end
%
$
T
=
all
(
t
);
%
@eof
:
4
...
...
@@ -263,8 +263,8 @@ error('dates::dates: Wrong calling sequence!')
%
$
end
%
$
%
$
if
t
(
1
)
%
$
t
(
2
)
=
d
yn_
assert
(
d
.
freq
,
B
.
freq
);
%
$
t
(
3
)
=
d
yn_
assert
(
d
.
time
,[
1950
2
]);
%
$
t
(
2
)
=
dassert
(
d
.
freq
,
B
.
freq
);
%
$
t
(
3
)
=
dassert
(
d
.
time
,[
1950
2
]);
%
$
end
%
$
T
=
all
(
t
);
%
@eof
:
5
...
...
@@ -282,8 +282,8 @@ error('dates::dates: Wrong calling sequence!')
%
$
end
%
$
%
$
if
t
(
1
)
%
$
t
(
2
)
=
d
yn_
assert
(
d
.
freq
,
B
.
freq
);
%
$
t
(
3
)
=
d
yn_
assert
(
d
.
time
,[
1950
2
]);
%
$
t
(
2
)
=
dassert
(
d
.
freq
,
B
.
freq
);
%
$
t
(
3
)
=
dassert
(
d
.
time
,[
1950
2
]);
%
$
end
%
$
T
=
all
(
t
);
%
@eof
:
6
...
...
matlab/@dates/double.m
View file @
8fedac4d
...
...
@@ -52,7 +52,7 @@ end
%$ E = [ones(4,1)*1950; 1951];
%$ E = E + [(transpose(1:4)-1)/4; 0];
%$ if t(1)
%$ t(2) = d
yn_
assert(isequal(C,E),1);
%$ t(2) = dassert(isequal(C,E),1);
%$ end
%$ T = all(t);
%@eof:1
...
...
@@ -75,7 +75,7 @@ end
%$ E = ones(2,1)*1950;
%$ E = E + [0; .25];
%$ if t(1)
%$ t(2) = d
yn_
assert(isequal(C,E),1);
%$ t(2) = dassert(isequal(C,E),1);
%$ end
%$ T = all(t);
%@eof:2
\ No newline at end of file
matlab/@dates/eq.m
View file @
8fedac4d
...
...
@@ -61,9 +61,9 @@ end
%$ t3 = d1==d3;
%$
%$ % Check the results.
%$ t(1) = d
yn_
assert(t1,ones(4,1));
%$ t(2) = d
yn_
assert(t2,zeros(4,1));
%$ t(2) = d
yn_
assert(t3,[1; 0; 1; 0]);
%$ t(1) = dassert(t1,ones(4,1));
%$ t(2) = dassert(t2,zeros(4,1));
%$ t(2) = dassert(t3,[1; 0; 1; 0]);
%$ T = all(t);
%@eof:1
...
...
@@ -79,9 +79,9 @@ end
%$ t3 = d1==d3;
%$
%$ % Check the results.
%$ t(1) = d
yn_
assert(t1,1);
%$ t(2) = d
yn_
assert(t2,0);
%$ t(2) = d
yn_
assert(t3,0);
%$ t(1) = dassert(t1,1);
%$ t(2) = dassert(t2,0);
%$ t(2) = dassert(t3,0);
%$ T = all(t);
%@eof:2
...
...
@@ -96,7 +96,7 @@ end
%$ t2 = d1==d3;
%$
%$ % Check the results.
%$ t(1) = d
yn_
assert(t1,[0; 1; 0; 0]);
%$ t(2) = d
yn_
assert(t2,zeros(4,1));
%$ t(1) = dassert(t1,[0; 1; 0; 0]);
%$ t(2) = dassert(t2,zeros(4,1));
%$ T = all(t);
%@eof:3
matlab/@dates/ge.m
View file @
8fedac4d
...
...
@@ -97,11 +97,11 @@ function c = greaterorequal(a,b)
%$ i5 = (d5>=d5);
%$
%$ % Check the results.
%$ t(1) = d
yn_
assert(i1,0);
%$ t(2) = d
yn_
assert(i2,1);
%$ t(3) = d
yn_
assert(i3,0);
%$ t(4) = d
yn_
assert(i4,0);
%$ t(5) = d
yn_
assert(i5,1);
%$ t(1) = dassert(i1,0);
%$ t(2) = dassert(i2,1);
%$ t(3) = dassert(i3,0);
%$ t(4) = dassert(i4,0);
%$ t(5) = dassert(i5,1);
%$ T = all(t);
%@eof:1
...
...
@@ -117,11 +117,11 @@ function c = greaterorequal(a,b)
%$ dd = dates(B1,B2,B3,B4);
%$
%$ % Check the results.
%$ t(1) = d
yn_
assert(dates(B1)>=dates(B2),0);
%$ t(2) = d
yn_
assert(dates(B2)>=dates(B1),1);
%$ t(3) = d
yn_
assert(dates(B2)>=dates(B2),1);
%$ t(4) = d
yn_
assert(dd>=dates(B5),zeros(4,1));
%$ t(5) = d
yn_
assert(dates(B5)>=dd,ones(4,1));
%$ t(6) = d
yn_
assert(dates(B1)>=dd,[1; zeros(3,1)]);
%$ t(1) = dassert(dates(B1)>=dates(B2),0);
%$ t(2) = dassert(dates(B2)>=dates(B1),1);
%$ t(3) = dassert(dates(B2)>=dates(B2),1);
%$ t(4) = dassert(dd>=dates(B5),zeros(4,1));
%$ t(5) = dassert(dates(B5)>=dd,ones(4,1));
%$ t(6) = dassert(dates(B1)>=dd,[1; zeros(3,1)]);
%$ T = all(t);
%@eof:2
\ No newline at end of file
matlab/@dates/gt.m
View file @
8fedac4d
...
...
@@ -94,10 +94,10 @@ function c = greaterthan(a,b)
%$ i4 = (d5>d4);
%$
%$ % Check the results.
%$ t(1) = d
yn_
assert(i1,0);
%$ t(2) = d
yn_
assert(i2,1);
%$ t(3) = d
yn_
assert(i3,0);
%$ t(4) = d
yn_
assert(i4,0);
%$ t(1) = dassert(i1,0);
%$ t(2) = dassert(i2,1);
%$ t(3) = dassert(i3,0);
%$ t(4) = dassert(i4,0);
%$ T = all(t);
%@eof:1
...
...
@@ -113,11 +113,11 @@ function c = greaterthan(a,b)
%$ dd = dates(B1,B2,B3,B4);
%$
%$ % Check the results.
%$ t(1) = d
yn_
assert(dates(B1)>dates(B2),0);
%$ t(2) = d
yn_
assert(dates(B2)>dates(B1),1);
%$ t(3) = d
yn_
assert(dates(B5)>dates(B1),1);
%$ t(4) = d
yn_
assert(dd>dates(B5),zeros(4,1));
%$ t(5) = d
yn_
assert(dates(B5)>dd,ones(4,1));
%$ t(6) = d
yn_
assert(dates(B1)>dd,[0; zeros(3,1)]);
%$ t(1) = dassert(dates(B1)>dates(B2),0);
%$ t(2) = dassert(dates(B2)>dates(B1),1);
%$ t(3) = dassert(dates(B5)>dates(B1),1);
%$ t(4) = dassert(dd>dates(B5),zeros(4,1));
%$ t(5) = dassert(dates(B5)>dd,ones(4,1));
%$ t(6) = dassert(dates(B1)>dd,[0; zeros(3,1)]);
%$ T = all(t);
%@eof:2
\ No newline at end of file
matlab/@dates/horzcat.m
View file @
8fedac4d
...
...
@@ -73,9 +73,9 @@ end
%$ d = [d, dates(B5)];
%$
%$ % Check the results.
%$ t(1) = d
yn_
assert(d.time,e.time);
%$ t(2) = d
yn_
assert(d.freq,e.freq);
%$ t(3) = d
yn_
assert(d.ndat,e.ndat);
%$ t(1) = dassert(d.time,e.time);
%$ t(2) = dassert(d.freq,e.freq);
%$ t(3) = dassert(d.ndat,e.ndat);
%$ T = all(t);
%@eof:1
...
...
@@ -97,9 +97,9 @@ end
%$ d = [d, dates(B1), dates(B5)];
%$
%$ % Check the results.
%$ t(1) = d
yn_
assert(d.time,e.time);
%$ t(2) = d
yn_
assert(d.freq,e.freq);
%$ t(3) = d
yn_
assert(d.ndat,e.ndat);
%$ t(1) = dassert(d.time,e.time);
%$ t(2) = dassert(d.freq,e.freq);
%$ t(3) = dassert(d.ndat,e.ndat);
%$ T = all(t);
%@eof:2
...
...
@@ -121,9 +121,9 @@ end
%$ d = [d, dates(B1,B5)];
%$
%$ % Check the results.
%$ t(1) = d
yn_
assert(d.time,e.time);
%$ t(2) = d
yn_
assert(d.freq,e.freq);
%$ t(3) = d
yn_
assert(d.ndat,e.ndat);
%$ t(1) = dassert(d.time,e.time);
%$ t(2) = dassert(d.freq,e.freq);
%$ t(3) = dassert(d.ndat,e.ndat);
%$ T = all(t);
%@eof:3
...
...
@@ -145,8 +145,8 @@ end
%$ d = [d, [dates(B1), dates(B5)]];
%$
%$ % Check the results.
%$ t(1) = d
yn_
assert(d.time,e.time);
%$ t(2) = d
yn_
assert(d.freq,e.freq);
%$ t(3) = d
yn_
assert(d.ndat,e.ndat);
%$ t(1) = dassert(d.time,e.time);
%$ t(2) = dassert(d.freq,e.freq);
%$ t(3) = dassert(d.ndat,e.ndat);
%$ T = all(t);
%@eof:4
\ No newline at end of file
matlab/@dates/intersect.m
View file @
8fedac4d
...
...
@@ -82,7 +82,7 @@ C.ndat = rows(time);
%
$
c2
=
intersect
(
d1
,
d3
);
%
$
%
$
%
Check
the
results
.
%
$
t
(
1
)
=
d
yn_
assert
(
isequal
(
c1
,
d2
),
1
);
%
$
t
(
2
)
=
d
yn_
assert
(
isempty
(
c2
),
1
);
%
$
t
(
1
)
=
dassert
(
isequal
(
c1
,
d2
),
1
);
%
$
t
(
2
)
=
dassert
(
isempty
(
c2
),
1
);
%
$
T
=
all
(
t
);
%
@eof
:
1
\ No newline at end of file
matlab/@dates/le.m
View file @
8fedac4d
...
...
@@ -97,11 +97,11 @@ function c = lessorequal(a, b)
%$ i5 = (d5<=d5);
%$
%$ % Check the results.
%$ t(1) = d
yn_
assert(i1,1);
%$ t(2) = d
yn_
assert(i2,0);
%$ t(3) = d
yn_
assert(i3,1);
%$ t(4) = d
yn_
assert(i4,1);
%$ t(5) = d
yn_
assert(i5,1);
%$ t(1) = dassert(i1,1);
%$ t(2) = dassert(i2,0);
%$ t(3) = dassert(i3,1);
%$ t(4) = dassert(i4,1);
%$ t(5) = dassert(i5,1);
%$ T = all(t);
%@eof:1
...
...
@@ -117,11 +117,11 @@ function c = lessorequal(a, b)
%$ dd = dates(B1,B2,B3,B4);
%$
%$ % Check the results.
%$ t(1) = d
yn_
assert(dates(B1)<=dates(B2),1);
%$ t(2) = d
yn_
assert(dates(B2)<=dates(B1),0);
%$ t(3) = d
yn_
assert(dates(B2)<=dates(B2),1);
%$ t(4) = d
yn_
assert(dd<=dates(B5),ones(4,1));
%$ t(5) = d
yn_
assert(dates(B5)<=dd,zeros(4,1));
%$ t(6) = d
yn_
assert(dates(B1)<=dd,ones(4,1));
%$ t(1) = dassert(dates(B1)<=dates(B2),1);
%$ t(2) = dassert(dates(B2)<=dates(B1),0);
%$ t(3) = dassert(dates(B2)<=dates(B2),1);
%$ t(4) = dassert(dd<=dates(B5),ones(4,1));
%$ t(5) = dassert(dates(B5)<=dd,zeros(4,1));
%$ t(6) = dassert(dates(B1)<=dd,ones(4,1));
%$ T = all(t);
%@eof:2
\ No newline at end of file
matlab/@dates/lt.m
View file @
8fedac4d
...
...
@@ -93,10 +93,10 @@ function c = lessthan(a,b)
%$ i4 = (d5<d4);
%$
%$ % Check the results.
%$ t(1) = d
yn_
assert(i1,1);
%$ t(2) = d
yn_
assert(i2,0);
%$ t(3) = d
yn_
assert(i3,1);
%$ t(4) = d
yn_
assert(i4,1);
%$ t(1) = dassert(i1,1);
%$ t(2) = dassert(i2,0);
%$ t(3) = dassert(i3,1);
%$ t(4) = dassert(i4,1);
%$ T = all(t);
%@eof:1
...
...
@@ -112,11 +112,11 @@ function c = lessthan(a,b)
%$ dd = dates(B1,B2,B3,B4);
%$
%$ % Check the results.
%$ t(1) = d
yn_
assert(dates(B1)<dates(B2),1);
%$ t(2) = d
yn_
assert(dates(B2)<dates(B1),0);
%$ t(3) = d
yn_
assert(dates(B2)<dates(B1),0);
%$ t(4) = d
yn_
assert(dd<dates(B5),ones(4,1));
%$ t(5) = d
yn_
assert(dates(B5)<dd,zeros(4,1));
%$ t(6) = d
yn_
assert(dates(B1)<dd,[0; ones(3,1)]);
%$ t(1) = dassert(dates(B1)<dates(B2),1);
%$ t(2) = dassert(dates(B2)<dates(B1),0);
%$ t(3) = dassert(dates(B2)<dates(B1),0);
%$ t(4) = dassert(dd<dates(B5),ones(4,1));
%$ t(5) = dassert(dates(B5)<dd,zeros(4,1));
%$ t(6) = dassert(dates(B1)<dd,[0; ones(3,1)]);
%$ T = all(t);
%@eof:2
matlab/@dates/max.m
View file @
8fedac4d
...
...
@@ -49,8 +49,8 @@ end
%$ i3 = (m3==d5);
%$
%$ % Check the results.
%$ t(1) = d
yn_
assert(i2,1);
%$ t(2) = d
yn_
assert(i3,1);
%$ t(1) = dassert(i2,1);
%$ t(2) = dassert(i3,1);
%$ T = all(t);
%@eof:1
...
...
@@ -61,7 +61,7 @@ end
%$ i = (m==dates('1951Q3'));
%$
%$ % Check the results.
%$ t(1) = d
yn_
assert(i,1);
%$ t(1) = dassert(i,1);
%$ T = all(t);
%@eof:2
...
...
@@ -71,7 +71,7 @@ end
%$ i = (m==dates('1951Q3'));
%$
%$ % Check the results.
%$ t(1) = d
yn_
assert(i,1);
%$ t(1) = dassert(i,1);
%$ T = all(t);
%@eof:3
...
...
@@ -81,6 +81,6 @@ end
%$ i = (m==dates('1951Q3'));
%$
%$ % Check the results.
%$ t(1) = d
yn_
assert(i,1);
%$ t(1) = dassert(i,1);
%$ T = all(t);
%@eof:4
\ No newline at end of file
matlab/@dates/min.m
View file @
8fedac4d
...
...
@@ -49,8 +49,8 @@ end
%$ i3 = (m3==d6);
%$
%$ % Check the results.
%$ t(1) = d
yn_
assert(i2,1);
%$ t(2) = d
yn_
assert(i3,1);
%$ t(1) = dassert(i2,1);
%$ t(2) = dassert(i3,1);
%$ T = all(t);
%@eof:1
...
...
@@ -61,7 +61,7 @@ end
%$ i = (m==dates('1949Q1'));
%$
%$ % Check the results.
%$ t(1) = d
yn_
assert(i,1);
%$ t(1) = dassert(i,1);
%$ T = all(t);
%@eof:2
...
...
@@ -71,7 +71,7 @@ end
%$ i = (m==dates('1949Q1'));
%$
%$ % Check the results.
%$ t(1) = d
yn_
assert(i,1);
%$ t(1) = dassert(i,1);
%$ T = all(t);
%@eof:3
...
...
@@ -81,6 +81,6 @@ end
%$ i = (m==dates('1949Q1'));
%$
%$ % Check the results.
%$ t(1) = d
yn_
assert(i,1);
%$ t(1) = dassert(i,1);
%$ T = all(t);
%@eof:4
\ No newline at end of file
matlab/@dates/minus.m
View file @
8fedac4d
...
...
@@ -69,8 +69,8 @@ end
%$ end
%$
%$ if t(1)
%$ t(2) = d
yn_
assert(e1,[2; 2; 0]);
%$ t(3) = d
yn_
assert(e2,9);
%$ t(2) = dassert(e1,[2; 2; 0]);
%$ t(3) = dassert(e2,9);
%$ end
%$ T = all(t);
%@eof:1
...
...
@@ -91,8 +91,8 @@ end
%$ end
%$
%$ if t(1)
%$ t(2) = d
yn_
assert(e1,[1; 1; 0]);
%$ t(3) = d
yn_
assert(e2,-1);
%$ t(2) = dassert(e1,[1; 1; 0]);
%$ t(3) = dassert(e2,-1);
%$ end
%$ T = all(t);
%@eof:2
...
...
@@ -111,8 +111,8 @@ end
%$ end
%$
%$ if t(1)
%$ t(2) = d
yn_
assert(isequal(e1,d2),1);
%$ t(3) = d
yn_
assert(isequal(e2,d1),1);
%$ t(2) = dassert(isequal(e1,d2),1);
%$ t(3) = dassert(isequal(e2,d1),1);
%$ end
%$ T = all(t);
%@eof:3
...
...
@@ -130,7 +130,7 @@ end
%$ end
%$
%$ if t(1)
%$ t(2) = d
yn_
assert(isequal(e1,f1),1);
%$ t(2) = dassert(isequal(e1,f1),1);
%$ end
%$ T = all(t);
%@eof:4
...
...
@@ -148,7 +148,7 @@ end
%$ end
%$
%$ if t(1)
%$ t(2) = d
yn_
assert(isequal(e1,f1),1);
%$ t(2) = dassert(isequal(e1,f1),1);
%$ end
%$ T = all(t);
%@eof:5
\ No newline at end of file
matlab/@dates/ne.m
View file @
8fedac4d
...
...
@@ -61,9 +61,9 @@ end
%$ t3 = d1~=d3;
%$
%$ % Check the results.
%$ t(1) = d
yn_
assert(t1,zeros(4,1));
%$ t(2) = d
yn_
assert(t2,ones(4,1));
%$ t(3) = d
yn_
assert(t3,[0; 1; 0; 1]);
%$ t(1) = dassert(t1,zeros(4,1));
%$ t(2) = dassert(t2,ones(4,1));
%$ t(3) = dassert(t3,[0; 1; 0; 1]);
%$ T = all(t);
%@eof:1
...
...
@@ -79,9 +79,9 @@ end
%$ t3 = d1~=d3;
%$
%$ % Check the results.
%$ t(1) = d
yn_
assert(t1,0);
%$ t(2) = d
yn_
assert(t2,1);
%$ t(3) = d
yn_
assert(t3,1);
%$ t(1) = dassert(t1,0);
%$ t(2) = dassert(t2,1);
%$ t(3) = dassert(t3,1);
%$ T = all(t);
%@eof:2
...
...
@@ -96,7 +96,7 @@ end
%$ t2 = d1~=d3;
%$
%$ % Check the results.
%$ t(1) = d
yn_
assert(t1,[1; 0; 1; 1]);
%$ t(2) = d
yn_
assert(t2,ones(4,1));
%$ t(1) = dassert(t1,[1; 0; 1; 1]);
%$ t(2) = dassert(t2,ones(4,1));
%$ T = all(t);
%@eof:3
matlab/@dates/plus.m
View file @
8fedac4d
...
...
@@ -63,8 +63,8 @@ end
%$ end
%$
%$ if t(1)
%$ t(2) = d
yn_
assert(isequal(e1,d3),1);
%$ t(3) = d
yn_
assert(isequal(e2,dates('1950Q1','1950Q2','1950Q3','1950Q4','1950Q1','1950Q2','1950Q3','1950Q4')),1);
%$ t(2) = dassert(isequal(e1,d3),1);
%$ t(3) = dassert(isequal(e2,dates('1950Q1','1950Q2','1950Q3','1950Q4','1950Q1','1950Q2','1950Q3','1950Q4')),1);
%$ end
%$ T = all(t);
%@eof:1
...
...
@@ -91,11 +91,11 @@ end
%$ end
%$
%$ if t(1)
%$ t(2) = d
yn_
assert(isequal(e1,f1),1);
%$ t(3) = d
yn_
assert(isequal(e2,f2),1);
%$ t(4) = d
yn_
assert(isequal(e3,f3),1);
%$ t(5) = d
yn_
assert(isequal(e4,f4),1);
%$ t(6) = d
yn_
assert(isequal(e5,f5),1);
%$ t(2) = dassert(isequal(e1,f1),1);
%$ t(3) = dassert(isequal(e2,f2),1);
%$ t(4) = dassert(isequal(e3,f3),1);
%$ t(5) = dassert(isequal(e4,f4),1);
%$ t(6) = dassert(isequal(e5,f5),1);
%$ end
%$ T = all(t);
%@eof:2
...
...
@@ -122,11 +122,11 @@ end
%$ end
%$
%$ if t(1)
%$ t(2) = d
yn_
assert(isequal(e1,f1),1);
%$ t(3) = d
yn_
assert(isequal(e2,f2),1);
%$ t(4) = d
yn_
assert(isequal(e3,f3),1);
%$ t(5) = d
yn_
assert(isequal(e4,f4),1);
%$ t(6) = d
yn_
assert(isequal(e5,f5),1);
%$ t(2) = dassert(isequal(e1,f1),1);
%$ t(3) = dassert(isequal(e2,f2),1);
%$ t(4) = dassert(isequal(e3,f3),1);
%$ t(5) = dassert(isequal(e4,f4),1);
%$ t(6) = dassert(isequal(e5,f5),1);
%$ end
%$ T = all(t);
%@eof:3
\ No newline at end of file
matlab/@dates/pop.m
View file @
8fedac4d
...
...
@@ -82,17 +82,17 @@ end
%$ d = dates(B4,B3,B2,B1);
%$ d = d.append(dates(B5));
%$ f = d.pop();
%$ t(1) = d
yn_
assert(f.time,e.time(1:end-1,:));
%$ t(2) = d
yn_
assert(f.freq,e.freq);
%$ t(3) = d
yn_
assert(f.ndat,e.ndat-1);
%$ t(1) = dassert(f.time,e.time(1:end-1,:));
%$ t(2) = dassert(f.freq,e.freq);
%$ t(3) = dassert(f.ndat,e.ndat-1);
%$ f = d.pop(B1);
%$ t(4) = d
yn_
assert(f.time,[1945 3; 1950 1; 1950 2; 2009 2]);
%$ t(5) = d
yn_
assert(f.freq,e.freq);
%$ t(6) = d
yn_
assert(f.ndat,e.ndat-1);
%$ t(4) = dassert(f.time,[1945 3; 1950 1; 1950 2; 2009 2]);
%$ t(5) = dassert(f.freq,e.freq);
%$ t(6) = dassert(f.ndat,e.ndat-1);
%$ f = d.pop(dates(B1));
%$ t(7) = d
yn_
assert(f.time,[1945 3; 1950 1; 1950 2; 2009 2]);
%$ t(8) = d
yn_
assert(f.freq,e.freq);
%$ t(9) = d
yn_
assert(f.ndat,e.ndat-1);
%$ t(7) = dassert(f.time,[1945 3; 1950 1; 1950 2; 2009 2]);
%$ t(8) = dassert(f.freq,e.freq);
%$ t(9) = dassert(f.ndat,e.ndat-1);
%$
%$ % Check the results.
%$ T = all(t);
...
...
@@ -110,10 +110,10 @@ end
%$ d = dates(B1,B2,B3,B4);
%$ d = d.append(dates(B5));
%$ f = d.pop();
%$ t(1) = d
yn_
assert(isequal(f,dates(B1,B2,B3,B4)),1);
%$ t(1) = dassert(isequal(f,dates(B1,B2,B3,B4)),1);
%$ f = d.pop(B1);
%$ t(2) = d
yn_
assert(isequal(f,dates(B1,B2,B4,B5)),1);
%$ t(2) = dassert(isequal(f,dates(B1,B2,B4,B5)),1);
%$ g = f.pop(1);
%$ t(3) = d
yn_
assert(isequal(g,dates(B2,B4,B5)),1);
%$ t(3) = dassert(isequal(g,dates(B2,B4,B5)),1);
%$ T = all(t);