Skip to content

Commit d0cd1e3

Browse files
committed
fix: fix rocket launch test
1 parent bcbd593 commit d0cd1e3

File tree

2 files changed

+11
-16
lines changed

2 files changed

+11
-16
lines changed

ext/MTKJuMPDynamicOptExt.jl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -265,12 +265,8 @@ function add_infopt_solve_constraints!(model::InfiniteModel, sys, pmap; is_free_
265265
diffsubmap = Dict([D(U[i]) => (U[i], t) for i in 1:length(U)])
266266
tₛ = is_free_t ? model[:tf] : 1
267267

268-
@show diff_equations(sys)
269-
@show pmap
270268
diff_eqs = substitute_jump_vars(model, sys, pmap, diff_equations(sys))
271-
@show diff_eqs
272269
diff_eqs = map(e -> Symbolics.substitute(e, diffsubmap), diff_eqs)
273-
@show diff_eqs
274270
@constraint(model, D[i = 1:length(diff_eqs)], diff_eqs[i].lhs==tₛ * diff_eqs[i].rhs)
275271

276272
# Algebraic equations

test/downstream/jump_control.jl

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const M = ModelingToolkit
2525
# Test explicit method.
2626
jprob = JuMPDynamicOptProblem(sys, u0map, tspan, parammap, dt = 0.01)
2727
@test JuMP.num_constraints(jprob.model) == 2 # initials
28-
jsol = solve(jprob, Ipopt.Optimizer, :RK4)
28+
jsol = solve(jprob, Ipopt.Optimizer, :RK4, silent = true)
2929
oprob = ODEProblem(sys, u0map, tspan, parammap)
3030
osol = solve(oprob, SimpleRK4(), dt = 0.01)
3131
@test jsol.sol.u osol.u
@@ -104,7 +104,7 @@ end
104104
tspan = (0.0, 1.0)
105105
parammap = [u(t) => 0.0]
106106
jprob = JuMPDynamicOptProblem(block, u0map, tspan, parammap; dt = 0.01)
107-
jsol = solve(jprob, Ipopt.Optimizer, :Verner8)
107+
jsol = solve(jprob, Ipopt.Optimizer, :Verner8, silent = true)
108108
# Linear systems have bang-bang controls
109109
@test is_bangbang(jsol.input_sol, [-1.0], [1.0])
110110
# Test reached final position.
@@ -142,7 +142,7 @@ end
142142
pmap = [b => 1, c => 1, μ => 1, s => 1, ν => 1, α => 1]
143143

144144
jprob = JuMPDynamicOptProblem(beesys, u0map, tspan, pmap, dt = 0.01)
145-
jsol = solve(jprob, Ipopt.Optimizer, :Tsitouras5)
145+
jsol = solve(jprob, Ipopt.Optimizer, :Tsitouras5, silent = true)
146146
@test is_bangbang(jsol.input_sol, [0.0], [1.0])
147147
iprob = InfiniteOptDynamicOptProblem(beesys, u0map, tspan, pmap, dt = 0.01)
148148
isol = solve(iprob, Ipopt.Optimizer; silent = true)
@@ -191,9 +191,8 @@ end
191191
@test jsol.sol.u[end][1] > 1.012
192192

193193
iprob = InfiniteOptDynamicOptProblem(
194-
rocket, u0map, (ts, te), pmap; dt = 0.001, cse = false)
195-
isol = solve(iprob, Ipopt.Optimizer,
196-
derivative_method = InfiniteOpt.OrthogonalCollocation(3), silent = true)
194+
rocket, u0map, (ts, te), pmap; dt = 0.001)
195+
isol = solve(iprob, Ipopt.Optimizer, silent = true)
197196
@test isol.sol.u[end][1] > 1.012
198197

199198
# Test solution
@@ -209,8 +208,8 @@ end
209208

210209
interpmap1 = Dict(T_interp => ctrl_to_spline(isol.input_sol, CubicSpline))
211210
oprob1 = ODEProblem(rocket_ode, u0map, (ts, te), merge(Dict(pmap), interpmap1))
212-
osol1 = solve(oprob1, RadauIIA5(); adaptive = false, dt = 0.001)
213-
@test (isol.sol.u, osol1.u, rtol = 0.02)
211+
osol1 = solve(oprob1, ImplicitEuler(); adaptive = false, dt = 0.001)
212+
@test (isol.sol.u, osol1.u, rtol = 0.01)
214213
end
215214

216215
@testset "Free final time problems" begin
@@ -229,11 +228,11 @@ end
229228
u0map = [x(t) => 17.5]
230229
pmap = [u(t) => 0.0, tf => 8]
231230
jprob = JuMPDynamicOptProblem(rocket, u0map, (0, tf), pmap; steps = 201)
232-
jsol = solve(jprob, Ipopt.Optimizer, :Tsitouras5)
231+
jsol = solve(jprob, Ipopt.Optimizer, :Tsitouras5, silent = true)
233232
@test isapprox(jsol.sol.t[end], 10.0, rtol = 1e-3)
234233

235234
iprob = InfiniteOptDynamicOptProblem(rocket, u0map, (0, tf), pmap; steps = 200)
236-
isol = solve(iprob, Ipopt.Optimizer)
235+
isol = solve(iprob, Ipopt.Optimizer, silent = true)
237236
@test isapprox(isol.sol.t[end], 10.0, rtol = 1e-3)
238237

239238
@variables x(..) v(..)
@@ -288,10 +287,10 @@ end
288287
u0map = [D(x(t)) => 0.0, D(θ(t)) => 0.0, θ(t) => 0.0, x(t) => 0.0]
289288
pmap = [mₖ => 1.0, mₚ => 0.2, l => 0.5, g => 9.81, u => 0]
290289
jprob = JuMPDynamicOptProblem(cartpole, u0map, tspan, pmap; dt = 0.04)
291-
jsol = solve(jprob, Ipopt.Optimizer, :RK4)
290+
jsol = solve(jprob, Ipopt.Optimizer, :RK4, silent = true)
292291
@test jsol.sol.u[end] [π, 0, 0, 0]
293292

294293
iprob = InfiniteOptDynamicOptProblem(cartpole, u0map, tspan, pmap; dt = 0.04)
295-
isol = solve(iprob, Ipopt.Optimizer)
294+
isol = solve(iprob, Ipopt.Optimizer, silent = true)
296295
@test isol.sol.u[end] [π, 0, 0, 0]
297296
end

0 commit comments

Comments
 (0)