Skip to content
Snippets Groups Projects
Verified Commit 7915b91f authored by Stéphane Adjemian's avatar Stéphane Adjemian Committed by Stéphane Adjemian
Browse files

Error takes sprintf like arguments directly.

parent 23af7f64
Branches
No related tags found
No related merge requests found
...@@ -33,7 +33,7 @@ global M_ ...@@ -33,7 +33,7 @@ global M_
i = strmatch(pname,M_.param_names,'exact'); i = strmatch(pname,M_.param_names,'exact');
if isempty(i) if isempty(i)
error(sprintf('Can''t find parameter %s', pname)) error('Can''t find parameter %s', pname)
end end
x = M_.params(i); x = M_.params(i);
...@@ -80,7 +80,7 @@ switch pshape(indx) ...@@ -80,7 +80,7 @@ switch pshape(indx)
abscissa = linspace(infbound,supbound,steps); abscissa = linspace(infbound,supbound,steps);
dens = density(abscissa,p6(indx),p7(indx),p3(indx)); dens = density(abscissa,p6(indx),p7(indx),p3(indx));
otherwise otherwise
error(sprintf('draw_prior_density: unknown distribution shape (index %d, type %d)', indx, pshape(indx))); error('draw_prior_density: unknown distribution shape (index %d, type %d)', indx, pshape(indx));
end end
if pshape(indx) ~= 5 if pshape(indx) ~= 5
......
...@@ -57,8 +57,7 @@ for i=1:size(etags,1) ...@@ -57,8 +57,7 @@ for i=1:size(etags,1)
if ~isempty(kop) if ~isempty(kop)
k = find(strcmp(strtrim(str(1:kop-1)), M_.endo_names)); %get variable index with restriction k = find(strcmp(strtrim(str(1:kop-1)), M_.endo_names)); %get variable index with restriction
if isempty(k) if isempty(k)
error(sprintf(['Complementarity condition %s: variable %s is ' ... error('Complementarity condition %s: variable %s is not recognized', etags{i,3}, strtrim(str(1:kop-1)))
'not recognized'],etags{i,3},strtrim(str(1:kop-1))))
end end
ub(k) = str2num(str(kop+1:end)); ub(k) = str2num(str(kop+1:end));
eq_index(eq_nbr) = k; eq_index(eq_nbr) = k;
...@@ -68,15 +67,13 @@ for i=1:size(etags,1) ...@@ -68,15 +67,13 @@ for i=1:size(etags,1)
if ~isempty(kop) if ~isempty(kop)
k = find(strcmp(strtrim(str(1:kop-1)), M_.endo_names)); %get variable index with restriction k = find(strcmp(strtrim(str(1:kop-1)), M_.endo_names)); %get variable index with restriction
if isempty(k) if isempty(k)
error(sprintf(['Complementarity condition %s: variable %s is ' ... error('Complementarity condition %s: variable %s is not recognized', etags{i,3}, strtrim(str(1:kop-1)))
'not recognized'],etags{i,3},strtrim(str(1:kop-1))))
end end
lb(k) = str2num(str(kop+1:end)); lb(k) = str2num(str(kop+1:end));
eq_index(eq_nbr) = k; eq_index(eq_nbr) = k;
eq_index(k) = eq_nbr; eq_index(k) = eq_nbr;
else else
error(sprintf(['Complementarity condition %s can''t be ' ... error('Complementarity condition %s can''t be parsed',etags{i,3})
'parsed'],etags{i,3}))
end end
end end
end end
......
Subproject commit 1bb3b1cbc9d1b29136e8e533d871e247f1b11103 Subproject commit 8acb7f8d5f6418717a9ad47e6b6b911354a86409
...@@ -48,7 +48,7 @@ for i = 1:M_.endo_nbr ...@@ -48,7 +48,7 @@ for i = 1:M_.endo_nbr
M_.endo_histval(i, M_.maximum_endo_lag) = ... M_.endo_histval(i, M_.maximum_endo_lag) = ...
ds{M_.endo_names{i}}(initialperiod).data; ds{M_.endo_names{i}}(initialperiod).data;
else else
error(sprintf('Can''t find %s in dseries', M_.endo_names{i})) error('Can''t find %s in dseries', M_.endo_names{i})
end end
end end
else else
...@@ -58,7 +58,7 @@ for i = 1:M_.endo_nbr ...@@ -58,7 +58,7 @@ for i = 1:M_.endo_nbr
M_.endo_histval(i,M_.maximum_endo_lag) = ... M_.endo_histval(i,M_.maximum_endo_lag) = ...
ds{M_.endo_names{a.orig_index}}(initialperiod+a.orig_lead_lag).data; ds{M_.endo_names{a.orig_index}}(initialperiod+a.orig_lead_lag).data;
else else
error(sprintf('Can''t find %s in dseries', M_.endo_names{a.orig_index})) error('Can''t find %s in dseries', M_.endo_names{a.orig_index})
end end
end end
k = k + 1; k = k + 1;
......
...@@ -69,10 +69,10 @@ elseif isempty(options_.datafile) && ~isempty(options_.dataset.series) ...@@ -69,10 +69,10 @@ elseif isempty(options_.datafile) && ~isempty(options_.dataset.series)
try try
dseriesobjectforuserdataset = evalin('base', options_.dataset.series); dseriesobjectforuserdataset = evalin('base', options_.dataset.series);
catch catch
error(sprintf('makedataset: %s is unknown!', options_.dataset.series)) error('makedataset: %s is unknown!', options_.dataset.series)
end end
if ~isdseries(dseriesobjectforuserdataset) if ~isdseries(dseriesobjectforuserdataset)
error(sprintf('makedataset: %s has to be a dseries object!', options_.dataset.series)) error('makedataset: %s has to be a dseries object!', options_.dataset.series)
end end
datafile = []; datafile = [];
newdatainterface = 1; newdatainterface = 1;
...@@ -103,7 +103,7 @@ if ~isempty(datafile) ...@@ -103,7 +103,7 @@ if ~isempty(datafile)
end end
end end
if isempty(available_extensions) if isempty(available_extensions)
error(['makedataset: I can''t find a datafile (with allowed extension m, mat, csv, xls or xlsx)!']) error('makedataset: I can''t find a datafile (with allowed extension m, mat, csv, xls or xlsx)!')
end end
if length(available_extensions)>1 if length(available_extensions)>1
error(sprintf(['makedataset: You did not specify an extension for the datafile, but more than one candidate ' ... error(sprintf(['makedataset: You did not specify an extension for the datafile, but more than one candidate ' ...
...@@ -203,7 +203,7 @@ if newdatainterface ...@@ -203,7 +203,7 @@ if newdatainterface
else else
% last_obs and nobs were used in the data command. Check that they are consistent (with firstobs). % last_obs and nobs were used in the data command. Check that they are consistent (with firstobs).
if ~isequal(lastobs,firstobs+(nobs-1)) if ~isequal(lastobs,firstobs+(nobs-1))
error(sprintf('makedataset: Options last_obs (%s), first_obs (%s) and nobs (%s) are not consistent!',char(lastobs),char(firstobs),num2str(nobs))); error('makedataset: Options last_obs (%s), first_obs (%s) and nobs (%s) are not consistent!',char(lastobs),char(firstobs),num2str(nobs));
end end
end end
end end
...@@ -227,23 +227,23 @@ FIRSTOBS = firstobs-initialconditions; ...@@ -227,23 +227,23 @@ FIRSTOBS = firstobs-initialconditions;
% Check that firstobs belongs to dataset_.dates % Check that firstobs belongs to dataset_.dates
if firstobs<dataset_.init if firstobs<dataset_.init
error(sprintf('makedataset: first_obs (%s) cannot be less than the first date in the dataset (%s)!',char(firstobs),char(dataset_.init))) error('makedataset: first_obs (%s) cannot be less than the first date in the dataset (%s)!',char(firstobs),char(dataset_.init))
end end
% Check that FIRSTOBS belongs to dataset_.dates % Check that FIRSTOBS belongs to dataset_.dates
if initialconditions && FIRSTOBS<dataset_.init if initialconditions && FIRSTOBS<dataset_.init
error(sprintf('makedataset: first_obs (%s) - %i cannot be less than the first date in the dataset (%s)!\nReduce the number of lags in the VAR model or increase the value of first_obs\nto at least first_obs=%i.', char(firstobs), initialconditions, char(dataset_.init),initialconditions+1)); error('makedataset: first_obs (%s) - %i cannot be less than the first date in the dataset (%s)!\nReduce the number of lags in the VAR model or increase the value of first_obs\nto at least first_obs=%i.', char(firstobs), initialconditions, char(dataset_.init),initialconditions+1);
end end
% Check that lastobs belongs to dataset_.dates... % Check that lastobs belongs to dataset_.dates...
if newdatainterface if newdatainterface
if lastobs>dataset_.dates(end) if lastobs>dataset_.dates(end)
error(sprintf('makedataset: last_obs (%s) cannot be greater than the last date in the dataset (%s)!',char(lastobs),char(dataset_.dates(end)))) error('makedataset: last_obs (%s) cannot be greater than the last date in the dataset (%s)!',char(lastobs),char(dataset_.dates(end)))
end end
else else
% ... or check that nobs is smaller than the number of observations in dataset_. % ... or check that nobs is smaller than the number of observations in dataset_.
if nobs>dataset_.nobs if nobs>dataset_.nobs
error(sprintf('makedataset: nobs (%s) cannot be greater than the last date in the dataset (%s)!', num2str(nobs), num2str(dataset_.nobs))) error('makedataset: nobs (%s) cannot be greater than the last date in the dataset (%s)!', num2str(nobs), num2str(dataset_.nobs))
end end
end end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment