Skip to content

Commit

Permalink
Fix documentation of risk measures (#544)
Browse files Browse the repository at this point in the history
  • Loading branch information
odow authored Dec 16, 2022
1 parent 8fb7d8d commit ed85827
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
4 changes: 3 additions & 1 deletion docs/src/guides/add_a_risk_measure.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ SDDP.Expectation
```

```@repl intermediate_risk
using SDDP
SDDP.adjust_probability(
SDDP.Expectation(),
risk_adjusted_probability,
Expand Down Expand Up @@ -146,7 +147,7 @@ SDDP.adjust_probability(
cost_realizations,
is_minimization
)
risk_adjusted_probabilitys
risk_adjusted_probability
```

### Convex combination of risk measures
Expand Down Expand Up @@ -209,6 +210,7 @@ SDDP.Wasserstein
```

```@repl intermediate_risk
import HiGHS
SDDP.adjust_probability(
SDDP.Wasserstein(HiGHS.Optimizer; alpha=0.5) do x, y
return abs(x - y)
Expand Down
8 changes: 5 additions & 3 deletions src/plugins/risk_measures.jl
Original file line number Diff line number Diff line change
Expand Up @@ -569,9 +569,11 @@ end
"""
Entropic(γ::Float64)
The entropic risk measure as described by Dowson, Morton, and Pagnoncelli
(2020). Multistage stochastic programs with the entropic risk measure.
http://www.optimization-online.org/DB_HTML/2020/08/7984.html
The entropic risk measure as described by:
Dowson, O., Morton, D.P. & Pagnoncelli, B.K. Incorporating convex risk
measures into multistage stochastic programming algorithms. Annals of
Operations Research (2022). [doi](https://doi.org/10.1007/s10479-022-04977-w).
As γ increases, the measure becomes more risk-averse.
"""
Expand Down

2 comments on commit ed85827

@odow
Copy link
Owner Author

@odow odow commented on ed85827 Dec 17, 2022

Choose a reason for hiding this comment

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

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

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

Registration pull request created: JuliaRegistries/General/74273

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v0.4.7 -m "<description of version>" ed85827e85895ae7f3233d13a8bc4836db4fb56a
git push origin v0.4.7

Please sign in to comment.