Skip to content

Commit

Permalink
Merge 9e0e23a into 3c5b120
Browse files Browse the repository at this point in the history
  • Loading branch information
dfolch committed Jun 17, 2015
2 parents 3c5b120 + 9e0e23a commit 738e65e
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion pysal/spreg/regimes.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class Chow:
>>> print 'Joint test:'
Joint test:
>>> print olsr.chow.joint
(0.6339319928978806, 0.8886223520178802)
(0.63393199289787527, 0.88862235201788142)
'''

def __init__(self, reg):
Expand Down
4 changes: 2 additions & 2 deletions pysal/spreg/tests/test_error_sp_regimes.py
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ def test_model_endog(self):
np.testing.assert_array_almost_equal(reg.vm[0],vm,4)
pr2 = 0.19623994206233333
self.assertAlmostEqual(reg.pr2,pr2,4)
sig2 = 649.4011
sig2 = 649.4005
self.assertAlmostEqual(round(reg.sig2,4),round(sig2,4),4)
std_err = np.array([ 19.77074866, 6.07667394, 24.32254786, 2.17776972,
2.97078606, 0.94392418])
Expand All @@ -167,7 +167,7 @@ def test_model_endog(self):
[ 0.40499741, 0.5245196 ],
[ 0.4498365 , 0.50241261]])
np.testing.assert_array_almost_equal(reg.chow.regi,chow_r,4)
chow_j = 1.2885590185243503
chow_j = 1.2885587585334619
self.assertAlmostEqual(reg.chow.joint[0],chow_j)

def test_model_endog_regi_error(self):
Expand Down
16 changes: 8 additions & 8 deletions pysal/spreg/tests/test_error_sp_sparse.py
Original file line number Diff line number Diff line change
Expand Up @@ -145,11 +145,11 @@ def test_model(self):
sy = 18.466069465206047
self.assertAlmostEqual(reg.std_y,sy)
#vm
vm = np.array([[ 529.15840986, -15.78336736, -8.38021053],
[ -15.78336736, 0.54023504, 0.23112032],
[ -8.38021053, 0.23112032, 0.14497738]])
vm = np.array([[ 529.15646434, -15.78333846, -8.3801693 ],
[ -15.78333846, 0.54023466, 0.23111961],
[ -8.3801693 , 0.23111961, 0.14497648]])
np.testing.assert_array_almost_equal(reg.vm,vm,4)
sig2 = 192.5002
sig2 = 192.5004
self.assertAlmostEqual(round(reg.sig2,4),round(sig2,4),4)

@unittest.skipIf(int(scipy.__version__.split(".")[1]) < 11,
Expand Down Expand Up @@ -198,13 +198,13 @@ def test_model(self):
self.assertAlmostEqual(reg.mean_y,my)
sy = 18.466069465206047
self.assertAlmostEqual(reg.std_y,sy)
vm = np.array([[ 529.15840986, -15.78336736, -8.38021053],
[ -15.78336736, 0.54023504, 0.23112032],
[ -8.38021053, 0.23112032, 0.14497738]])
vm = np.array([[ 529.15646434, -15.78333846, -8.3801693 ],
[ -15.78333846, 0.54023466, 0.23111961],
[ -8.3801693 , 0.23111961, 0.14497648]])
np.testing.assert_array_almost_equal(reg.vm,vm,4)
pr2 = 0.346472557570858
self.assertAlmostEqual(reg.pr2,pr2)
sig2 = 192.5002
sig2 = 192.5004
self.assertAlmostEqual(round(reg.sig2,4),round(sig2,4),4)
std_err = np.array([ 23.003401 , 0.73500657, 0.38075777])
np.testing.assert_array_almost_equal(reg.std_err,std_err,4)
Expand Down

0 comments on commit 738e65e

Please sign in to comment.