Skip to content
Snippets Groups Projects
Commit 917f5e17 authored by Stéphane Adjemian's avatar Stéphane Adjemian
Browse files

Merge branch 'master' into ecb-master

parents c25319ef a35ff079
Branches
No related tags found
No related merge requests found
......@@ -42,9 +42,9 @@ end
for i = 1:vobs(o)
if isempty(o.ops{i})
o.ops(i) = {['qdiff(' o.name{i} ')']};
o.ops(i) = {['qgrowth(' o.name{i} ')']};
else
o.ops(i) = {['qdiff(' o.ops{i} ')']};
o.ops(i) = {['qgrowth(' o.ops{i} ')']};
end
end
......
......@@ -56,7 +56,7 @@ switch length(S)
S(1).subs = replace_object_in_a_one_dimensional_cell_array(S(1).subs, elements(:), i);
end
if ~isempty(idBracket.open)
elements = build_list_of_variables_with_regexp(A.name, idBracket, element, {});
elements = build_list_of_variables_with_regexp(A.name, element(2:end-1), false);
S(1).subs = replace_object_in_a_one_dimensional_cell_array(S(1).subs, elements(:), i);
end
end
......
......@@ -170,7 +170,7 @@ d.dates = [b.dates; c.dates];
%@test:4
%$ A = dseries(ones(3, 1), '1990Q1');
%$ B = dseries(2*ones(3, 1), '1990Q4Q3');
%$ B = dseries(2*ones(3, 1), '1990Q4');
%$
%$ try
%$ C = [A; B];
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment