Skip to content

Commit b243589

Browse files
refactor: format
1 parent 1e5450b commit b243589

File tree

5 files changed

+28
-12
lines changed

5 files changed

+28
-12
lines changed

src/parameter_indexing.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ function _getp(sys, ::ScalarSymbolic, p)
3535
end
3636
end
3737

38-
function _getp(sys, ::ScalarSymbolic, p::Union{Tuple,AbstractArray})
38+
function _getp(sys, ::ScalarSymbolic, p::Union{Tuple, AbstractArray})
3939
idxs = parameter_index.((sys,), p)
4040
return function getter(sol)
4141
return getindex.((parameter_values(sol),), idxs)
@@ -77,7 +77,7 @@ function _setp(sys, ::ScalarSymbolic, p)
7777
end
7878
end
7979

80-
function _setp(sys, ::ScalarSymbolic, p::Union{Tuple,AbstractArray})
80+
function _setp(sys, ::ScalarSymbolic, p::Union{Tuple, AbstractArray})
8181
idxs = parameter_index.((sys,), p)
8282
return function setter!(sol, val)
8383
setindex!.((parameter_values(sol),), val, idxs)

src/symbol_cache.jl

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,35 @@ at least one independent variable.
1111
The independent variable may be specified as a single symbolic variable instead of an
1212
array containing a single variable if the system has only one independent variable.
1313
"""
14-
struct SymbolCache{V<:Union{Nothing,AbstractVector}, P<:Union{Nothing,AbstractVector}, I}
14+
struct SymbolCache{
15+
V <: Union{Nothing, AbstractVector},
16+
P <: Union{Nothing, AbstractVector},
17+
I,
18+
}
1519
variables::V
1620
parameters::P
1721
independent_variables::I
1822
end
1923

2024
function SymbolCache(vars = nothing, params = nothing, indepvars = nothing)
21-
return SymbolCache{typeof(vars),typeof(params),typeof(indepvars)}(vars, params, indepvars)
25+
return SymbolCache{typeof(vars), typeof(params), typeof(indepvars)}(vars,
26+
params,
27+
indepvars)
2228
end
2329

24-
is_variable(sc::SymbolCache, sym) = sc.variables !== nothing && any(isequal(sym), sc.variables)
25-
variable_index(sc::SymbolCache, sym) = sc.variables === nothing ? nothing : findfirst(isequal(sym), sc.variables)
30+
function is_variable(sc::SymbolCache, sym)
31+
sc.variables !== nothing && any(isequal(sym), sc.variables)
32+
end
33+
function variable_index(sc::SymbolCache, sym)
34+
sc.variables === nothing ? nothing : findfirst(isequal(sym), sc.variables)
35+
end
2636
variable_symbols(sc::SymbolCache, i = nothing) = something(sc.variables, [])
27-
is_parameter(sc::SymbolCache, sym) = sc.parameters !== nothing && any(isequal(sym), sc.parameters)
28-
parameter_index(sc::SymbolCache, sym) = sc.parameters === nothing ? nothing : findfirst(isequal(sym), sc.parameters)
37+
function is_parameter(sc::SymbolCache, sym)
38+
sc.parameters !== nothing && any(isequal(sym), sc.parameters)
39+
end
40+
function parameter_index(sc::SymbolCache, sym)
41+
sc.parameters === nothing ? nothing : findfirst(isequal(sym), sc.parameters)
42+
end
2943
parameter_symbols(sc::SymbolCache) = something(sc.parameters, [])
3044
function is_independent_variable(sc::SymbolCache, sym)
3145
sc.independent_variables === nothing && return false
@@ -61,5 +75,6 @@ constant_structure(::SymbolCache) = true
6175
function Base.copy(sc::SymbolCache)
6276
return SymbolCache(sc.variables === nothing ? nothing : copy(sc.variables),
6377
sc.parameters === nothing ? nothing : copy(sc.parameters),
64-
sc.independent_variables isa AbstractArray ? copy(sc.independent_variables) : sc.independent_variables)
78+
sc.independent_variables isa AbstractArray ? copy(sc.independent_variables) :
79+
sc.independent_variables)
6580
end

src/trait.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,4 @@ hasname(::Any) = false
5858
5959
Get the name of a symbolic variable as a `Symbol`
6060
"""
61-
function getname end
61+
function getname end

test/fallback_test.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ all_syms = [:x, :y, :z, :a, :b, :t]
1414
@test variable_index.((sys,), all_syms) == variable_index.((sc,), all_syms)
1515
@test is_parameter.((sys,), all_syms) == is_parameter.((sc,), all_syms)
1616
@test parameter_index.((sys,), all_syms) == parameter_index.((sc,), all_syms)
17-
@test is_independent_variable.((sys,), all_syms) == is_independent_variable.((sc,), all_syms)
17+
@test is_independent_variable.((sys,), all_syms) ==
18+
is_independent_variable.((sc,), all_syms)
1819
@test is_observed.((sys,), all_syms) == is_observed.((sc,), all_syms)
1920
@test is_time_dependent(sys) == is_time_dependent(sc)
2021
@test constant_structure(sys) == constant_structure(sc)

test/runtests.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ end
1515
end
1616
@testset "Parameter indexing test" begin
1717
@time include("parameter_indexing_test.jl")
18-
end
18+
end

0 commit comments

Comments
 (0)