diff --git a/matlab/CutSample.m b/matlab/CutSample.m index cc166a5f0..5a3e94019 100644 --- a/matlab/CutSample.m +++ b/matlab/CutSample.m @@ -62,9 +62,9 @@ elseif TotalNumberOfMhFiles == 2 && FirstMhFile > 1 record.KeepedDraws.Distribution = [MAX_nruns-FirstLine+1 ; record.MhDraws(end,3)]; end save([DirectoryName '/' M_.fname '_mh_history.mat'],'record'); -fprintf('MH: Total number of Mh draws: %d.\n',TotalNumberOfMhDraws); -fprintf('MH: Total number of generated Mh files: %d.\n',TotalNumberOfMhFiles); +fprintf('MH: Total number of MH draws: %d.\n',TotalNumberOfMhDraws); +fprintf('MH: Total number of generated MH files: %d.\n',TotalNumberOfMhFiles); fprintf('MH: I''ll use mh-files %d to %d.\n',FirstMhFile,TotalNumberOfMhFiles); -fprintf('MH: In mh-file number %d i''ll start at line %d.\n',FirstMhFile,FirstLine); +fprintf('MH: In MH-file number %d I''ll start at line %d.\n',FirstMhFile,FirstLine); fprintf('MH: Finally I keep %d draws.\n',TotalNumberOfMhDraws-FirstDraw); disp(' '); diff --git a/matlab/dynare_estimation_1.m b/matlab/dynare_estimation_1.m index 8f4522712..1681bb02c 100644 --- a/matlab/dynare_estimation_1.m +++ b/matlab/dynare_estimation_1.m @@ -572,7 +572,7 @@ if (any(bayestopt_.pshape >0 ) && options_.mh_replic) || ... if options_.cova_compute oo_.MC_record=feval(options_.posterior_sampling_method,objective_function,options_.proposal_distribution,xparam1,invhess,bounds,dataset_,options_,M_,estim_params_,bayestopt_,oo_); else - error('I Cannot start the MCMC because the hessian of the posterior kernel at the mode was not computed.') + error('I Cannot start the MCMC because the Hessian of the posterior kernel at the mode was not computed.') end options_.analytic_derivation = ana_deriv; end diff --git a/matlab/marginal_density.m b/matlab/marginal_density.m index 2bb23e737..40170def9 100644 --- a/matlab/marginal_density.m +++ b/matlab/marginal_density.m @@ -62,7 +62,7 @@ fprintf(' Done!\n'); save([M_.fname '_mean.mat'],'xparam1','hh','SIGMA'); disp(' '); -disp('MH: I''m computing the posterior log marginale density (modified harmonic mean)... '); +disp('MH: I''m computing the posterior log marginal density (modified harmonic mean)... '); detSIGMA = det(SIGMA); invSIGMA = inv(SIGMA); marginal = zeros(9,2); diff --git a/matlab/parallel/masterParallel.m b/matlab/parallel/masterParallel.m index a7c2b7082..3e5cbf12c 100644 --- a/matlab/parallel/masterParallel.m +++ b/matlab/parallel/masterParallel.m @@ -4,22 +4,22 @@ function [fOutVar,nBlockPerCPU, totCPU] = masterParallel(Parallel,fBlock,nBlock, % computing. % It is the top-level function called on the master computer when parallelizing a task. -% This function have two main computational startegy for manage the matlab worker (slave process). +% This function has two main computational strategiues for managing the matlab worker (slave process). % 0 Simple Close/Open Stategy: -% In this case the new matlab istances (slave process) are open when +% In this case the new Matlab instances (slave process) are open when % necessary and then closed. This can happen many times during the % simulation of a model. % 1 Always Open Strategy: % In this case we have a more sophisticated management of slave processes, % which are no longer closed at the end of each job. The slave processes -% waits for a new job (if exist). If a slave do not receives a new job after a +% wait for a new job (if it exists). If a slave does not receive a new job after a % fixed time it is destroyed. This solution removes the computational -% time necessary to Open/Close new matlab istances. +% time necessary to Open/Close new Matlab instances. % The first (point 0) is the default Strategy % i.e.(Parallel_info.leaveSlaveOpen=0). This value can be changed by the -% user in xxx.mod file or it is changed by the programmer if it necessary to +% user in xxx.mod file or it is changed by the programmer if it is necessary to % reduce the overall computational time. See for example the % prior_posterior_statistics.m. @@ -30,7 +30,7 @@ function [fOutVar,nBlockPerCPU, totCPU] = masterParallel(Parallel,fBlock,nBlock, % o fBlock [int] index number of the first thread % (between 1 and nBlock) % o nBlock [int] index number of the last thread -% o NamFileInput [cell array] containins the list of input files to be +% o NamFileInput [cell array] contains the list of input files to be % copied in the working directory of remote slaves % 2 columns, as many lines as there are files % - first column contains directory paths @@ -49,8 +49,8 @@ function [fOutVar,nBlockPerCPU, totCPU] = masterParallel(Parallel,fBlock,nBlock, % struct per thread % o nBlockPerCPU [int vector] for each CPU used, indicates the number of % threads run on that CPU -% o totCPU [int] total number of CPU used (can be lower than -% the number of CPU declared in "Parallel", if +% o totCPU [int] total number of CPUs used (can be lower than +% the number of CPUs declared in "Parallel", if % the number of required threads is lower) % Copyright (C) 2009-2013 Dynare Team @@ -106,8 +106,8 @@ if isfield(Parallel_info,'local_files') end end -% Deactivate some 'Parallel/Warning' message in Octave! -% Comment the line 'warning('off');' in order to view the warning message +% Deactivate some 'Parallel/Warning' messages in Octave! +% Comment the line 'warning('off');' in order to view the warning messages % in Octave! if exist('OCTAVE_VERSION'),