Skip to content

Commit 3e474bd

Browse files
committed
Eagerly screen units
1 parent 8f09054 commit 3e474bd

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Distributed = "1"
7373
Distributions = "0.23, 0.24, 0.25"
7474
DocStringExtensions = "0.7, 0.8, 0.9"
7575
DomainSets = "0.6"
76-
DynamicQuantities = "0.8"
76+
DynamicQuantities = "0.8, 0.9, 0.10"
7777
ForwardDiff = "0.10.3"
7878
FunctionWrappersWrappers = "0.1"
7979
Graphs = "1.5.2"

src/systems/unit_check.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ function __get_literal_unit(x)
1919
return nothing
2020
end
2121
v = value(x)
22-
getmetadata(v, VariableUnit, nothing)
22+
u = getmetadata(v, VariableUnit, nothing)
23+
u === nothing ? nothing : screen_unit(u)
2324
end
2425
function __get_scalar_unit_type(v)
2526
u = __get_literal_unit(v)

test/dq_units.jl

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,11 @@ end
5959
end
6060
@named p1 = Pin()
6161
@named p2 = Pin()
62-
@named op = OtherPin()
62+
@test_throws MT.ValidationError @named op = OtherPin()
6363
@named lp = LongPin()
6464
good_eqs = [connect(p1, p2)]
65-
bad_eqs = [connect(p1, p2, op)]
66-
bad_length_eqs = [connect(op, lp)]
6765
@test MT.validate(good_eqs)
68-
@test !MT.validate(bad_eqs)
69-
@test !MT.validate(bad_length_eqs)
7066
@named sys = ODESystem(good_eqs, t, [], [])
71-
@test_throws MT.ValidationError ODESystem(bad_eqs, t, [], []; name = :sys)
7267

7368
# Array variables
7469
@variables t [unit = u"s"] x(t)[1:3] [unit = u"m"]

0 commit comments

Comments
 (0)