Merge pull request #39 from blegat/fix38

Fix #38

Author: blegat

.travis.yml

@@ -3,7 +3,6 @@ language: julia
 os:
   - linux
 julia:
-  - 0.5
   - 0.6
   - nightly
 notifications:

appveyor.yml

@@ -1,7 +1,5 @@
 environment:
   matrix:
-    - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.5/julia-0.5-latest-win32.exe"
-    - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.5/julia-0.5-latest-win64.exe"
     - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
     - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
     - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"

src/diff.jl

@@ -38,17 +38,28 @@ differentiate(p::MatPolynomial, x) = differentiate(Polynomial(p), x)
 
 differentiate(p::RationalPoly, x::PolyVar) = (differentiate(p.num, x) * p.den - p.num * differentiate(p.den, x)) / p.den^2
 
-function differentiate{C}(p::PolyType{C}, xs::Vector{PolyVar{C}})
+# even if I annotate with ::Array{_diff_promote_op(T, PolyVar{C}), N+1}, it cannot detect the type since it seems to be unable to determine the dimension N+1 :(
+function differentiate{N, C, T<:PolyType{C}}(ps::AbstractArray{T, N}, xs::Union{AbstractVector{PolyVar{C}}, Tuple})
+    qs = Array{_diff_promote_op(T, PolyVar{C}), N+1}(length(xs), size(ps)...)
+    for (i, x) in enumerate(xs)
+        for j in linearindices(ps)
+            J = ind2sub(ps, j)
+            qs[i, J...] = differentiate(ps[J...], x)
+        end
+    end
+    qs
+end
+function differentiate{C}(p::PolyType{C}, xs::Union{AbstractVector{PolyVar{C}}, Tuple})
     [differentiate(p, x) for x in xs]
 end
 
 # In Julia v0.5, Base.promote_op returns Any for PolyVar, Monomial and MatPolynomial
+# Even on Julia v0.6 and Polynomial, Base.promote_op returns Any...
 _diff_promote_op(S, T) = Base.promote_op(differentiate, S, T)
-_diff_promote_op{C}(::Type{PolyVar{C}}, ::Type{PolyVar{C}}) = Term{true, Int}
-_diff_promote_op{C}(::Type{Monomial{C}}, ::Type{PolyVar{C}}) = Term{true, Int}
-_diff_promote_op{C, T}(::Type{MatPolynomial{C, T}}, ::Type{PolyVar{C}}) = Polynomial{true, Base.promote_op(*, T, Int)}
+_diff_promote_op{C}(::Union{Type{PolyVar{C}}, Type{Monomial{C}}}, ::Type{PolyVar{C}}) = Term{true, Int}
+_diff_promote_op{C, T}(::Union{Type{Polynomial{C, T}}, Type{MatPolynomial{C, T}}}, ::Type{PolyVar{C}}) = Polynomial{true, Base.promote_op(*, T, Int)}
 
-function differentiate(p::PolyType, x, deg::Int)
+function differentiate{T<:PolyType}(p::Union{T, AbstractArray{T}}, x, deg::Int)
     if deg < 0
         throw(DomainError())
     elseif deg == 0

test/diff.jl

@@ -4,6 +4,7 @@
     @inferred differentiate(true*x+true*x^2, y)
     @test differentiate(MatPolynomial{true, Int}((i,j)->1, [x]), y) == 0
     @test differentiate(x*y + 3y^2 , [x, y]) == [y, x+6y]
+    @inferred differentiate(x*y + 3y^2 , x)
     @inferred differentiate(x*y + 3y^2 , [x, y])
     @test differentiate(1 / x , [x, y]) == [-1/x^2, 0]
     @test differentiate((x - y) / (x * y) , [x, y]) == [y^2 / (x * y)^2, -x^2 / (x * y)^2]
@@ -21,4 +22,11 @@
     @inferred differentiate(2x^2, x, 2)
     @test differentiate(MatPolynomial{true, Int}((i,j)->1, [x, y]), y, 1) == 2x + 2y
     @inferred differentiate(MatPolynomial{true, Int}((i,j)->1, [x, y]), y, 0)
+    @inferred differentiate(2x^2 + x*y + y^2, [x, y])
+    p = differentiate(2x^2 + 3x*y + y^2, [x, y], 2)
+    @test isa(p, Matrix{Polynomial{true,Int}})
+    @test p == [4 3; 3 2]
+    p = differentiate(2x^2 + 3x*y^2 + 4y^3 + 2.0, (x, y), 2)
+    @test isa(p, Matrix{Polynomial{true,Float64}})
+    @test p == [4.0 6.0y; 6.0y 6.0x+24.0y]
 end