using a substitute for strsplit()
parent
653e275de3
commit
2f84a4809c
|
@ -23,30 +23,33 @@ ub = inf(M.endo_nbr,1);
|
||||||
lb = -ub;
|
lb = -ub;
|
||||||
eq_index = (1:M.endo_nbr)';
|
eq_index = (1:M.endo_nbr)';
|
||||||
for i=1:size(etags,1)
|
for i=1:size(etags,1)
|
||||||
if strcmp(etags{i,2},'mcp')
|
if strcmp(etags{i,2},'mcp')
|
||||||
[b,m] = strsplit(etags{i,3},{' ','<','>'});
|
str = etags{i,3};
|
||||||
if length(m) == 1
|
kop = strfind(etags{i,3},'<');
|
||||||
if any(m{1} == '<')
|
if ~isempty(kop)
|
||||||
k = find(strcmp(b{1},cellstr(M.endo_names)));
|
k = find(strcmp(strtrim(str(1:kop-1)),cellstr(M.endo_names)));
|
||||||
if isempty(k)
|
if isempty(k)
|
||||||
error(sprintf(['Complementarity condition %s: variable %s is ' ...
|
error(sprintf(['Complementarity condition %s: variable %s is ' ...
|
||||||
'not recognized',etags{i,3},b{1}]))
|
'not recognized',etags{i,3},b{1}]))
|
||||||
end
|
end
|
||||||
ub(k) = str2num(b{2});
|
ub(k) = str2num(str(kop+1:end));
|
||||||
eq_index(etags{i,1}) = k;
|
eq_index(etags{i,1}) = k;
|
||||||
eq_index(k) = etags{i,1};
|
eq_index(k) = etags{i,1};
|
||||||
elseif any(m{1} == '>')
|
else
|
||||||
k = find(strcmp(b{1},cellstr(M.endo_names)));
|
kop = strfind(etags{i,3},'>');
|
||||||
|
if ~isempty(kop)
|
||||||
|
k = find(strcmp(strtrim(str(1:kop-1)),cellstr(M.endo_names)));
|
||||||
if isempty(k)
|
if isempty(k)
|
||||||
error(sprintf(['Complementarity condition %s: variable %s is ' ...
|
error(sprintf(['Complementarity condition %s: variable %s is ' ...
|
||||||
'not recognized',etags{i},b{1}]))
|
'not recognized',etags{i},b{1}]))
|
||||||
end
|
end
|
||||||
lb(k) = str2num(b{2});
|
lb(k) = str2num(str(kop+1:end));
|
||||||
eq_index(etags{i,1}) = k;
|
eq_index(etags{i,1}) = k;
|
||||||
eq_index(k) = etags{i,1};
|
eq_index(k) = etags{i,1};
|
||||||
|
else
|
||||||
|
error(sprintf(['Complementarity condition %s can''t be ' ...
|
||||||
|
'parsed'],etags{i,3}))
|
||||||
end
|
end
|
||||||
else
|
|
||||||
error(sprintf('Complementarity condition %s can''t be parsed',etags{i,3}))
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue