Skip to content

Commit 16a3288

Browse files
committed
Expand observed equations into lhs => rhs defaults, but flip if lhs is given
1 parent f5378df commit 16a3288

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

src/systems/diffeqs/abstractodesystem.jl

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -725,10 +725,16 @@ function get_u0(
725725
defs = mergedefaults(defs, parammap, ps)
726726
end
727727

728-
obs = filter!(x -> !(x[1] isa Number),
729-
map(x -> isparameter(x.rhs) ? x.lhs => x.rhs : x.rhs => x.lhs, observed(sys)))
730-
observedmap = isempty(obs) ? Dict() : todict(obs)
731-
defs = mergedefaults(defs, observedmap, u0map, dvs)
728+
# Convert observed equations "lhs ~ rhs" into defaults.
729+
# Use the order "lhs => rhs" by default, but flip it to "rhs => lhs"
730+
# if "lhs" is known by other means (parameter, another default, ...)
731+
# TODO: Is there a better way to determine which equations to flip?
732+
obs = map(x -> x.lhs => x.rhs, observed(sys))
733+
obs = map(x -> isparameter(x[1]) || x[1] in keys(defs) ? reverse(x) : x, obs)
734+
obs = filter!(x -> !(x[1] isa Number), obs) # exclude e.g. "0 => x^2 + y^2 - 25"
735+
obsmap = isempty(obs) ? Dict() : todict(obs)
736+
737+
defs = mergedefaults(defs, obsmap, u0map, dvs)
732738
if symbolic_u0
733739
u0 = varmap_to_vars(
734740
u0map, dvs; defaults = defs, tofloat = false, use_union = false, toterm)

0 commit comments

Comments
 (0)