Skip to content
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

fix: fix getu with parameter symbols #55

Merged
merged 2 commits into from
Mar 9, 2024
Merged

fix: fix getu with parameter symbols #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e7497f
fix: fix `getu` with parameter symbols
AayushSabharwal Mar 8, 2024
ad18dbf
test: test `getu` with parameter symbols and parameter timeseries
AayushSabharwal Mar 8, 2024
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
12 changes: 10 additions & 2 deletions src/state_indexing.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,16 @@
return getu(sys, idx)
elseif is_parameter(sys, sym)
return let fn = getp(sys, sym)
getter(prob, args...) = fn(prob)
getter
_getter_p(::NotTimeseries, prob) = fn(prob)
function _getter_p(::Timeseries, prob)
[fn(parameter_values_at_state_time(prob, i))

Check warning on line 100 in src/state_indexing.jl

View check run for this annotation

Codecov / codecov/patch

src/state_indexing.jl#L98-L100 

Added lines #L98 - L100 were not covered by tests
for i in eachindex(current_time(prob))]
end
_getter_p(::Timeseries, prob, i) = fn(parameter_values_at_state_time(prob, i))
let _getter = _getter_p
getter(prob, args...) = _getter(is_timeseries(prob), prob, args...)
getter

Check warning on line 106 in src/state_indexing.jl

View check run for this annotation

Codecov / codecov/patch

src/state_indexing.jl#L103-L106 

Added lines #L103 - L106 were not covered by tests
end
end
elseif is_independent_variable(sys, sym)
_getter(::IsTimeseriesTrait, prob) = current_time(prob)
Expand Down
19 changes: 19 additions & 0 deletions test/parameter_indexing_test.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@ end
function Base.getproperty(fs::FakeSolution, s::Symbol)
s === :ps ? ParameterIndexingProxy(fs) : getfield(fs, s)
end
SymbolicIndexingInterface.state_values(fs::FakeSolution) = fs.u
SymbolicIndexingInterface.current_time(fs::FakeSolution) = fs.t
SymbolicIndexingInterface.symbolic_container(fs::FakeSolution) = fs.sys
SymbolicIndexingInterface.parameter_values(fs::FakeSolution) = fs.p[end]
SymbolicIndexingInterface.parameter_values(fs::FakeSolution, i) = fs.p[end][i]
Expand Down Expand Up @@ -149,3 +151,20 @@ for (sym, val, arrval, check_inference) in [
@test get(fs, sub_inds) == arrval[sub_inds]
end
end

ps = fs.p[2:2:end]
avals = getindex.(ps, 1)
bvals = getindex.(ps, 2)
cvals = getindex.(ps, 3)
for (sym, val, arrval) in [
(:a, p[1], avals),
((:b, :c), p[2:3], tuple.(bvals, cvals)),
([:c, :a], p[[3, 1]], vcat.(cvals, avals))
]
get = getu(sys, sym)
@inferred get(fs)
@test get(fs) == arrval
for i in eachindex(ps)
@test get(fs, i) == arrval[i]
end
end
Loading