Skip to content

Commit c7ad26b

Browse files
committed
Better formatting.
1 parent 3383d35 commit c7ad26b

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

src/systems/diffeqs/validation.jl

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,13 @@ function safe_get_units(term, info)
5353
side
5454
end
5555

56-
function _validate(terms::Vector,labels::Vector; info::String = "")
57-
equnits = safe_get_units.(terms,info.*labels)
58-
allthere = all(map(x->x!==nothing,equnits))
56+
function _validate(terms::Vector, labels::Vector; info::String = "")
57+
equnits = safe_get_units.(terms, info*", ".*labels)
58+
allthere = all(map(x -> x!==nothing, equnits))
5959
allmatching = true
6060
if allthere
6161
for idx in 2:length(equnits)
62-
if !isequal(equnits[1],equnits[idx])
62+
if !isequal(equnits[1], equnits[idx])
6363
allmatching = false
6464
@warn("$info: units $(equnits[1]) for $(labels[1]) and $(equnits[idx]) for $(labels[idx]) do not match.")
6565
end
@@ -70,36 +70,36 @@ end
7070

7171
function validate(eq::ModelingToolkit.Equation; info::String = "")
7272
labels = ["left-hand side", "right-hand side"]
73-
terms = [eq.lhs,eq.rhs]
74-
_validate(terms,labels,info = info)
73+
terms = [eq.lhs, eq.rhs]
74+
_validate(terms, labels, info = info)
7575
end
7676

77-
function validate(eq::ModelingToolkit.Equation,noiseterm; info::String = "")
78-
labels = ["left-hand side", "right-hand side","noise term"]
79-
terms = [eq.lhs,eq.rhs,noiseterm]
80-
_validate(terms,labels,info = info)
77+
function validate(eq::ModelingToolkit.Equation, noiseterm; info::String = "")
78+
labels = ["left-hand side", "right-hand side", "noise term"]
79+
terms = [eq.lhs, eq.rhs, noiseterm]
80+
_validate(terms, labels, info = info)
8181
end
8282

83-
function validate(eq::ModelingToolkit.Equation,noisevec::Vector; info::String = "")
84-
labels = vcat(["left-hand side", "right-hand side"],"noise term #".* string.(1:length(noisevec)))
85-
terms = vcat([eq.lhs,eq.rhs],noisevec)
86-
_validate(terms,labels,info = info)
83+
function validate(eq::ModelingToolkit.Equation, noisevec::Vector; info::String = "")
84+
labels = vcat(["left-hand side", "right-hand side"], "noise term #".* string.(1:length(noisevec)))
85+
terms = vcat([eq.lhs, eq.rhs], noisevec)
86+
_validate(terms, labels, info = info)
8787
end
8888

8989
function validate(eqs::Vector{ModelingToolkit.Equation})
90-
all([validate(eqs[idx],info = "In eq. #$idx") for idx in 1:length(eqs)])
90+
all([validate(eqs[idx], info = "In eq. #$idx") for idx in 1:length(eqs)])
9191
end
9292

93-
function validate(eqs::Vector{ModelingToolkit.Equation},noise::Vector)
94-
all([validate(eqs[idx],noise[idx],info = "In eq. #$idx") for idx in 1:length(eqs)])
93+
function validate(eqs::Vector{ModelingToolkit.Equation}, noise::Vector)
94+
all([validate(eqs[idx], noise[idx], info = "In eq. #$idx") for idx in 1:length(eqs)])
9595
end
9696

97-
function validate(eqs::Vector{ModelingToolkit.Equation},noise::Matrix)
98-
all([validate(eqs[idx],noise[idx,:],info = "In eq. #$idx") for idx in 1:length(eqs)])
97+
function validate(eqs::Vector{ModelingToolkit.Equation}, noise::Matrix)
98+
all([validate(eqs[idx], noise[idx, :], info = "In eq. #$idx") for idx in 1:length(eqs)])
9999
end
100100

101101
"Returns true iff units of equations are valid."
102-
validate(eqs::Vector) = validate(convert.(ModelingToolkit.Equation,eqs))
102+
validate(eqs::Vector) = validate(convert.(ModelingToolkit.Equation, eqs))
103103

104104
"Throws error if units of equations are invalid."
105105
check_units(eqs...) = validate(eqs...) || throw(ArgumentError("Some equations had invalid units. See warnings for details."))

0 commit comments

Comments
 (0)