Skip to content

Commit 8ab6bfe

Browse files
committed
Run formatter
1 parent c7bd8da commit 8ab6bfe

File tree

4 files changed

+23
-17
lines changed

4 files changed

+23
-17
lines changed

src/systems/model_parsing.jl

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -197,12 +197,14 @@ function parse_variable_def!(dict, mod, arg, varclass, kwargs, where_types;
197197
end
198198
Expr(:(::), a, type) => begin
199199
type = getfield(mod, type)
200-
parse_variable_def!(dict, mod, a, varclass, kwargs, where_types; def, type, meta)
200+
parse_variable_def!(
201+
dict, mod, a, varclass, kwargs, where_types; def, type, meta)
201202
end
202203
Expr(:(::), Expr(:call, a, b), type) => begin
203204
type = getfield(mod, type)
204205
def = _type_check!(def, a, type, varclass)
205-
parse_variable_def!(dict, mod, a, varclass, kwargs, where_types; def, type, meta)
206+
parse_variable_def!(
207+
dict, mod, a, varclass, kwargs, where_types; def, type, meta)
206208
end
207209
Expr(:call, a, b) => begin
208210
var = generate_var!(dict, a, b, varclass, mod; indices, type)
@@ -618,7 +620,8 @@ function parse_variable_arg!(exprs, vs, dict, mod, arg, varclass, kwargs, where_
618620
end
619621

620622
function convert_units(varunits::DynamicQuantities.Quantity, value)
621-
DynamicQuantities.ustrip(DynamicQuantities.uconvert(DynamicQuantities.SymbolicUnits.as_quantity(varunits), value))
623+
DynamicQuantities.ustrip(DynamicQuantities.uconvert(
624+
DynamicQuantities.SymbolicUnits.as_quantity(varunits), value))
622625
end
623626

624627
function convert_units(varunits::Unitful.FreeUnits, value)
@@ -639,10 +642,12 @@ function parse_variable_arg(dict, mod, arg, varclass, kwargs, where_types)
639642
try
640643
$setdefault($vv, $convert_units($unit, $name))
641644
catch e
642-
if isa(e, $(DynamicQuantities.DimensionError)) || isa(e, $(Unitful.DimensionError))
643-
error("Unable to convert units for \'"*string(:($$vv))*"\'")
645+
if isa(e, $(DynamicQuantities.DimensionError)) ||
646+
isa(e, $(Unitful.DimensionError))
647+
error("Unable to convert units for \'" * string(:($$vv)) * "\'")
644648
elseif isa(e, MethodError)
645-
error("No or invalid units provided for \'"*string(:($$vv))*"\'")
649+
error("No or invalid units provided for \'" * string(:($$vv)) *
650+
"\'")
646651
else
647652
rethrow(e)
648653
end

test/dq_units.jl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -160,17 +160,17 @@ maj2 = MassActionJump(γ, [S => 1], [S => -1])
160160

161161
@mtkmodel ParamTest begin
162162
@parameters begin
163-
a, [unit=u"m"]
163+
a, [unit = u"m"]
164164
end
165165
@variables begin
166-
b(t), [unit=u"kg"]
166+
b(t), [unit = u"kg"]
167167
end
168168
end
169169

170170
@named sys = ParamTest()
171171

172-
@named sys = ParamTest(a=3.0u"cm")
172+
@named sys = ParamTest(a = 3.0u"cm")
173173
@test ModelingToolkit.getdefault(sys.a) 0.03
174174

175-
@test_throws ErrorException ParamTest(;name=:t, a=1.0)
176-
@test_throws ErrorException ParamTest(;name=:t, a=1.0u"s")
175+
@test_throws ErrorException ParamTest(; name = :t, a = 1.0)
176+
@test_throws ErrorException ParamTest(; name = :t, a = 1.0u"s")

test/model_parsing.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,8 @@ resistor = getproperty(rc, :resistor; namespace = false)
165165
# Test that `C_val` passed via argument is set as default of C.
166166
@test getdefault(rc.capacitor.C) * get_unit(rc.capacitor.C) == C_val
167167
# Test that `k`'s default value is unchanged.
168-
@test getdefault(rc.constant.k) * get_unit(rc.constant.k) == eval(RC.structure[:kwargs][:k_val][:value])
168+
@test getdefault(rc.constant.k) * get_unit(rc.constant.k) ==
169+
eval(RC.structure[:kwargs][:k_val][:value])
169170
@test getdefault(rc.capacitor.v) == 0.0
170171

171172
@test get_gui_metadata(rc.resistor).layout == Resistor.structure[:icon] ==

test/units.jl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -195,17 +195,17 @@ maj2 = MassActionJump(γ, [S => 1], [S => -1])
195195

196196
@mtkmodel ParamTest begin
197197
@parameters begin
198-
a, [unit=u"m"]
198+
a, [unit = u"m"]
199199
end
200200
@variables begin
201-
b(t), [unit=u"kg"]
201+
b(t), [unit = u"kg"]
202202
end
203203
end
204204

205205
@named sys = ParamTest()
206206

207-
@named sys = ParamTest(a=3.0u"cm")
207+
@named sys = ParamTest(a = 3.0u"cm")
208208
@test ModelingToolkit.getdefault(sys.a) 0.03
209209

210-
@test_throws ErrorException ParamTest(;name=:t, a=1.0)
211-
@test_throws ErrorException ParamTest(;name=:t, a=1.0u"s")
210+
@test_throws ErrorException ParamTest(; name = :t, a = 1.0)
211+
@test_throws ErrorException ParamTest(; name = :t, a = 1.0u"s")

0 commit comments

Comments
 (0)