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
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
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
Stéphane Adjemian
dynare
Commits
e3c1204c
Verified
Commit
e3c1204c
authored
3 years ago
by
Johannes Pfeifer
Committed by
Sébastien Villemot
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Clarify auxiliary variable types
Related to
Dynare/dynare#1811
(cherry picked from commit
58ee2400
)
parent
b6785ac8
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
matlab/isauxiliary.m
+4
-4
4 additions, 4 deletions
matlab/isauxiliary.m
matlab/subst_auxvar.m
+6
-0
6 additions, 0 deletions
matlab/subst_auxvar.m
with
10 additions
and
4 deletions
matlab/isauxiliary.m
+
4
−
4
View file @
e3c1204c
...
@@ -20,13 +20,13 @@ function b = isauxiliary(var, types)
...
@@ -20,13 +20,13 @@ function b = isauxiliary(var, types)
% - 4 Expectation (substitute for Expectation Operator)
% - 4 Expectation (substitute for Expectation Operator)
% - 5, Diff forward (substitute for the differentiate of a forward variable)
% - 5, Diff forward (substitute for the differentiate of a forward variable)
% - 6, Multipliers for FOC of Ramsey Problem
% - 6, Multipliers for FOC of Ramsey Problem
% - 7,
Variable for var_model with order > abs(min_lag()) present in model
% - 7,
currently not used, see SymbolTable.hh
% - 8, Variable for Diff operator
% - 8, Variable for Diff operator
% - 9, Lag on Diff
% - 9, Lag on Diff
% - 10,
U
nary operator (log, exp)
% - 10,
Variable created when diff was taken of u
nary operator (log, exp)
% - 11, Lead on Diff
% - 11, Lead on Diff
% Copyright (C) 2018-201
9
Dynare Team
% Copyright (C) 2018-20
2
1 Dynare Team
%
%
% This file is part of Dynare.
% This file is part of Dynare.
%
%
...
...
This diff is collapsed.
Click to expand it.
matlab/subst_auxvar.m
+
6
−
0
View file @
e3c1204c
...
@@ -60,6 +60,9 @@ if ~isempty(aux_index)
...
@@ -60,6 +60,9 @@ if ~isempty(aux_index)
str
=
sprintf
(
'%s'
,
M_
.
endo_names
{
M_
.
aux_vars
(
aux_index
)
.
endo_index
});
str
=
sprintf
(
'%s'
,
M_
.
endo_names
{
M_
.
aux_vars
(
aux_index
)
.
endo_index
});
end
end
return
return
case
7
% currently unused
error
(
'This type of auxiliary variable should not occur, please contact the developers.'
)
case
8
case
8
% Diff operator
% Diff operator
str
=
sprintf
(
'diff(%s)'
,
M_
.
endo_names
{
M_
.
aux_vars
(
aux_index
)
.
orig_index
});
str
=
sprintf
(
'diff(%s)'
,
M_
.
endo_names
{
M_
.
aux_vars
(
aux_index
)
.
orig_index
});
...
@@ -74,6 +77,9 @@ if ~isempty(aux_index)
...
@@ -74,6 +77,9 @@ if ~isempty(aux_index)
end
end
str
=
sprintf
(
'diff(%s(-%u))'
,
M_
.
endo_names
{
M_
.
aux_vars
(
j
)
.
orig_index
},
lags
);
str
=
sprintf
(
'diff(%s(-%u))'
,
M_
.
endo_names
{
M_
.
aux_vars
(
j
)
.
orig_index
},
lags
);
return
return
case
10
% Variable created when diff was taken of unary operator (log, exp)
error
(
'This type of auxiliary variable should not occur, please contact the developers.'
)
case
11
case
11
% Leaded diff
% Leaded diff
leads
=
0
;
leads
=
0
;
...
...
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