From 1b47c8a5e551be046fba8b592d29f38e17099bfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org>
Date: Mon, 16 Jan 2023 16:14:28 +0100
Subject: [PATCH] =?UTF-8?q?Drop=20the=20=E2=80=9Cperiods=E2=80=9D=20statem?=
=?UTF-8?q?ent?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
doc/manual/source/the-model-file.rst | 18 --------
preprocessor | 2 +-
tests/deterministic_simulations/pfwee.mod | 6 +--
.../pfwee_learnt_in.mod | 6 +--
tests/t_lag2_check.mod | 44 -------------------
tests/t_lag2_checka.mod | 44 -------------------
tests/t_lag2a.mod | 44 -------------------
tests/t_lag2b.mod | 42 ------------------
tests/test_matlab.mod | 40 -----------------
tests/variance_0.mod | 42 ------------------
10 files changed, 7 insertions(+), 281 deletions(-)
delete mode 100644 tests/t_lag2_check.mod
delete mode 100644 tests/t_lag2_checka.mod
delete mode 100644 tests/t_lag2a.mod
delete mode 100644 tests/t_lag2b.mod
delete mode 100644 tests/test_matlab.mod
delete mode 100644 tests/variance_0.mod
diff --git a/doc/manual/source/the-model-file.rst b/doc/manual/source/the-model-file.rst
index 740ab0197f..5cb0378e2c 100644
--- a/doc/manual/source/the-model-file.rst
+++ b/doc/manual/source/the-model-file.rst
@@ -2846,24 +2846,6 @@ Other general declarations
|br| Reduces the number of periods considered in subsequent output commands.
-.. command:: periods INTEGER
-
- |br| This command is now deprecated (but will still work for older
- model files). It is not necessary when no simulation is performed
- and is replaced by an option ``periods`` in
- ``perfect_foresight_setup``, ``simul`` and ``stoch_simul``.
-
- This command sets the number of periods in the simulation. The
- periods are numbered from 1 to INTEGER. In perfect foresight
- simulations, it is assumed that all future events are perfectly
- known at the beginning of period 1.
-
- *Example*
-
- ::
-
- periods 100;
-
.. _st-st:
diff --git a/preprocessor b/preprocessor
index 93b9ed6957..a7b0a324c9 160000
--- a/preprocessor
+++ b/preprocessor
@@ -1 +1 @@
-Subproject commit 93b9ed69577246cb13eef1890d52708f2aea4a9d
+Subproject commit a7b0a324c9b97ec1bbcf3e3487dcaa176423598a
diff --git a/tests/deterministic_simulations/pfwee.mod b/tests/deterministic_simulations/pfwee.mod
index adfe550797..9184101968 100644
--- a/tests/deterministic_simulations/pfwee.mod
+++ b/tests/deterministic_simulations/pfwee.mod
@@ -51,7 +51,7 @@ oo_.exo_steady_state = 1.1;
oo_.exo_simul(end, 1) = oo_.exo_steady_state;
oo_.steady_state = evaluate_steady_state(oo_.steady_state, M_, options_, oo_, true);
oo_.endo_simul(:, end) = oo_.steady_state;
-periods 6;
+options_.periods = 6;
saved_endo = oo_.endo_simul(:, 1);
saved_exo = oo_.exo_simul(1, :);
oo_.endo_simul = oo_.endo_simul(:, 2:end);
@@ -66,7 +66,7 @@ oo_.exo_steady_state = 1.2;
oo_.exo_simul(end, 1) = oo_.exo_steady_state;
oo_.steady_state = evaluate_steady_state(oo_.steady_state, M_, options_, oo_, true);
oo_.endo_simul(:, end) = oo_.steady_state;
-periods 5;
+options_.periods = 5;
saved_endo = oo_.endo_simul(:, 1:2);
saved_exo = oo_.exo_simul(1:2, :);
oo_.endo_simul = oo_.endo_simul(:, 3:end);
@@ -82,7 +82,7 @@ oo_.exo_steady_state = 1.1;
oo_.exo_simul(end, 1) = oo_.exo_steady_state;
oo_.steady_state = evaluate_steady_state(oo_.steady_state, M_, options_, oo_, true);
oo_.endo_simul(:, end) = oo_.steady_state;
-periods 2;
+options_.periods = 2;
saved_endo = oo_.endo_simul(:, 1:5);
saved_exo = oo_.exo_simul(1:5, :);
oo_.endo_simul = oo_.endo_simul(:, 6:end);
diff --git a/tests/deterministic_simulations/pfwee_learnt_in.mod b/tests/deterministic_simulations/pfwee_learnt_in.mod
index 5c7e396ddb..f12cd13ed7 100644
--- a/tests/deterministic_simulations/pfwee_learnt_in.mod
+++ b/tests/deterministic_simulations/pfwee_learnt_in.mod
@@ -94,7 +94,7 @@ oo_.exo_steady_state = 1.1;
oo_.exo_simul(end, 1) = oo_.exo_steady_state;
oo_.steady_state = evaluate_steady_state(oo_.steady_state, M_, options_, oo_, true);
oo_.endo_simul(:, end) = oo_.steady_state;
-periods 6;
+options_.periods = 6;
saved_endo = oo_.endo_simul(:, 1);
saved_exo = oo_.exo_simul(1, :);
oo_.endo_simul = oo_.endo_simul(:, 2:end);
@@ -110,7 +110,7 @@ oo_.exo_steady_state = 1.1+0.1;
oo_.exo_simul(end, 1) = oo_.exo_steady_state;
oo_.steady_state = evaluate_steady_state(oo_.steady_state, M_, options_, oo_, true);
oo_.endo_simul(:, end) = oo_.steady_state;
-periods 5;
+options_.periods = 5;
saved_endo = oo_.endo_simul(:, 1:2);
saved_exo = oo_.exo_simul(1:2, :);
oo_.endo_simul = oo_.endo_simul(:, 3:end);
@@ -126,7 +126,7 @@ oo_.exo_steady_state = (1.1+0.1)*0.75;
oo_.exo_simul(end, 1) = oo_.exo_steady_state;
oo_.steady_state = evaluate_steady_state(oo_.steady_state, M_, options_, oo_, true);
oo_.endo_simul(:, end) = oo_.steady_state;
-periods 2;
+options_.periods = 2;
saved_endo = oo_.endo_simul(:, 1:5);
saved_exo = oo_.exo_simul(1:5, :);
oo_.endo_simul = oo_.endo_simul(:, 6:end);
diff --git a/tests/t_lag2_check.mod b/tests/t_lag2_check.mod
deleted file mode 100644
index 3be39bce4c..0000000000
--- a/tests/t_lag2_check.mod
+++ /dev/null
@@ -1,44 +0,0 @@
-// example 1 from Collard's guide to Dynare
-periods 400;
-
-var y, c, k, a, h, b, b1;
-varexo e,u;
-
-parameters beta, rho, alpha, delta, theta, psi, tau, phi;
-
-alpha = 0.36;
-rho = 0.95;
-tau = 0.025;
-beta = 0.99;
-delta = 0.025;
-psi = 0;
-theta = 2.95;
-
-phi = 0.1;
-
-model;
-c*theta*h^(1+psi)=(1-alpha)*y;
-k = beta*(((exp(b)*c)/(exp(b(+1))*c(+1)))
- *(exp(b(+1))*alpha*y(+1)+(1-delta)*k));
-y = exp(a)*(k(-1)^alpha)*(h^(1-alpha));
-k = exp(b)*(y-c)+(1-delta)*k(-1);
-a = rho*a(-1)+tau*b1(-1) + e;
-b = tau*a(-1)+rho*b1(-1) + u;
-b1 = b(-1);
-end;
-
-initval;
-y = 1.08068253095672;
-c = 0.80359242014163;
-h = 0.29175631001732;
-k = 5;
-b1 = 0;
-a = 0;
-b = 0;
-e = 0;
-u = 0;
-end;
-
-Sigma_e = [ 0.000081; (phi*0.009*0.009) 0.000081];
-
-stoch_simul(order=2,irf=0);
diff --git a/tests/t_lag2_checka.mod b/tests/t_lag2_checka.mod
deleted file mode 100644
index 36a888e41b..0000000000
--- a/tests/t_lag2_checka.mod
+++ /dev/null
@@ -1,44 +0,0 @@
-// example 1 from Collard's guide to Dynare
-periods 400;
-
-var y, c, k, a, h, b, b1;
-varexo e,u;
-
-parameters beta, rho, alpha, delta, theta, psi, tau, phi;
-
-alpha = 0.36;
-rho = 0.95;
-tau = 0.025;
-beta = 0.99;
-delta = 0.025;
-psi = 0;
-theta = 2.95;
-
-phi = 0.1;
-
-model;
-c*theta*h^(1+psi)=(1-alpha)*y;
-k = beta*(((exp(b)*c)/(exp(b(+1))*c(+1)))
- *(exp(b(+1))*alpha*y(+1)+(1-delta)*k));
-y = exp(a)*(k(-1)^alpha)*(h^(1-alpha));
-k = exp(b)*(y-c)+(1-delta)*k(-1);
-a = rho*a(-1)+tau*b1(-1) + e;
-b = tau*a(-1)+rho*b1(-1) + u;
-b1 = b(-1);
-end;
-
-initval;
-y = 1.08068253095672;
-c = 0.80359242014163;
-h = 0.29175631001732;
-k = 5;
-b1 = 0;
-a = 0;
-b = 0;
-e = 0;
-u = 0;
-end;
-
-Sigma_e = [ 0.000081; (phi*0.009*0.009) 0.000081];
-
-stoch_simul(order=1,irf=0);
diff --git a/tests/t_lag2a.mod b/tests/t_lag2a.mod
deleted file mode 100644
index f3b4f400bf..0000000000
--- a/tests/t_lag2a.mod
+++ /dev/null
@@ -1,44 +0,0 @@
-// example 1 from Collard's guide to Dynare
-periods 400;
-
-var y, c, k, a, h, b, b1;
-varexo e,u;
-
-parameters beta, rho, alpha, delta, theta, psi, tau, phi;
-
-alpha = 0.36;
-rho = 0.95;
-tau = 0.025;
-beta = 0.99;
-delta = 0.025;
-psi = 0;
-theta = 2.95;
-
-phi = 0.1;
-
-model;
-c*theta*h^(1+psi)=(1-alpha)*y;
-k = beta*(((exp(b)*c)/(exp(b(+1))*c(+1)))
- *(exp(b(+1))*alpha*y(+1)+(1-delta)*k));
-y = exp(a)*(k(-1)^alpha)*(h^(1-alpha));
-k = exp(b)*(y-c)+(1-delta)*k(-1);
-a = rho*a(-1)+tau*b1(-1) + e;
-b = tau*a(-1)+rho*b1(-1) + u;
-b1 = b(-1);
-end;
-
-initval;
-y = 1.08068253095672;
-c = 0.80359242014163;
-h = 0.29175631001732;
-k = 5;
-a = 0;
-b = 0;
-b1 = 0;
-e = 0;
-u = 0;
-end;
-
-Sigma_e = [ 0.000081; (phi*0.009*0.009) 0.000081];
-
-stoch_simul(irf=0,order=1);
diff --git a/tests/t_lag2b.mod b/tests/t_lag2b.mod
deleted file mode 100644
index 0753c9fdea..0000000000
--- a/tests/t_lag2b.mod
+++ /dev/null
@@ -1,42 +0,0 @@
-// example 1 from Collard's guide to Dynare
-periods 400;
-
-var y, c, k, a, h, b, b1;
-varexo e,u;
-
-parameters beta, rho, alpha, delta, theta, psi, tau, phi;
-
-alpha = 0.36;
-rho = 0.95;
-tau = 0.025;
-beta = 0.99;
-delta = 0.025;
-psi = 0;
-theta = 2.95;
-
-phi = 0.1;
-
-model;
-c*theta*h^(1+psi)=(1-alpha)*y;
-k = beta*(((exp(b)*c)/(exp(b(+1))*c(+1)))
- *(exp(b(+1))*alpha*y(+1)+(1-delta)*k));
-y = exp(a)*(k(-1)^alpha)*(h^(1-alpha));
-k = exp(b)*(y-c)+(1-delta)*k(-1);
-a = rho*a(-1)+tau*b1(-1) + e;
-b = tau*a(-1)+rho*b1(-1) + u;
-b1 = b(-1);
-end;
-
-initval;
-y = 1.08068253095672;
-c = 0.80359242014163;
-h = 0.29175631001732;
-k = 5;
-a = 0;
-b = 0;
-b1 = 0;
-end;
-
-Sigma_e = [ 0.000081; (phi*0.009*0.009) 0.000081];
-
-stoch_simul(irf=0,periods=10000,order=2);
diff --git a/tests/test_matlab.mod b/tests/test_matlab.mod
deleted file mode 100644
index 68d3444483..0000000000
--- a/tests/test_matlab.mod
+++ /dev/null
@@ -1,40 +0,0 @@
-periods 200;
-var y, c, k, a, h, b;
-varexo e,u;
-
-parameters beta, rho, beta, alpha, delta, theta, psi, tau, phi;
-
-alpha = 0.36;
-rho = 0.95;
-tau = 0.025;
-beta = 0.99;
-delta = 0.025;
-psi = 0;
-theta = 2.95;
-
-phi = 0.1;
-
-model;
-c*theta*h^(1+psi)=(1-alpha)*y;
-k = beta*(((exp(b)*c)/(exp(b(+1))*c(+1)))*(exp(b(+1))*alpha*y(+1)+(1-delta)*k));
-y = exp(a)*(k(-1)^alpha)*(h^(1-alpha));
-k = exp(b)*(y-c)+(1-delta)*k(-1);
-a = rho*a(-1)+tau*b(-1) + e;
-b = tau*a(-1)+rho*b(-1) + u;
-end;
-
-initval;
-y = 1;
-c = 0.7;
-h = 0.1;
-k = 11;
-a = 0;
-b = 0;
-e = 0;
-u = 0;
-end;
-
-Sigma_e = [ 0.01 0.005; 0.01];
-
-stoch_simul(irf=0);
-
diff --git a/tests/variance_0.mod b/tests/variance_0.mod
deleted file mode 100644
index 70944586a7..0000000000
--- a/tests/variance_0.mod
+++ /dev/null
@@ -1,42 +0,0 @@
-// test setting variance to 0
-periods 400;
-
-var y, c, k, a, h, b;
-varexo e,u;
-
-parameters beta, rho, alpha, delta, theta, psi, tau, phi;
-
-alpha = 0.36;
-rho = 0.95;
-tau = 0.025;
-beta = 0.99;
-delta = 0.025;
-psi = 0;
-theta = 2.95;
-
-phi = 0.1;
-
-model;
-c*theta*h^(1+psi)=(1-alpha)*y;
-k = beta*(((exp(b)*c)/(exp(b(+1))*c(+1)))
- *(exp(b(+1))*alpha*y(+1)+(1-delta)*k));
-y = exp(a)*(k(-1)^alpha)*(h^(1-alpha));
-k = exp(b)*(y-c)+(1-delta)*k(-1);
-a = rho*a(-1)+tau*b(-1) + e;
-b = tau*a(-1)+rho*b(-1) + u;
-end;
-
-initval;
-y = 1.08068253095672;
-c = 0.80359242014163;
-h = 0.29175631001732;
-k = 5;
-a = 0;
-b = 0;
-e = 0;
-u = 0;
-end;
-
-Sigma_e = [ 0.000081; (phi*0.009*0.009) 0];
-
-stoch_simul(order=1,irf=0,simul);
--
GitLab