Skip to content

Commit 57f45fb

Browse files
ChrisRackauckasChrisRackauckas
committed
change internal variable name
1 parent 91687d6 commit 57f45fb

File tree

3 files changed

+33
-33
lines changed

3 files changed

+33
-33
lines changed

‎src/func_builds.jl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ function build_jac_func(symjac,indvar_dict,param_dict,inline_dict;params_from_fu
88
else
99
ex = ode_symbol_findreplace(ex,indvar_dict,param_dict,inline_dict,params_from_function=params_from_function)
1010
end
11-
push!(Jex.args,:(___J[$i,$j] = $ex))
11+
push!(Jex.args,:(internal_var___J[$i,$j] = $ex))
1212
end
1313
end
1414
Jex.head = :block
@@ -25,7 +25,7 @@ function build_tgrad_func(symtgrad,indvar_dict,param_dict,inline_dict;params_fro
2525
else
2626
ex = ode_symbol_findreplace(ex,indvar_dict,param_dict,inline_dict,params_from_function=params_from_function)
2727
end
28-
push!(tgradex.args,:(___grad[$i] = $ex))
28+
push!(tgradex.args,:(internal_var___grad[$i] = $ex))
2929
end
3030
tgradex.head = :block
3131
push!(tgradex.args,nothing)
@@ -48,7 +48,7 @@ function build_p_funcs(paramfuncs,indvar_dict,param_dict,inline_dict)
4848
else
4949
ex = ode_symbol_findreplace(ex,indvar_dict,param_dict_drop_cur,inline_dict)
5050
end
51-
push!(pfunc.args,:(___du[$j] = $ex))
51+
push!(pfunc.args,:(internal_var___du[$j] = $ex))
5252
end
5353
pfunc.head = :block
5454
push!(pfunc.args,nothing)

‎src/ode_def_opts.jl‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ function ode_def_opts(name::Symbol,opts::Dict{Symbol,Bool},ex::Expr,params...;M=
2828
vector_ex_return = copy(origex) # Build it from the original expression
2929
ode_findreplace(vector_ex_return,copy(origex),indvar_dict,param_dict,inline_dict;
3030
vectorized_form=true,vectorized_returns=:vals)
31-
dus = [Symbol("___du$i") for i in 1:length(keys(indvar_dict))] # TODO: vectorized forms need @. to work
31+
dus = [Symbol("internal_var___du$i") for i in 1:length(keys(indvar_dict))] # TODO: vectorized forms need @. to work
3232
push!(vector_ex_return.args,:(hcat($(dus...)))) # Make the return void
3333

3434
######
@@ -241,35 +241,35 @@ function ode_def_opts(name::Symbol,opts::Dict{Symbol,Bool},ex::Expr,params...;M=
241241
push!(exprs,constructorex)
242242

243243
# Overload the Call
244-
overloadex = :(((___p::$name))(t::Number,___u,___du) = $fex) |> esc
244+
overloadex = :(((internal_var___p::$name))(t::Number,internal_var___u,internal_var___du) = $fex) |> esc
245245
push!(exprs,overloadex)
246246
# Value Dispatches for the Parameters
247247
params = param_syms
248248
for i in 1:length(params)
249249
param = Symbol(params[i])
250250
param_func = pfuncs[i]
251251
param_valtype = Val{param}
252-
overloadex = :(((___p::$name))(::Type{$param_valtype},t,___u,$param,___du) = $param_func) |> esc
252+
overloadex = :(((internal_var___p::$name))(::Type{$param_valtype},t,internal_var___u,$param,internal_var___du) = $param_func) |> esc
253253
push!(exprs,overloadex)
254254
end
255255

256256
# Build the Function
257-
overloadex = :(((___p::$name))(t::Number,___u,params,___du) = $pex) |> esc
257+
overloadex = :(((internal_var___p::$name))(t::Number,internal_var___u,params,internal_var___du) = $pex) |> esc
258258
push!(exprs,overloadex)
259259

260260
# Add a method which allocates the `du` and returns it instead of being inplace
261-
overloadex = :(((___p::$name))(t::Number,u) = (du=similar(u); ___p(t,u,du); du)) |> esc
261+
overloadex = :(((internal_var___p::$name))(t::Number,u) = (du=similar(u); internal_var___p(t,u,du); du)) |> esc
262262
push!(exprs,overloadex)
263263

264264
# Build the Vectorized functions
265-
overloadex = :(((___p::$name))(::Type{Val{:vec}},t::Number,___u,___du) = $vector_ex) |> esc
265+
overloadex = :(((internal_var___p::$name))(::Type{Val{:vec}},t::Number,internal_var___u,internal_var___du) = $vector_ex) |> esc
266266
push!(exprs,overloadex)
267267

268268
# Build the Vectorized functions
269-
overloadex = :(((___p::$name))(::Type{Val{:vec}},t::Number,___u) = $vector_ex_return) |> esc
269+
overloadex = :(((internal_var___p::$name))(::Type{Val{:vec}},t::Number,internal_var___u) = $vector_ex_return) |> esc
270270
push!(exprs,overloadex)
271271
#=
272-
overloadex = :(((___p::$name))(::Type{Val{:vec}},t::Number,u) = (du=similar(u); p(t,___u,du); du)) |> esc
272+
overloadex = :(((internal_var___p::$name))(::Type{Val{:vec}},t::Number,u) = (du=similar(u); p(t,internal_var___u,du); du)) |> esc
273273
push!(exprs,overloadex)
274274
=#
275275

@@ -279,57 +279,57 @@ function ode_def_opts(name::Symbol,opts::Dict{Symbol,Bool},ex::Expr,params...;M=
279279
param = Symbol(params[i])
280280
param_func = d_pfuncs[i]
281281
param_valtype = Val{param}
282-
overloadex = :(((___p::$name))(::Type{Val{:deriv}},::Type{$param_valtype},t,___u,$param,___du) = $param_func) |> esc
282+
overloadex = :(((internal_var___p::$name))(::Type{Val{:deriv}},::Type{$param_valtype},t,internal_var___u,$param,internal_var___du) = $param_func) |> esc
283283
push!(exprs,overloadex)
284284
end
285285
end
286286

287287
# Add the t gradient
288288
if tgrad_exists
289-
overloadex = :(((___p::$name))(::Type{Val{:tgrad}},t,___u,___grad) = $tgradex) |> esc
289+
overloadex = :(((internal_var___p::$name))(::Type{Val{:tgrad}},t,internal_var___u,internal_var___grad) = $tgradex) |> esc
290290
push!(exprs,overloadex)
291291
end
292292

293293
# Add the Jacobian
294294
if jac_exists
295-
overloadex = :(((___p::$name))(::Type{Val{:jac}},t,___u,___J) = $Jex) |> esc
295+
overloadex = :(((internal_var___p::$name))(::Type{Val{:jac}},t,internal_var___u,internal_var___J) = $Jex) |> esc
296296
push!(exprs,overloadex)
297-
overloadex = :(((___p::$name))(::Type{Val{:jac}},t::Number,u) = (J=similar(u, (length(u), length(u))); ___p(Val{:jac},t,u,J); J)) |> esc
297+
overloadex = :(((internal_var___p::$name))(::Type{Val{:jac}},t::Number,u) = (J=similar(u, (length(u), length(u))); internal_var___p(Val{:jac},t,u,J); J)) |> esc
298298
push!(exprs,overloadex)
299299
end
300300
# Add the Exponential Jacobian
301301
if expjac_exists
302-
overloadex = :(((___p::$name))(::Type{Val{:expjac}},t,___u,internal_γ,___J) = $expJex) |> esc
302+
overloadex = :(((internal_var___p::$name))(::Type{Val{:expjac}},t,internal_var___u,internal_γ,internal_var___J) = $expJex) |> esc
303303
push!(exprs,overloadex)
304304
end
305305
# Add the Inverse Jacobian
306306
if invjac_exists
307-
overloadex = :(((___p::$name))(::Type{Val{:invjac}},t,___u,___J) = $invJex) |> esc
307+
overloadex = :(((internal_var___p::$name))(::Type{Val{:invjac}},t,internal_var___u,internal_var___J) = $invJex) |> esc
308308
push!(exprs,overloadex)
309309
end
310310
# Add the Inverse Rosenbrock-W
311311
if invW_exists
312-
overloadex = :(((___p::$name))(::Type{Val{:invW}},t,___u,internal_γ,___J) = $invWex) |> esc
312+
overloadex = :(((internal_var___p::$name))(::Type{Val{:invW}},t,internal_var___u,internal_γ,internal_var___J) = $invWex) |> esc
313313
push!(exprs,overloadex)
314314
end
315315
# Add the Inverse Rosenbrock-W Transformed
316316
if invW_exists
317-
overloadex = :(((___p::$name))(::Type{Val{:invW_t}},t,___u,internal_γ,___J) = $invWex_t) |> esc
317+
overloadex = :(((internal_var___p::$name))(::Type{Val{:invW_t}},t,internal_var___u,internal_γ,internal_var___J) = $invWex_t) |> esc
318318
push!(exprs,overloadex)
319319
end
320320
# Add the Hessian
321321
if hes_exists
322-
overloadex = :(((___p::$name))(::Type{Val{:hes}},t,___u,___J) = $Hex) |> esc
322+
overloadex = :(((internal_var___p::$name))(::Type{Val{:hes}},t,internal_var___u,internal_var___J) = $Hex) |> esc
323323
push!(exprs,overloadex)
324324
end
325325
# Add the Inverse Hessian
326326
if invhes_exists
327-
overloadex = :(((___p::$name))(::Type{Val{:invhes}},t,___u,___J) = $invHex) |> esc
327+
overloadex = :(((internal_var___p::$name))(::Type{Val{:invhes}},t,internal_var___u,internal_var___J) = $invHex) |> esc
328328
push!(exprs,overloadex)
329329
end
330330
# Add Parameter Jacobian
331331
if param_jac_exists
332-
overloadex = :(((___p::$name))(::Type{Val{:paramjac}},t,___u,params,___J) = $param_Jex) |> esc
332+
overloadex = :(((internal_var___p::$name))(::Type{Val{:paramjac}},t,internal_var___u,params,internal_var___J) = $param_Jex) |> esc
333333
push!(exprs,overloadex)
334334
end
335335

‎src/ode_findrep.jl‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ function ode_findreplace(ex,symex,indvar_dict,param_dict,inline_dict;params_from
99
s = string(arg)
1010
if haskey(indvar_dict,arg)
1111
if vectorized_form
12-
ex.args[i] = :(___u[:,$(indvar_dict[arg])]) # replace with ___u[:,i]
12+
ex.args[i] = :(internal_var___u[:,$(indvar_dict[arg])]) # replace with internal_var___u[:,i]
1313
else
14-
ex.args[i] = :(___u[$(indvar_dict[arg])]) # replace with ___u[i]
14+
ex.args[i] = :(internal_var___u[$(indvar_dict[arg])]) # replace with internal_var___u[i]
1515
end
1616
elseif haskey(inline_dict,arg)
1717
ex.args[i] = :($(inline_dict[arg])) # inline from inline_dict
1818
symex.args[i] = :($(inline_dict[arg])) # also do in symbolic
1919
elseif haskey(param_dict,arg)
2020
if params_from_function
21-
ex.args[i] = :(___p.$arg) # replace with ___p.arg
21+
ex.args[i] = :(internal_var___p.$arg) # replace with internal_var___p.arg
2222
else
2323
idx = findfirst(param_dict.keys .== arg)
2424
ex.args[i] = :(params[$idx]) # replace with params[arg]
@@ -27,14 +27,14 @@ function ode_findreplace(ex,symex,indvar_dict,param_dict,inline_dict;params_from
2727
elseif length(string(arg))>1 && haskey(indvar_dict,Symbol(s[nextind(s, 1):end])) && Symbol(s[1])==:d
2828
tmp = Symbol(s[nextind(s, 1):end]) # Remove the first letter, the d
2929
if vectorized_returns == :slice
30-
ex.args[i] = :(___du[:,$(indvar_dict[tmp])])
31-
symex.args[i] = :(___du[:,$(indvar_dict[tmp])]) #also do in symbolic
30+
ex.args[i] = :(internal_var___du[:,$(indvar_dict[tmp])])
31+
symex.args[i] = :(internal_var___du[:,$(indvar_dict[tmp])]) #also do in symbolic
3232
elseif vectorized_returns == :vals
33-
ex.args[i] = Symbol("___du$(indvar_dict[tmp])")
34-
symex.args[i] = Symbol("___du$(indvar_dict[tmp])") #also do in symbolic
33+
ex.args[i] = Symbol("internal_var___du$(indvar_dict[tmp])")
34+
symex.args[i] = Symbol("internal_var___du$(indvar_dict[tmp])") #also do in symbolic
3535
else # vectorized_returns == :standard
36-
ex.args[i] = :(___du[$(indvar_dict[tmp])])
37-
symex.args[i] = :(___du[$(indvar_dict[tmp])]) #also do in symbolic
36+
ex.args[i] = :(internal_var___du[$(indvar_dict[tmp])])
37+
symex.args[i] = :(internal_var___du[$(indvar_dict[tmp])]) #also do in symbolic
3838
end
3939
end
4040
end
@@ -56,10 +56,10 @@ end
5656

5757
function ode_symbol_findreplace(ex,indvar_dict,param_dict,inline_dict;params_from_function=true)
5858
if haskey(indvar_dict,ex)
59-
ex = :(___u[$(indvar_dict[ex])]) # replace with ___u[i]
59+
ex = :(internal_var___u[$(indvar_dict[ex])]) # replace with internal_var___u[i]
6060
elseif haskey(param_dict,ex)
6161
if params_from_function
62-
ex = :(___p.$ex) # replace with ___u[i]
62+
ex = :(internal_var___p.$ex) # replace with internal_var___u[i]
6363
else
6464
idx = findfirst(param_dict.keys .== ex)
6565
ex = :(params[$idx])

0 commit comments

Comments
 (0)