Skip to content

Commit 48b0b37

Browse files
use to_numpy() instead of as_matrix()
1 parent fd72bd4 commit 48b0b37

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

pymc3/glm/utils.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,15 @@ def any_to_tensor_and_labels(x, labels=None):
4848
if isinstance(x, pd.DataFrame):
4949
if not labels:
5050
labels = x.columns
51-
x = x.as_matrix()
51+
x = x.to_numpy()
5252

5353
# pandas.Series
5454
# there can still be a label
5555
# we can override labels
5656
elif isinstance(x, pd.Series):
5757
if not labels:
5858
labels = [x.name]
59-
x = x.as_matrix()[:, None]
59+
x = x.to_numpy()[:, None]
6060

6161
# dict
6262
# labels are keys,
@@ -66,7 +66,7 @@ def any_to_tensor_and_labels(x, labels=None):
6666
try:
6767
x = pd.DataFrame.from_dict(x)
6868
labels = x.columns
69-
x = x.as_matrix()
69+
x = x.to_numpy()
7070
# some types fail there
7171
# another approach is to construct
7272
# variable by hand

pymc3/tests/test_examples.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,11 @@ class TestARM12_6(SeededTest):
7272
def build_model(self):
7373
data = get_city_data()
7474

75-
self.obs_means = data.groupby('fips').lradon.mean().as_matrix()
75+
self.obs_means = data.groupby('fips').lradon.mean().to_numpy()
7676

77-
lradon = data.lradon.as_matrix()
78-
floor = data.floor.as_matrix()
79-
group = data.group.as_matrix()
77+
lradon = data.lradon.to_numpy()
78+
floor = data.floor.to_numpy()
79+
group = data.group.to_numpy()
8080

8181
with pm.Model() as model:
8282
groupmean = pm.Normal('groupmean', 0, 10. ** -2.)
@@ -107,10 +107,10 @@ def build_model(self):
107107
data = get_city_data()
108108
self.obs_means = data.groupby('fips').lradon.mean()
109109

110-
lradon = data.lradon.as_matrix()
111-
floor = data.floor.as_matrix()
112-
group = data.group.as_matrix()
113-
ufull = data.Uppm.as_matrix()
110+
lradon = data.lradon.to_numpy()
111+
floor = data.floor.to_numpy()
112+
group = data.group.to_numpy()
113+
ufull = data.Uppm.to_numpy()
114114

115115
with pm.Model() as model:
116116
groupmean = pm.Normal('groupmean', 0, 10. ** -2.)

0 commit comments

Comments
 (0)