From 258acc58adf629fb36e96e180c5549829ca931d5 Mon Sep 17 00:00:00 2001 From: Houtan Bastani <houtan@dynare.org> Date: Fri, 29 Mar 2013 10:10:29 +0100 Subject: [PATCH] reporting: numel -> numElements, numPages --- matlab/reporting/@elements/{numel.m => numElements.m} | 4 ++-- matlab/reporting/@graph/createGraph.m | 2 +- matlab/reporting/@pages/{numel.m => numPages.m} | 4 ++-- matlab/reporting/@pages/write.m | 2 +- matlab/reporting/@section/{numel.m => numElements.m} | 6 +++--- matlab/reporting/@section/write.m | 2 +- matlab/reporting/@seriesElements/{numel.m => numElements.m} | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) rename matlab/reporting/@elements/{numel.m => numElements.m} (92%) rename matlab/reporting/@pages/{numel.m => numPages.m} (94%) rename matlab/reporting/@section/{numel.m => numElements.m} (88%) rename matlab/reporting/@seriesElements/{numel.m => numElements.m} (92%) diff --git a/matlab/reporting/@elements/numel.m b/matlab/reporting/@elements/numElements.m similarity index 92% rename from matlab/reporting/@elements/numel.m rename to matlab/reporting/@elements/numElements.m index e52bd80314..c318420378 100644 --- a/matlab/reporting/@elements/numel.m +++ b/matlab/reporting/@elements/numElements.m @@ -1,5 +1,5 @@ -function n = numel(o) -% function n = numel(o) +function n = numElements(o) +% function n = numElements(o) % Copyright (C) 2013 Dynare Team % diff --git a/matlab/reporting/@graph/createGraph.m b/matlab/reporting/@graph/createGraph.m index 0daf941b87..b985fe971e 100644 --- a/matlab/reporting/@graph/createGraph.m +++ b/matlab/reporting/@graph/createGraph.m @@ -42,7 +42,7 @@ if o.grid set(gca, 'GridLineStyle', '--'); end -ne = o.seriesElements.numel(); +ne = o.seriesElements.numElements(); dd = dynDates(); for i=1:ne ddt = o.seriesElements(i).getLine(o.xrange); diff --git a/matlab/reporting/@pages/numel.m b/matlab/reporting/@pages/numPages.m similarity index 94% rename from matlab/reporting/@pages/numel.m rename to matlab/reporting/@pages/numPages.m index 49a9f234f6..303ac223eb 100644 --- a/matlab/reporting/@pages/numel.m +++ b/matlab/reporting/@pages/numPages.m @@ -1,5 +1,5 @@ -function n = numel(o) -% function n = numel(o) +function n = numPages(o) +% function n = numPages(o) % Sections Class Constructor % % INPUTS diff --git a/matlab/reporting/@pages/write.m b/matlab/reporting/@pages/write.m index acf71930e6..c7b2c18730 100644 --- a/matlab/reporting/@pages/write.m +++ b/matlab/reporting/@pages/write.m @@ -31,7 +31,7 @@ function o = write(o, fid) assert(fid ~= -1); fprintf(fid, '\n%% Pages Object\n'); -nps = numel(o); +nps = numPages(o); for i=1:nps o.objArray(i).write(fid); end diff --git a/matlab/reporting/@section/numel.m b/matlab/reporting/@section/numElements.m similarity index 88% rename from matlab/reporting/@section/numel.m rename to matlab/reporting/@section/numElements.m index 0d4a5aeb62..c1c54b952d 100644 --- a/matlab/reporting/@section/numel.m +++ b/matlab/reporting/@section/numElements.m @@ -1,5 +1,5 @@ -function n = numel(o) -% function n = numel(o) +function n = numElements(o) +% function n = numElements(o) % Copyright (C) 2013 Dynare Team % @@ -18,5 +18,5 @@ function n = numel(o) % You should have received a copy of the GNU General Public License % along with Dynare. If not, see <http://www.gnu.org/licenses/>. -n = o.elements.numel(); +n = o.elements.numElements(); end \ No newline at end of file diff --git a/matlab/reporting/@section/write.m b/matlab/reporting/@section/write.m index cf1955375e..c592b93cee 100644 --- a/matlab/reporting/@section/write.m +++ b/matlab/reporting/@section/write.m @@ -37,7 +37,7 @@ for i=1:o.cols fprintf(fid, 'c'); end fprintf(fid, '}\n'); -ne = numel(o); +ne = numElements(o); nvspace = numVspace(o); nlcounter = 0; for i=1:ne diff --git a/matlab/reporting/@seriesElements/numel.m b/matlab/reporting/@seriesElements/numElements.m similarity index 92% rename from matlab/reporting/@seriesElements/numel.m rename to matlab/reporting/@seriesElements/numElements.m index e52bd80314..c318420378 100644 --- a/matlab/reporting/@seriesElements/numel.m +++ b/matlab/reporting/@seriesElements/numElements.m @@ -1,5 +1,5 @@ -function n = numel(o) -% function n = numel(o) +function n = numElements(o) +% function n = numElements(o) % Copyright (C) 2013 Dynare Team % -- GitLab