Skip to content

Commit a114199

Browse files
AayushSabharwalAayushSabharwal
committed
Formatting
1 parent 518e043 commit a114199

File tree

7 files changed

+25
-50
lines changed

7 files changed

+25
-50
lines changed

‎src/systems/abstractsystem.jl

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,13 @@ function RecursiveArrayTools.independent_variables(sys::AbstractSystem)
160160
end
161161
end
162162

163-
RecursiveArrayTools.independent_variables(sys::AbstractTimeDependentSystem) = [getfield(sys, :iv)]
163+
function RecursiveArrayTools.independent_variables(sys::AbstractTimeDependentSystem)
164+
[getfield(sys, :iv)]
165+
end
164166
RecursiveArrayTools.independent_variables(sys::AbstractTimeIndependentSystem) = []
165-
RecursiveArrayTools.independent_variables(sys::AbstractMultivariateSystem) = getfield(sys, :ivs)
167+
function RecursiveArrayTools.independent_variables(sys::AbstractMultivariateSystem)
168+
getfield(sys, :ivs)
169+
end
166170

167171
iscomplete(sys::AbstractSystem) = isdefined(sys, :complete) && getfield(sys, :complete)
168172

@@ -508,7 +512,9 @@ end
508512
RecursiveArrayTools.states(sys::AbstractSystem, v) = renamespace(sys, v)
509513
RecursiveArrayTools.parameters(sys::AbstractSystem, v) = toparam(states(sys, v))
510514
for f in [:states, :parameters]
511-
@eval RecursiveArrayTools.$f(sys::AbstractSystem, vs::AbstractArray) = map(v -> $f(sys, v), vs)
515+
@eval function RecursiveArrayTools.$f(sys::AbstractSystem, vs::AbstractArray)
516+
map(v -> $f(sys, v), vs)
517+
end
512518
end
513519

514520
flatten(sys::AbstractSystem, args...) = sys
@@ -574,11 +580,19 @@ end
574580

575581
RecursiveArrayTools.is_indep_sym(sys::AbstractSystem, sym) = isequal(sym, get_iv(sys))
576582

577-
RecursiveArrayTools.state_sym_to_index(sys::AbstractSystem, sym) = findfirst(isequal(sym), states(sys))
578-
RecursiveArrayTools.is_state_sym(sys::AbstractSystem, sym) = !isnothing(RecursiveArrayTools.state_sym_to_index(sys, sym))
583+
function RecursiveArrayTools.state_sym_to_index(sys::AbstractSystem, sym)
584+
findfirst(isequal(sym), states(sys))
585+
end
586+
function RecursiveArrayTools.is_state_sym(sys::AbstractSystem, sym)
587+
!isnothing(RecursiveArrayTools.state_sym_to_index(sys, sym))
588+
end
579589

580-
RecursiveArrayTools.param_sym_to_index(sys::AbstractSystem, sym) = findfirst(isequal(sym), parameters(sys))
581-
RecursiveArrayTools.is_param_sym(sys::AbstractSystem, sym) = !isnothing(RecursiveArrayTools.param_sym_to_index(sys, sym))
590+
function RecursiveArrayTools.param_sym_to_index(sys::AbstractSystem, sym)
591+
findfirst(isequal(sym), parameters(sys))
592+
end
593+
function RecursiveArrayTools.is_param_sym(sys::AbstractSystem, sym)
594+
!isnothing(RecursiveArrayTools.param_sym_to_index(sys, sym))
595+
end
582596

583597
struct AbstractSysToExpr
584598
sys::AbstractSystem

‎src/systems/diffeqs/abstractodesystem.jl

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -380,9 +380,6 @@ function DiffEqBase.ODEFunction{iip, specialize}(sys::AbstractODESystem, dvs = s
380380
tgrad = _tgrad === nothing ? nothing : _tgrad,
381381
mass_matrix = _M,
382382
jac_prototype = jac_prototype,
383-
# syms = Symbol.(states(sys)),
384-
# indepsym = Symbol(get_iv(sys)),
385-
# paramsyms = Symbol.(ps),
386383
observed = observedfun,
387384
sparsity = sparsity ? jacobian_sparsity(sys) : nothing)
388385
end
@@ -473,9 +470,6 @@ function DiffEqBase.DAEFunction{iip}(sys::AbstractODESystem, dvs = states(sys),
473470
DAEFunction{iip}(f,
474471
sys = sys,
475472
jac = _jac === nothing ? nothing : _jac,
476-
# syms = Symbol.(dvs),
477-
# indepsym = Symbol(get_iv(sys)),
478-
# paramsyms = Symbol.(ps),
479473
jac_prototype = jac_prototype,
480474
observed = observedfun)
481475
end
@@ -559,9 +553,6 @@ function ODEFunctionExpr{iip}(sys::AbstractODESystem, dvs = states(sys),
559553
tgrad = $tgradsym,
560554
mass_matrix = M,
561555
jac_prototype = $jp_expr,
562-
# syms = $(Symbol.(states(sys))),
563-
# indepsym = $(QuoteNode(Symbol(get_iv(sys)))),
564-
# paramsyms = $(Symbol.(parameters(sys))),
565556
sparsity = $(sparsity ? jacobian_sparsity(sys) : nothing))
566557
end
567558
!linenumbers ? striplines(ex) : ex

‎src/systems/diffeqs/sdesystem.jl

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -437,9 +437,6 @@ function DiffEqBase.SDEFunction{iip}(sys::SDESystem, dvs = states(sys),
437437
Wfact = _Wfact === nothing ? nothing : _Wfact,
438438
Wfact_t = _Wfact_t === nothing ? nothing : _Wfact_t,
439439
mass_matrix = _M,
440-
# syms = Symbol.(states(sys)),
441-
# indepsym = Symbol(get_iv(sys)),
442-
# paramsyms = Symbol.(ps),
443440
observed = observedfun)
444441
end
445442

@@ -524,10 +521,7 @@ function SDEFunctionExpr{iip}(sys::SDESystem, dvs = states(sys),
524521
Wfact = Wfact,
525522
Wfact_t = Wfact_t,
526523
mass_matrix = M,
527-
# syms = $(Symbol.(states(sys))),
528-
# indepsym = $(Symbol(get_iv(sys))),
529-
# paramsyms = $(Symbol.(parameters(sys))))
530-
)
524+
)
531525
end
532526
!linenumbers ? striplines(ex) : ex
533527
end

‎src/systems/discrete_system/discrete_system.jl

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -223,10 +223,7 @@ function SciMLBase.DiscreteProblem(sys::DiscreteSystem, u0map = [], tspan = get_
223223
expression_module = eval_module)
224224
f_oop, _ = (@RuntimeGeneratedFunction(eval_module, ex) for ex in f_gen)
225225
f(u, p, iv) = f_oop(u, p, iv)
226-
fd = DiscreteFunction(f; # syms = Symbol.(dvs),
227-
# indepsym = Symbol(iv),
228-
# paramsyms = Symbol.(ps),
229-
sys = sys)
226+
fd = DiscreteFunction(f; sys = sys)
230227
DiscreteProblem(fd, u0, tspan, p; kwargs...)
231228
end
232229

‎src/systems/jumps/jumpsystem.jl

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -312,11 +312,7 @@ function DiffEqBase.DiscreteProblem(sys::JumpSystem, u0map, tspan::Union{Tuple,
312312
end
313313
end
314314

315-
df = DiscreteFunction{true, true}(f;
316-
# syms = Symbol.(states(sys)),
317-
# indepsym = Symbol(get_iv(sys)),
318-
# paramsyms = Symbol.(ps), sys = sys,
319-
observed = observedfun)
315+
df = DiscreteFunction{true, true}(f; observed = observedfun)
320316
DiscreteProblem(df, u0, tspan, p; kwargs...)
321317
end
322318

@@ -355,11 +351,7 @@ function DiscreteProblemExpr(sys::JumpSystem, u0map, tspan::Union{Tuple, Nothing
355351
u0 = $u0
356352
p = $p
357353
tspan = $tspan
358-
df = DiscreteFunction{true, true}(f,
359-
# syms = $(Symbol.(states(sys))),
360-
# indepsym = $(Symbol(get_iv(sys))),
361-
# paramsyms = $(Symbol.(parameters(sys)))
362-
)
354+
df = DiscreteFunction{true, true}(f)
363355
DiscreteProblem(df, u0, tspan, p)
364356
end
365357
end

‎src/systems/nonlinear/nonlinearsystem.jl

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,6 @@ function SciMLBase.NonlinearFunction{iip}(sys::NonlinearSystem, dvs = states(sys
253253
jac_prototype = sparse ?
254254
similar(calculate_jacobian(sys, sparse = sparse),
255255
Float64) : nothing,
256-
# syms = Symbol.(states(sys)),
257-
# paramsyms = Symbol.(parameters(sys)),
258256
observed = observedfun)
259257
end
260258

@@ -300,8 +298,6 @@ function NonlinearFunctionExpr{iip}(sys::NonlinearSystem, dvs = states(sys),
300298
NonlinearFunction{$iip}(f,
301299
jac = jac,
302300
jac_prototype = $jp_expr,
303-
# syms = $(Symbol.(states(sys))),
304-
# paramsyms = $(Symbol.(parameters(sys)))
305301
)
306302
end
307303
!linenumbers ? striplines(ex) : ex
@@ -331,7 +327,6 @@ function process_NonlinearProblem(constructor, sys::NonlinearSystem, u0map, para
331327

332328
f = constructor(sys, dvs, ps, u0; jac = jac, checkbounds = checkbounds,
333329
linenumbers = linenumbers, parallel = parallel, simplify = simplify,
334-
# syms = Symbol.(dvs), paramsyms = Symbol.(ps),
335330
sparse = sparse, eval_expression = eval_expression, kwargs...)
336331
return f, u0, p
337332
end

‎src/systems/optimization/optimizationsystem.jl

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -352,8 +352,6 @@ function DiffEqBase.OptimizationProblem{iip}(sys::OptimizationSystem, u0map,
352352
grad = _grad,
353353
hess = _hess,
354354
hess_prototype = hess_prototype,
355-
# syms = Symbol.(states(sys)),
356-
# paramsyms = Symbol.(parameters(sys)),
357355
cons = cons[2],
358356
cons_j = _cons_j,
359357
cons_h = _cons_h,
@@ -370,8 +368,6 @@ function DiffEqBase.OptimizationProblem{iip}(sys::OptimizationSystem, u0map,
370368
SciMLBase.NoAD();
371369
grad = _grad,
372370
hess = _hess,
373-
# syms = Symbol.(states(sys)),
374-
# paramsyms = Symbol.(parameters(sys)),
375371
hess_prototype = hess_prototype,
376372
expr = obj_expr,
377373
observed = observedfun)
@@ -544,8 +540,6 @@ function OptimizationProblemExpr{iip}(sys::OptimizationSystem, u0map,
544540
_f = OptimizationFunction{iip}(f, SciMLBase.NoAD();
545541
grad = grad,
546542
hess = hess,
547-
# syms = syms,
548-
# paramsyms = paramsyms,
549543
hess_prototype = hess_prototype,
550544
cons = cons,
551545
cons_j = cons_j,
@@ -572,8 +566,6 @@ function OptimizationProblemExpr{iip}(sys::OptimizationSystem, u0map,
572566
_f = OptimizationFunction{iip}(f, SciMLBase.NoAD();
573567
grad = grad,
574568
hess = hess,
575-
# syms = syms,
576-
# paramsyms = paramsyms,
577569
hess_prototype = hess_prototype,
578570
expr = obj_expr)
579571
OptimizationProblem{$iip}(_f, u0, p; lb = lb, ub = ub, int = int, kwargs...)

0 commit comments

Comments
 (0)