Merge branch 'use-dynSeries' of ithaca.fr:dynare into use-dynSeries

Conflicts:
	matlab/check_list_of_variables.m
	matlab/dynare_estimation_1.m
time-shift
Stéphane Adjemian (Charybdis) 2013-09-09 11:40:01 +02:00
commit b485a13580
2 changed files with 6 additions and 7 deletions

View File

@ -113,7 +113,7 @@ if isempty(varlist)
if choice==1
varlist = M_.endo_names(1:M_.orig_endo_nbr, :);
elseif choice==2
varlist = options_.varobs;
varlist = char(options_.varobs);
elseif choice==3
varlist = NaN;
else
@ -123,15 +123,14 @@ if isempty(varlist)
end
end
end
if isnan(varlist)
edit([M_.fname '.mod'])
end
skipline()
end
if isnan(varlist)
edit([M_.fname '.mod'])
end
skipline()
end
function format_text(remain, max_number_of_words_per_line)
index = 0;
line_of_text = [];

View File

@ -812,7 +812,7 @@ if (~((any(bayestopt_.pshape > 0) && options_.mh_replic) || (any(bayestopt_.psha
hold on
plot(1:gend,measurement_error(index(k),:),marker_string{2,1},'linewidth',1)
hold off
name = deblank(options_.varobs{index(k)});
name = options_.varobs{index(k)};
if gend>1
xlim([1 gend])
end