diff --git a/matlab/reporting/@elements/elements.m b/matlab/reporting/@elements/elements.m index e6ca1a3152e1fc22aa04917d5a26778433436225..77c3f91d7f3a3594873a215720120036a23ed13c 100644 --- a/matlab/reporting/@elements/elements.m +++ b/matlab/reporting/@elements/elements.m @@ -33,10 +33,10 @@ switch nargin e = class(struct, 'elements', objArray()); case 1 assert(isa(varargin{1}, 'elements'), ... - ['With one arg to elements constructor, you must pass an ' ... - 'elements object or a char.']); + ['@elements.elements: with one arg, you must pass an elements ' ... + 'object or a char.']); e = varargin{1}; otherwise - error('Elements constructor: invalid number of arguments'); + error('@elements.elements: invalid number of arguments'); end end \ No newline at end of file diff --git a/matlab/reporting/@elements/subsasgn.m b/matlab/reporting/@elements/subsasgn.m index 878a5ee1525e790e22bd079ed89b7dcf3507acd3..5661f66e4afcfe4356200468f50b4ee364908dc3 100644 --- a/matlab/reporting/@elements/subsasgn.m +++ b/matlab/reporting/@elements/subsasgn.m @@ -34,6 +34,6 @@ switch S.type assert(isnumeric(index)); B.objArray(index) = V; otherwise - error('Elements subsasign syntax error') + error('@elements.subsasign: syntax error'); end end \ No newline at end of file diff --git a/matlab/reporting/@elements/subsref.m b/matlab/reporting/@elements/subsref.m index d1dac4c8a362d417507042a861a10edcecdee9b7..0562000bc424363dd2f8dbd20dfbc987503be720 100644 --- a/matlab/reporting/@elements/subsref.m +++ b/matlab/reporting/@elements/subsref.m @@ -31,14 +31,14 @@ switch S(1).type A = feval(S(1).subs, A); end otherwise - error(['Elements Class: unknown field or method: ' S(1).subs]); + error(['@elements.subsref: unknown field or method: ' S(1).subs]); end case '()' A = getElements(A, S(1).subs{:}); case '{}' - error(['Elements Class: ' S(1).type ' indexing not supported.']); + error(['@elements.subsref: ' S(1).type ' indexing not supported.']); otherwise - error('Elements Class: subsref.m impossible case') + error('@elements.subsref: impossible case'); end S = shiftS(S); diff --git a/matlab/reporting/@graph/createGraph.m b/matlab/reporting/@graph/createGraph.m index 696a93df6b20c65540a88218e2e12966d0ec9aae..d2c663db25aad2ab5fc39a2561a52e37670c3e9f 100644 --- a/matlab/reporting/@graph/createGraph.m +++ b/matlab/reporting/@graph/createGraph.m @@ -32,7 +32,8 @@ assert(~isempty(o.data)); assert(isa(o.data, 'dynSeries')) ; if ~isempty(o.figname) - warning('Will overwrite %s with new graph\n', o.figname); + warning('@graph.createGraph: will overwrite %s with new graph\n', ... + o.figname); end %o = readConfig(o); @@ -66,10 +67,12 @@ if ~isempty(o.shade) yrange = get(gca, 'YLim'); if isempty(x1) - error([o.shade{1} ' not in date range of provided data']); + error(['@graph.createGraph: ' o.shade{1} ' not in date range of ' ... + 'provided data']); end if isempty(x2) - error([o.shade{2} ' not in date range of provided data']); + error(['@graph.createGraph: ' o.shade{2} ' not in date range of ' ... + 'provided data']); end % From ShadePlotForEmpahsis (Matlab Exchange) diff --git a/matlab/reporting/@graph/graph.m b/matlab/reporting/@graph/graph.m index 759df6fe9f775fa33b2f24f0aacfa9bf76263641..b8a73374e4bdd8f4dd951cdc4f114dc1d7a8dd88 100644 --- a/matlab/reporting/@graph/graph.m +++ b/matlab/reporting/@graph/graph.m @@ -52,13 +52,13 @@ o.legend_orientation = 'horizontal'; o.legend_font_size = 8; if nargin == 1 - assert(isa(varargin{1}, 'graph'),['With one arg to Graph constructor, ' ... - 'you must pass a graph object']); + assert(isa(varargin{1}, 'graph'),['@graph.graph: with one arg you ' ... + 'must pass a graph object']); o = varargin{1}; return; elseif nargin > 1 if round(nargin/2) ~= nargin/2 - error(['Options to Graph constructor must be supplied in name/value ' ... + error(['@graph.graph: options must be supplied in name/value ' ... 'pairs.']); end @@ -70,8 +70,7 @@ elseif nargin > 1 if any(strmatch(field, optNames, 'exact')) o.(field) = pair{2}; else - error('%s is not a recognized option to the Graph constructor.', ... - field); + error('@graph.graph: %s is not a recognized option.', field); end end end diff --git a/matlab/reporting/@graph/subsasgn.m b/matlab/reporting/@graph/subsasgn.m index deef33b8207e7a9dabd1f6dcfb0bf410ef857df4..8ab064094aeae37b3e5a9a07680521bfc6ca064c 100644 --- a/matlab/reporting/@graph/subsasgn.m +++ b/matlab/reporting/@graph/subsasgn.m @@ -34,9 +34,9 @@ switch S.type case fieldnames(A) B.(S.subs) = V; otherwise - error(['field ' S.subs 'does not exist in the page class']) + error(['@graph.subsasgn: field ' S.subs 'does not exist']); end otherwise - error('report subsasign syntax error') + error('@graph.subsasgn: syntax error'); end end \ No newline at end of file diff --git a/matlab/reporting/@graph/subsref.m b/matlab/reporting/@graph/subsref.m index 01a57c6eb49177b3cf1578aa9f032fd9bc762188..1610116f7739d7ef9b08a21be9793d2eaf39309e 100644 --- a/matlab/reporting/@graph/subsref.m +++ b/matlab/reporting/@graph/subsref.m @@ -31,12 +31,12 @@ switch S(1).type A = feval(S(1).subs, A); end otherwise - error(['Graph Class: unknown field or method: ' S(1).subs]); + error(['@graph.subsref: unknown field or method: ' S(1).subs]); end case {'()', '{}'} - error(['Graph Class: ' S(1).type ' indexing not supported.']); + error(['@graph.subsref: ' S(1).type ' indexing not supported.']); otherwise - error('Graph Class: subsref.m impossible case') + error('@graph.subsref: impossible case') end S = shiftS(S); diff --git a/matlab/reporting/@objArray/getObjs.m b/matlab/reporting/@objArray/getObjs.m index 6c7dcbeae9550f8633f82fe283befc8982867e84..a3b239a4a2f08700eefada078d26f3e0c7d1d9c2 100644 --- a/matlab/reporting/@objArray/getObjs.m +++ b/matlab/reporting/@objArray/getObjs.m @@ -25,6 +25,6 @@ switch nargin assert(isnumeric(varargin{1})); e = oa.objs{varargin{1}}; otherwise - error('objArray getObjs: invalid number of arguments'); + error('@objArray.getObjs: invalid number of arguments'); end end \ No newline at end of file diff --git a/matlab/reporting/@objArray/objArray.m b/matlab/reporting/@objArray/objArray.m index 5ac61e7097e8a5c30b2d11525e51003f5e85f9a1..4f0dff92f5726e33e8e3b44d1882844cf57c1aa0 100644 --- a/matlab/reporting/@objArray/objArray.m +++ b/matlab/reporting/@objArray/objArray.m @@ -34,10 +34,10 @@ switch nargin oa.objs = cell(0); oa = class(oa, 'objArray'); case 1 - assert(isa(varargin{1}, 'objArray'), ['ObjArray constructor: the only ' ... + assert(isa(varargin{1}, 'objArray'), ['@objArray.objArray: the only ' ... 'valid arguments are objArray objects']); oa = varargin{1}; otherwise - error('ObjArray constructor: invalid number of arguments'); + error('@objArray.objArray: invalid number of arguments'); end end \ No newline at end of file diff --git a/matlab/reporting/@objArray/subsasgn.m b/matlab/reporting/@objArray/subsasgn.m index b1777ab1f2ea58c3ac76473c6254f60b9533d3fe..6cc07616db04ba403d85c1c93820e299f10160d9 100644 --- a/matlab/reporting/@objArray/subsasgn.m +++ b/matlab/reporting/@objArray/subsasgn.m @@ -34,6 +34,6 @@ switch S.type assert(isnumeric(index)); B.objs{index} = V; otherwise - error('objArray subsasgn syntax error') + error('objArray.subsasgn: syntax error'); end end \ No newline at end of file diff --git a/matlab/reporting/@objArray/subsref.m b/matlab/reporting/@objArray/subsref.m index f5e15e6907ebe175e55a79b0385300a5ce36da74..81d75b09c9810015e8e10b4fc0b4e1285f524f0b 100644 --- a/matlab/reporting/@objArray/subsref.m +++ b/matlab/reporting/@objArray/subsref.m @@ -31,14 +31,14 @@ switch S(1).type A = feval(S(1).subs, A); end otherwise - error(['ObjArray Class: unknown field or method: ' S(1).subs]); + error(['objArray.subsref: unknown field or method: ' S(1).subs]); end case '()' A = getObjs(A, S(1).subs{:}); case '{}' - error(['ObjArray Class: ' S(1).type ' indexing not supported.']); + error(['objArray.subsref: ' S(1).type ' indexing not supported.']); otherwise - error('ObjArray Class: subsref.m impossible case') + error('objArray.subsref: impossible case') end S = shiftS(S); diff --git a/matlab/reporting/@page/page.m b/matlab/reporting/@page/page.m index d0dd38caef665021aa63967ed2a03eb3b7cc3419..5882b518d83ea403f504a900c4873f8eb7f95242 100644 --- a/matlab/reporting/@page/page.m +++ b/matlab/reporting/@page/page.m @@ -37,13 +37,13 @@ o.footnote = ''; o.sections = sections(); if nargin == 1 - assert(isa(varargin{1}, 'page'), ['With one arg to Page constructor, ' ... - 'you must pass a page object']); + assert(isa(varargin{1}, 'page'), ['@page.page: with one arg to Page ' ... + 'constructor, you must pass a page object']); o = varargin{1}; return; elseif nargin > 1 if round(nargin/2) ~= nargin/2 - error(['Options to Page constructor must be supplied in name/value ' ... + error(['@page.page: options must be supplied in name/value ' ... 'pairs.']); end @@ -55,8 +55,7 @@ elseif nargin > 1 if any(strmatch(field, optNames, 'exact')) o.(field) = pair{2}; else - error('%s is not a recognized option to the Page constructor.', ... - field); + error('@page.page: %s is not a recognized option.', field); end end end diff --git a/matlab/reporting/@page/subsasgn.m b/matlab/reporting/@page/subsasgn.m index ede173bfbf797cb7fd306d30279053b4bba9b0e5..00e85ae2d325eef678942aef2970db4acbab0f90 100644 --- a/matlab/reporting/@page/subsasgn.m +++ b/matlab/reporting/@page/subsasgn.m @@ -38,9 +38,9 @@ switch S.type case fieldnames(A) B.(S.subs) = V; otherwise - error(['field ' S.subs 'does not exist in the page class']) + error(['@page.subsasgn: field ' S.subs 'does not exist']); end otherwise - error('report subsasign syntax error') + error('@page.subsasgn: syntax error'); end end \ No newline at end of file diff --git a/matlab/reporting/@page/subsref.m b/matlab/reporting/@page/subsref.m index 7b3826bb94208d97283882811f845e46cee36672..3b58fddc806758210c28cabbbe93b4a4a60e83e8 100644 --- a/matlab/reporting/@page/subsref.m +++ b/matlab/reporting/@page/subsref.m @@ -31,14 +31,14 @@ switch S(1).type A = feval(S(1).subs, A); end otherwise - error(['Page Class: unknown field or method: ' S(1).subs]); + error(['@page.subsref: unknown field or method: ' S(1).subs]); end case '()' A = getSections(A, S(1).subs{:}); case '{}' - error(['Page Class: ' S(1).type ' indexing not supported.']); + error(['@page.subsref: ' S(1).type ' indexing not supported.']); otherwise - error('Page Class: subsref.m impossible case') + error('@page.subsref: impossible case') end S = shiftS(S); diff --git a/matlab/reporting/@pages/pages.m b/matlab/reporting/@pages/pages.m index 189ab2d7dc58a8073fdf8d4208121ca60214c991..37727eb94c51993cf07f035ad41dd7ca5d36e9e0 100644 --- a/matlab/reporting/@pages/pages.m +++ b/matlab/reporting/@pages/pages.m @@ -33,10 +33,10 @@ switch nargin ps = class(struct, 'pages', objArray()); case 1 assert(isa(varargin{1}, 'pages'), ... - ['With one arg to pages constructor, you must pass an ' ... - 'pages object or a char.']); + ['@pages.pages: With one arg to pages constructor, you must ' ... + 'pass an pages object or a char.']); ps = varargin{1}; otherwise - error('Pages constructor: invalid number of arguments'); + error('@pages.pages: invalid number of arguments'); end end \ No newline at end of file diff --git a/matlab/reporting/@pages/subsasgn.m b/matlab/reporting/@pages/subsasgn.m index d99e0695f950122647925f88769ff4bde2bc462e..318b0bd826cfe8bcbc4ab4a2a81dffce2aa6dc01 100644 --- a/matlab/reporting/@pages/subsasgn.m +++ b/matlab/reporting/@pages/subsasgn.m @@ -34,6 +34,6 @@ switch S.type assert(isnumeric(index)); B.objArray(index) = V; otherwise - error('Pages subsasign syntax error'); + error('@pages.subsasgn: syntax error'); end end \ No newline at end of file diff --git a/matlab/reporting/@pages/subsref.m b/matlab/reporting/@pages/subsref.m index 8d78e5c2632954d8fa8ab4c28559cebd44e71526..643f218c190fd94dedcfc5891ae7c2063255f753 100644 --- a/matlab/reporting/@pages/subsref.m +++ b/matlab/reporting/@pages/subsref.m @@ -31,14 +31,14 @@ switch S(1).type A = feval(S(1).subs, A); end otherwise - error(['Pages Class: unknown field or method: ' S(1).subs]); + error(['@pages.subsref: unknown field or method: ' S(1).subs]); end case '()' A = getPages(A, S(1).subs{:}); case '{}' - error(['Pages Class: ' S(1).type ' indexing not supported.']); + error(['@pages.subsref: ' S(1).type ' indexing not supported.']); otherwise - error('Pages Class: subsref.m impossible case') + error('@pages.subsref: impossible case') end S = shiftS(S); diff --git a/matlab/reporting/@report/report.m b/matlab/reporting/@report/report.m index 0fd4de327b8ba40d11357cf7e8179842dfd81d88..77f3faa90999a232758d2b67c96e81e505621ead 100644 --- a/matlab/reporting/@report/report.m +++ b/matlab/reporting/@report/report.m @@ -41,14 +41,14 @@ o.config = ''; o.showdate = true; if nargin == 1 - assert(isa(varargin{1}, 'report'),['With one arg to Report constructor, ' ... + assert(isa(varargin{1}, 'report'), ['@report.report: with one arg, ' ... 'you must pass a report object']); r = varargin{1}; return; elseif nargin > 1 if round(nargin/2) ~= nargin/2 - error(['Options to Report constructor must be supplied in name/value ' ... - 'pairs.']); + error(['@report.report: options must be supplied in name/value ' ... + 'pairs']); end optNames = lower(fieldnames(o)); @@ -64,7 +64,7 @@ elseif nargin > 1 end o.(field) = pair{2}; else - error('%s is not a recognized option to the Report constructor.', ... + error('@report.report: %s is not a recognized option.', ... field); end end diff --git a/matlab/reporting/@report/subsasgn.m b/matlab/reporting/@report/subsasgn.m index 527e6c905925ef4f16fabb3ffb7516e3cce21df7..60c7d969c2902c9c9856e8eb48110addecccd683 100644 --- a/matlab/reporting/@report/subsasgn.m +++ b/matlab/reporting/@report/subsasgn.m @@ -38,9 +38,9 @@ switch S.type case fieldnames(A) B.(S.subs) = V; otherwise - error(['field ' S.subs 'does not exist in the report class']); + error(['@report.subsasgn: field ' S.subs 'does not exist']); end otherwise - error('report subsasign syntax error'); + error('@report.subsasgn: syntax error'); end end \ No newline at end of file diff --git a/matlab/reporting/@report/subsref.m b/matlab/reporting/@report/subsref.m index 9559393fe62e22803d88c46c1580342f465a08f6..f8714054d74958bfc27775325b470cd280597f0c 100644 --- a/matlab/reporting/@report/subsref.m +++ b/matlab/reporting/@report/subsref.m @@ -31,14 +31,14 @@ switch S(1).type A = feval(S(1).subs, A); end otherwise - error(['Report Class: unknown field or method: ' S(1).subs]); + error(['@report.subsasgn: unknown field or method: ' S(1).subs]); end case '()' A = A.pages.getPages(S(1).subs{:}); case '{}' - error(['Report Class: ' S(1).type ' indexing not supported.']); + error(['@report.subsasgn: ' S(1).type ' indexing not supported.']); otherwise - error('Report Class: subsref.m impossible case'); + error('@report.subsasgn: impossible case'); end S = shiftS(S); diff --git a/matlab/reporting/@report/write.m b/matlab/reporting/@report/write.m index 456f58a76e35a65c127d180f28b533e13986212f..21496e2e991376cb662f0c0a6af7a3cae9325603 100644 --- a/matlab/reporting/@report/write.m +++ b/matlab/reporting/@report/write.m @@ -30,7 +30,7 @@ function o = write(o) [fid, msg] = fopen(o.filename, 'w'); if fid == -1 - error(msg); + error(['@report.subsasgn: ' msg]); end fprintf(fid, '%% Report Object\n'); @@ -67,6 +67,6 @@ fprintf(fid, '\\end{document}\n'); fprintf(fid, '%% End Report Object\n'); status = fclose(fid); if status == -1 - error('Error closing %s\n', o.filename); + error('@report.wrie: closing %s\n', o.filename); end end \ No newline at end of file diff --git a/matlab/reporting/@section/section.m b/matlab/reporting/@section/section.m index e2260f47b25cd3b24cc828c83285c4bcf936d69c..2e3f0972bcf9a719cea8850e3fc6b8b07a103fb7 100644 --- a/matlab/reporting/@section/section.m +++ b/matlab/reporting/@section/section.m @@ -32,8 +32,8 @@ if nargin == 1 return; elseif nargin > 1 if round(nargin/2) ~= nargin/2 - error(['Options to Section constructor must be supplied in name/' ... - 'value pairs.']); + error(['@section.section: options must be supplied in name/value ' ... + 'pairs.']); end optNames = lower(fieldnames(o)); @@ -44,7 +44,7 @@ elseif nargin > 1 if any(strmatch(field, optNames, 'exact')) o.(field) = pair{2}; else - error('%s is not a recognized option to the Section constructor.', ... + error('@section.section: %s is not a recognized option.', ... field); end end diff --git a/matlab/reporting/@section/subsasgn.m b/matlab/reporting/@section/subsasgn.m index 3311423eed38fb06587ccb8a3444ce8a70e76582..79f3af53a169936bd8cc00d08286e3d6fdf70ae6 100644 --- a/matlab/reporting/@section/subsasgn.m +++ b/matlab/reporting/@section/subsasgn.m @@ -34,6 +34,6 @@ switch S.type assert(isnumeric(index)); B(index) = V; otherwise - error('objArray subsasign syntax error') + error('@section.subsasgn: syntax error') end end \ No newline at end of file diff --git a/matlab/reporting/@section/subsref.m b/matlab/reporting/@section/subsref.m index eeb041c5301d038b9795f89498bd056d5e55408e..82994b82a789235490d882a5396db1721d43483e 100644 --- a/matlab/reporting/@section/subsref.m +++ b/matlab/reporting/@section/subsref.m @@ -31,14 +31,14 @@ switch S(1).type A = feval(S(1).subs, A); end otherwise - error(['Section Class: unknown field or method: ' S(1).subs]); + error(['@section.subsref: unknown field or method: ' S(1).subs]); end case '()' A = A.elements.getElements(S(1).subs{:}); case '{}' - error(['Section Class: ' S(1).type ' indexing not supported.']); + error(['@section.subsref: ' S(1).type ' indexing not supported.']); otherwise - error('Section Class: subsref.m impossible case') + error('@section.subsref: impossible case') end S = shiftS(S); diff --git a/matlab/reporting/@sections/sections.m b/matlab/reporting/@sections/sections.m index bacde01981ca3ed7cb14c473f93200cb9400d60a..9779751fe0847abfc51e8e3483f5a3bab9bf19cc 100644 --- a/matlab/reporting/@sections/sections.m +++ b/matlab/reporting/@sections/sections.m @@ -26,7 +26,7 @@ switch nargin 'valid arguments are sections objects']); s = varargin{1}; otherwise - error('Sections constructor: invalid number of arguments'); + error('@sections.sections: invalid number of arguments'); end end diff --git a/matlab/reporting/@sections/subsasgn.m b/matlab/reporting/@sections/subsasgn.m index 1916c1a5c3400acd69e24a64eca62c361dd65037..2782f7e1c7670feb9e60a5c9775ae67522756cf0 100644 --- a/matlab/reporting/@sections/subsasgn.m +++ b/matlab/reporting/@sections/subsasgn.m @@ -34,6 +34,6 @@ switch S.type assert(isnumeric(index)); B.objArray(index) = V; otherwise - error('objArray subsasign syntax error') + error('@sections.subsasgn: syntax error') end end \ No newline at end of file diff --git a/matlab/reporting/@sections/subsref.m b/matlab/reporting/@sections/subsref.m index 89e2948f8098fdb651795efe75e4fd6526514821..8661809acff8fe0df4c5c86df7639968c73790d7 100644 --- a/matlab/reporting/@sections/subsref.m +++ b/matlab/reporting/@sections/subsref.m @@ -31,14 +31,14 @@ switch S(1).type A = feval(S(1).subs, A); end otherwise - error(['Sections Class: unknown field or method: ' S(1).subs]); + error(['@sections.subsref unknown field or method: ' S(1).subs]); end case '()' A = getSections(A, S(1).subs{:}); case '{}' - error(['Sections Class: ' S(1).type ' indexing not supported.']); + error(['@sections.subsref ' S(1).type ' indexing not supported.']); otherwise - error('Sections Class: subsref.m impossible case') + error('@sections.subsref subsref.m impossible case') end S = shiftS(S); diff --git a/matlab/reporting/@table/subsasgn.m b/matlab/reporting/@table/subsasgn.m index deef33b8207e7a9dabd1f6dcfb0bf410ef857df4..1b903e6ccc80dcde168fbab4e5a43572898bb389 100644 --- a/matlab/reporting/@table/subsasgn.m +++ b/matlab/reporting/@table/subsasgn.m @@ -34,9 +34,9 @@ switch S.type case fieldnames(A) B.(S.subs) = V; otherwise - error(['field ' S.subs 'does not exist in the page class']) + error(['@table.subsasgn: field ' S.subs 'does not exist in the table class']) end otherwise - error('report subsasign syntax error') + error('@table.subsasgn: syntax error') end end \ No newline at end of file diff --git a/matlab/reporting/@table/subsref.m b/matlab/reporting/@table/subsref.m index 1f9468edac288fc149c7b0e6940ecdc2bfa8ce4d..7062d72ff026c9478c57dde82522d85ca1159762 100644 --- a/matlab/reporting/@table/subsref.m +++ b/matlab/reporting/@table/subsref.m @@ -31,12 +31,12 @@ switch S(1).type A = feval(S(1).subs, A); end otherwise - error(['Table Class: unknown field or method: ' S(1).subs]); + error(['@table.subsref: unknown field or method: ' S(1).subs]); end case {'()', '{}'} - error(['Table Class: ' S(1).type ' indexing not supported.']); + error(['@table.subsref: ' S(1).type ' indexing not supported.']); otherwise - error('Table Class: subsref.m impossible case') + error('@table.subsref: subsref.m impossible case') end S = shiftS(S);