From 4291b4f07e74f07c85d58de1e4ffca41de04b818 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org>
Date: Tue, 28 Mar 2023 18:17:28 +0200
Subject: [PATCH] The preprocessor now sets
options_.{ramsey,discretionary}_policy in all cases
---
matlab/default_option_values.m | 2 +-
matlab/discretionary_policy/discretionary_policy.m | 3 +--
matlab/ramsey_policy.m | 1 -
preprocessor | 2 +-
4 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/matlab/default_option_values.m b/matlab/default_option_values.m
index 0ebbe0e54a..9e8917d423 100644
--- a/matlab/default_option_values.m
+++ b/matlab/default_option_values.m
@@ -686,7 +686,7 @@ options_.dr_logarithmic_reduction_maxiter = 100;
options_.initial_date = dates();
% discretionary policy
-options_.discretionary_policy = 0;
+options_.discretionary_policy = false;
options_.discretionary_tol = 1e-7;
% Shock decomposition
diff --git a/matlab/discretionary_policy/discretionary_policy.m b/matlab/discretionary_policy/discretionary_policy.m
index 8e9701a6bf..3c57a91460 100644
--- a/matlab/discretionary_policy/discretionary_policy.m
+++ b/matlab/discretionary_policy/discretionary_policy.m
@@ -12,7 +12,7 @@ function [info, oo_, options_, M_] = discretionary_policy(M_, options_, oo_, var
% - options_ [structure] Matlab's structure describing the current options (options_).
% - M_ [structure] Matlab's structure describing the model (M_).
-% Copyright © 2007-2020 Dynare Team
+% Copyright © 2007-2023 Dynare Team
%
% This file is part of Dynare.
%
@@ -32,7 +32,6 @@ function [info, oo_, options_, M_] = discretionary_policy(M_, options_, oo_, var
M_=discretionary_policy_initialization(M_,options_);
origorder = options_.order;
-options_.discretionary_policy = 1;
options_.order = 1;
[info, oo_, options_, M_] = stoch_simul(M_, options_, oo_, var_list);
diff --git a/matlab/ramsey_policy.m b/matlab/ramsey_policy.m
index 3c4b901104..51b08297a2 100644
--- a/matlab/ramsey_policy.m
+++ b/matlab/ramsey_policy.m
@@ -19,7 +19,6 @@ function info = ramsey_policy(var_list)
global options_ oo_ M_
-options_.ramsey_policy = 1;
oldoptions = options_;
[info, oo_, options_, M_] = stoch_simul(M_, options_, oo_, var_list);
diff --git a/preprocessor b/preprocessor
index 0169240f76..70192aec71 160000
--- a/preprocessor
+++ b/preprocessor
@@ -1 +1 @@
-Subproject commit 0169240f76532df6d507b01647e8576d1094e95d
+Subproject commit 70192aec718e5f1e13f1513a7a23e48c31f30714
--
GitLab