From 70e8f48afd21bb58ac9e7eec327ca38d7c2c5a9d Mon Sep 17 00:00:00 2001 From: Houtan Bastani Date: Fri, 22 Nov 2013 17:11:57 +0100 Subject: [PATCH] reporting: replace occurrences of dynDate with dates --- matlab/reports/@report_series/write.m | 2 +- matlab/reports/@report_table/report_table.m | 4 +-- matlab/reports/@seriesElements/getMaxRange.m | 4 +-- tests/reporting/runDynareReport.m | 32 ++++++++++---------- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/matlab/reports/@report_series/write.m b/matlab/reports/@report_series/write.m index f175ecd74..6377b55d7 100644 --- a/matlab/reports/@report_series/write.m +++ b/matlab/reports/@report_series/write.m @@ -97,7 +97,7 @@ end % Calculate and display annual averages for i=1:length(yrsForAvgs) - slice = o.data(dynDate([num2str(yrsForAvgs(i)) 'q1']):dynDate([num2str(yrsForAvgs(i)) 'q4'])); + slice = o.data(dates([num2str(yrsForAvgs(i)) 'q1']):dates([num2str(yrsForAvgs(i)) 'q4'])); avg = sum(slice.data)/size(slice); fprintf(fid, '&'); if o.tableShowMarkers diff --git a/matlab/reports/@report_table/report_table.m b/matlab/reports/@report_table/report_table.m index 5f29225f7..f336212d2 100644 --- a/matlab/reports/@report_table/report_table.m +++ b/matlab/reports/@report_table/report_table.m @@ -86,8 +86,8 @@ assert(isempty(o.data) || isa(o.data, 'dseries'), ... '@report_table.report_table: data must be a dseries'); assert(isempty(o.seriesToUse) || iscellstr(o.seriesToUse), ... '@report_table.report_table: seriesToUse must be a cell array of string(s)'); -assert(isempty(o.vlineAfter) || isa(o.vlineAfter, 'dynDate'), ... - '@report_table.report_table: vlineAfter must be a dynDate'); +assert(isempty(o.vlineAfter) || isa(o.vlineAfter, 'dates'), ... + '@report_table.report_table: vlineAfter must be a dates'); if o.showVlines o.vlineAfter = ''; end diff --git a/matlab/reports/@seriesElements/getMaxRange.m b/matlab/reports/@seriesElements/getMaxRange.m index 35eeebde2..e1c19dfc8 100644 --- a/matlab/reports/@seriesElements/getMaxRange.m +++ b/matlab/reports/@seriesElements/getMaxRange.m @@ -19,8 +19,8 @@ function dd = getMaxRange(o) % along with Dynare. If not, see . ne = numSeriesElements(o); -ddmin = dynDate(); -ddmax = dynDate(); +ddmin = dates(); +ddmax = dates(); for i=1:ne a = getSeriesElements(o, i); ddt = a.getRange(); diff --git a/tests/reporting/runDynareReport.m b/tests/reporting/runDynareReport.m index 6bbcf390d..24b4a7cc3 100644 --- a/tests/reporting/runDynareReport.m +++ b/tests/reporting/runDynareReport.m @@ -17,11 +17,11 @@ function runDynareReport(dc_a, dc_q, db_a, db_q) % along with Dynare. If not, see . -larange= dynDate('2007'):dynDate('2014'); -arange = dynDate('2012'):dynDate('2014'); -trange = dynDate('2012q2'):dynDate('2014q4'); -prange = dynDate('2007q1'):dynDate('2013q4'); -forecast_date = dynDate('2012q2'); +larange= dates('2007a'):dates('2014a'); +arange = dates('2012a'):dates('2014a'); +trange = dates('2012q2'):dates('2014q4'); +prange = dates('2007q1'):dates('2013q4'); +forecast_date = dates('2012q2'); srange = forecast_date:prange(end); shortNames = {'US', 'EU', 'JA', 'EA6', 'LA6', 'RC6'}; @@ -40,13 +40,13 @@ rep = rep.addVspace(); % Table 1 rep = rep.addTable('title', 'Real GDP Growth', 'range', larange, ... - 'vlineAfter', dynDate('2011')); + 'vlineAfter', dates('2011y')); rep = AnnualTable(rep, db_a, dc_a, 'PCH_GROWTH4_', larange); rep = rep.addVspace('number', 2); % Table 2 rep = rep.addTable('title', 'Potential GDP Growth', 'range', larange, ... - 'vlineAfter', dynDate('2011')); + 'vlineAfter', dates('2011y')); rep = AnnualTable(rep, db_a, dc_a, 'PCH_GROWTH4_BAR_', larange); @@ -58,13 +58,13 @@ rep = rep.addVspace(); % Table 1 rep = rep.addTable('title', 'Headline CPI Inflation', 'range', larange, ... - 'vlineAfter', dynDate('2011')); + 'vlineAfter', dates('2011y')); rep = AnnualTable(rep, db_a, dc_a, 'PCH_PIE4_', larange); rep = rep.addVspace('number', 2); % Table 2 rep = rep.addTable('title', 'Core CPI Inflation', 'range', larange, ... - 'vlineAfter', dynDate('2011')); + 'vlineAfter', dates('2011y')); rep = AnnualTable(rep, db_a, dc_a, 'PCH_PIEX4_', larange); @@ -76,13 +76,13 @@ rep = rep.addVspace(); % Table 1 rep = rep.addTable('title', 'Gas Inflation', 'range', larange, ... - 'vlineAfter', dynDate('2011')); + 'vlineAfter', dates('2011y')); rep = AnnualTable(rep, db_a, dc_a, 'PCH_PIE4_GAS_', larange); rep = rep.addVspace('number', 2); % Table 2 rep = rep.addTable('title', 'Food Inflation', 'range', larange, ... - 'vlineAfter', dynDate('2011')); + 'vlineAfter', dates('2011y')); rep = AnnualTable(rep, db_a, dc_a, 'PCH_PIE4_CONSFOOD_', larange); @@ -94,13 +94,13 @@ rep = rep.addVspace(); % Table 1 rep = rep.addTable('title', 'Nominal Interest Rate', 'range', larange, ... - 'vlineAfter', dynDate('2011')); + 'vlineAfter', dates('2011y')); rep = AnnualTable(rep, db_a, dc_a, 'RS_', larange); rep = rep.addVspace('number', 2); % Table 2 rep = rep.addTable('title', 'Output Gap', 'range', larange, ... - 'vlineAfter', dynDate('2011')); + 'vlineAfter', dates('2011y')); db_a = db_a.tex_rename('Y_WORLD', 'World'); rep = rep.addSeries('data', db_a{'Y_WORLD'}); delta = db_a{'Y_WORLD'}-dc_a{'Y_WORLD'}; @@ -120,7 +120,7 @@ for i=1:length(shortNames) rep = rep.addPage('title', 'Jan1 vs Jan2', ... 'titleFormat', '\large\bfseries'); rep = rep.addSection(); - rep = CountryTablePage(rep, shortNames{i}, longNames{i}, db_q, dc_q, trange, dynDate('2012q2')); + rep = CountryTablePage(rep, shortNames{i}, longNames{i}, db_q, dc_q, trange, dates('2012q2')); end %% Residual Reports @@ -129,14 +129,14 @@ for i=1:length(shortNames) rep = rep.addPage('title', 'Residual Report Jan1 vs Jan2', ... 'titleFormat', '\large\bfseries'); rep = rep.addSection(); - rep = ResidTablePage(rep, shortNames{i}, longNames{i}, db_q, dc_q, trange, dynDate('2012q2')); + rep = ResidTablePage(rep, shortNames{i}, longNames{i}, db_q, dc_q, trange, dates('2012q2')); end % Commodities rep = rep.addPage('title', 'Residual Report Jan1 vs Jan2', ... 'titleFormat', '\large\bfseries'); rep = rep.addSection(); -rep = CommResidTablePage(rep, db_q, dc_q, trange, dynDate('2012q2')); +rep = CommResidTablePage(rep, db_q, dc_q, trange, dates('2012q2')); %% Commodities Graphs %Page 1