Skip to content

Avoid ambiguous generators in output saturation #536

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

Closed
ChrisRackauckas-Claude wants to merge 1 commit into from
Closed

Avoid ambiguous generators in output saturation #536

Show file tree
Hide file tree
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
13 changes: 10 additions & 3 deletions src/output_saturation.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,22 @@ function saturate_outputs(
lie_ders = lie_derivatives_up_to(ode, Dict(ode.y_equations[y] => ord for (y, ord) in orders))
@info "Degrees: $([(total_degree(numerator(f)), total_degree(denominator(f))) for f in lie_ders])"

current_y = RationalFunctionField(vcat(collect(values(ode.y_equations)), ode.u_vars, ode.parameters))
current_generators = [
f // 1 for
f in vcat(collect(values(ode.y_equations)), ode.u_vars, ode.parameters)
]
current_y = RationalFunctionField(current_generators)
lie_ders = filter(f -> total_degree_frac(f) <= max_deg, lie_ders)
sort!(lie_ders, lt = RationalFunctionFields.rational_function_cmp)
for f in lie_ders
if !first(RationalFunctionFields.check_algebraicity_modp(current_y, [f]))
current_y = RationalFunctionField(vcat(generators(current_y), [f]))
push!(current_generators, f)
current_y = RationalFunctionField(current_generators)
end
end
new_outputs = generators(current_y)[(length(ode.y_vars) + length(ode.u_vars) + length(ode.parameters) + 1):end]
new_outputs = current_generators[
(length(ode.y_vars) + length(ode.u_vars) + length(ode.parameters) + 1):end,
]

idx = 1
old_y_names = map(var_to_str, ode.y_vars)
Expand Down
11 changes: 11 additions & 0 deletions test/bodies/y_saturation.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,17 @@ include(joinpath(@__DIR__, "..", "shared", "test_setup.jl"))

if GROUP == "All" || GROUP == "Core"
@testset "Output saturation" begin
independent_derivative = @ODEmodel(
x'(t) = z(t),
z'(t) = 0,
y(t) = x(t) // a
)
saturated = saturate_outputs(
independent_derivative,
Dict(only(independent_derivative.y_vars) => 1),
)
@test length(saturated.y_vars) == 2

# full nfkb model from benchmarks
nfkb = @ODEmodel(
x1'(t) = k_prod - k_deg * x1(t) - k1 * x1(t) * u(t),
Expand Down
Loading