Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
reporting
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Archives
reporting
Commits
e2ec7156
Project 'Dynare/reporting' was moved to 'Archives/reporting'. Please update any links and bookmarks that may still have the old path.
Commit
e2ec7156
authored
10 years ago
by
Houtan Bastani
Browse files
Options
Downloads
Patches
Plain Diff
fix strjoin statements
parent
8c32ea69
No related branches found
No related tags found
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/@graph/graph.m
+7
-7
7 additions, 7 deletions
src/@graph/graph.m
src/@page/page.m
+2
-2
2 additions, 2 deletions
src/@page/page.m
src/@report/report.m
+4
-4
4 additions, 4 deletions
src/@report/report.m
src/@report_series/writeSeriesForGraph.m
+1
-1
1 addition, 1 deletion
src/@report_series/writeSeriesForGraph.m
with
14 additions
and
14 deletions
src/@graph/graph.m
+
7
−
7
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. '
...
...
...
This diff is collapsed.
Click to expand it.
src/@page/page.m
+
2
−
2
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
};
...
...
This diff is collapsed.
Click to expand it.
src/@report/report.m
+
4
−
4
View file @
e2ec7156
...
...
@@ -79,15 +79,15 @@ 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'
);
...
...
This diff is collapsed.
Click to expand it.
src/@report_series/writeSeriesForGraph.m
+
1
−
1
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'
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment