From 8e7deead742bf87e3c1db558dc64c87976bc71e9 Mon Sep 17 00:00:00 2001 From: michel <michel@ac1d8469-bf42-47a9-8791-bf33cf982152> Date: Sat, 11 Feb 2006 16:09:13 +0000 Subject: [PATCH] v3: corrected bug in osr git-svn-id: https://www.dynare.org/svn/dynare/dynare_v3@619 ac1d8469-bf42-47a9-8791-bf33cf982152 --- matlab/dynare_m.exe | Bin 728110 -> 728110 bytes matlab/osr1.m | 2 +- matlab/osr_obj.m | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/matlab/dynare_m.exe b/matlab/dynare_m.exe index e19c15a99b599081fc3fbbbe5b61b9bdd915c83d..331fce85606deb7c89c68e0e10d20fb91f6c7277 100644 GIT binary patch delta 2470 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 GV*&u29+0X4 delta 2462 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 AtpET3 diff --git a/matlab/osr1.m b/matlab/osr1.m index bfc17203cf..25c809e461 100644 --- a/matlab/osr1.m +++ b/matlab/osr1.m @@ -18,7 +18,7 @@ function [dr_,info]=osr1(params,weights) t0(i)=evalin('base',[params(i,:) ';']); end - [f,info] = osr_obj(t0,params,weights); + [f,vx,info] = osr_obj(t0,params,weights); if info > 0 disp('OSR: bad initial value for the parameters'); return diff --git a/matlab/osr_obj.m b/matlab/osr_obj.m index 7302daace4..b09b6f91c5 100644 --- a/matlab/osr_obj.m +++ b/matlab/osr_obj.m @@ -1,5 +1,5 @@ % the beginning and the end of this function may be adapted by the userx -function [loss,vx]=osr_obj(x,params,weights); +function [loss,vx,info]=osr_obj(x,params,weights); global ys_ Sigma_e_ endo_nbr exo_nbr optimal_Q_ it_ ykmin_ options_ vx = []; -- GitLab