diff --git a/matlab/reports/@report_series/writeSeriesForGraph.m b/matlab/reports/@report_series/writeSeriesForGraph.m index 6c0c64ada046cb7ebb36255fb845f89c31dbb14c..aebd8eec9e926ec2db1278d58272825cb13fba78 100644 --- a/matlab/reports/@report_series/writeSeriesForGraph.m +++ b/matlab/reports/@report_series/writeSeriesForGraph.m @@ -30,7 +30,7 @@ function o = writeSeriesForGraph(o, fid, xrange) % along with Dynare. If not, see <http://www.gnu.org/licenses/>. %% Validate options provided by user -assert(~isempty(o.data) && isa(o.data, 'dseries'), ['@report_series.writeLine: must ' ... +assert(~isempty(o.data) && isa(o.data, 'dseries'), ['@report_series.writeSeriesForGraph: must ' ... 'provide data as a dseries']); % Line @@ -38,10 +38,10 @@ valid_graphLineColor = {'red', 'green', 'blue', 'cyan ', 'magenta', 'yellow', .. 'black', 'gray', 'darkgray', 'lightgray', 'brown', ... 'lime', 'olive', 'orange', 'pink', 'purple', 'teal', 'violet', 'white'}; assert(any(strcmp(o.graphLineColor, valid_graphLineColor)), ... - ['@report_series.writeLine: graphLineColor must be one of ' strjoin(valid_graphLineColor)]); -assert(ischar(o.graphLineStyle), '@report_series.writeLine: graphLineStyle must be a string'); + ['@report_series.writeSeriesForGraph: graphLineColor must be one of ' strjoin(valid_graphLineColor)]); +assert(ischar(o.graphLineStyle), '@report_series.writeSeriesForGraph: graphLineStyle must be a string'); assert(isfloat(o.graphLineWidth) && o.graphLineWidth > 0, ... - '@report_series.writeLine: graphLineWidth must be a positive number'); + '@report_series.writeSeriesForGraph: graphLineWidth must be a positive number'); % GraphMarker valid_graphMarker = {'x', '+', '-', '|', 'o', 'asterisk', 'star', '10-pointed star', 'oplus', ... @@ -50,15 +50,15 @@ 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.writeLine: 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.writeLine: graphMarkerEdgeColor must be a string'); -assert(ischar(o.graphMarkerFaceColor), '@report_series.writeLine: graphMarkerFaceColor must be a string'); +assert(ischar(o.graphMarkerEdgeColor), '@report_series.writeSeriesForGraph: graphMarkerEdgeColor must be a string'); +assert(ischar(o.graphMarkerFaceColor), '@report_series.writeSeriesForGraph: graphMarkerFaceColor must be a string'); assert(isfloat(o.graphMarkerSize) && o.graphMarkerSize > 0, ... - '@report_series.writeLine: graphMarkerSize must be a positive number'); + '@report_series.writeSeriesForGraph: graphMarkerSize must be a positive number'); % Marker & Line -assert(~(strcmp(o.graphLineStyle, 'none') && isempty(o.graphMarker)), ['@report_series.writeLine: ' ... +assert(~(strcmp(o.graphLineStyle, 'none') && isempty(o.graphMarker)), ['@report_series.writeSeriesForGraph: ' ... 'you must provide at least one of graphLineStyle and graphMarker']); % Validate xrange diff --git a/matlab/reports/@report_series/writeSeriesForTable.m b/matlab/reports/@report_series/writeSeriesForTable.m index 0273ab0d6138390fdcfa915f7dcc01145335c8c0..a35d0531a93748ed71509be15ef17f4abfec6559 100644 --- a/matlab/reports/@report_series/writeSeriesForTable.m +++ b/matlab/reports/@report_series/writeSeriesForTable.m @@ -40,26 +40,26 @@ end assert(isint(precision)); %% Validate options provided by user -assert(ischar(o.tableSubSectionHeader), '@report_series.write: tableSubSectionHeader must be a string'); +assert(ischar(o.tableSubSectionHeader), '@report_series.writeSeriesForTable: tableSubSectionHeader must be a string'); if isempty(o.tableSubSectionHeader) assert(~isempty(o.data) && isa(o.data, 'dseries'), ... - '@report_series.write: must provide data as a dseries'); + '@report_series.writeSeriesForTable: must provide data as a dseries'); if ~isempty(o.tableDataRhs) assert(~isempty(o.tableDataRhs) && isa(o.tableDataRhs, 'dseries'), ... - '@report_series.write: must provide tableDataRhs as a dseries'); + '@report_series.writeSeriesForTable: must provide tableDataRhs as a dseries'); assert(iscell(dates) && length(dates) == 2, ... - '@report_series.write: must provide second range with tableDataRhs'); + '@report_series.writeSeriesForTable: must provide second range with tableDataRhs'); end end -assert(ischar(o.tableNegColor), '@report_series.write: tableNegColor must be a string'); -assert(ischar(o.tablePosColor), '@report_series.write: tablePosColor must be a string'); -assert(ischar(o.tableRowColor), '@report_series.write: tableRowColor must be a string'); -assert(isint(o.tableRowIndent), '@report_series.write: tableRowIndent must be an integer'); -assert(islogical(o.tableShowMarkers), '@report_series.write: tableShowMarkers must be true or false'); -assert(islogical(o.tableAlignRight), '@report_series.write: tableAlignRight must be true or false'); -assert(isfloat(o.tableMarkerLimit), '@report_series,write: tableMarkerLimit must be a float'); +assert(ischar(o.tableNegColor), '@report_series.writeSeriesForTable: tableNegColor must be a string'); +assert(ischar(o.tablePosColor), '@report_series.writeSeriesForTable: tablePosColor must be a string'); +assert(ischar(o.tableRowColor), '@report_series.writeSeriesForTable: tableRowColor must be a string'); +assert(isint(o.tableRowIndent), '@report_series.writeSeriesForTable: tableRowIndent must be an integer'); +assert(islogical(o.tableShowMarkers), '@report_series.writeSeriesForTable: tableShowMarkers must be true or false'); +assert(islogical(o.tableAlignRight), '@report_series.writeSeriesForTable: tableAlignRight must be true or false'); +assert(isfloat(o.tableMarkerLimit), '@report_series.writeSeriesForTable: tableMarkerLimit must be a float'); %% Write Output fprintf(fid, '%% Table Row (report_series)\n');