From ccd4a416f71d3e06775bf602ac43a788c1de14b3 Mon Sep 17 00:00:00 2001 From: Houtan Bastani Date: Tue, 3 Sep 2019 11:56:14 +0200 Subject: [PATCH] use inplace dseries functions --- matlab/reporting/test/AnnualTable.m | 4 ++-- matlab/reporting/test/CommResidTablePage.m | 2 +- matlab/reporting/test/CountryTablePage.m | 6 +++--- matlab/reporting/test/ResidTablePage.m | 2 +- matlab/reporting/test/createReport.m | 20 ++++++++++++++------ 5 files changed, 21 insertions(+), 13 deletions(-) diff --git a/matlab/reporting/test/AnnualTable.m b/matlab/reporting/test/AnnualTable.m index 5c04370b1..e300ec7c4 100644 --- a/matlab/reporting/test/AnnualTable.m +++ b/matlab/reporting/test/AnnualTable.m @@ -23,10 +23,10 @@ longNames = {'Coca Cola', 'Kinder Bueno', 'Pizza', ... rep.addSeries('tableSubSectionHeader', 'A group', ... 'tableRowColor', 'red!22'); for i = 1:length(shortNames) - db_a = db_a.tex_rename([seriesRootName shortNames{i}], longNames{i}); + db_a = db_a.tex_rename_([seriesRootName shortNames{i}], longNames{i}); rep.addSeries('data', db_a{[seriesRootName shortNames{i}]}); delta = dc_a{[seriesRootName shortNames{i}]}-db_a{[seriesRootName shortNames{i}]}; - delta = delta.tex_rename('$\Delta$'); + delta = delta.tex_rename_('$\Delta$'); rep.addSeries('data', delta, ... 'tableShowMarkers', true, ... 'tableAlignRight', true); diff --git a/matlab/reporting/test/CommResidTablePage.m b/matlab/reporting/test/CommResidTablePage.m index 144c89d65..30edeeffb 100644 --- a/matlab/reporting/test/CommResidTablePage.m +++ b/matlab/reporting/test/CommResidTablePage.m @@ -30,7 +30,7 @@ rep.addTable('title', 'Commodities', ... for i = 1:length(seriesNames) rep.addSeries('data', db_q{seriesNames{i}{1}}); delta = db_q{seriesNames{i}{1}} - dc_q{seriesNames{i}{1}}; - delta = delta.tex_rename('$\Delta$'); + delta = delta.tex_rename_('$\Delta$'); rep.addSeries('data', delta, ... 'tableShowMarkers', true, ... 'tableAlignRight', true); diff --git a/matlab/reporting/test/CountryTablePage.m b/matlab/reporting/test/CountryTablePage.m index 1b47f11c9..7e3208850 100644 --- a/matlab/reporting/test/CountryTablePage.m +++ b/matlab/reporting/test/CountryTablePage.m @@ -52,14 +52,14 @@ for i = 1:length(seriesNames) any(strcmp(seriesNames{i}{1}, notForOtherThree)) continue end - db_q = db_q.tex_rename([seriesNames{i}{1} countryAbbr], seriesNames{i}{2}); + db_q = db_q.tex_rename_([seriesNames{i}{1} countryAbbr], seriesNames{i}{2}); rep.addSeries('data', db_q{[seriesNames{i}{1} countryAbbr]}, ... 'tableDataRhs', db_a{[seriesNames{i}{1} countryAbbr]}); delta = db_q{[seriesNames{i}{1} countryAbbr]}-dc_q{[seriesNames{i}{1} countryAbbr]}; - delta = delta.tex_rename('$\Delta$'); + delta = delta.tex_rename_('$\Delta$'); deltaa = db_a{[seriesNames{i}{1} countryAbbr]}-dc_a{[seriesNames{i}{1} countryAbbr]}; - deltaa = deltaa.tex_rename('$\Delta$'); + deltaa = deltaa.tex_rename_('$\Delta$'); rep.addSeries('data', delta, ... 'tableShowMarkers', true, ... 'tableRowIndent', 2, ... diff --git a/matlab/reporting/test/ResidTablePage.m b/matlab/reporting/test/ResidTablePage.m index fee665cf6..124b9dc39 100644 --- a/matlab/reporting/test/ResidTablePage.m +++ b/matlab/reporting/test/ResidTablePage.m @@ -57,7 +57,7 @@ for i=1:length(seriesNames) end rep.addSeries('data', db_q{[seriesNames{i}{1} countryAbbr]}); delta = db_q{[seriesNames{i}{1} countryAbbr]}-dc_q{[seriesNames{i}{1} countryAbbr]}; - delta = delta.tex_rename('$\Delta$'); + delta = delta.tex_rename_('$\Delta$'); rep.addSeries('data', delta, ... 'tableShowMarkers', true, ... 'tableAlignRight', true); diff --git a/matlab/reporting/test/createReport.m b/matlab/reporting/test/createReport.m index 64630c800..a798b90c8 100644 --- a/matlab/reporting/test/createReport.m +++ b/matlab/reporting/test/createReport.m @@ -108,10 +108,10 @@ rep.addVspace('number', 2); % Table 2 rep.addTable('title', 'Output Gap', 'range', larange, ... 'vlineAfter', dates('2011y'), 'tableDirName', 'page4table2'); -db_a = db_a.tex_rename('Y_WORLD', 'World'); +db_a = db_a.tex_rename_('Y_WORLD', 'World'); rep.addSeries('data', db_a{'Y_WORLD'}); delta = db_a{'Y_WORLD'}-dc_a{'Y_WORLD'}; -delta = delta.tex_rename('$\Delta$'); +delta = delta.tex_rename_('$\Delta$'); rep.addSeries('data', delta, ... 'tableShowMarkers', true, ... 'tableAlignRight', true); @@ -163,14 +163,14 @@ rep.addSeries('data', db_q{'LRPFOOD_BAR_WORLD'}, ... 'graphBarColor', 'red', ... 'graphBarFillColor', 'gray', ... 'graphBarWidth', 1); -db_q = db_q.tex_rename('LRPOIL_WORLD', 'Oil Price'); +db_q = db_q.tex_rename_('LRPOIL_WORLD', 'Oil Price'); rep.addSeries('data', db_q{'LRPOIL_WORLD'}, ... 'graphLineColor', 'blue', ... 'graphLineWidth', 1.5, ... 'graphMarker', 'triangle*', ... 'graphMarkerEdgeColor','black', ... 'graphMarkerSize',4); -db_q = db_q.tex_rename('LRPOIL_BAR_WORLD', 'Equilibrium Oil Price'); +db_q = db_q.tex_rename_('LRPOIL_BAR_WORLD', 'Equilibrium Oil Price'); rep.addSeries('data', db_q{'LRPOIL_BAR_WORLD'}, ... 'graphLineColor', 'green', ... 'graphLineStyle', 'solid', ... @@ -189,11 +189,11 @@ rep.addSeries('data', db_q{'LRPFOOD_BAR_WORLD'}, ... 'graphBarColor', 'green', ... 'graphBarFillColor', 'yellow', ... 'graphBarWidth', 1); -db_q = db_q.tex_rename('LRPFOOD_WORLD', 'Food Price'); +db_q = db_q.tex_rename_('LRPFOOD_WORLD', 'Food Price'); rep.addSeries('data', db_q{'LRPFOOD_WORLD'}, ... 'graphLineColor', 'blue', ... 'graphLineWidth', 1.5); -db_q = db_q.tex_rename('LRPFOOD_BAR_WORLD', 'Equilibrium Food Price'); +db_q = db_q.tex_rename_('LRPFOOD_BAR_WORLD', 'Equilibrium Food Price'); rep.addSeries('graphVline', dates('2009q2'), ... 'graphLineColor', 'red', ... 'graphLineWidth', 1.5); @@ -296,6 +296,14 @@ rep.addSeries('data', d, ... 'graphLegendName', 'control', ... 'graphFanShadeColor', 'red', 'graphFanShadeOpacity', 20); +% Page 26 +% rep.addPage('title', {'report\_data test'}, ... +% 'titleFormat', {'\large\bfseries', '\large'}); +% rep.addSection('cols', 1); +% rep.addTable('title', {'Table Data', 'subtitle 2'}); +% rep.addData('data', [repmat({'a'},10,1) num2cell(rand(10,6))]); + + %% Write & Compile Report rep.write(); rep.compile();