Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add DynamicQuantities.jl extension #3

Merged
merged 1 commit into from
Oct 10, 2023
Merged

Add DynamicQuantities.jl extension #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,15 @@ version = "0.1.0"
[weakdeps]
CoDa = "5900dafe-f573-5c72-b367-76665857777b"
Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
DynamicQuantities = "06fc5a27-2a28-4c7c-a15d-362465fb6821"

[extensions]
SciTypesCoDaExt = "CoDa"
SciTypesUnitfulExt = "Unitful"
SciTypesDynamicQuantitiesExt = "DynamicQuantities"

[compat]
CoDa = "1.0"
DynamicQuantities = "0.7"
Unitful = "1.17"
julia = "1.9"
9 changes: 9 additions & 0 deletions ext/SciTypesDynamicQuantitiesExt.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
module SciTypesDynamicQuantitiesExt

using SciTypes
using DynamicQuantities: AbstractQuantity

SciTypes.scitype(::Type{<:AbstractQuantity{T}}) where {T} = scitype(T)
SciTypes.sciconvert(::Type{SciTypes.Continuous}, x::AbstractQuantity{<:Integer}) = float(x)

end
1 change: 1 addition & 0 deletions test/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[deps]
CoDa = "5900dafe-f573-5c72-b367-76665857777b"
DynamicQuantities = "06fc5a27-2a28-4c7c-a15d-362465fb6821"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
51 changes: 39 additions & 12 deletions test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using SciTypes
using Unitful
import DynamicQuantities
import Unitful
using CoDa
using Test

Expand Down Expand Up @@ -112,8 +113,9 @@ using Test
end

@testset "Unitful" begin
q1 = 1u"m"
q2 = 1.0u"m"
u = Unitful.u"m"
q1 = 1 * u
q2 = 1.0 * u
Q1 = typeof(q1)
Q2 = typeof(q2)
@test scitype(Q1) <: SciTypes.Categorical
Expand All @@ -122,15 +124,40 @@ using Test
@test scitype(q2) <: SciTypes.Continuous
@test elscitype(Vector{Q1}) <: SciTypes.Categorical
@test elscitype(Vector{Q2}) <: SciTypes.Continuous
@test elscitype([1, 2, 3]u"m") <: SciTypes.Categorical
@test elscitype([1.0, 2.0, 3.0]u"m") <: SciTypes.Continuous
@test elscitype([1, missing, 3]u"m") <: SciTypes.Categorical
@test elscitype([1.0, missing, 3.0]u"m") <: SciTypes.Continuous
@test SciTypes.sciconvert(SciTypes.Continuous, q1) == 1.0u"m"
@test elscitype([1, 2, 3] * u) <: SciTypes.Categorical
@test elscitype([1.0, 2.0, 3.0] * u) <: SciTypes.Continuous
@test elscitype([1, missing, 3] * u) <: SciTypes.Categorical
@test elscitype([1.0, missing, 3.0] * u) <: SciTypes.Continuous
@test SciTypes.sciconvert(SciTypes.Continuous, q1) == 1.0 * u
@test scitype(SciTypes.sciconvert(SciTypes.Continuous, q1)) <: SciTypes.Continuous
@test coerce(SciTypes.Continuous, [1, 2, 3]u"m") == [1.0, 2.0, 3.0]u"m"
@test elscitype(coerce(SciTypes.Continuous, [1, 2, 3]u"m")) <: SciTypes.Continuous
@test isequal(coerce(SciTypes.Continuous, [1, missing, 3]u"m"), [1.0, missing, 3.0]u"m")
@test elscitype(coerce(SciTypes.Continuous, [1, missing, 3]u"m")) <: SciTypes.Continuous
@test coerce(SciTypes.Continuous, [1, 2, 3] * u) == [1.0, 2.0, 3.0] * u
@test elscitype(coerce(SciTypes.Continuous, [1, 2, 3] * u)) <: SciTypes.Continuous
@test isequal(coerce(SciTypes.Continuous, [1, missing, 3] * u), [1.0, missing, 3.0] * u)
@test elscitype(coerce(SciTypes.Continuous, [1, missing, 3] * u)) <: SciTypes.Continuous
end

@testset "DynamicQuantities" begin
uf = DynamicQuantities.u"m"
ui = DynamicQuantities.Quantity{Int}(uf)
q1 = 1 * ui
q2 = 1.0 * uf
Q1 = typeof(q1)
Q2 = typeof(q2)
@test scitype(Q1) <: SciTypes.Categorical
@test scitype(Q2) <: SciTypes.Continuous
@test scitype(q1) <: SciTypes.Categorical
@test scitype(q2) <: SciTypes.Continuous
@test elscitype(Vector{Q1}) <: SciTypes.Categorical
@test elscitype(Vector{Q2}) <: SciTypes.Continuous
@test elscitype([1, 2, 3] .* ui) <: SciTypes.Categorical
@test elscitype([1.0, 2.0, 3.0] .* uf) <: SciTypes.Continuous
@test elscitype([1 * ui, missing, 3 * ui]) <: SciTypes.Categorical
@test elscitype([1.0 * uf, missing, 3.0 * uf]) <: SciTypes.Continuous
@test SciTypes.sciconvert(SciTypes.Continuous, q1) == 1.0 * uf
@test scitype(SciTypes.sciconvert(SciTypes.Continuous, q1)) <: SciTypes.Continuous
@test coerce(SciTypes.Continuous, [1, 2, 3] .* ui) == [1.0, 2.0, 3.0] .* uf
@test elscitype(coerce(SciTypes.Continuous, [1, 2, 3] .* ui)) <: SciTypes.Continuous
@test isequal(coerce(SciTypes.Continuous, [1 * ui, missing, 3 * ui]), [1.0 * uf, missing, 3.0 * uf])
@test elscitype(coerce(SciTypes.Continuous, [1 * ui, missing, 3 * ui])) <: SciTypes.Continuous
end
end