Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/identifiable_functions.jl
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ function _find_identifiable_functions(
priority_variables = [parent_ring_change(p, bring) for p in ode.parameters],
)
else
id_funcs_fracs = dennums_to_fractions(id_funcs)
id_funcs_fracs = RationalFunctionFields.dennums_to_fractions(id_funcs)
end
id_funcs_fracs = [parent_ring_change(f, parent(ode)) for f in id_funcs_fracs]
_runtime_logger[:id_total] = (time_ns() - runtime_start) / 1.0e9
Expand Down
24 changes: 13 additions & 11 deletions src/known_ic.jl
Original file line number Diff line number Diff line change
Expand Up @@ -42,20 +42,22 @@ function _find_identifiable_functions_kic(
ode,
prob_threshold = half_p,
with_states = true,
simplify = simplify,
simplify = :absent,
rational_interpolator = rational_interpolator,
seed = seed,
)

id_funcs = simplified_generating_set(
RationalFunctionField(
vcat(id_funcs_general, [f // one(parent(ode)) for f in known_ic]),
),
prob_threshold = half_p,
seed = seed,
simplify = simplify,
rational_interpolator = rational_interpolator,
)
id_funcs = vcat(id_funcs_general, [f // one(parent(ode)) for f in known_ic])

if (simplify != :absent)
id_funcs = simplified_generating_set(
RationalFunctionField(id_funcs),
prob_threshold = half_p,
seed = seed,
simplify = simplify,
rational_interpolator = rational_interpolator,
)
end

@info "The search for identifiable functions with known initial conditions concluded in $((time_ns() - runtime_start) / 1.0e9) seconds"

Expand Down Expand Up @@ -89,7 +91,7 @@ function _assess_identifiability_kic(
funcs_to_check = vcat(ode.x_vars, ode.parameters)
end
half_p = 0.5 + prob_threshold / 2
id_funcs = _find_identifiable_functions_kic(ode, known_ic, prob_threshold = half_p)
id_funcs = _find_identifiable_functions_kic(ode, known_ic, prob_threshold = half_p, simplify = :absent)
#funcs_to_check = replace_with_ic(ode, funcs_to_check)
result = OrderedDict(f => :globally for f in funcs_to_check)

Expand Down
Loading