diff --git a/matlab/reports/@graph/createGraph.m b/matlab/reports/@graph/createGraph.m index 9bf8422c7cbd1d87405a3b857863f799484b3d2e..ff1acc107aa66ababaf121f7f503a8ee6726d829 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 52f11f36458905496813459d19b2a06f6591f726..a766b97c46cf82cf872d2fbbefb0fcff824ecb78 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 <http://www.gnu.org/licenses/>. 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 9ba1f6af6608fe73ef0a6cf9f0d61e52ca76d720..35eeebde2d441790de1899f6f6588cd142b444aa 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 <http://www.gnu.org/licenses/>. -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 73355b0d30ee16cdc11c6a14ded6278ca8cebcb9..fad1c52e2b1fd464ff09cfcb12899b6a6baa9757 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 e203e20f2d78056041e61d664cf9b3752a51b9c2..afb47f16b9fed074bd1e8859cda3f468be3164eb 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 <http://www.gnu.org/licenses/>. 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