Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
dynare
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Wenddy SHu
dynare
Commits
b2c55462
Commit
b2c55462
authored
Jun 28, 2018
by
Sébastien Villemot
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Various fixes related to the new layout of generated files
parent
d741804b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
8 deletions
+8
-8
matlab/dynare.m
matlab/dynare.m
+5
-0
matlab/getH.m
matlab/getH.m
+2
-2
mex/sources/bytecode/Interpreter.cc
mex/sources/bytecode/Interpreter.cc
+1
-1
tests/block_bytecode/run_ls2003.m
tests/block_bytecode/run_ls2003.m
+0
-5
No files found.
matlab/dynare.m
View file @
b2c55462
...
...
@@ -283,4 +283,9 @@ end
if
~
isempty
(
find
(
abs
(
fname
)
==
46
))
fname
=
fname
(:,
1
:
find
(
abs
(
fname
)
==
46
)
-
1
)
;
end
% We need to clear the driver (and only the driver, because the "clear all"
% within the driver will clean the rest)
clear
([
'+'
fname
'/driver'
])
evalin
(
'base'
,[
fname
'.driver'
])
;
matlab/getH.m
View file @
b2c55462
...
...
@@ -201,11 +201,11 @@ else
end
end
if
nargout
>
5
[
df
,
gp
,
d2f
,
gpp
,
hp
]
=
feval
([
M_
.
fname
,
'_params_derivs'
],
yy0
,
oo_
.
exo_steady_state
'
,
...
[
df
,
gp
,
d2f
,
gpp
,
hp
]
=
feval
([
M_
.
fname
,
'
.dynamic
_params_derivs'
],
yy0
,
oo_
.
exo_steady_state
'
,
...
M_
.
params
,
oo_
.
dr
.
ys
,
1
,
dyssdtheta
,
d2yssdtheta
);
H2ss
=
d2yssdtheta
(
oo_
.
dr
.
order_var
,
indx
,
indx
);
else
[
df
,
gp
]
=
feval
([
M_
.
fname
,
'_params_derivs'
],
yy0
,
repmat
(
oo_
.
exo_steady_state
'
,[
M_
.
maximum_exo_lag
+
M_
.
maximum_exo_lead
+
1
,
1
]),
...
[
df
,
gp
]
=
feval
([
M_
.
fname
,
'
.dynamic
_params_derivs'
],
yy0
,
repmat
(
oo_
.
exo_steady_state
'
,[
M_
.
maximum_exo_lag
+
M_
.
maximum_exo_lead
+
1
,
1
]),
...
M_
.
params
,
oo_
.
dr
.
ys
,
1
,
dyssdtheta
,
d2yssdtheta
);
[
residual
,
g1
,
g2
]
=
feval
([
M_
.
fname
,
'.dynamic'
],
yy0
,
repmat
(
oo_
.
exo_steady_state
'
,[
M_
.
maximum_exo_lag
+
M_
.
maximum_exo_lead
+
1
,
1
]),
...
M_
.
params
,
oo_
.
dr
.
ys
,
1
);
...
...
mex/sources/bytecode/Interpreter.cc
View file @
b2c55462
...
...
@@ -587,7 +587,7 @@ Interpreter::ReadCodeFile(string file_name, CodeLoad &code)
if
(
!
code_liste
.
size
())
{
ostringstream
tmp
;
tmp
<<
" in compute_blocks, "
<<
file_name
.
c_str
()
<<
"
cannot be opened
\n
"
;
tmp
<<
" in compute_blocks, "
<<
file_name
<<
".cod
cannot be opened
\n
"
;
throw
FatalExceptionHandling
(
tmp
.
str
());
}
if
(
block
>=
(
int
)
code
.
get_block_number
())
...
...
tests/block_bytecode/run_ls2003.m
View file @
b2c55462
...
...
@@ -17,11 +17,6 @@ function run_ls2003(block, bytecode, solve_algo, stack_solve_algo)
% You should have received a copy of the GNU General Public License
% along with Dynare. If not, see <http://www.gnu.org/licenses/>.
% Workaround for a strange race condition under Octave
if
exist
(
'ls2003_tmp.m'
)
==
2
delete
(
'ls2003_tmp.m'
)
end
disp
([
'TEST: ls2003 (block='
num2str
(
block
)
', bytecode='
...
num2str
(
bytecode
)
', solve_algo='
num2str
(
solve_algo
)
...
', stack_solve_algo='
num2str
(
stack_solve_algo
)
')...'
]);
...
...
Write
Preview
Markdown
is supported
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