Skip to content
Open
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
2 changes: 1 addition & 1 deletion docs/losses.html.md
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ d_{p}(y,\mu)
y\,\ln\!\frac{y}{\mu}\;-\;(y-\mu),
& p = 1\quad(\text{Poisson deviance}),\\[0.5em]
\displaystyle
-2\Bigl[\ln\!\frac{y}{\mu}\;-\;\frac{y-\mu}{\mu}\Bigr],
-\Bigl[\ln\!\frac{y}{\mu}\;-\;\frac{y-\mu}{\mu}\Bigr],
& p = 2\quad(\text{Gamma deviance}).
\end{cases}
```
Expand Down
10 changes: 9 additions & 1 deletion tests/test_losses.py
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ def tweedie_deviance_single(y_true, y_pred, power, **kwargs):
elif power == 1:
return np.mean(2 * (y_true * np.log(y_true / y_pred) - (y_true - y_pred)))
elif power == 2:
return np.mean(2 * (np.log(y_pred) - np.log(y_true)) + y_true / y_pred - 1)
return np.mean(2 * ((np.log(y_pred) - np.log(y_true)) + y_true / y_pred - 1))
else:
return np.mean(
2
Expand Down Expand Up @@ -235,6 +235,14 @@ def linex_single(y_true, y_pred, a=1.0, **kwargs):
partial(ufl.tweedie_deviance, power=2),
partial(tweedie_deviance_single, power=2),
),
(
partial(ufl.tweedie_deviance, power=1.5),
partial(tweedie_deviance_single, power=1.5),
),
(
partial(ufl.tweedie_deviance, power=2.5),
partial(tweedie_deviance_single, power=2.5),
),
],
)
def test_loss(engine, utils_fn, single_fn):
Expand Down
17 changes: 12 additions & 5 deletions utilsforecast/losses.py
Original file line number Diff line number Diff line change
Expand Up @@ -1232,9 +1232,12 @@ def gen_expr(model):

def gen_expr(model):
return (
2 * (nw.col(model).log() - nw.col(target_col).log())
+ (nw.col(target_col) / nw.col(model))
- 1
2
* (
(nw.col(model).log() - nw.col(target_col).log())
+ (nw.col(target_col) / nw.col(model))
- 1
)
).alias(model)

else:
Expand All @@ -1245,9 +1248,13 @@ def gen_expr(model):
* (
nw.col(target_col).clip(0) ** (2 - power)
/ ((1 - power) * (2 - power))
- (
nw.col(target_col)
* (nw.col(model) ** (1 - power))
/ (1 - power)
)
+ (nw.col(model) ** (2 - power) / (2 - power))
)
- (nw.col(target_col) * (nw.col(model) ** (1 - power)) / (1 - power))
+ (nw.col(model) ** (2 - power) / (2 - power))
).alias(model)

return _nw_agg_expr(
Expand Down
Loading