Skip to content

Commit

Permalink
Merge pull request #3451 from bashtage/squash-final-future-warning
Browse files Browse the repository at this point in the history
MAINT: fix numpy FutureWarning
  • Loading branch information
josef-pkt committed Feb 7, 2017
2 parents 3feea49 + de9b9dd commit bfd8d2b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
5 changes: 2 additions & 3 deletions statsmodels/tsa/vector_ar/tests/test_svar.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,9 @@
class TestSVAR(object):
@classmethod
def setupClass(cls):
mdata = sm.datasets.macrodata.load().data
mdata = sm.datasets.macrodata.load_pandas().data
mdata = mdata[['realgdp','realcons','realinv']]
names = mdata.dtype.names
data = mdata.view((float,3))
data = mdata.values
data = np.diff(np.log(data), axis=0)
A = np.asarray([[1, 0, 0],['E', 1, 0],['E', 'E', 1]])
B = np.asarray([['E', 0, 0], [0, 'E', 0], [0, 0, 'E']])
Expand Down
4 changes: 2 additions & 2 deletions statsmodels/tsa/vector_ar/tests/test_var.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ def test_bse(self):
assert_almost_equal(self.res1.bse, self.res2.bse, DECIMAL_4)

def get_macrodata():
data = sm.datasets.macrodata.load().data[['realgdp','realcons','realinv']]
names = data.dtype.names
data = sm.datasets.macrodata.load_pandas().data[['realgdp','realcons','realinv']]
data = data.to_records(index=False)
nd = data.view((float,3), type=np.ndarray)
nd = np.diff(np.log(nd), axis=0)
return nd.ravel().view(data.dtype, type=np.ndarray)
Expand Down

0 comments on commit bfd8d2b

Please sign in to comment.