From 1e04db5f2825f223fb8bcad48bd8594bda29d90c Mon Sep 17 00:00:00 2001 From: Houtan Bastani <houtan@dynare.org> Date: Tue, 3 Sep 2019 12:49:45 +0200 Subject: [PATCH] further changes linked to 130105a6c22096c3154b13825a971e4172a42f35 --- test/AnnualTable.m | 4 ++-- test/CommResidTablePage.m | 2 +- test/CountryTablePage.m | 6 +++--- test/ResidTablePage.m | 2 +- test/createReport.m | 12 ++++++------ 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/test/AnnualTable.m b/test/AnnualTable.m index e300ec7..92a276a 100644 --- a/test/AnnualTable.m +++ b/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.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.tex_rename_('$\Delta$'); rep.addSeries('data', delta, ... 'tableShowMarkers', true, ... 'tableAlignRight', true); diff --git a/test/CommResidTablePage.m b/test/CommResidTablePage.m index 30edeef..26da030 100644 --- a/test/CommResidTablePage.m +++ b/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.tex_rename_('$\Delta$'); rep.addSeries('data', delta, ... 'tableShowMarkers', true, ... 'tableAlignRight', true); diff --git a/test/CountryTablePage.m b/test/CountryTablePage.m index 7e32088..62073b1 100644 --- a/test/CountryTablePage.m +++ b/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.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.tex_rename_('$\Delta$'); deltaa = db_a{[seriesNames{i}{1} countryAbbr]}-dc_a{[seriesNames{i}{1} countryAbbr]}; - deltaa = deltaa.tex_rename_('$\Delta$'); + deltaa.tex_rename_('$\Delta$'); rep.addSeries('data', delta, ... 'tableShowMarkers', true, ... 'tableRowIndent', 2, ... diff --git a/test/ResidTablePage.m b/test/ResidTablePage.m index 124b9dc..295e705 100644 --- a/test/ResidTablePage.m +++ b/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.tex_rename_('$\Delta$'); rep.addSeries('data', delta, ... 'tableShowMarkers', true, ... 'tableAlignRight', true); diff --git a/test/createReport.m b/test/createReport.m index a798b90..c789f2a 100644 --- a/test/createReport.m +++ b/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.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.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.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.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.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.tex_rename_('LRPFOOD_BAR_WORLD', 'Equilibrium Food Price'); rep.addSeries('graphVline', dates('2009q2'), ... 'graphLineColor', 'red', ... 'graphLineWidth', 1.5); -- GitLab