Skip to content

broken -> not broken tests #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 6, 2024
+11 −15
Merged

broken -> not broken tests #24

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 11 additions & 15 deletions test/test_discrete_blocks.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,11 +164,9 @@ let (; c2d, tf, feedback, lsim) = CS
G = feedback(C, P)
res = lsim(G, (x, t) -> [0.5], timevec)
y = res.y[:]
@test_skip begin
@test_broken sol(timevec .+ 1e-10, idxs = model.plant.input.u)≈y rtol=1e-8 # Broken due to discrete observed
# plot([y sol(timevec .+ 1e-12, idxs=model.plant.input.u)], lab=["CS" "MTK"])
plot(timevec, [y sol(timevec .+ 1e-12, idxs = model.controller.u)[:]], m = :o, lab = ["CS" "MTK"])
end
@test sol(timevec, idxs = model.plant.input.u)≈y rtol=1e-8
# plot([y sol(timevec, idxs=model.plant.input.u).u], lab=["CS" "MTK"])
# plot(timevec, [y sol(timevec, idxs = model.controller.u)[:]], m = :o, lab = ["CS" "MTK"])
end
# ==============================================================================
## DiscretePIDStandard
Expand All @@ -183,7 +181,7 @@ k = ShiftIndex()
sampler = Sampler(; dt)
zoh = ZeroOrderHold()
controller = DiscretePIDStandard(
K = 2, Ti = 1, Imethod = :forward, with_D = false)
K = 2, Ti = 1, Imethod = :backward, with_D = false)
ref = Constant(k = 0.5)
end
@equations begin
Expand Down Expand Up @@ -226,16 +224,14 @@ let (; c2d, tf, feedback, lsim) = CS
# plot(timevec, [y sol(timevec, idxs = model.plant.output.u)[:]], m = :o, lab = ["CS" "MTK"])
# display(current())

@test_broken sol(timevec, idxs = model.plant.output.u)[:]≈y rtol=1e-6
@test sol(timevec, idxs = model.plant.output.u)[:]≈y rtol=1e-6

@test_skip begin
# Test the output of the discrete partition
G = feedback(C, P)
res = lsim(G, (x, t) -> [0.5], timevec)
y = res.y[:]
@test_broken sol(timevec .+ 1e-10, idxs = model.controller.output.u)≈y rtol=1e-8 # Broken due to discrete observed
# plot([y sol(timevec .+ 1e-12, idxs=model.controller.output.u)], lab=["CS" "MTK"])
end
# Test the output of the discrete partition
G = feedback(C, P)
res = lsim(G, (x, t) -> [0.5], timevec)
y = res.y[:]
@test_broken sol(timevec, idxs = model.controller.u)≈y rtol=1e-8 # Broken due to LLVM error: ERROR: KeyError: key shift(controller₊I, -1, false, nothing) not found
# plot([y sol(timevec .+ 1e-12, idxs=model.controller.u).u], lab=["CS" "MTK"])
end
# ==============================================================================
## Delay
Expand Down
Loading