@@ -296,7 +296,7 @@ function make_reaction_system(ex::Expr, name)
296
296
species_declared = [extract_syms (options, :species ); compound_species]
297
297
parameters_declared = extract_syms (options, :parameters )
298
298
variables_declared = extract_syms (options, :variables )
299
- vars_extracted, add_default_diff, equations = read_equations_options (options,
299
+ vars_extracted, add_default_diff, equations = read_equations_options (options,
300
300
variables_declared)
301
301
302
302
# Extracts all reactions. Extracts all parameters, species, and variables of the system and
@@ -314,9 +314,9 @@ function make_reaction_system(ex::Expr, name)
314
314
tiv, sivs, ivs, ivexpr = read_ivs_option (options)
315
315
continuous_events_expr = read_events_option (options, :continuous_events )
316
316
discrete_events_expr = read_events_option (options, :discrete_events )
317
- observed_expr, observed_eqs, obs_syms = read_observed_options (options,
317
+ observed_expr, observed_eqs, obs_syms = read_observed_options (options,
318
318
[species_declared; variables], ivs)
319
- diffexpr = create_differential_expr (options, add_default_diff,
319
+ diffexpr = create_differential_expr (options, add_default_diff,
320
320
[species; parameters; variables], tiv)
321
321
default_reaction_metadata = read_default_noise_scaling_option (options)
322
322
combinatoric_ratelaws = read_combinatoric_ratelaws_option (options)
424
424
425
425
# Takes a reaction line and creates reaction(s) from it and pushes those to the reaction vector.
426
426
# Used to create multiple reactions from bundled reactions (like `k, (X,Y) --> 0`).
427
- function push_reactions! (reactions:: Vector{ReactionInternal} , subs:: ExprValues ,
427
+ function push_reactions! (reactions:: Vector{ReactionInternal} , subs:: ExprValues ,
428
428
prods:: ExprValues , rate:: ExprValues , metadata:: ExprValues , arrow:: Symbol )
429
429
# The rates, substrates, products, and metadata may be in a tuple form (e.g. `k, (X,Y) --> 0`).
430
430
# This finds these tuples' lengths (or 1 for non-tuple forms). Inconsistent lengths yield error.
@@ -802,9 +802,9 @@ function read_observed_options(options, species_n_vars_declared, ivs_sorted)
802
802
# Adds a line to the `observed_expr` expression, setting the ivs for this observable.
803
803
# Cannot extract directly using e.g. "getfield.(dependants_structs, :reactant)" because
804
804
# then we get something like :([:X1, :X2]), rather than :([X1, X2]).
805
- dep_var_expr = :(filter (! MT. isparameter,
805
+ dep_var_expr = :(filter (! MT. isparameter,
806
806
Symbolics. get_variables ($ (obs_eq. args[3 ]))))
807
- ivs_get_expr = :(unique (reduce (vcat,
807
+ ivs_get_expr = :(unique (reduce (vcat,
808
808
[arguments (MT. unwrap (dep)) for dep in $ dep_var_expr])))
809
809
sort_func (iv) = findfirst (MT. getname (iv) == ivs for ivs in ivs_sorted)
810
810
ivs_get_expr_sorted = :(sort ($ (ivs_get_expr); by = sort_func))
0 commit comments