Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
dynare
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Dynare
dynare
Commits
5e7256da
Commit
5e7256da
authored
Jan 17, 2018
by
Marco Ratto
Committed by
Stéphane Adjemian
Jan 27, 2018
Browse files
Options
Downloads
Patches
Plain Diff
Bug fixes after changes in the options structures for shock decompositions.
parent
cbc0cdfe
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
matlab/expand_group.m
+9
-6
9 additions, 6 deletions
matlab/expand_group.m
matlab/graph_decomp.m
+6
-3
6 additions, 3 deletions
matlab/graph_decomp.m
matlab/graph_decomp_detail.m
+5
-2
5 additions, 2 deletions
matlab/graph_decomp_detail.m
with
20 additions
and
11 deletions
matlab/expand_group.m
+
9
−
6
View file @
5e7256da
...
...
@@ -34,16 +34,19 @@ mydata=get(findobj(gcf,'tag',['group' int2str(ic)]),'userdata');
if
isfield
(
mydata
,
'shock_decomp'
)
options
.
shock_decomp
=
mydata
.
shock_decomp
;
end
options
.
plot_shock_decomp
=
mydata
.
plot_shock_decomp
;
options
.
first_obs
=
mydata
.
first_obs
;
options
.
nobs
=
mydata
.
nobs
;
% define expanded group
label
=
mydata
.
shock_group
.
label
;
shocks
=
mydata
.
shock_group
.
shocks
;
options
.
shock_decomp
.
fig_name
=
[
mydata
.
fig_name
'. Expand'
];
options
.
use_shock_groups
=
strrep
(
label
,
' '
,
'_'
);
%[use_shock_groups_old int2str(ic)];
options
.
plot_
shock_decomp
.
fig_name
=
[
mydata
.
fig_name
'. Expand'
];
options
.
plot_shock_decomp
.
use_shock_groups
=
strrep
(
label
,
' '
,
'_'
);
%[use_shock_groups_old int2str(ic)];
for
j
=
1
:
length
(
shocks
)
M
.
shock_groups
.
(
options
.
use_shock_groups
)
.
([
'group'
int2str
(
j
)])
.
label
=
shocks
{
j
};
M
.
shock_groups
.
(
options
.
use_shock_groups
)
.
([
'group'
int2str
(
j
)])
.
shocks
=
shocks
(
j
);
M
.
shock_groups
.
(
options
.
plot_shock_decomp
.
use_shock_groups
)
.
([
'group'
int2str
(
j
)])
.
label
=
shocks
{
j
};
M
.
shock_groups
.
(
options
.
plot_shock_decomp
.
use_shock_groups
)
.
([
'group'
int2str
(
j
)])
.
shocks
=
shocks
(
j
);
end
options
.
shock_decomp
.
interactive
=
0
;
options
.
shock_decomp
.
expand
=
1
;
options
.
plot_
shock_decomp
.
interactive
=
0
;
options
.
plot_
shock_decomp
.
expand
=
1
;
plot_shock_decomposition
(
M
,
oo
,
options
,
var_list_
);
This diff is collapsed.
Click to expand it.
matlab/graph_decomp.m
+
6
−
3
View file @
5e7256da
...
...
@@ -193,12 +193,15 @@ for j=1:nvar
mydata
.
fig_name
=
DynareOptions
.
plot_shock_decomp
.
fig_name
(
2
:
end
);
mydata
.
use_shock_groups
=
DynareOptions
.
plot_shock_decomp
.
use_shock_groups
;
mydata
.
shock_group
=
shock_groups
.
(
shock_ind
{
i
});
mydata
.
shock_decomp
=
DynareOptions
.
plot_shock_decomp
;
if
~
isempty
(
mydata
.
shock_group
.
shocks
{
1
})
mydata
.
shock_decomp
=
DynareOptions
.
shock_decomp
;
mydata
.
plot_shock_decomp
=
DynareOptions
.
plot_shock_decomp
;
mydata
.
first_obs
=
DynareOptions
.
first_obs
;
mydata
.
nobs
=
DynareOptions
.
nobs
;
if
~
isempty
(
mydata
.
shock_group
.
shocks
)
c
=
uicontextmenu
;
hl
.
UIContextMenu
=
c
;
browse_menu
=
uimenu
(
c
,
'Label'
,
'Browse group'
);
expand_menu
=
uimenu
(
c
,
'Label'
,
'Expand group'
,
'Callback'
,[
'expand_group(
''
'
mydata
.
use_shock_groups
'
''
,
''
'
deblank
(
mydata
.
shock_decomp
.
orig_varlist
(
j
,:)
)
'
''
,'
int2str
(
i
)
')'
]);
expand_menu
=
uimenu
(
c
,
'Label'
,
'Expand group'
,
'Callback'
,[
'expand_group(
''
'
mydata
.
plot_shock_decomp
.
use_shock_groups
'
''
,
''
'
deblank
(
mydata
.
plot_
shock_decomp
.
orig_varlist
{
j
}
)
'
''
,'
int2str
(
i
)
')'
]);
set
(
expand_menu
,
'UserData'
,
mydata
,
'Tag'
,[
'group'
int2str
(
i
)]);
for
jmember
=
mydata
.
shock_group
.
shocks
uimenu
(
'parent'
,
browse_menu
,
'Label'
,
char
(
jmember
))
...
...
This diff is collapsed.
Click to expand it.
matlab/graph_decomp_detail.m
+
5
−
2
View file @
5e7256da
...
...
@@ -195,12 +195,15 @@ for j=1:nvar
mydata
.
fig_name
=
DynareOptions
.
plot_shock_decomp
.
fig_name
(
2
:
end
);
mydata
.
use_shock_groups
=
DynareOptions
.
plot_shock_decomp
.
use_shock_groups
;
mydata
.
shock_group
=
shock_groups
.
(
shock_ind
{
ic
});
mydata
.
shock_decomp
=
DynareOptions
.
plot_shock_decomp
;
mydata
.
shock_decomp
=
DynareOptions
.
shock_decomp
;
mydata
.
plot_shock_decomp
=
DynareOptions
.
plot_shock_decomp
;
mydata
.
first_obs
=
DynareOptions
.
first_obs
;
mydata
.
nobs
=
DynareOptions
.
nobs
;
if
~
isempty
(
mydata
.
shock_group
.
shocks
)
c
=
uicontextmenu
;
hax
.
UIContextMenu
=
c
;
browse_menu
=
uimenu
(
c
,
'Label'
,
'Browse group'
);
expand_menu
=
uimenu
(
c
,
'Label'
,
'Expand group'
,
'Callback'
,[
'expand_group(
''
'
mydata
.
use_shock_groups
'
''
,
''
'
deblank
(
mydata
.
shock_decomp
.
orig_varlist
(
j
,:)
)
'
''
,'
int2str
(
ic
)
')'
]);
expand_menu
=
uimenu
(
c
,
'Label'
,
'Expand group'
,
'Callback'
,[
'expand_group(
''
'
mydata
.
plot_shock_decomp
.
use_shock_groups
'
''
,
''
'
deblank
(
mydata
.
plot_
shock_decomp
.
orig_varlist
{
j
}
)
'
''
,'
int2str
(
ic
)
')'
]);
set
(
expand_menu
,
'UserData'
,
mydata
,
'Tag'
,[
'group'
int2str
(
ic
)]);
for
jmember
=
mydata
.
shock_group
.
shocks
uimenu
(
'parent'
,
browse_menu
,
'Label'
,
char
(
jmember
))
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment