Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions pywt/_cwt.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,12 @@ def cwt(data, scales, wavelet, sampling_period=1., method='conv', axis=-1,
dt_cplx = np.result_type(dt, np.complex64)
if not isinstance(wavelet, (ContinuousWavelet, Wavelet)):
wavelet = DiscreteContinuousWavelet(wavelet)
if not isinstance(wavelet, ContinuousWavelet):
raise ValueError(
f"cwt() requires a continuous wavelet, but {wavelet.name!r} is a "
f"discrete wavelet. Use a continuous wavelet such as those returned "
f"by pywt.wavelist(kind='continuous') (e.g. 'morl', 'mexh', 'cmor')."
)

scales = np.atleast_1d(scales)
if np.any(scales <= 0):
Expand Down
13 changes: 13 additions & 0 deletions pywt/tests/test_cwt_wavelets.py
Original file line number Diff line number Diff line change
Expand Up @@ -480,3 +480,16 @@ def test_continuous_wavelet_pickle(tmpdir):
wavelet2 = pickle.load(f)
assert isinstance(wavelet2, pywt.ContinuousWavelet)
assert wavelet2.name == wavelet.name


def test_cwt_discrete_wavelet_raises():
# A discrete wavelet such as 'coif1' has no continuous form; cwt should
# raise a clear error rather than an opaque AttributeError (gh-776).
data = np.ones(100)
for bad in ['coif1', 'db2', pywt.Wavelet('coif1')]:
with pytest.raises(ValueError, match='continuous wavelet'):
pywt.cwt(data, [1, 2], bad)

# a continuous wavelet still works
out, _ = pywt.cwt(data, [1, 2], 'morl')
assert out.shape == (2, 100)
Loading