Skip to content

Changed import of factorial for SciPy>1.0 #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
joschaschmiedt wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Changed import of factorial for SciPy>1.0 #19

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
209b24a
Changed import of factorial for SciPy>1.0
joschaschmiedt May 27, 2019
4ec9558
NEW: Added scale conversion functionality for Paul + DOG wavelets
pantaray Jul 14, 2020
d99fdb8
Merge pull request #1 from pantaray/master
joschaschmiedt Jul 16, 2020
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
2 changes: 1 addition & 1 deletion wavelets/wavelets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import scipy.signal
import scipy.optimize
import scipy.special
from scipy.misc import factorial
from scipy.special import factorial

__all__ = ['Morlet', 'Paul', 'DOG', 'Ricker', 'Marr', 'Mexican_hat']

Expand Down