Skip to content

Commit 6467291

Browse files
committed
make scalarizing a keyword
1 parent bac1091 commit 6467291

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

src/dsl.jl

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -370,9 +370,11 @@ function make_reaction_system(ex::Expr; name = :(gensym(:ReactionSystem)))
370370
vexprs = get_sexpr(vars_extracted, options, :variables; iv_symbols = ivs)
371371
pexprs = get_pexpr(parameters_extracted, options)
372372
ps, pssym = assign_expr_to_var(!isempty(parameters), pexprs, "ps")
373-
vars, varssym = assign_expr_to_var(!isempty(variables), vexprs, "vars", true)
374-
sps, spssym = assign_expr_to_var(!isempty(species), sexprs, "specs", true)
375-
comps, compssym = assign_expr_to_var(!isempty(compound_species), compound_expr, "comps", true)
373+
vars, varssym = assign_expr_to_var(!isempty(variables), vexprs, "vars";
374+
scalarize = true)
375+
sps, spssym = assign_expr_to_var(!isempty(species), sexprs, "specs"; scalarize = true)
376+
comps, compssym = assign_expr_to_var(!isempty(compound_species), compound_expr,
377+
"comps"; scalarize = true)
376378
rxexprs = :(CatalystEqType[])
377379
for reaction in reactions
378380
push!(rxexprs.args, get_rxexprs(reaction))
@@ -591,9 +593,9 @@ function get_rxexprs(rxstruct)
591593
end
592594

593595
# takes a ModelingToolkit declaration macro like @parameters and returns an expression
594-
# that calls the macro and saves it in a variable named namesym.
595-
# also scalarizes if desired
596-
function assign_expr_to_var(nonempty, ex, name, scalarize = false)
596+
# that calls the macro and saves it in a variable given by namesym based on name.
597+
# scalarizes if desired
598+
function assign_expr_to_var(nonempty, ex, name; scalarize = false)
597599
namesym = gensym(name)
598600
if nonempty
599601
if scalarize

0 commit comments

Comments
 (0)