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.

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

add VonMises family #453

Merged
merged 3 commits into from
Feb 18, 2022
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
1 change: 1 addition & 0 deletions bambi/backend/pymc.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ class PyMC3Model:
"log": tt.exp,
"logit": logit,
"probit": probit,
"tan_2": lambda x: 2 * tt.arctan(x),
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we make this a regular function? We're still not using any pickling but this can be an impediment. See #400.

"softmax": tt.nnet.softmax,
}

Expand Down
1 change: 1 addition & 0 deletions bambi/backend/terms.py
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,7 @@ def build(self, nu, invlinks):
nu = tt.concatenate([np.zeros((data.shape[0], 1)), nu], axis=1)

# Add mean parameter and observed data

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

was this added on purpose? Otherwise, I would remove it, so the format is the same in all the code.

kwargs = {self.family.likelihood.parent: linkinv(nu), "observed": data}

# Add auxiliary parameters
Expand Down
13 changes: 13 additions & 0 deletions bambi/defaults/defaults.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
NegativeBinomial,
Poisson,
StudentT,
VonMises,
Wald,
)

Expand All @@ -31,6 +32,7 @@
"NegativeBinomial": {"alpha": 1, "mu": 1},
"Poisson": {"mu": 1},
"StudentT": {"lam": 1, "nu": 1},
"VonMises": {"mu": 0, "kappa": 1},
"Wald": {"mu": 1, "lam": 1},
}

Expand Down Expand Up @@ -128,6 +130,17 @@
"link": "identity",
"family": StudentT,
},
"vonmises": {
"likelihood": {
"name": "VonMises",
"args": {
"kappa": "HalfNormal"
},
"parent": "mu",
},
"link": "tan_2",
"family": VonMises,
},
"wald": {
"likelihood": {
"name": "Wald",
Expand Down
1 change: 1 addition & 0 deletions bambi/families/family.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ class Family:
"logit",
"probit",
"softmax",
"tan_2",
]

def __init__(self, name, likelihood, link):
Expand Down
1 change: 1 addition & 0 deletions bambi/families/likelihood.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"NegativeBinomial": {"params": ("mu", "alpha"), "parent": "mu", "args": ("alpha",)},
"Poisson": {"params": ("mu",), "parent": "mu", "args": None},
"StudentT": {"params": ("mu", "sigma"), "args": ("sigma", "nu")},
"Vonmises": {"params": ("mu", "kappa"), "parent": "mu", "args": ("kappa",)},
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be "VonMises" with capital M, as in the PyMC distribution name.

"Wald": {"params": ("mu", "lam"), "parent": "mu", "args": ("lam",)},
}

Expand Down
14 changes: 13 additions & 1 deletion bambi/families/link.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,14 @@ def inv_inverse_squared(eta):
return 1 / np.sqrt(eta)


def arctan_2(x):
return 2 * np.arctan(x)


def tan_2(x):
return np.tan(x / 2)


def link_not_implemented(*args, **kwargs):
raise NotImplementedError("link not implemented")

Expand Down Expand Up @@ -114,7 +122,11 @@ def link_not_implemented(*args, **kwargs):
"softmax": {
"link": link_not_implemented,
"linkinv": softmax
}
},
"tan_2": {
"link": tan_2,
"linkinv": arctan_2
},
}
# fmt: on

Expand Down
14 changes: 14 additions & 0 deletions bambi/families/univariate.py
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,20 @@ def posterior_predictive(self, model, posterior, linear_predictor, draws, draw_n
return stats.t.rvs(nu, mean, sigma)


class VonMises(UnivariateFamily):
SUPPORTED_LINKS = ["identity", "tan_2"]

def posterior_predictive(self, model, posterior, linear_predictor, draws, draw_n):
mean = self.link.linkinv(linear_predictor)
kappa = posterior[model.response.name + "_kappa"].values

idxs = np.random.randint(low=0, high=draw_n, size=draws)
mean = mean[:, idxs, :]
kappa = kappa[:, idxs, np.newaxis]

return np.random.vonmises(mean, kappa)


class Wald(UnivariateFamily):
SUPPORTED_LINKS = ["inverse", "inverse_squared", "identity", "log"]

Expand Down
1 change: 1 addition & 0 deletions bambi/families/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"gaussian": ("sigma",),
"negativebinomial": ("alpha",),
"t": ("sigma", "nu"),
"vonmises": ("kappa",),
"wald": ("lam",),
}

Expand Down
5 changes: 5 additions & 0 deletions bambi/tests/test_built_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,11 @@ def test_t_regression():
Model("y ~ x", data, family="t").fit(draws=10, tune=10)


def test_vonmises_regression():
data = pd.DataFrame({"y": np.random.vonmises(0, 1, size=100), "x": np.random.normal(size=100)})
Model("y ~ x", data, family="vonmises").fit(draws=10, tune=10)


def test_plot_priors(crossed_data):
model = Model("Y ~ 0 + threecats", crossed_data)
# Priors cannot be plotted until model is built.
Expand Down
3 changes: 3 additions & 0 deletions bambi/tests/test_model_construction.py
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,7 @@ def test_sparse_fails():
"bernoulli",
"poisson",
"gamma",
"vonmises",
"wald",
],
)
Expand All @@ -353,6 +354,7 @@ def test_links():
"gaussian": ["identity", "log", "inverse"],
"negativebinomial": ["identity", "log", "cloglog"],
"poisson": ["identity", "log"],
"vonmises": ["identity", "tan_2"],
"wald": ["inverse", "inverse_squared", "identity", "log"],
}
for family, links in FAMILIES.items():
Expand All @@ -379,6 +381,7 @@ def test_bad_links():
"gaussian": ["logit", "probit", "cloglog"],
"negativebinomial": ["logit", "probit", "inverse", "inverse_squared"],
"poisson": ["logit", "probit", "cloglog", "inverse", "inverse_squared"],
"vonmises": ["logit", "probit", "cloglog"],
"wald": ["logit", "probit", "cloglog"],
}

Expand Down