Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dseries
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
6
Issues
6
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dynare
dseries
Commits
d898f760
Commit
d898f760
authored
Dec 05, 2019
by
Stéphane Adjemian
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed merge of empty dseries.
parent
40263275
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
2 deletions
+13
-2
src/@dseries/merge.m
src/@dseries/merge.m
+13
-2
No files found.
src/@dseries/merge.m
View file @
d898f760
...
@@ -32,13 +32,24 @@ function q = merge(o, p, rewritewithnans) % --*-- Unitary tests --*--
...
@@ -32,13 +32,24 @@ function q = merge(o, p, rewritewithnans) % --*-- Unitary tests --*--
% You should have received a copy of the GNU General Public License
% You should have received a copy of the GNU General Public License
% along with Dynare. If not, see <http://www.gnu.org/licenses/>.
% along with Dynare. If not, see <http://www.gnu.org/licenses/>.
if
~
isdseries
(
p
)
if
~
isdseries
(
p
)
||
~
isdseries
(
o
)
error
(
'dseries::merge: Both inputs must be dseries objects!'
)
error
(
'dseries::merge: Both inputs must be dseries objects!'
)
end
end
if
isempty
(
o
)
&&
~
isempty
(
p
)
q
=
p
;
return
elseif
~
isempty
(
o
)
&&
isempty
(
p
)
q
=
o
;
return
elseif
isempty
(
o
)
&&
isempty
(
p
)
q
=
p
;
return
end
if
~
isequal
(
frequency
(
o
),
frequency
(
p
))
if
~
isequal
(
frequency
(
o
),
frequency
(
p
))
if
isempty
(
inputname
(
1
))
if
isempty
(
inputname
(
1
))
error
(
[
'dseries::merge: Cannot merge dseries objects (frequencies are different)!'
]
)
error
(
'dseries::merge: Cannot merge dseries objects (frequencies are different)!'
)
else
else
error
([
'dseries::merge: Cannot merge '
inputname
(
1
)
' and '
inputname
(
2
)
' (frequencies are different)!'
])
error
([
'dseries::merge: Cannot merge '
inputname
(
1
)
' and '
inputname
(
2
)
' (frequencies are different)!'
])
end
end
...
...
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