diff --git a/src/@graph/graph.m b/src/@graph/graph.m index d33b80ed0614b58ebe15c6831f8dfb07d182aa4d..b1f294015f480c8dc0524a3ac7ef6ea4e8e3f791 100644 --- a/src/@graph/graph.m +++ b/src/@graph/graph.m @@ -14,7 +14,7 @@ function o = graph(varargin) % SPECIAL REQUIREMENTS % none -% Copyright (C) 2013-2014 Dynare Team +% Copyright (C) 2013-2015 Dynare Team % % This file is part of Dynare. % @@ -152,20 +152,20 @@ assert(any(strcmp(o.axisShape, {'box', 'L'})), ['@graph.graph: axisShape ' ... valid_legend_locations = ... {'south west','south east','north west','north east','outer north east'}; assert(any(strcmp(o.legendLocation, valid_legend_locations)), ... - ['@graph.graph: legendLocation must be one of ' strjoin(valid_legend_locations, ' ')]); + ['@graph.graph: legendLocation must be one of ' strjoin(valid_legend_locations, ', ')]); valid_font_sizes = {'tiny', 'scriptsize', 'footnotesize', 'small', ... 'normalsize', 'large', 'Large', 'LARGE', 'huge', 'Huge'}; assert(any(strcmp(o.legendFontSize, valid_font_sizes)), ... - ['@graph.graph: legendFontSize must be one of ' strjoin(valid_font_sizes)]); + ['@graph.graph: legendFontSize must be one of ' strjoin(valid_font_sizes, ', ')]); assert(any(strcmp(o.titleFontSize, valid_font_sizes)), ... - ['@graph.graph: titleFontSize must be one of ' strjoin(valid_font_sizes)]); + ['@graph.graph: titleFontSize must be one of ' strjoin(valid_font_sizes, ', ')]); assert(any(strcmp(o.tickFontSize, valid_font_sizes)), ... - ['@graph.graph: tickFontSize must be one of ' strjoin(valid_font_sizes)]); + ['@graph.graph: tickFontSize must be one of ' strjoin(valid_font_sizes, ', ')]); valid_legend_orientations = {'vertical', 'horizontal'}; assert(any(strcmp(o.legendOrientation, valid_legend_orientations)), ... - ['@graph.graph: legendOrientation must be one of ' strjoin(valid_legend_orientations, ' ')]); + ['@graph.graph: legendOrientation must be one of ' strjoin(valid_legend_orientations, ', ')]); assert(isempty(o.shade) || (isdates(o.shade) && o.shade.ndat >= 2), ... ['@graph.graph: shade is specified as a dates range, e.g. ' ... @@ -216,4 +216,4 @@ end % Create graph object o = class(o, 'graph'); -end \ No newline at end of file +end diff --git a/src/@page/page.m b/src/@page/page.m index 57f16fd9ecf1ab7f1ad69c6c292364a48ad80c8d..ba317ba84c28287ad55411163d90691e67499bd4 100644 --- a/src/@page/page.m +++ b/src/@page/page.m @@ -89,11 +89,11 @@ assert(ischar(o.latex), ... '@page.page: latex must be a string'); valid_paper = {'a4', 'letter'}; assert(any(strcmp(o.paper, valid_paper)), ... - ['@page.page: paper must be one of ' strjoin(valid_paper, ' ')]); + ['@page.page: paper must be one of ' strjoin(valid_paper, ', ')]); valid_orientation = {'portrait', 'landscape'}; assert(any(strcmp(o.orientation, valid_orientation)), ... - ['@page.page: orientation must be one of ' strjoin(valid_orientation, ' ')]); + ['@page.page: orientation must be one of ' strjoin(valid_orientation, ', ')]); if ischar(o.footnote) o.footnote = {o.footnote}; diff --git a/src/@report/report.m b/src/@report/report.m index 06123bd358451a22c56b4fe6ec8def13d32bf3df..9792661846723c861980504c53c8902ebb4e6c7f 100644 --- a/src/@report/report.m +++ b/src/@report/report.m @@ -79,16 +79,16 @@ assert(isfloat(o.margin) && o.margin > 0, '@report.report: margin must be a floa assert(ischar(o.header), '@report.report: header must be a string'); valid_margin_unit = {'cm', 'in'}; assert(any(strcmp(o.marginUnit, valid_margin_unit)), ... - ['@report.report: marginUnit must be one of ' strjoin(valid_margin_unit, ' ')]); + ['@report.report: marginUnit must be one of ' strjoin(valid_margin_unit, ', ')]); valid_paper = {'a4', 'letter'}; assert(any(strcmp(o.paper, valid_paper)), ... - ['@report.report: paper must be one of ' strjoin(valid_paper, ' ')]); + ['@report.report: paper must be one of ' strjoin(valid_paper, ', ')]); valid_orientation = {'portrait', 'landscape'}; assert(any(strcmp(o.orientation, valid_orientation)), ... - ['@report.report: orientation must be one of ' strjoin(valid_orientation, ' ')]); + ['@report.report: orientation must be one of ' strjoin(valid_orientation, ', ')]); % Create report object o = class(o, 'report'); -end \ No newline at end of file +end diff --git a/src/@report_series/writeSeriesForGraph.m b/src/@report_series/writeSeriesForGraph.m index 17c3296c80edc3a5532e489e79f51950f3217818..1489946236bc2c75296e2ebf1bad964f0b0fd4bd 100644 --- a/src/@report_series/writeSeriesForGraph.m +++ b/src/@report_series/writeSeriesForGraph.m @@ -61,7 +61,7 @@ valid_graphMarker = {'x', '+', '-', '|', 'o', 'asterisk', 'star', '10-pointed st 'halfsquare left*','Mercedes star','Mercedes star flipped','halfcircle',... 'halfcircle*','pentagon','pentagon star'}; assert(isempty(o.graphMarker) || any(strcmp(o.graphMarker, valid_graphMarker)), ... - ['@report_series.writeSeriesForGraph: graphMarker must be one of ' strjoin(valid_graphMarker)]); + ['@report_series.writeSeriesForGraph: graphMarker must be one of ' strjoin(valid_graphMarker, ', ')]); assert(ischar(o.graphMarkerEdgeColor), '@report_series.writeSeriesForGraph: graphMarkerEdgeColor must be a string'); assert(ischar(o.graphMarkerFaceColor), '@report_series.writeSeriesForGraph: graphMarkerFaceColor must be a string');