Merge pull request #2 from JuliaActuary/fix_rate_dispatch

JuliaActuary · Aug 11, 2022 · 23ac8f8 · 23ac8f8
2 parents 8527f9e + 211034e
commit 23ac8f8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 104 deletions.
diff --git a/docs/Manifest.toml b/docs/Manifest.toml
diff --git a/src/Rates.jl b/src/Rates.jl
@@ -320,7 +320,7 @@ function Base.:+(a::Real, b::Rate{N,T}) where {N<:Real, T<:Periodic}
     return Periodic(b.value + a,b.compounding.frequency)
 end
 
-function Base.:+(a::Rate{N,T},b::Rate{N,T}) where {N<:Real,T<:CompoundingFrequency}
+function Base.:+(a::Rate{N,T},b::Rate{N,U}) where {N<:Real,T,U}
     a_rate = rate(a)
     b_rate = rate(convert(a.compounding,b))
     r = Rate(a_rate + b_rate,a.compounding)
@@ -359,7 +359,7 @@ end
 function Base.:-(a::Real, b::Rate{N,T}) where {N<:Real, T<:Periodic}
     return Periodic(a - b.value, b.compounding.frequency)
 end
-function Base.:-(a::Rate{N,T},b::Rate{N,T}) where {N<:Real,T<:CompoundingFrequency}
+function Base.:-(a::Rate{N,U},b::Rate{N,U}) where {N<:Real,T,U}
     a_rate = rate(a)
     b_rate = rate(convert(a.compounding,b))
     r = Rate(a_rate - b_rate,a.compounding)
@@ -424,7 +424,7 @@ julia> Yields.Periodic(0.03,100) < Yields.Continuous(0.03)
 true
 ```
 """
-function Base.:<(a::Rate{N,T},b::Rate{N,U}) where {N<:Real,T<:CompoundingFrequency,U<:CompoundingFrequency}
+function Base.:<(a::Rate{N,T},b::Rate{N,U}) where {N<:Real,T,U}
     bc = convert(a.compounding,b)
     return rate(a) < rate(bc)
 end
@@ -441,7 +441,7 @@ julia> Yields.Periodic(0.03,100) > Yields.Continuous(0.03)
 false
 ```
 """
-function Base.:>(a::Rate{N,T},b::Rate{N,U}) where {N<:Real,T<:CompoundingFrequency,U<:CompoundingFrequency}
+function Base.:>(a::Rate{N,T},b::Rate{N,U}) where {N<:Real,T,U}
     bc = convert(a.compounding,b)
     return rate(a) > rate(bc)
 end
diff --git a/test/Rates.jl b/test/Rates.jl
@@ -118,6 +118,9 @@
 
             @test p(a) + b ≈ Periodic(0.05,1)
             @test a + p(b) ≈ Periodic(0.05,1)
+
+            @test p(a) + c(b) ≈ p(a) + Periodic(1)(c(b)) 
+            @test c(a) + p(b) ≈ c(a) + Continuous()(p(b))
         end
 
         @testset "multiplication" begin