11extract_idv (eq:: DiffEq ) = eq. D. x
22
3- function lower_varname (D:: Differential , x, naming_scheme ; lower= false )
3+ function lower_varname (D:: Differential , x; lower= false )
44 order = lower ? D. order- 1 : D. order
5- return lower_varname (x, D. x, order, naming_scheme )
5+ return lower_varname (x, D. x, order)
66end
7- function lower_varname (var:: Variable , idv, order:: Int , naming_scheme )
7+ function lower_varname (var:: Variable , idv, order:: Int )
88 sym = var. name
9- name = order == 0 ? sym : Symbol (sym, naming_scheme , string (idv. name)^ order)
9+ name = order == 0 ? sym : Symbol (sym, :_ , string (idv. name)^ order)
1010 return Variable (name, var. subtype, var. dependents)
1111end
1212
@@ -15,8 +15,8 @@ function ode_order_lowering(sys::DiffEqSystem; kwargs...)
1515 eqs_lowered = ode_order_lowering (eqs; kwargs... )
1616 DiffEqSystem (eqs_lowered, sys. iv)
1717end
18- ode_order_lowering (eqs; naming_scheme = " _ " ) = ode_order_lowering! (deepcopy (eqs), naming_scheme )
19- function ode_order_lowering! (eqs, naming_scheme )
18+ ode_order_lowering (eqs) = ode_order_lowering! (deepcopy (eqs))
19+ function ode_order_lowering! (eqs)
2020 idv = extract_idv (eqs[1 ])
2121 D = Differential (idv, 1 )
2222 var_order = Dict {Variable,Int} ()
@@ -30,15 +30,15 @@ function ode_order_lowering!(eqs, naming_scheme)
3030 var_order[var] = maxorder
3131 var ∈ vars || push! (vars, var)
3232 end
33- lhs_renaming! (eq, D, naming_scheme )
34- rhs_renaming! (eq, naming_scheme )
33+ lhs_renaming! (eq, D)
34+ rhs_renaming! (eq)
3535 end
3636
3737 for var ∈ vars
3838 order = var_order[var]
3939 for o in (order- 1 ): - 1 : 1
40- lvar = lower_varname (var, idv, o- 1 , naming_scheme )
41- rhs = lower_varname (var, idv, o, naming_scheme )
40+ lvar = lower_varname (var, idv, o- 1 )
41+ rhs = lower_varname (var, idv, o)
4242 eq = DiffEq (D, lvar, rhs)
4343 push! (eqs, eq)
4444 end
@@ -47,20 +47,20 @@ function ode_order_lowering!(eqs, naming_scheme)
4747 return eqs
4848end
4949
50- function lhs_renaming! (eq:: DiffEq , D, naming_scheme )
51- eq. var = lower_varname (eq. D, eq. var, naming_scheme, lower= true )
50+ function lhs_renaming! (eq:: DiffEq , D)
51+ eq. var = lower_varname (eq. D, eq. var, lower= true )
5252 eq. D = D
5353 return eq
5454end
55- rhs_renaming! (eq:: DiffEq , naming_scheme ) = _rec_renaming! (eq. rhs, naming_scheme )
55+ rhs_renaming! (eq:: DiffEq ) = _rec_renaming! (eq. rhs)
5656
57- function _rec_renaming! (rhs, naming_scheme )
57+ function _rec_renaming! (rhs)
5858 isa (rhs, Operation) && isa (rhs. op, Differential) &&
59- return lower_varname (rhs. op, rhs. args[1 ], naming_scheme )
59+ return lower_varname (rhs. op, rhs. args[1 ])
6060 if rhs isa Operation
6161 args = rhs. args
6262 for i in eachindex (args)
63- args[i] = _rec_renaming! (args[i], naming_scheme )
63+ args[i] = _rec_renaming! (args[i])
6464 end
6565 end
6666 rhs
0 commit comments