@@ -337,42 +337,42 @@ JuMP.unset_time_limit_sec(nmpc_madnlp_ss.optim)
337337samples, evals, seconds = 100 , 1 , 15 * 60
338338CASE_MPC[" Pendulum" ][" NonLinMPC" ][" Noneconomic" ][" Ipopt" ][" SingleShooting" ] =
339339 @benchmarkable (
340- sim! ($ nmpc_ipopt_ss, $ N, $ ry; plant= $ plant, x_0= $ x_0, x̂_0= $ x̂_0),
340+ sim! ($ nmpc_ipopt_ss, $ N, $ ry; plant= $ plant, x_0= $ x_0, x̂_0= $ x̂_0, progress = false ),
341341 samples= samples, evals= evals, seconds= seconds
342342 )
343343CASE_MPC[" Pendulum" ][" NonLinMPC" ][" Noneconomic" ][" Ipopt" ][" SingleShooting (Hessian)" ] =
344344 @benchmarkable (
345- sim! ($ nmpc_ipopt_ss_hess, $ N, $ ry; plant= $ plant, x_0= $ x_0, x̂_0= $ x̂_0),
345+ sim! ($ nmpc_ipopt_ss_hess, $ N, $ ry; plant= $ plant, x_0= $ x_0, x̂_0= $ x̂_0, progress = false ),
346346 samples= samples, evals= evals, seconds= seconds
347347 )
348348CASE_MPC[" Pendulum" ][" NonLinMPC" ][" Noneconomic" ][" Ipopt" ][" MultipleShooting" ] =
349349 @benchmarkable (
350- sim! ($ nmpc_ipopt_ms, $ N, $ ry; plant= $ plant, x_0= $ x_0, x̂_0= $ x̂_0),
350+ sim! ($ nmpc_ipopt_ms, $ N, $ ry; plant= $ plant, x_0= $ x_0, x̂_0= $ x̂_0, progress = false ),
351351 samples= samples, evals= evals, seconds= seconds
352352 )
353353CASE_MPC[" Pendulum" ][" NonLinMPC" ][" Noneconomic" ][" Ipopt" ][" MultipleShooting (Hessian)" ] =
354354 @benchmarkable (
355- sim! ($ nmpc_ipopt_ms_hess, $ N, $ ry; plant= $ plant, x_0= $ x_0, x̂_0= $ x̂_0),
355+ sim! ($ nmpc_ipopt_ms_hess, $ N, $ ry; plant= $ plant, x_0= $ x_0, x̂_0= $ x̂_0, progress = false ),
356356 samples= samples, evals= evals, seconds= seconds
357357 )
358358CASE_MPC[" Pendulum" ][" NonLinMPC" ][" Noneconomic" ][" Ipopt" ][" MultipleShooting (threaded)" ] =
359359 @benchmarkable (
360- sim! ($ nmpc_ipopt_mst, $ N, $ ry; plant= $ plant, x_0= $ x_0, x̂_0= $ x̂_0),
360+ sim! ($ nmpc_ipopt_mst, $ N, $ ry; plant= $ plant, x_0= $ x_0, x̂_0= $ x̂_0, progress = false ),
361361 samples= samples, evals= evals, seconds= seconds
362362 )
363363CASE_MPC[" Pendulum" ][" NonLinMPC" ][" Noneconomic" ][" Ipopt" ][" TrapezoidalCollocation" ] =
364364 @benchmarkable (
365- sim! ($ nmpc_ipopt_tc, $ N, $ ry; plant= $ plant, x_0= $ x_0, x̂_0= $ x̂_0),
365+ sim! ($ nmpc_ipopt_tc, $ N, $ ry; plant= $ plant, x_0= $ x_0, x̂_0= $ x̂_0, progress = false ),
366366 samples= samples, evals= evals, seconds= seconds
367367 )
368368CASE_MPC[" Pendulum" ][" NonLinMPC" ][" Noneconomic" ][" Ipopt" ][" TrapezoidalCollocation (threaded)" ] =
369369 @benchmarkable (
370- sim! ($ nmpc_ipopt_tct, $ N, $ ry; plant= $ plant, x_0= $ x_0, x̂_0= $ x̂_0),
370+ sim! ($ nmpc_ipopt_tct, $ N, $ ry; plant= $ plant, x_0= $ x_0, x̂_0= $ x̂_0, progress = false ),
371371 samples= samples, evals= evals, seconds= seconds
372372 )
373373CASE_MPC[" Pendulum" ][" NonLinMPC" ][" Noneconomic" ][" MadNLP" ][" SingleShooting" ] =
374374 @benchmarkable (
375- sim! ($ nmpc_madnlp_ss, $ N, $ ry; plant= $ plant, x_0= $ x_0, x̂_0= $ x̂_0),
375+ sim! ($ nmpc_madnlp_ss, $ N, $ ry; plant= $ plant, x_0= $ x_0, x̂_0= $ x̂_0, progress = false ),
376376 samples= samples, evals= evals, seconds= seconds
377377 )
378378
@@ -418,22 +418,22 @@ JuMP.unset_time_limit_sec(empc_madnlp_ss.optim)
418418samples, evals, seconds = 100 , 1 , 15 * 60
419419CASE_MPC[" Pendulum" ][" NonLinMPC" ][" Economic" ][" Ipopt" ][" SingleShooting" ] =
420420 @benchmarkable (
421- sim! ($ empc_ipopt_ss, $ N, $ ry; plant= $ plant2, x_0= $ x_0, x̂_0= $ x̂_0),
421+ sim! ($ empc_ipopt_ss, $ N, $ ry; plant= $ plant2, x_0= $ x_0, x̂_0= $ x̂_0, progress = false ),
422422 samples= samples, evals= evals, seconds= seconds
423423 )
424424CASE_MPC[" Pendulum" ][" NonLinMPC" ][" Economic" ][" Ipopt" ][" MultipleShooting" ] =
425425 @benchmarkable (
426- sim! ($ empc_ipopt_ms, $ N, $ ry; plant= $ plant2, x_0= $ x_0, x̂_0= $ x̂_0),
426+ sim! ($ empc_ipopt_ms, $ N, $ ry; plant= $ plant2, x_0= $ x_0, x̂_0= $ x̂_0, progress = false ),
427427 samples= samples, evals= evals, seconds= seconds
428428 )
429429CASE_MPC[" Pendulum" ][" NonLinMPC" ][" Economic" ][" Ipopt" ][" TrapezoidalCollocation" ] =
430430 @benchmarkable (
431- sim! ($ empc_ipopt_tc, $ N, $ ry; plant= $ plant2, x_0= $ x_0, x̂_0= $ x̂_0),
431+ sim! ($ empc_ipopt_tc, $ N, $ ry; plant= $ plant2, x_0= $ x_0, x̂_0= $ x̂_0, progress = false ),
432432 samples= samples, evals= evals, seconds= seconds
433433 )
434434CASE_MPC[" Pendulum" ][" NonLinMPC" ][" Economic" ][" MadNLP" ][" SingleShooting" ] =
435435 @benchmarkable (
436- sim! ($ empc_madnlp_ss, $ N, $ ry; plant= $ plant2, x_0= $ x_0, x̂_0= $ x̂_0),
436+ sim! ($ empc_madnlp_ss, $ N, $ ry; plant= $ plant2, x_0= $ x_0, x̂_0= $ x̂_0, progress = false ),
437437 samples= samples, evals= evals, seconds= seconds
438438 )
439439
@@ -484,17 +484,17 @@ JuMP.unset_time_limit_sec(nmpc2_ipopt_tc.optim)
484484samples, evals, seconds = 100 , 1 , 15 * 60
485485CASE_MPC[" Pendulum" ][" NonLinMPC" ][" Custom constraints" ][" Ipopt" ][" SingleShooting" ] =
486486 @benchmarkable (
487- sim! ($ nmpc2_ipopt_ss, $ N, $ ry; plant= $ plant2, x_0= $ x_0, x̂_0= $ x̂_0),
487+ sim! ($ nmpc2_ipopt_ss, $ N, $ ry; plant= $ plant2, x_0= $ x_0, x̂_0= $ x̂_0), progress = false ,
488488 samples= samples, evals= evals, seconds= seconds
489489 )
490490CASE_MPC[" Pendulum" ][" NonLinMPC" ][" Custom constraints" ][" Ipopt" ][" MultipleShooting" ] =
491491 @benchmarkable (
492- sim! ($ nmpc2_ipopt_ms, $ N, $ ry; plant= $ plant2, x_0= $ x_0, x̂_0= $ x̂_0),
492+ sim! ($ nmpc2_ipopt_ms, $ N, $ ry; plant= $ plant2, x_0= $ x_0, x̂_0= $ x̂_0, progress = false ),
493493 samples= samples, evals= evals, seconds= seconds
494494 )
495495CASE_MPC[" Pendulum" ][" NonLinMPC" ][" Custom constraints" ][" Ipopt" ][" TrapezoidalCollocation" ] =
496496 @benchmarkable (
497- sim! ($ nmpc2_ipopt_tc, $ N, $ ry; plant= $ plant2, x_0= $ x_0, x̂_0= $ x̂_0),
497+ sim! ($ nmpc2_ipopt_tc, $ N, $ ry; plant= $ plant2, x_0= $ x_0, x̂_0= $ x̂_0, progress = false ),
498498 samples= samples, evals= evals, seconds= seconds
499499 )
500500
0 commit comments