Renamed dynSeries class as dseries.

remove-priordens
Stéphane Adjemian (Charybdis) 2013-10-18 17:38:43 +02:00
parent 2bb645ec70
commit cb9732a609
6 changed files with 11 additions and 11 deletions

View File

@ -125,8 +125,8 @@ assert(isempty(o.yrange) || (isfloat(o.yrange) && length(o.yrange) == 2 && ...
o.yrange(1) < o.yrange(2)), ...
['@graph.graph: yrange is specified an array with two float entries, ' ...
'the lower bound and upper bound.']);
assert(isempty(o.data) || isa(o.data, 'dynSeries'), ['@graph.graph: data must ' ...
'be a dynSeries']);
assert(isempty(o.data) || isa(o.data, 'dseries'), ['@graph.graph: data must ' ...
'be a dseries']);
assert(isempty(o.seriesToUse) || iscellstr(o.seriesToUse), ['@graph.graph: ' ...
'series to use must be a cell array of string(s)']);

View File

@ -30,8 +30,8 @@ function h = getLine(o, xrange)
% along with Dynare. If not, see <http://www.gnu.org/licenses/>.
%% Validate options provided by user
assert(~isempty(o.data) && isa(o.data, 'dynSeries'), ['@series.getLine: must ' ...
'provide data as a dynSeries']);
assert(~isempty(o.data) && isa(o.data, 'dseries'), ['@series.getLine: must ' ...
'provide data as a dseries']);
% Line
assert(ischar(o.graphLineColor), '@series.getLine: graphLineColor must be a string');

View File

@ -41,8 +41,8 @@ assert(isint(precision));
%% Validate options provided by user
assert(ischar(o.tableSubSectionHeader), '@series.write: tableSubSectionHeader must be a string');
if isempty(o.tableSubSectionHeader)
assert(~isempty(o.data) && isa(o.data, 'dynSeries'), ...
'@series.write: must provide data as a dynSeries');
assert(~isempty(o.data) && isa(o.data, 'dseries'), ...
'@series.write: must provide data as a dseries');
end
assert(ischar(o.tableNegColor), '@series.write: tableNegColor must be a string');

View File

@ -82,8 +82,8 @@ assert(isint(o.precision), '@table.table: precision must be an int');
assert(isempty(o.range) || (isa(o.range, 'dates') && o.range.ndat >= 2), ...
['@table.table: range is specified as a dates range, e.g. ' ...
'''dates(''1999q1''):dates(''1999q3'')''.']);
assert(isempty(o.data) || isa(o.data, 'dynSeries'), ...
'@table.table: data must be a dynSeries');
assert(isempty(o.data) || isa(o.data, 'dseries'), ...
'@table.table: data must be a dseries');
assert(isempty(o.seriesToUse) || iscellstr(o.seriesToUse), ...
'@table.table: seriesToUse must be a cell array of string(s)');
assert(isempty(o.vlineAfter) || isa(o.vlineAfter, 'dynDate'), ...

View File

@ -129,7 +129,7 @@ switch dates.freq
case 12
error('@table.write: weekly dates not yet implemented');
otherwise
error('@table.write: invalid dynSeries frequency');
error('@table.write: invalid dseries frequency');
end
for i=1:length(yrsForAvgs)
fprintf(fid, ' & %d', years(i));

View File

@ -69,9 +69,9 @@ for i=1:length(fields)
if isa(val, 'dates')
fprintf('<dates: %s, ..., %s>', ...
val(1).format, val(end).format);
elseif isa(val, 'dynSeries')
elseif isa(val, 'dseries')
if numel(val) == 1
fprintf('<dynSeries: %s>', val.name{1});
fprintf('<dseries: %s>', val.name{1});
else
fprintf('%s', class(val));
end