From 3e84e333b4532bac3265a8fd5d1658855a53a10f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Adjemian=20=28Charybdis=29?= <stephane.adjemian@univ-lemans.fr> Date: Mon, 26 Dec 2011 14:26:32 +0100 Subject: [PATCH] Changed verbosity options (fast deterministic simulations). Default is options_.verbosity==1. --- matlab/ep/extended_path.m | 1 + matlab/global_initialization.m | 4 +++- mex/sources/bytecode/bytecode.cc | 3 +-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/matlab/ep/extended_path.m b/matlab/ep/extended_path.m index 99b0536869..66b16eddf4 100644 --- a/matlab/ep/extended_path.m +++ b/matlab/ep/extended_path.m @@ -33,6 +33,7 @@ function time_series = extended_path(initial_conditions,sample_size) global M_ options_ oo_ debug = 0; +options_.verbosity = options_.ep.verbosity; verbosity = options_.ep.verbosity+debug; % Test if bytecode and block options are used (these options are mandatory) diff --git a/matlab/global_initialization.m b/matlab/global_initialization.m index 52bbad9586..ef14b25392 100644 --- a/matlab/global_initialization.m +++ b/matlab/global_initialization.m @@ -35,6 +35,8 @@ bayestopt_ = []; options_.console_mode = 0; +options_.verbosity = 1; + options_.terminal_condition = 0; options_.rplottype = 0; options_.smpl = 0; @@ -109,7 +111,7 @@ options_.SpectralDensity = 0; % Extended path options % % Set verbose mode -options_.ep.verbosity = 1; +options_.ep.verbosity = 0; % Initialization of the perfect foresight equilibrium paths % * init=0, previous solution is used. % * init=1, a path generated with the first order reduced form is used. diff --git a/mex/sources/bytecode/bytecode.cc b/mex/sources/bytecode/bytecode.cc index c6cec73370..134c19f425 100644 --- a/mex/sources/bytecode/bytecode.cc +++ b/mex/sources/bytecode/bytecode.cc @@ -286,8 +286,7 @@ main(int nrhs, const char *prhs[]) nb_row_xd = row_x; } } - mxArray *ep = mxGetFieldByNumber(options_, 0, mxGetFieldNumber(options_, "ep")); - int verbose= int(*mxGetPr((mxGetFieldByNumber(ep, 0, mxGetFieldNumber(ep, "verbosity"))))); + int verbose= int(*mxGetPr((mxGetFieldByNumber(options_, 0, mxGetFieldNumber(options_, "verbosity"))))); if (verbose) print_it = true; int maxit_ = int (floor(*(mxGetPr(mxGetFieldByNumber(options_, 0, mxGetFieldNumber(options_, "maxit_")))))); -- GitLab