From 965f54884d9d28bb6816fdb3c66a188ff289036b Mon Sep 17 00:00:00 2001 From: Houtan Bastani Date: Thu, 16 May 2013 12:06:29 +0200 Subject: [PATCH] reporting: @seriesElements: rename numElements to numSeriesElements to conform with other numClass methods --- matlab/reports/@graph/createGraph.m | 4 ++-- matlab/reports/@graph/end.m | 2 +- matlab/reports/@seriesElements/getMaxRange.m | 2 +- .../@seriesElements/{numElements.m => numSeriesElements.m} | 4 ++-- matlab/reports/@table/write.m | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) rename matlab/reports/@seriesElements/{numElements.m => numSeriesElements.m} (91%) diff --git a/matlab/reports/@graph/createGraph.m b/matlab/reports/@graph/createGraph.m index 9bf8422c7..ff1acc107 100644 --- a/matlab/reports/@graph/createGraph.m +++ b/matlab/reports/@graph/createGraph.m @@ -33,7 +33,7 @@ if ~isempty(o.figname) o.figname); end -if ~o.seriesElements.numElements() +if ~o.seriesElements.numSeriesElements() warning('@graph.crepateGraph: no series to plot, returning'); return; end @@ -52,7 +52,7 @@ else dd = o.xrange; end -ne = o.seriesElements.numElements(); +ne = o.seriesElements.numSeriesElements(); line_handles = zeros(ne, 1); for i=1:ne line_handles(i) = o.seriesElements(i).getLine(dd); diff --git a/matlab/reports/@graph/end.m b/matlab/reports/@graph/end.m index 52f11f364..a766b97c4 100644 --- a/matlab/reports/@graph/end.m +++ b/matlab/reports/@graph/end.m @@ -31,5 +31,5 @@ function lastIndex = end(o, k, n) % along with Dynare. If not, see . assert(k==1 && n==1, '@graph/end: graph only has one dimension'); -lastIndex = o.seriesElements.numElements(); +lastIndex = o.seriesElements.numSeriesElements(); end \ No newline at end of file diff --git a/matlab/reports/@seriesElements/getMaxRange.m b/matlab/reports/@seriesElements/getMaxRange.m index 9ba1f6af6..35eeebde2 100644 --- a/matlab/reports/@seriesElements/getMaxRange.m +++ b/matlab/reports/@seriesElements/getMaxRange.m @@ -18,7 +18,7 @@ function dd = getMaxRange(o) % You should have received a copy of the GNU General Public License % along with Dynare. If not, see . -ne = numElements(o); +ne = numSeriesElements(o); ddmin = dynDate(); ddmax = dynDate(); for i=1:ne diff --git a/matlab/reports/@seriesElements/numElements.m b/matlab/reports/@seriesElements/numSeriesElements.m similarity index 91% rename from matlab/reports/@seriesElements/numElements.m rename to matlab/reports/@seriesElements/numSeriesElements.m index 73355b0d3..fad1c52e2 100644 --- a/matlab/reports/@seriesElements/numElements.m +++ b/matlab/reports/@seriesElements/numSeriesElements.m @@ -1,5 +1,5 @@ -function n = numElements(o) -% function n = numElements(o) +function n = numSeriesElements(o) +% function n = numSeriesElements(o) % Copyright (C) 2013 Dynare Team % diff --git a/matlab/reports/@table/write.m b/matlab/reports/@table/write.m index e203e20f2..afb47f16b 100644 --- a/matlab/reports/@table/write.m +++ b/matlab/reports/@table/write.m @@ -30,7 +30,7 @@ function o = write(o, fid) % along with Dynare. If not, see . assert(fid ~= -1); -if ~o.seriesElements.numElements() +if ~o.seriesElements.numSeriesElements() warning('@table.write: no series to plot, returning'); return; end @@ -122,7 +122,7 @@ fprintf(fid, '\\\\%%\n'); fprintf(fid, '%%\n'); % Write Table Data -ne = o.seriesElements.numElements(); +ne = o.seriesElements.numSeriesElements(); for i=1:ne o.seriesElements(i).write(fid, dates, o.precision); if o.showHlines