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
Dóra Kocsis
dynare
Commits
4f7606f5
Commit
4f7606f5
authored
Jan 12, 2013
by
MichelJuillard
Browse files
* matlab/@dynDate: started changing references to dynTime by
dynDates; dynDate can be initialized with a single dynDate
parent
15fa7fc8
Changes
3
Show whitespace changes
Inline
Side-by-side
matlab/@dynDate/colon.m
View file @
4f7606f5
...
...
@@ -4,7 +4,7 @@ function sp = colon(a,b)
%!
@deftypefn
{
Function
File
}
{
@var
{
sp
}
=
}
colon
(
@var
{
a
},
@var
{
b
})
%!
@anchor
{
@dynDate
/
colon
}
%!
@sp
1
%!
Overloads
the
colon
operator
for
the
Dynare
Dates
class
(
@ref
{
dynDate
}).
Creates
a
@ref
{
dyn
Time
}
object
.
%!
Overloads
the
colon
operator
for
the
Dynare
Dates
class
(
@ref
{
dynDate
}).
Creates
a
@ref
{
dyn
Dates
}
object
.
%!
@sp
2
%!
@strong
{
Inputs
}
%!
@sp
1
...
...
@@ -19,13 +19,13 @@ function sp = colon(a,b)
%!
@sp
1
%!
@table
@
@var
%!
@item
c
%!
Dynare
Time
object
instantiated
by
@ref
{
dyn
Time
}.
%!
Dynare
Dates
object
instantiated
by
@ref
{
dyn
Dates
}.
%!
@end
table
%!
@sp
2
%!
@strong
{
This
function
is
called
by
:
}
%!
@sp
2
%!
@strong
{
This
function
calls
:
}
%!
@ref
{
dyn
Time
},
@ref
{
@@dyn
Time
/
setFreq
},
@ref
{
@@dyn
Time
/
setTime
},
@ref
{
@@dyn
Time
/
setSize
}
%!
@ref
{
dyn
Dates
},
@ref
{
@@dyn
Dates
/
setFreq
},
@ref
{
@@dyn
Dates
/
setTime
},
@ref
{
@@dyn
Dates
/
setSize
}
%!
%!
@end
deftypefn
%
@eod
:
...
...
@@ -50,7 +50,7 @@ function sp = colon(a,b)
%
Original
author
:
stephane
DOT
adjemian
AT
univ
DASH
lemans
DOT
fr
if
nargin
~=
2
error
(
'
dyn
Tim
e
::
colon
:
I
need
exactly
two
input
arguments
!
'
)
error
(
'
dyn
Dat
e
::
colon
:
I
need
exactly
two
input
arguments
!
'
)
end
if
~
(
isa
(
a
,
'
dynDate
'
)
&&
isa
(
b
,
'
dynDate
'
))
...
...
@@ -65,22 +65,28 @@ if a>b
error
([
'
dynDate
:
:
colon
:
'
inputname
(
1
)
'
must
precede
'
inputname
(
2
)
'!'
])
end
if
a
==
b
%
Time
range
with
only
one
date
.
sp
=
dynTime
();
sp
=
sp
.
setFreq
(
a
.
freq
);
sp
=
sp
.
setSize
(
1
);
sp
=
sp
.
setTime
(
1
,
a
.
time
);
else
n
=
b
-
a
;
sp
=
dynTime
();
sp
=
sp
.
setFreq
(
a
.
freq
);
sp
=
sp
.
setSize
(
n
+
1
);
sp
=
sp
.
setTime
(
1
,
a
.
time
);
for
t
=
2
:
n
+
1
sp
=
dynDates
(
a
);
n
=
b
-
a
;
for
t
=
1
:
n
a
=
+
a
;
sp
=
sp
.
setTime
(
t
,
a
.
time
);
end
sp
=
sp
.
append
(
a
);
end
%
$$$
if
a
==
b
%
Time
range
with
only
one
date
.
%
$$$
sp
=
dynDates
(
a
);
%
$$$
sp
=
sp
.
setFreq
(
a
.
freq
);
%
$$$
sp
=
sp
.
setSize
(
1
);
%
$$$
sp
=
sp
.
setTime
(
1
,
a
.
time
);
%
$$$
else
%
$$$
n
=
b
-
a
;
%
$$$
sp
=
dynDates
();
%
$$$
sp
=
sp
.
setFreq
(
a
.
freq
);
%
$$$
sp
=
sp
.
setSize
(
n
+
1
);
%
$$$
sp
=
sp
.
setTime
(
1
,
a
.
time
);
%
$$$
for
t
=
2
:
n
+
1
%
$$$
a
=
+
a
;
%
$$$
sp
=
sp
.
setTime
(
t
,
a
.
time
);
%
$$$
end
%
$$$
end
%
@test
:
1
%
$
%
Define
two
dates
...
...
matlab/@dynDates/dynDates.m
View file @
4f7606f5
...
...
@@ -66,9 +66,9 @@ function dd = dynDates(varargin)
dd
=
struct
;
dd
.
ndat
=
[]
;
dd
.
ndat
=
0
;
dd
.
freq
=
[];
dd
.
time
=
dynTime
()
;
dd
.
time
=
[]
;
dd
=
class
(
dd
,
'
dynDates
'
);
...
...
@@ -80,7 +80,7 @@ switch nargin
if
isa
(
varargin
{
1
}
,
'
dynDates
'
)
%
Returns
a
copy
of
the
input
argument
dd
=
varargin
{
1
}
;
elseif
ischar
(
varargin
{
1
}
)
elseif
ischar
(
varargin
{
1
}
)
||
isa
(
varargin
{
1
}
,
'
dynDate
'
)
tmp
=
dynDate
(
varargin
{
1
}
);
dd
.
ndat
=
1
;
dd
.
freq
=
tmp
.
freq
;
...
...
matlab/@dynSeries/subsref.m
View file @
4f7606f5
...
...
@@ -92,6 +92,8 @@ if length(S)==1 && isequal(S.type,'.')
end
if
length
(
S
)
==
1
&&
isequal
(
S
.
type
,
'
()
'
)
if
isa
(
S
.
subs
{
1
},
'
dynTime
'
)
if
ischar
(
S
.
subs
{
1
})
us
=
dynSeries
(
S
.
subs
{
1
});
else
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment