Commit b2c55462 authored by Sébastien Villemot's avatar Sébastien Villemot

Various fixes related to the new layout of generated files

parent d741804b
...@@ -283,4 +283,9 @@ end ...@@ -283,4 +283,9 @@ end
if ~ isempty(find(abs(fname) == 46)) if ~ isempty(find(abs(fname) == 46))
fname = fname(:,1:find(abs(fname) == 46)-1) ; fname = fname(:,1:find(abs(fname) == 46)-1) ;
end 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']) ; evalin('base',[fname '.driver']) ;
...@@ -201,11 +201,11 @@ else ...@@ -201,11 +201,11 @@ else
end end
end end
if nargout>5 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); M_.params, oo_.dr.ys, 1, dyssdtheta, d2yssdtheta);
H2ss = d2yssdtheta(oo_.dr.order_var,indx,indx); H2ss = d2yssdtheta(oo_.dr.order_var,indx,indx);
else 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); 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]), ... [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); M_.params, oo_.dr.ys, 1);
......
...@@ -587,7 +587,7 @@ Interpreter::ReadCodeFile(string file_name, CodeLoad &code) ...@@ -587,7 +587,7 @@ Interpreter::ReadCodeFile(string file_name, CodeLoad &code)
if (!code_liste.size()) if (!code_liste.size())
{ {
ostringstream tmp; 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()); throw FatalExceptionHandling(tmp.str());
} }
if (block >= (int) code.get_block_number()) if (block >= (int) code.get_block_number())
......
...@@ -17,11 +17,6 @@ function run_ls2003(block, bytecode, solve_algo, stack_solve_algo) ...@@ -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 % You should have received a copy of the GNU General Public License
% along with Dynare. If not, see <http://www.gnu.org/licenses/>. % 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=' ... disp(['TEST: ls2003 (block=' num2str(block) ', bytecode=' ...
num2str(bytecode) ', solve_algo=' num2str(solve_algo) ... num2str(bytecode) ', solve_algo=' num2str(solve_algo) ...
', stack_solve_algo=' num2str(stack_solve_algo) ')...']); ', stack_solve_algo=' num2str(stack_solve_algo) ')...']);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment