Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • 4.3
  • 4.4
  • 4.5
  • 4.6
  • 5.x
  • 6.x
  • asm
  • aux_func
  • clang+openmp
  • dates-and-dseries-improvements
  • declare_vars_in_model_block
  • dmm
  • dragonfly
  • dynare_minreal
  • eigen
  • error_msg_undeclared_model_vars
  • estim_params
  • exo_steady_state
  • gpm-optimal-policy
  • julia
  • madysson
  • master
  • mex-GetPowerDeriv
  • penalty
  • separateM_
  • slice
  • sphinx-doc-experimental
  • static_aux_vars
  • time-varying-information-set
  • various_fixes
  • 3.062
  • 3.063
  • 4.0.0
  • 4.0.1
  • 4.0.2
  • 4.0.3
  • 4.0.4
  • 4.1-alpha1
  • 4.1-alpha2
  • 4.1.0
  • 4.1.1
  • 4.1.2
  • 4.1.3
  • 4.2.0
  • 4.2.1
  • 4.2.2
  • 4.2.3
  • 4.2.4
  • 4.2.5
  • 4.3.0
  • 4.3.1
  • 4.3.2
  • 4.3.3
  • 4.4-beta1
  • 4.4.0
  • 4.4.1
  • 4.4.2
  • 4.4.3
  • 4.5.0
  • 4.5.1
  • 4.5.2
  • 4.5.3
  • 4.5.4
  • 4.5.5
  • 4.5.6
  • 4.5.7
  • 4.6-beta1
  • 4.6.0
  • 4.6.0-rc1
  • 4.6.0-rc2
  • 4.6.1
  • 4.6.2
  • 4.6.3
  • 4.6.4
  • 4.7-beta1
  • 4.7-beta2
  • 4.7-beta3
  • 5.0
  • 5.0-rc1
  • 5.1
  • 5.2
  • 5.3
  • 5.4
  • 5.5
  • 6-beta1
  • 6-beta2
  • 6.0
  • 6.1
  • 6.2
  • 6.3
  • 6.4
91 results

Target

Select target project
  • giovanma/dynare
  • giorgiomas/dynare
  • Vermandel/dynare
  • Dynare/dynare
  • normann/dynare
  • MichelJuillard/dynare
  • wmutschl/dynare
  • FerhatMihoubi/dynare
  • sebastien/dynare
  • lnsongxf/dynare
  • rattoma/dynare
  • CIMERS/dynare
  • FredericKarame/dynare
  • SumuduK/dynare
  • MinjeJeon/dynare
  • camilomrch/dynare
  • DoraK/dynare
  • avtishin/dynare
  • selma/dynare
  • claudio_olguin/dynare
  • jeffjiang07/dynare
  • EthanSystem/dynare
  • stepan-a/dynare
  • wjgatt/dynare
  • JohannesPfeifer/dynare
  • gboehl/dynare
  • ebenetce/dynare
  • chskcau/dynare-doc-fixes
28 results
Select Git revision
  • 4.3
  • 4.4
  • 4.5
  • 4.6
  • 4.7
  • 5.x
  • 6.x
  • Andreasen
  • DSMH
  • DSMH_Karame
  • aux_func
  • dates-and-dseries-improvements
  • declare_vars_in_model_block
  • dmm
  • doc_bib
  • dsge_Base_test
  • dynamic-striated
  • eigen
  • error_msg_undeclared_model_vars
  • estim_params
  • exceptions
  • exist
  • exo_steady_state
  • filter_initial_state
  • gmhmaxlik
  • gpm-optimal-policy
  • julia
  • master
  • merge-initvalfile-fix
  • mex
  • mex-GetPowerDeriv
  • multi_wait
  • new_ep
  • occbin
  • osr_analytic
  • penalty
  • remove-@dates
  • remove-@dseries
  • remove-utilities-tests
  • rmExtraExo
  • semi_doc
  • separateM_
  • slice
  • sphinx-doc-experimental
  • static_aux_vars
  • temporary_terms
  • trust_region_legacy
  • 3.062
  • 3.063
  • 4.0.0
  • 4.0.1
  • 4.0.2
  • 4.0.3
  • 4.0.4
  • 4.1-alpha1
  • 4.1-alpha2
  • 4.1.0
  • 4.1.1
  • 4.1.2
  • 4.1.3
  • 4.2.0
  • 4.2.1
  • 4.2.2
  • 4.2.3
  • 4.2.4
  • 4.2.5
  • 4.3.0
  • 4.3.1
  • 4.3.2
  • 4.3.3
  • 4.4-beta1
  • 4.4.0
  • 4.4.1
  • 4.4.2
  • 4.4.3
  • 4.5.0
  • 4.5.1
  • 4.5.2
  • 4.5.3
  • 4.5.4
  • 4.5.5
  • 4.5.6
82 results
Show changes

Commits on Source 3

function [cancel,figh] = multiWaitbar( label, varargin )
%multiWaitbar: add, remove or update an entry on the multi waitbar
function [cancel,figh] = multi( label, varargin )
%waitbar.multi: add, remove or update an entry on the multi waitbar
%
% dynutil.multiWaitbar(TAG,VALUE) adds a waitbar for the specified label, or
% waitbar.multi(TAG,VALUE) adds a waitbar for the specified label, or
% if it already exists updates the value. TAG must be a string and
% VALUE a number between zero and one or the string 'Close' to remove the
% entry Setting value equal to 0 or 'Reset' will cause the progress bar
% to reset and the time estimate to be re-initialized.
%
% dynutil.multiWaitbar(TAG,COMMAND,VALUE,...) or
% dynutil.multiWaitbar(TAG,VALUE,COMMAND,VALUE,...)
% waitbar.multi(TAG,COMMAND,VALUE,...) or
% waitbar.multi(TAG,VALUE,COMMAND,VALUE,...)
% passes one or more command/value pairs for changing the named waitbar
% entry. Possible commands include:
% 'Value' Set the value of the named waitbar entry. The
......@@ -32,7 +32,7 @@ function [cancel,figh] = multiWaitbar( label, varargin )
% bounces back and forth. Return to normal progress display
% using the 'Reset' command.
%
% cancel = dynutil.multiWaitbar(LABEL,VALUE) also returns whether the user has
% cancel = waitbar.multi(LABEL,VALUE) also returns whether the user has
% clicked the "cancel" button for this entry (true or false). Two
% mechanisms are provided for cancelling an entry if the 'CanCancel'
% setting is 'on'. The first is just to check the return argument and if
......@@ -41,25 +41,25 @@ function [cancel,figh] = multiWaitbar( label, varargin )
% MATLAB's built-in WAITBAR. In either case, you can use the
% 'ResetCancel' command if you don't want to cancel after all.
%
% dynutil.multiWaitbar('CLOSEALL') closes the waitbar window.
% waitbar.multi('CLOSEALL') closes the waitbar window.
%
% Example:
% dynutil.multiWaitbar( 'CloseAll' );
% dynutil.multiWaitbar( 'Task 1', 0 );
% dynutil.multiWaitbar( 'Task 2', 0.5, 'Color', 'b' );
% dynutil.multiWaitbar( 'Task 3', 'Busy');
% dynutil.multiWaitbar( 'Task 1', 'Value', 0.1 );
% dynutil.multiWaitbar( 'Task 2', 'Increment', 0.2 );
% dynutil.multiWaitbar( 'Task 3', 'Reset' ); % Disables "busy" mode
% dynutil.multiWaitbar( 'Task 3', 'Value', 0.3 );
% dynutil.multiWaitbar( 'Task 2', 'Close' );
% dynutil.multiWaitbar( 'Task 3', 'Close' );
% dynutil.multiWaitbar( 'Task 1', 'Close' );
% waitbar.multi( 'CloseAll' );
% waitbar.multi( 'Task 1', 0 );
% waitbar.multi( 'Task 2', 0.5, 'Color', 'b' );
% waitbar.multi( 'Task 3', 'Busy');
% waitbar.multi( 'Task 1', 'Value', 0.1 );
% waitbar.multi( 'Task 2', 'Increment', 0.2 );
% waitbar.multi( 'Task 3', 'Reset' ); % Disables "busy" mode
% waitbar.multi( 'Task 3', 'Value', 0.3 );
% waitbar.multi( 'Task 2', 'Close' );
% waitbar.multi( 'Task 3', 'Close' );
% waitbar.multi( 'Task 1', 'Close' );
%
% Example:
% dynutil.multiWaitbar( 'Task 1', 0, 'CancelFcn', @(a,b) disp( ['Cancel ',a] ) );
% waitbar.multi( 'Task 1', 0, 'CancelFcn', @(a,b) disp( ['Cancel ',a] ) );
% for ii=1:100
% abort = dynutil.multiWaitbar( 'Task 1', ii/100 );
% abort = waitbar.multi( 'Task 1', ii/100 );
% if abort
% % Here we would normally ask the user if they're sure
% break
......@@ -67,17 +67,17 @@ function [cancel,figh] = multiWaitbar( label, varargin )
% pause( 1 )
% end
% end
% dynutil.multiWaitbar( 'Task 1', 'Close' )
% waitbar.multi( 'Task 1', 'Close' )
%
% Example:
% dynutil.multiWaitbar( 'CloseAll' );
% dynutil.multiWaitbar( 'Red...', 7/7, 'Color', [0.8 0.0 0.1] );
% dynutil.multiWaitbar( 'Orange...', 6/7, 'Color', [1.0 0.4 0.0] );
% dynutil.multiWaitbar( 'Yellow...', 5/7, 'Color', [0.9 0.8 0.2] );
% dynutil.multiWaitbar( 'Green...', 4/7, 'Color', [0.2 0.9 0.3] );
% dynutil.multiWaitbar( 'Blue...', 3/7, 'Color', [0.1 0.5 0.8] );
% dynutil.multiWaitbar( 'Indigo...', 2/7, 'Color', [0.4 0.1 0.5] );
% dynutil.multiWaitbar( 'Violet...', 1/7, 'Color', [0.8 0.4 0.9] );
% waitbar.multi( 'CloseAll' );
% waitbar.multi( 'Red...', 7/7, 'Color', [0.8 0.0 0.1] );
% waitbar.multi( 'Orange...', 6/7, 'Color', [1.0 0.4 0.0] );
% waitbar.multi( 'Yellow...', 5/7, 'Color', [0.9 0.8 0.2] );
% waitbar.multi( 'Green...', 4/7, 'Color', [0.2 0.9 0.3] );
% waitbar.multi( 'Blue...', 3/7, 'Color', [0.1 0.5 0.8] );
% waitbar.multi( 'Indigo...', 2/7, 'Color', [0.4 0.1 0.5] );
% waitbar.multi( 'Violet...', 1/7, 'Color', [0.8 0.4 0.9] );
% Based on the work by Ben Tordoff
%
......
......@@ -7,7 +7,7 @@ function oo_=perfect_foresight_with_expectation_errors_setup(M_, options_, oo_)
% OUTPUTS
% oo_ [structure] storing the results
% Copyright © 2021-2024 Dynare Team
% Copyright © 2021-2025 Dynare Team
%
% This file is part of Dynare.
%
......@@ -25,10 +25,10 @@ function oo_=perfect_foresight_with_expectation_errors_setup(M_, options_, oo_)
% along with Dynare. If not, see <https://www.gnu.org/licenses/>.
if ~isempty(M_.endo_histval)
error('perfect_foresight_with_expectation_errors_setup: cannot be used in conjunction with histval')
error('perfect_foresight_with_expectation_errors_setup: cannot be used in conjunction with histval or histval_file')
end
if ~isempty(oo_.initval_series)
error('perfect_foresight_with_expectation_errors_setup: cannot be used in conjunction with histval_file/initval_file')
error('perfect_foresight_with_expectation_errors_setup: cannot be used in conjunction with initval_file')
end
[periods, first_simulation_period] = get_simulation_periods(options_);
......