Skip to content

Commit 998dfad

Browse files
committed
Fix contradictory bounds in test files
- test_onepass_fun.jl: fix overlapping bounds for ocp7 and ocp8 - test_onepass_exa.jl: fix contradictory equality/inequality constraints on variables, states, and controls
1 parent c61d14f commit 998dfad

2 files changed

Lines changed: 17 additions & 17 deletions

File tree

test/test_onepass_exa.jl

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ function test_onepass_exa()
77
l_scheme = [:euler, :euler_implicit, :midpoint, :trapeze]
88
#l_scheme = [:midpoint]
99
for scheme in l_scheme
10-
__test_onepass_exa(; scheme=scheme)
11-
CUDA.functional() && __test_onepass_exa(CUDABackend(); scheme=scheme)
10+
__test_onepass_exa(; scheme=scheme, print_level=MadNLP.WARN)
11+
CUDA.functional() && __test_onepass_exa(CUDABackend(); scheme=scheme, print_level=MadNLP.WARN)
1212
end
1313
end
1414

@@ -842,7 +842,7 @@ function __test_onepass_exa(
842842
(x₃)(t) == x₁(t)
843843
(x₄)(t) == x₁(t)
844844
x₁(0) == 1
845-
x[1:2:3](0) == [1, 2]
845+
x[1:2:3](0) == [1, 3]
846846
x[1:3](0) == [1, 2, 3]
847847
x(0) == [1, 2, 3, 4]
848848
x₁(0) + 2cos(x₂(tf)) min
@@ -855,7 +855,7 @@ function __test_onepass_exa(
855855
x R⁴, state
856856
u R, control
857857
x₁(tf) == 1
858-
x[1:2:3](tf) == [1, 2]
858+
x[1:2:3](tf) == [1, 3]
859859
x[1:3](tf) == [1, 2, 3]
860860
x(tf) == [1, 2, 3, 4]
861861
(x₁)(t) == x₁(t)
@@ -872,7 +872,7 @@ function __test_onepass_exa(
872872
x R⁴, state
873873
u R, control
874874
v₁ == 1
875-
v[1:2:3] == [1, 2]
875+
v[1:2:3] == [1, 3]
876876
v[1:3] == [1, 2, 3]
877877
v == [1, 2, 3, 4]
878878
(x₁)(t) == x₁(t)
@@ -888,7 +888,7 @@ function __test_onepass_exa(
888888
x R⁴, state
889889
u R, control
890890
x₁(t) == 1
891-
x[1:2:3](t) == [1, 2]
891+
x[1:2:3](t) == [1, 3]
892892
x[1:3](t) == [1, 2, 3]
893893
x(t) == [1, 2, 3, 4]
894894
(x₁)(t) == x₁(t)
@@ -904,9 +904,9 @@ function __test_onepass_exa(
904904
x R⁴, state
905905
u R⁵, control
906906
u₁(t) == 1
907-
u[2:2:4](t) == [1, 2]
908-
u[2:4](t) == [1, 2, 3]
909-
u(t) == [1, 2, 3, 4, 5]
907+
u[2:2:4](t) == [1, 4]
908+
u[2:4](t) == [1, 3, 4]
909+
u(t) == [1, 1, 3, 4, 5]
910910
(x₁)(t) == x₁(t)
911911
(x₂)(t) == x₁(t)
912912
(x₃)(t) == x₁(t)
@@ -927,13 +927,13 @@ function __test_onepass_exa(
927927
v[1:2] [1, 2]
928928
v[1:2] [1, 2]
929929
x[2](t) 1
930-
x[2:2:4](t) [1, 2]
930+
x[2:2:4](t) [1, 3]
931931
x[2:4](t) [1, 2, 3]
932932
x[2](t) 1
933933
x[2:2:4](t) [1, 2]
934934
x[2:4](t) [1, 2, 3]
935935
u[2](t) 1
936-
u[2:2:4](t) [1, 2]
936+
u[2:2:4](t) [1, 3]
937937
u[2:4](t) [1, 2, 3]
938938
u[2](t) 1
939939
u[2:2:4](t) [1, 2]

test/test_onepass_fun.jl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1727,8 +1727,8 @@ function test_onepass_fun()
17271727

17281728
# define more variables
17291729
u_b = 1.0
1730-
u_u = 2.0
1731-
u2_b = 3.0
1730+
u_u = 3.5
1731+
u2_b = 2.5
17321732
u2_u = 4.0
17331733
v_b = 5.0
17341734
v_u = 6.0
@@ -1760,10 +1760,10 @@ function test_onepass_fun()
17601760
n = 2
17611761
u_b = 1.0
17621762
u_u = 2.0
1763-
u2_b = 3.0
1764-
u2_u = 4.0
1765-
v_b = 5.0
1766-
v_u = 6.0
1763+
u2_b = 1.5
1764+
u2_u = 2.5
1765+
v_b = 1.5
1766+
v_u = 2.5
17671767
@def ocp8 begin
17681768
t [t0, tf], time
17691769
x R^n, state

0 commit comments

Comments
 (0)