[Pkg-octave-commit] [SCM] Debian packaging for dynare branch, master, updated. debian/4.2.5-2-18-g2a35554

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit a1d1d0b1e2c7c94374bf038d39f6d7025e4964f5
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date:   Mon Jun 18 18:52:07 2012 +0000

    welfare-computation.patch: new patch picked upstream

diff --git a/debian/patches/series b/debian/patches/series
index 9d797d8..08b3366 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 extra-addpatch.patch
 fhs-compliance.patch
 shock-decomposition.patch
+welfare-computation.patch
diff --git a/debian/patches/welfare-computation.patch b/debian/patches/welfare-computation.patch
new file mode 100644
index 0000000..532bf5b
--- /dev/null
+++ b/debian/patches/welfare-computation.patch
@@ -0,0 +1,19 @@
+Description: Fix bug in welfare computation when using ramsey_policy and histval
+Origin: upstream, commit: c185ff95195561fcb17450d7be8313fd61751d41
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+diff --git a/matlab/evaluate_planner_objective.m b/matlab/evaluate_planner_objective.m
+index 0f16bb7..ae90b08 100644
+--- a/matlab/evaluate_planner_objective.m
++++ b/matlab/evaluate_planner_objective.m
+@@ -112,9 +112,8 @@ if ~isempty(M.endo_histval)
+     % initialize endogenous state variable to histval if necessary
+     yhat1(1:M.orig_endo_nbr) = M.endo_histval(1:M.orig_endo_nbr);
+     if options.ramsey_policy
+-        yhat12(1:M.orig_endo_nbr) = M.endo_histval(1:M.orig_endo_nbr);
++        yhat2(1:M.orig_endo_nbr) = M.endo_histval(1:M.orig_endo_nbr);
+     end
+-
+ end
+ yhat1 = yhat1(dr.order_var(nstatic+(1:npred)),1)-dr.ys(dr.order_var(nstatic+(1:npred)));
+ yhat2 = yhat2(dr.order_var(nstatic+(1:npred)),1)-dr.ys(dr.order_var(nstatic+(1:npred)));

-- 
Debian packaging for dynare