Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Dynare
reporting
Commits
e2ec7156
Commit
e2ec7156
authored
Jul 16, 2015
by
Houtan Bastani
Browse files
fix strjoin statements
parent
8c32ea69
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/@graph/graph.m
View file @
e2ec7156
...
...
@@ -14,7 +14,7 @@ function o = graph(varargin)
% SPECIAL REQUIREMENTS
% none
% Copyright (C) 2013-201
4
Dynare Team
% Copyright (C) 2013-201
5
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
src/@page/page.m
View file @
e2ec7156
...
...
@@ -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
};
...
...
src/@report/report.m
View file @
e2ec7156
...
...
@@ -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
src/@report_series/writeSeriesForGraph.m
View file @
e2ec7156
...
...
@@ -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'
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment