From 796fa477c7c139ff5f1e3c4fb6f072df4f49e64e Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Wed, 13 Dec 2023 09:21:35 +1300 Subject: [PATCH 1/7] [docs] mention extensions in relevant tutorials --- docs/src/tutorials/nonlinear/nested_problems.jl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/src/tutorials/nonlinear/nested_problems.jl b/docs/src/tutorials/nonlinear/nested_problems.jl index 54865d05c13..77b473486ff 100644 --- a/docs/src/tutorials/nonlinear/nested_problems.jl +++ b/docs/src/tutorials/nonlinear/nested_problems.jl @@ -32,6 +32,10 @@ # For a simpler example of writing a user-defined operator, # see the [User-defined Hessians](@ref) tutorial. +# !!! info +# The JuMP extension [BilevelJuMP.jl](@ref) can also be used to model and +# solve bilevel optimization problems. + # This tutorial uses the following packages: using JuMP From b92f660d0e63fa50c2bfa34ce6e5cc23c47635de Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Wed, 13 Dec 2023 09:23:16 +1300 Subject: [PATCH 2/7] Update rocket_control.jl --- docs/src/tutorials/nonlinear/rocket_control.jl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/src/tutorials/nonlinear/rocket_control.jl b/docs/src/tutorials/nonlinear/rocket_control.jl index 0a2c5127998..c2eccce031d 100644 --- a/docs/src/tutorials/nonlinear/rocket_control.jl +++ b/docs/src/tutorials/nonlinear/rocket_control.jl @@ -12,6 +12,10 @@ # The example is an optimal control problem of a nonlinear rocket. +# !!! info +# The JuMP extension [InfiniteOpt.jl](/packages/InfiniteOpt) can also be +# used to model and solve optimal control problems. + # This tutorial uses the following packages: using JuMP From e25db7f6428e86358bacc0b25fa996019eb68102 Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Wed, 13 Dec 2023 09:23:56 +1300 Subject: [PATCH 3/7] Update space_shuttle_reentry_trajectory.jl --- .../tutorials/nonlinear/space_shuttle_reentry_trajectory.jl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/src/tutorials/nonlinear/space_shuttle_reentry_trajectory.jl b/docs/src/tutorials/nonlinear/space_shuttle_reentry_trajectory.jl index 638c7e1d8f0..4796ffe271b 100644 --- a/docs/src/tutorials/nonlinear/space_shuttle_reentry_trajectory.jl +++ b/docs/src/tutorials/nonlinear/space_shuttle_reentry_trajectory.jl @@ -31,6 +31,10 @@ # ["Practical Methods for Optimal Control and Estimation Using Nonlinear Programming"](https://epubs.siam.org/doi/book/10.1137/1.9780898718577), # by John T. Betts. +# !!! info +# The JuMP extension [InfiniteOpt.jl](/packages/InfiniteOpt) can also be +# used to model and solve optimal control problems. + # !!! tip # This tutorial is a more-complicated version of the [Rocket Control](@ref) example. # If you are new to solving nonlinear programs in JuMP, you may want to start there instead. From cef6d8358ee52847fab32b403679a9fbada6c05c Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Wed, 13 Dec 2023 10:03:06 +1300 Subject: [PATCH 4/7] Apply suggestions from code review --- docs/src/tutorials/nonlinear/rocket_control.jl | 2 +- .../src/tutorials/nonlinear/space_shuttle_reentry_trajectory.jl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/src/tutorials/nonlinear/rocket_control.jl b/docs/src/tutorials/nonlinear/rocket_control.jl index c2eccce031d..d93392af419 100644 --- a/docs/src/tutorials/nonlinear/rocket_control.jl +++ b/docs/src/tutorials/nonlinear/rocket_control.jl @@ -13,7 +13,7 @@ # The example is an optimal control problem of a nonlinear rocket. # !!! info -# The JuMP extension [InfiniteOpt.jl](/packages/InfiniteOpt) can also be +# The JuMP extension [InfiniteOpt.jl](../../../packages/InfiniteOpt) can also be # used to model and solve optimal control problems. # This tutorial uses the following packages: diff --git a/docs/src/tutorials/nonlinear/space_shuttle_reentry_trajectory.jl b/docs/src/tutorials/nonlinear/space_shuttle_reentry_trajectory.jl index 4796ffe271b..8bbbf44a5e2 100644 --- a/docs/src/tutorials/nonlinear/space_shuttle_reentry_trajectory.jl +++ b/docs/src/tutorials/nonlinear/space_shuttle_reentry_trajectory.jl @@ -32,7 +32,7 @@ # by John T. Betts. # !!! info -# The JuMP extension [InfiniteOpt.jl](/packages/InfiniteOpt) can also be +# The JuMP extension [InfiniteOpt.jl](../../../packages/InfiniteOpt) can also be # used to model and solve optimal control problems. # !!! tip From 4c76ecbc42158ebc7641756a399057f7844e0924 Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Wed, 13 Dec 2023 10:37:16 +1300 Subject: [PATCH 5/7] Apply suggestions from code review --- docs/src/tutorials/nonlinear/rocket_control.jl | 2 +- .../src/tutorials/nonlinear/space_shuttle_reentry_trajectory.jl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/src/tutorials/nonlinear/rocket_control.jl b/docs/src/tutorials/nonlinear/rocket_control.jl index d93392af419..75558920863 100644 --- a/docs/src/tutorials/nonlinear/rocket_control.jl +++ b/docs/src/tutorials/nonlinear/rocket_control.jl @@ -13,7 +13,7 @@ # The example is an optimal control problem of a nonlinear rocket. # !!! info -# The JuMP extension [InfiniteOpt.jl](../../../packages/InfiniteOpt) can also be +# The JuMP extension [InfiniteOpt.jl](../../packages/InfiniteOpt) can also be # used to model and solve optimal control problems. # This tutorial uses the following packages: diff --git a/docs/src/tutorials/nonlinear/space_shuttle_reentry_trajectory.jl b/docs/src/tutorials/nonlinear/space_shuttle_reentry_trajectory.jl index 8bbbf44a5e2..4deeafc73fa 100644 --- a/docs/src/tutorials/nonlinear/space_shuttle_reentry_trajectory.jl +++ b/docs/src/tutorials/nonlinear/space_shuttle_reentry_trajectory.jl @@ -32,7 +32,7 @@ # by John T. Betts. # !!! info -# The JuMP extension [InfiniteOpt.jl](../../../packages/InfiniteOpt) can also be +# The JuMP extension [InfiniteOpt.jl](../../packages/InfiniteOpt) can also be # used to model and solve optimal control problems. # !!! tip From 06c5fb78044e5c25bdbb227831ce602f86caed02 Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Wed, 13 Dec 2023 13:24:31 +1300 Subject: [PATCH 6/7] Apply suggestions from code review --- docs/src/tutorials/nonlinear/nested_problems.jl | 2 +- docs/src/tutorials/nonlinear/rocket_control.jl | 2 +- .../src/tutorials/nonlinear/space_shuttle_reentry_trajectory.jl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/src/tutorials/nonlinear/nested_problems.jl b/docs/src/tutorials/nonlinear/nested_problems.jl index 77b473486ff..96eae79bf5e 100644 --- a/docs/src/tutorials/nonlinear/nested_problems.jl +++ b/docs/src/tutorials/nonlinear/nested_problems.jl @@ -33,7 +33,7 @@ # see the [User-defined Hessians](@ref) tutorial. # !!! info -# The JuMP extension [BilevelJuMP.jl](@ref) can also be used to model and +# The JuMP extension [BilevelJuMP.jl](./../packages/BilevelJuMP) can also be used to model and # solve bilevel optimization problems. # This tutorial uses the following packages: diff --git a/docs/src/tutorials/nonlinear/rocket_control.jl b/docs/src/tutorials/nonlinear/rocket_control.jl index 75558920863..09705b8647a 100644 --- a/docs/src/tutorials/nonlinear/rocket_control.jl +++ b/docs/src/tutorials/nonlinear/rocket_control.jl @@ -13,7 +13,7 @@ # The example is an optimal control problem of a nonlinear rocket. # !!! info -# The JuMP extension [InfiniteOpt.jl](../../packages/InfiniteOpt) can also be +# The JuMP extension [InfiniteOpt.jl](./../../packages/InfiniteOpt) can also be # used to model and solve optimal control problems. # This tutorial uses the following packages: diff --git a/docs/src/tutorials/nonlinear/space_shuttle_reentry_trajectory.jl b/docs/src/tutorials/nonlinear/space_shuttle_reentry_trajectory.jl index 4deeafc73fa..ce2a95d34b1 100644 --- a/docs/src/tutorials/nonlinear/space_shuttle_reentry_trajectory.jl +++ b/docs/src/tutorials/nonlinear/space_shuttle_reentry_trajectory.jl @@ -32,7 +32,7 @@ # by John T. Betts. # !!! info -# The JuMP extension [InfiniteOpt.jl](../../packages/InfiniteOpt) can also be +# The JuMP extension [InfiniteOpt.jl](/../../packages/InfiniteOpt) can also be # used to model and solve optimal control problems. # !!! tip From 3bd428be266ee0c4367b8636b389904edf6e8054 Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Wed, 13 Dec 2023 15:33:42 +1300 Subject: [PATCH 7/7] Apply suggestions from code review Co-authored-by: Morten Piibeleht --- docs/src/tutorials/nonlinear/nested_problems.jl | 2 +- docs/src/tutorials/nonlinear/rocket_control.jl | 2 +- .../src/tutorials/nonlinear/space_shuttle_reentry_trajectory.jl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/src/tutorials/nonlinear/nested_problems.jl b/docs/src/tutorials/nonlinear/nested_problems.jl index 96eae79bf5e..5ee010472e3 100644 --- a/docs/src/tutorials/nonlinear/nested_problems.jl +++ b/docs/src/tutorials/nonlinear/nested_problems.jl @@ -33,7 +33,7 @@ # see the [User-defined Hessians](@ref) tutorial. # !!! info -# The JuMP extension [BilevelJuMP.jl](./../packages/BilevelJuMP) can also be used to model and +# The JuMP extension [BilevelJuMP.jl](../../packages/BilevelJuMP.md) can also be used to model and # solve bilevel optimization problems. # This tutorial uses the following packages: diff --git a/docs/src/tutorials/nonlinear/rocket_control.jl b/docs/src/tutorials/nonlinear/rocket_control.jl index 09705b8647a..33b3895b834 100644 --- a/docs/src/tutorials/nonlinear/rocket_control.jl +++ b/docs/src/tutorials/nonlinear/rocket_control.jl @@ -13,7 +13,7 @@ # The example is an optimal control problem of a nonlinear rocket. # !!! info -# The JuMP extension [InfiniteOpt.jl](./../../packages/InfiniteOpt) can also be +# The JuMP extension [InfiniteOpt.jl](../../packages/InfiniteOpt.md) can also be # used to model and solve optimal control problems. # This tutorial uses the following packages: diff --git a/docs/src/tutorials/nonlinear/space_shuttle_reentry_trajectory.jl b/docs/src/tutorials/nonlinear/space_shuttle_reentry_trajectory.jl index ce2a95d34b1..a62c1c7b305 100644 --- a/docs/src/tutorials/nonlinear/space_shuttle_reentry_trajectory.jl +++ b/docs/src/tutorials/nonlinear/space_shuttle_reentry_trajectory.jl @@ -32,7 +32,7 @@ # by John T. Betts. # !!! info -# The JuMP extension [InfiniteOpt.jl](/../../packages/InfiniteOpt) can also be +# The JuMP extension [InfiniteOpt.jl](../../packages/InfiniteOpt.md) can also be # used to model and solve optimal control problems. # !!! tip