Merge pull request #72 from JuliaAI/dev

For a 0.1.14 release

Project.toml

@@ -1,7 +1,7 @@
 name = "CategoricalDistributions"
 uuid = "af321ab8-2d2e-40a6-b165-3d674595d28e"
 authors = ["Anthony D. Blaom <[email protected]>"]
-version = "0.1.13"
+version = "0.1.14"
 
 [deps]
 CategoricalArrays = "324d7699-5711-5eae-9e2f-1d82baa6b597"

src/arithmetic.jl

@@ -9,7 +9,12 @@ import Base: +, *, /, -
 pdf_matrix(d::UnivariateFinite, L) = pdf.(d, L)
 pdf_matrix(d::AbstractArray{<:UnivariateFinite}, L) = pdf(d, L)
 
-function +(d1::U, d2::U) where U <: SingletonOrArray
+function +(d1::UnivariateFinite{S, V}, d2::UnivariateFinite{S, V}) where {S, V}
+    L = classes(d1)
+    L == classes(d2) || throw(ERR_DIFFERENT_SAMPLE_SPACES)
+    return UnivariateFinite(L, pdf_matrix(d1, L) + pdf_matrix(d2, L))
+end
+function +(d1::UnivariateFiniteArray{S, V}, d2::UnivariateFiniteArray{S, V}) where {S, V}
     L = classes(d1)
     L == classes(d2) || throw(ERR_DIFFERENT_SAMPLE_SPACES)
     return UnivariateFinite(L, pdf_matrix(d1, L) + pdf_matrix(d2, L))
@@ -27,7 +32,12 @@ end
 -(d::UnivariateFinite) = _minus(d, UnivariateFinite)
 -(d::UnivariateFiniteArray) = _minus(d, UnivariateFiniteArray)
 
-function -(d1::U, d2::U) where U <: SingletonOrArray
+function -(d1::UnivariateFinite{S, V}, d2::UnivariateFinite{S, V}) where {S, V}
+    L = classes(d1)
+    L == classes(d2) || throw(ERR_DIFFERENT_SAMPLE_SPACES)
+    return UnivariateFinite(L, pdf_matrix(d1, L) - pdf_matrix(d2, L))
+end
+function -(d1::UnivariateFiniteArray{S, V}, d2::UnivariateFiniteArray{S, V}) where {S, V}
     L = classes(d1)
     L == classes(d2) || throw(ERR_DIFFERENT_SAMPLE_SPACES)
     return UnivariateFinite(L, pdf_matrix(d1, L) - pdf_matrix(d2, L))

test/arithmetic.jl

@@ -13,14 +13,17 @@ end
 L = ["yes", "no"]
 d1 = UnivariateFinite(L, rand(rng, 2), pool=missing)
 d2 = UnivariateFinite(L, rand(rng, 2), pool=missing)
+df32 = UnivariateFinite(L, rand(rng, Float32, 2), pool=missing)
 
 @testset "arithmetic" begin
 
     # addition and subtraction:
     for op in [:+, :-]
         quote
             s = $op(d1, d2 )
+            s2 = $op(d1, df32 )
             @test $op(pdf.(d1, L), pdf.(d2, L)) ≈ pdf.(s, L)
+            @test $op(pdf.(d1, L), pdf.(df32, L)) ≈ pdf.(s2, L)
         end |> eval
     end