Skip to content

Commit 8674e51

Browse files
committed
Fix tests
1 parent 61fd2ce commit 8674e51

File tree

2 files changed

+22
-5
lines changed

2 files changed

+22
-5
lines changed

src/systems/abstractsystem.jl

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -242,9 +242,26 @@ function getvar(sys::AbstractSystem, name::Symbol; namespace=false)
242242
end
243243
end
244244

245-
avs = get_var_to_name(sys)
246-
v = get(avs, name, nothing)
247-
v === nothing || return namespace ? renamespace(sysname, v, name) : v
245+
if has_var_to_name(sys)
246+
avs = get_var_to_name(sys)
247+
v = get(avs, name, nothing)
248+
v === nothing || return namespace ? renamespace(sysname, v, name) : v
249+
250+
else
251+
sts = get_states(sys)
252+
i = findfirst(x->getname(x) == name, sts)
253+
if i !== nothing
254+
return namespace ? renamespace(sysname,sts[i]) : sts[i]
255+
end
256+
257+
if has_ps(sys)
258+
ps = get_ps(sys)
259+
i = findfirst(x->getname(x) == name,ps)
260+
if i !== nothing
261+
return namespace ? renamespace(sysname,ps[i]) : ps[i]
262+
end
263+
end
264+
end
248265

249266
sts = get_states(sys)
250267
i = findfirst(x->getname(x) == name, sts)

src/systems/jumps/jumpsystem.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ function JumpSystem(eqs, iv, states, ps;
9595

9696
states, ps = value.(states), value.(ps)
9797
var_to_name = Dict()
98-
process_variables!(var_to_name, defaults, dvs′)
99-
process_variables!(var_to_name, defaults, ps)
98+
process_variables!(var_to_name, defaults, states)
99+
process_variables!(var_to_name, defaults, ps)
100100

101101
JumpSystem{typeof(ap)}(ap, value(iv), states, ps, var_to_name, observed, name, systems, defaults, connection_type)
102102
end

0 commit comments

Comments
 (0)