Merge branch 'no_print' into 'master'

Fix bugs related to print_info.m and noprint

Closes #1714

See merge request Dynare/dynare!1721

matlab/cli/prior.m

@@ -143,7 +143,7 @@ if ismember('moments', varargin) % Prior simulations (2nd order moments).
     end
     if info
         skipline()
-        message = get_error_message(info);
+        message = get_error_message(info,options_);
         fprintf('Cannot solve the model on the prior mode (info = %d, %s)\n', info(1), message);
         skipline()
         return

matlab/dynare_identification.m

@@ -461,7 +461,7 @@ if iload <=0
         identification_analysis(params, indpmodel, indpstderr, indpcorr, options_ident, dataset_info, prior_exist, 1); %the 1 at the end implies initialization of persistent variables
     if info(1)~=0
         % there are errors in the solution algorithm
-        message = get_error_message(info,0,options_);
+        message = get_error_message(info,options_);
         fprintf('-----------\n');
         fprintf('The model does not solve for %s (info = %d: %s)\n', parameters, info(1), message);
         fprintf('-----------\n');

matlab/fjaco.m

@@ -59,7 +59,7 @@ function disp_info_error_identification_perturbation(info,j)
     % there are errors in the solution algorithm
     probl_par = get_the_name(j,varargin{5}.TeX,varargin{3},varargin{2},varargin{5});
     skipline()
-    message = get_error_message(info,0,varargin{5});
+    message = get_error_message(info,varargin{5});
     fprintf('Parameter error in numerical two-sided difference method:\n')
     fprintf('Cannot solve the model for %s (info = %d, %s)\n', probl_par, info(1), message);
     fprintf('Possible solutions:\n')

matlab/get_error_message.m

@@ -1,9 +1,8 @@
-function message = get_error_message(info, noprint, DynareOptions)
+function message = get_error_message(info, DynareOptions)
 % Returns error messages
 %
 % INPUTS
 %   info              [double]     vector returned by resol.m
-%   noprint           [integer]    equal to 0 if the error message has to be printed.
 %   DynareOptions     [structure]  --> options_
 % OUTPUTS
 %    message          [string]     corresponding error message
@@ -11,7 +10,7 @@ function message = get_error_message(info, noprint, DynareOptions)
 % SPECIAL REQUIREMENTS
 %    none
 
-% Copyright (C) 2005-2019 Dynare Team
+% Copyright (C) 2005-2020 Dynare Team
 %
 % This file is part of Dynare.
 %
@@ -28,8 +27,7 @@ function message = get_error_message(info, noprint, DynareOptions)
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
-if ~noprint
-    switch info(1)
+switch info(1)
     case 0
         message = '';
     case 1
@@ -170,5 +168,4 @@ if ~noprint
         message = 'Aim: Problem in SPEIG.';
     otherwise
         message = 'This case shouldn''t happen. Contact the authors of Dynare';
-    end
 end

matlab/print_info.m

@@ -11,7 +11,7 @@ function print_info(info, noprint, DynareOptions)
 % SPECIAL REQUIREMENTS
 %    none
 
-% Copyright (C) 2005-2019 Dynare Team
+% Copyright (C) 2005-2020 Dynare Team
 %
 % This file is part of Dynare.
 %
@@ -27,6 +27,7 @@ function print_info(info, noprint, DynareOptions)
 %
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
-
-message = get_error_message(info, noprint, DynareOptions);
-error(message);
+if ~noprint
+    message = get_error_message(info, DynareOptions);
+    error(message);
+end

tests/Makefile.am

@@ -279,6 +279,7 @@ MODFILES = \
 	ep/rbcii.mod \
 	ep/linearmodel0.mod \
 	ep/linearmodel1.mod \
+	stochastic_simulations/example1_noprint.mod \
 	stochastic-backward-models/solow_cd.mod \
 	stochastic-backward-models/solow_ces.mod \
 	stochastic-backward-models/solow_cd_with_steadystate.mod \

tests/stochastic_simulations/example1_noprint.mod

@@ -0,0 +1,68 @@
+/*
+ * Example 1 from F. Collard (2001): "Stochastic simulations with DYNARE:
+ * A practical guide" (see "guide.pdf" in the documentation directory).
+ */
+
+/*
+ * Copyright (C) 2001-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 <http://www.gnu.org/licenses/>.
+ */
+
+
+var y, c, k, a, h, b;
+varexo e, u;
+
+parameters beta, rho, alpha, delta, theta, psi, tau;
+
+alpha = -0.36;  // changed "0.36" to "-0.36" to generate an error
+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 = 11.08360443260358;
+a = 0;
+b = 0;
+e = 0;
+u = 0;
+end;
+
+shocks;
+var e; stderr 0.009;
+var u; stderr 0.009;
+var e, u = phi*0.009*0.009;
+end;
+
+stoch_simul(noprint);   // added "noprint"