Skip to content

Commit bf21724

Browse files
authored
Merge pull request #129 from jGaboardi/fix_import_bug
2 parents c0ead26 + ae8a959 commit bf21724

File tree

2 files changed

+25
-25
lines changed

2 files changed

+25
-25
lines changed

spreg/diagnostics.py

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,14 @@
66
"Luc Anselin [email protected], Nicholas Malizia [email protected] "
77
)
88

9-
from libpysal.common import *
10-
import scipy.sparse as SP
119
from math import sqrt, pi
10+
11+
from libpysal.common import MISSINGVALUE
12+
import numpy as np
13+
import numpy.linalg as la
14+
import scipy.sparse as SP
15+
from scipy import stats
16+
1217
from .utils import spmultiply, sphstack, spmin, spmax
1318

1419

@@ -160,12 +165,9 @@ def t_stat(reg, z_stat=False):
160165
vm = reg.vm # (array) coefficients of variance matrix (k x k)
161166
betas = reg.betas # (array) coefficients of the regressors (1 x k)
162167
variance = vm.diagonal()
163-
tStat = (
164-
betas[list(range(0, len(vm)))].reshape(
165-
len(vm),
166-
)
167-
/ np.sqrt(variance)
168-
)
168+
tStat = betas[list(range(0, len(vm)))].reshape(
169+
len(vm),
170+
) / np.sqrt(variance)
169171
ts_result = []
170172
for t in tStat:
171173
if z_stat:
@@ -678,15 +680,15 @@ def jarque_bera(reg):
678680
"""
679681
n = reg.n # (scalar) number of observations
680682
u = reg.u # (array) residuals from regression
681-
u2 = u ** 2
682-
u3 = u ** 3
683-
u4 = u ** 4
683+
u2 = u**2
684+
u3 = u**3
685+
u4 = u**4
684686
mu2 = np.mean(u2)
685687
mu3 = np.mean(u3)
686688
mu4 = np.mean(u4)
687689
S = mu3 / (mu2 ** (1.5)) # skewness measure
688-
K = mu4 / (mu2 ** 2) # kurtosis measure
689-
jb = n * (((S ** 2) / 6) + ((K - 3) ** 2) / 24)
690+
K = mu4 / (mu2**2) # kurtosis measure
691+
jb = n * (((S**2) / 6) + ((K - 3) ** 2) / 24)
690692
pvalue = stats.chisqprob(jb, 2)
691693
jb_result = {"df": 2, "jb": jb, "pvalue": pvalue}
692694
return jb_result
@@ -776,7 +778,7 @@ def breusch_pagan(reg, z=None):
776778
0.0193
777779
778780
"""
779-
e2 = reg.u ** 2
781+
e2 = reg.u**2
780782
e = reg.u
781783
n = reg.n
782784
k = reg.k
@@ -919,7 +921,7 @@ def white(reg):
919921
0.0013
920922
921923
"""
922-
e = reg.u ** 2
924+
e = reg.u**2
923925
k = int(reg.k)
924926
n = int(reg.n)
925927
y = reg.y
@@ -1084,7 +1086,7 @@ def koenker_bassett(reg, z=None):
10841086
10851087
"""
10861088
# The notation here matches that of Greene (2003).
1087-
u = reg.u ** 2
1089+
u = reg.u**2
10881090
e = reg.u
10891091
n = reg.n
10901092
k = reg.k

spreg/diagnostics_tsls.py

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
"Luc Anselin [email protected], Nicholas Malizia [email protected] "
88
)
99

10-
from libpysal.common import *
10+
import numpy as np
11+
from scipy import stats
1112
from scipy.stats import pearsonr
1213

1314
__all__ = ["t_stat", "pr2_aspatial", "pr2_spatial"]
@@ -118,12 +119,9 @@ def t_stat(reg, z_stat=False):
118119
vm = reg.vm # (array) coefficients of variance matrix (k x k)
119120
betas = reg.betas # (array) coefficients of the regressors (1 x k)
120121
variance = vm.diagonal()
121-
tStat = (
122-
betas.reshape(
123-
len(betas),
124-
)
125-
/ np.sqrt(variance)
126-
)
122+
tStat = betas.reshape(
123+
len(betas),
124+
) / np.sqrt(variance)
127125
ts_result = []
128126
for t in tStat:
129127
if z_stat:
@@ -221,7 +219,7 @@ def pr2_aspatial(tslsreg):
221219
y = tslsreg.y
222220
predy = tslsreg.predy
223221
pr = pearsonr(y.flatten(), predy.flatten())[0]
224-
pr2_result = float(pr ** 2)
222+
pr2_result = float(pr**2)
225223
return pr2_result
226224

227225

@@ -329,7 +327,7 @@ def pr2_spatial(tslsreg):
329327
y = tslsreg.y
330328
predy_e = tslsreg.predy_e
331329
pr = pearsonr(y.flatten(), predy_e.flatten())[0]
332-
pr2_result = float(pr ** 2)
330+
pr2_result = float(pr**2)
333331
return pr2_result
334332

335333

0 commit comments

Comments
 (0)