Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
ACS
Public
VILLASframework
VILLASdataprocessing
Commits
e3308d25
Commit
e3308d25
authored
Jan 14, 2018
by
Steffen Vogel
🎅🏼
Browse files
fix numpy exception
parent
f4eaec17
Changes
1
Hide whitespace changes
Inline
Side-by-side
dataprocessing/timeseries.py
View file @
e3308d25
...
...
@@ -47,7 +47,7 @@ class TimeSeries:
def
diff
(
name
,
ts1
,
ts2
):
"""Returns difference between values of two Timeseries objects.
"""
if
ts1
.
time
==
ts2
.
time
:
if
len
(
ts1
.
time
)
==
len
(
ts2
.
time
)
:
ts_diff
=
TimeSeries
(
name
,
ts1
.
time
,
(
ts1
.
values
-
ts2
.
values
))
else
:
# different timestamps, common time vector and interpolation required before substraction
time
=
sorted
(
set
(
list
(
ts1
.
time
)
+
list
(
ts2
.
time
)))
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment