Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
12 changes: 0 additions & 12 deletions calibr8/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -482,8 +482,6 @@ def loglikelihood(
y,
x,
name: Optional[str] = None,
replicate_id: Optional[str] = None,
dependent_key: Optional[str] = None,
theta=None,
**dist_kwargs,
):
Expand All @@ -503,10 +501,6 @@ def loglikelihood(
name : str
Name for the likelihood variable in a PyMC model (tensor mode).
Previously this was `f'{replicate_id}.{dependent_key}'`.
replicate_id : optional, str
Deprecated; pass the `name` kwarg instead.
dependent_key : optional, str
Deprecated; pass the `name` kwarg instead.
theta : optional, array-like
Parameters for the calibration model to use instead of `theta_fitted`.
The vector must have the correct length, but can have numeric and or symbolic entries.
Expand Down Expand Up @@ -540,12 +534,6 @@ def loglikelihood(

pmodel = pm.Model.get_context(error_if_none=False)
if pmodel is not None:
if replicate_id and dependent_key:
warnings.warn(
"The `replicate_id` and `dependent_key` parameters are deprecated. Use `name` instead.",
DeprecationWarning,
)
name = f"{replicate_id}.{dependent_key}"
if not name:
raise ValueError("A `name` must be specified for the PyMC likelihood.")
rv = self.pymc_dist(name, **self.to_pymc(*params), observed=y, **dist_kwargs or {})
Expand Down
3 changes: 0 additions & 3 deletions calibr8/test_all.py
Original file line number Diff line number Diff line change
Expand Up @@ -474,9 +474,6 @@ def test_symbolic_loglikelihood_checks_and_warnings(self):
x_hat = pm.Uniform("x_hat", shape=5)
with pytest.raises(ValueError, match="`name` must be specified"):
cmodel.loglikelihood(x=x_hat, y=y_obs)

with pytest.warns(DeprecationWarning, match="Use `name` instead"):
cmodel.loglikelihood(x=x_hat, y=y_obs, replicate_id="A01", dependent_key="A")
pass

@pytest.mark.skipif(not HAS_PYMC, reason="requires PyMC")
Expand Down
Loading