From 743eb2575bbf843197b3a037dd4bde599d2985de Mon Sep 17 00:00:00 2001
From: Florent Jaillet <florent.jaillet@lis-lab.fr>
Date: Wed, 25 Apr 2018 14:30:09 +0200
Subject: [PATCH] Correcting waveform.py (should improve its test coverage)
---
madarrays/waveform.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/madarrays/waveform.py b/madarrays/waveform.py
index 08ad2ef..15be221 100644
--- a/madarrays/waveform.py
+++ b/madarrays/waveform.py
@@ -169,7 +169,8 @@ class Waveform(MadArray):
raise ValueError(errmsg.format(inputs[0].fs, inputs[1].fs))
output = output.view(Waveform)
- output.fs = inputs[0].fs if isinstance(inputs[0], Waveform) else inputs[1].fs
+ output.fs = inputs[0].fs if isinstance(inputs[0], Waveform) \
+ else inputs[1].fs
return output
@@ -771,7 +772,7 @@ class Waveform(MadArray):
def copy(self):
return Waveform(self)
- # def __add__(self, other):
+ def __add__(self, other):
if isinstance(other, Waveform) and self.fs != other.fs:
errmsg = 'Waveforms do not have the same fs: {} and {}'
raise ValueError(errmsg.format(self.fs, other.fs))
--
GitLab