From 07302130592dc6b7af5df6f8a782dd0e1cca2e6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= Date: Wed, 27 Oct 2010 18:35:42 +0200 Subject: [PATCH] Fix end of line convention and copyright years --- matlab/dynare_solve_block_or_bytecode.m | 143 ++++++++++++------------ 1 file changed, 72 insertions(+), 71 deletions(-) diff --git a/matlab/dynare_solve_block_or_bytecode.m b/matlab/dynare_solve_block_or_bytecode.m index f90c73c53..91d281dd1 100644 --- a/matlab/dynare_solve_block_or_bytecode.m +++ b/matlab/dynare_solve_block_or_bytecode.m @@ -1,72 +1,73 @@ -function [x,info] = dynare_solve_block_or_bytecode(y, exo, params) -% Copyright (C) 1996-2010 Dynare Team -% -% This file is part of Dynare. -% -% Dynare is free software: you can redistribute it and/or modify -% it under the terms of the GNU General Public License as published by -% the Free Software Foundation, either version 3 of the License, or -% (at your option) any later version. -% -% Dynare is distributed in the hope that it will be useful, -% but WITHOUT ANY WARRANTY; without even the implied warranty of -% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -% GNU General Public License for more details. -% -% You should have received a copy of the GNU General Public License -% along with Dynare. If not, see . -global options_ M_ -info = 0; -x = y; -if options_.block && ~options_.bytecode - for b = 1:size(M_.blocksMFS,1) - n = size(M_.blocksMFS{b}, 1); - ss = x; - if n ~= 0 - if options_.solve_algo <= 4 - [y, check] = dynare_solve('block_mfs_steadystate', ... - ss(M_.blocksMFS{b}), ... - options_.jacobian_flag, b, ss); - if check ~= 0 - error(['STEADY: convergence problems in block ' int2str(b)]) - end - ss(M_.blocksMFS{b}) = y; - else - [ss, check] = solve_one_boundary([M_.fname '_static_' int2str(b)], ss, exo, ... - params, M_.blocksMFS{b}, n, 1, 0, b, 0, options_.maxit_, ... - options_.solve_tolf, options_.slowc, 0, options_.solve_algo, 1, 0, 0); - - end - end - [r, g1, x] = feval([M_.fname '_static'], b, ss, ... - exo, params); - end -elseif options_.bytecode - if options_.solve_algo > 4 - [check, x] = bytecode('static', y, exo, params); - mexErrCheck('bytecode', check); - info = check; - elseif options_.block - for b = 1:size(M_.blocksMFS,1) - n = size(M_.blocksMFS{b}, 1); - if n ~= 0 - [y, check] = dynare_solve('block_bytecode_mfs_steadystate', ... - x(M_.blocksMFS{b}), ... - options_.jacobian_flag, b, x); - if check ~= 0 - error(['STEADY: convergence problems in block ' int2str(b)]) - end - x(M_.blocksMFS{b}) = y; - else - [check, x] = feval('bytecode', x, exo, params, 'static', ['block = ' int2str(b)]); - end; - end - else - [x, check] = dynare_solve('bytecode_steadystate', ... - y, ... - options_.jacobian_flag); - if check ~= 0 - error('STEADY: convergence problems') - end - end +function [x,info] = dynare_solve_block_or_bytecode(y, exo, params) +% Copyright (C) 2010 Dynare Team +% +% This file is part of Dynare. +% +% Dynare is free software: you can redistribute it and/or modify +% it under the terms of the GNU General Public License as published by +% the Free Software Foundation, either version 3 of the License, or +% (at your option) any later version. +% +% Dynare is distributed in the hope that it will be useful, +% but WITHOUT ANY WARRANTY; without even the implied warranty of +% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +% GNU General Public License for more details. +% +% You should have received a copy of the GNU General Public License +% along with Dynare. If not, see . + +global options_ M_ +info = 0; +x = y; +if options_.block && ~options_.bytecode + for b = 1:size(M_.blocksMFS,1) + n = size(M_.blocksMFS{b}, 1); + ss = x; + if n ~= 0 + if options_.solve_algo <= 4 + [y, check] = dynare_solve('block_mfs_steadystate', ... + ss(M_.blocksMFS{b}), ... + options_.jacobian_flag, b, ss); + if check ~= 0 + error(['STEADY: convergence problems in block ' int2str(b)]) + end + ss(M_.blocksMFS{b}) = y; + else + [ss, check] = solve_one_boundary([M_.fname '_static_' int2str(b)], ss, exo, ... + params, M_.blocksMFS{b}, n, 1, 0, b, 0, options_.maxit_, ... + options_.solve_tolf, options_.slowc, 0, options_.solve_algo, 1, 0, 0); + + end + end + [r, g1, x] = feval([M_.fname '_static'], b, ss, ... + exo, params); + end +elseif options_.bytecode + if options_.solve_algo > 4 + [check, x] = bytecode('static', y, exo, params); + mexErrCheck('bytecode', check); + info = check; + elseif options_.block + for b = 1:size(M_.blocksMFS,1) + n = size(M_.blocksMFS{b}, 1); + if n ~= 0 + [y, check] = dynare_solve('block_bytecode_mfs_steadystate', ... + x(M_.blocksMFS{b}), ... + options_.jacobian_flag, b, x); + if check ~= 0 + error(['STEADY: convergence problems in block ' int2str(b)]) + end + x(M_.blocksMFS{b}) = y; + else + [check, x] = feval('bytecode', x, exo, params, 'static', ['block = ' int2str(b)]); + end; + end + else + [x, check] = dynare_solve('bytecode_steadystate', ... + y, ... + options_.jacobian_flag); + if check ~= 0 + error('STEADY: convergence problems') + end + end end \ No newline at end of file