Skip to content
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

Deprecated scipy package replaced with update #7

Merged
merged 4 commits into from
Jun 5, 2019
Merged

Deprecated scipy package replaced with update #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0e22b07
removed version settings on numpy and scipy
monocongo Oct 31, 2018
2a31168
removed readme from the about section since this was causing a files/…
monocongo Oct 31, 2018
fcbc2e9
removed commented line
monocongo Oct 31, 2018
3349b90
replaced scipy.misc.comb with scipy.special.comb
monocongo Jun 2, 2019
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
9 changes: 4 additions & 5 deletions conda-recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ requirements:
build:
- python
- setuptools
- numpy 1.9*
- scipy >=0.14
- numpy
- scipy

run:
- python
- numpy 1.9*
- scipy >=0.14
- numpy
- scipy

test:
imports:
Expand All @@ -29,5 +29,4 @@ about:
license: GPLv3
license_file: LICENSE
summary: Python library for estimating linear moments for statistical distributions
readme: README.rst

26 changes: 13 additions & 13 deletions lmoments3/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
__version__ = get_versions()['version']
del get_versions

import scipy.misc as sm
import scipy.special
import numpy as np


Expand Down Expand Up @@ -99,7 +99,7 @@ def _samlmularge(x, nmom=5):
raise ValueError("Insufficient length of data for specified nmoments")

##Calculate first order
l = [np.sum(x) / sm.comb(n, 1, exact=True)]
l = [np.sum(x) / scipy.special.comb(n, 1, exact=True)]

if nmom == 1:
return l[0]
Expand All @@ -109,10 +109,10 @@ def _samlmularge(x, nmom=5):
for i in range(1, nmom):
comb.append([])
for j in range(n):
comb[-1].append(sm.comb(j, i, exact=True))
comb[-1].append(scipy.special.comb(j, i, exact=True))

for mom in range(2, nmom + 1):
coefl = 1.0 / mom * 1.0 / sm.comb(n, mom, exact=True)
coefl = 1.0 / mom * 1.0 / scipy.special.comb(n, mom, exact=True)
xtrans = []
for i in range(0, n):
coeftemp = []
Expand All @@ -126,7 +126,7 @@ def _samlmularge(x, nmom=5):
coeftemp[j] = coeftemp[j] * comb[j - 1][n - i - 1]

for j in range(0, mom):
coeftemp[j] = coeftemp[j] * sm.comb(mom - 1, j, exact=True)
coeftemp[j] = coeftemp[j] * scipy.special.comb(mom - 1, j, exact=True)

for j in range(0, int(0.5 * mom)):
coeftemp[j * 2 + 1] = -coeftemp[j * 2 + 1]
Expand Down Expand Up @@ -156,15 +156,15 @@ def _samlmusmall(x, nmom=5):

# First L-moment

l1 = np.sum(x) / sm.comb(n, 1, exact=True)
l1 = np.sum(x) / scipy.special.comb(n, 1, exact=True)

if nmom == 1:
return l1

# Second L-moment

comb1 = range(n)
coefl2 = 0.5 / sm.comb(n, 2, exact=True)
coefl2 = 0.5 / scipy.special.comb(n, 2, exact=True)
sum_xtrans = sum([(comb1[i] - comb1[n - i - 1]) * x[i] for i in range(n)])
l2 = coefl2 * sum_xtrans

Expand All @@ -173,8 +173,8 @@ def _samlmusmall(x, nmom=5):

# Third L-moment

comb3 = [sm.comb(i, 2, exact=True) for i in range(n)]
coefl3 = 1.0 / 3.0 / sm.comb(n, 3, exact=True)
comb3 = [scipy.special.comb(i, 2, exact=True) for i in range(n)]
coefl3 = 1.0 / 3.0 / scipy.special.comb(n, 3, exact=True)
sum_xtrans = sum([(comb3[i] - 2 * comb1[i] * comb1[n - i - 1] + comb3[n - i - 1]) * x[i] for i in range(n)])
l3 = coefl3 * sum_xtrans / l2

Expand All @@ -183,8 +183,8 @@ def _samlmusmall(x, nmom=5):

# Fourth L-moment

comb5 = [sm.comb(i, 3, exact=True) for i in range(n)]
coefl4 = 0.25 / sm.comb(n, 4, exact=True)
comb5 = [scipy.special.comb(i, 3, exact=True) for i in range(n)]
coefl4 = 0.25 / scipy.special.comb(n, 4, exact=True)
sum_xtrans = sum(
[(comb5[i] - 3 * comb3[i] * comb1[n - i - 1] + 3 * comb1[i] * comb3[n - i - 1] - comb5[n - i - 1]) * x[i]
for i in range(n)])
Expand All @@ -195,8 +195,8 @@ def _samlmusmall(x, nmom=5):

# Fifth L-moment

comb7 = [sm.comb(i, 4, exact=True) for i in range(n)]
coefl5 = 0.2 / sm.comb(n, 5, exact=True)
comb7 = [scipy.special.comb(i, 4, exact=True) for i in range(n)]
coefl5 = 0.2 / scipy.special.comb(n, 5, exact=True)
sum_xtrans = sum(
[(comb7[i] - 4 * comb5[i] * comb1[n - i - 1] + 6 * comb3[i] * comb3[n - i - 1] -
4 * comb1[i] * comb5[n - i - 1] + comb7[n - i - 1]) * x[i]
Expand Down