Commit ddddb5ad authored by Houtan Bastani's avatar Houtan Bastani
Browse files

console => nodisplay (Completes ticket #282)

parent 34bcc9a2
......@@ -696,9 +696,9 @@ initialized. @xref{Parameter initialization}, or
and exogenous variables.
@item console
Activate console mode: Dynare will not use graphical waitbars for long
computations. Note that this option is only useful under MATLAB, since
Octave does not provide graphical waitbar capabilities.
Activate console mode. In addition to the behavior of
@code{nodisplay}, Dynare will not use graphical waitbars for long
computations.
@item cygwin
Tells Dynare that your MATLAB is configured for compiling MEX files with
......
......@@ -34,19 +34,6 @@ estim_params_ = [];
bayestopt_ = [];
options_.datafile = '';
options_.verbosity = 1;
options_.console_mode = 0;
if exist('OCTAVE_VERSION')
if sum(get(0,'screensize'))==4
options_.console_mode = 1;
end
else
if isunix && (~usejava('jvm') || ...
((matlab_ver_less_than('7.5') && sum(get(0,'ScreenSize'))==4) || ...
(~matlab_ver_less_than('7.5') && ~feature('ShowFigureWindows'))))
options_.console_mode = 1;
end
end
options_.terminal_condition = 0;
options_.rplottype = 0;
options_.smpl = 0;
......@@ -125,6 +112,20 @@ options_.nodisplay = 0;
options_.nograph = 0;
options_.XTick = [];
options_.XTickLabel = [];
options_.console_mode = 0;
if exist('OCTAVE_VERSION')
if sum(get(0,'screensize'))==4
options_.console_mode = 1;
options_.nodisplay = 1;
end
else
if isunix && (~usejava('jvm') || ...
((matlab_ver_less_than('7.5') && sum(get(0,'ScreenSize'))==4) || ...
(~matlab_ver_less_than('7.5') && ~feature('ShowFigureWindows'))))
options_.console_mode = 1;
options_.nodisplay = 1;
end
end
% IRFs & other stoch_simul output
options_.irf = 40;
......
......@@ -475,7 +475,8 @@ ModFile::writeOutputFiles(const string &basename, bool clear_all, bool no_log, b
<< "diary(logname_)" << endl;
if (console)
mOutputFile << "options_.console_mode = 1;" << endl;
mOutputFile << "options_.console_mode = 1;" << endl
<< "options_.nodisplay = 1;" << endl;
cout << "Processing outputs ...";
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment