Merge branch 'master' into 96-comparison

Author: jverzani

src/Polynomials.jl

@@ -243,14 +243,12 @@ dot(p1::Poly, p2::Poly) = p1 * p2
 +{T<:Number}(c::T, p::Poly) = +(p, c)
 function +{S,T<:Number}(p::Poly{S}, c::T)
     U = promote_type(S,T)
-    degree(p) == 0 && return Poly(U[c], p.var)
     p2 = U == S ? copy(p) : convert(Poly{U}, p)
     p2[0] += c
     return p2
 end
 function -{T<:Number,S}(c::T, p::Poly{S})
     U = promote_type(S,T)
-    degree(p) == 0 && return Poly(U[c], p.var)
     p2 = convert(Poly{U}, -p)
     p2[0] += c
     return p2
@@ -435,7 +433,7 @@ end
 
 # if we have both coefficients and initial condition that can take `NaN`
 function polyint{T<:Union{Real,Complex},S<:Union{Real,Complex}}(p::Poly{T}, k::S)
-    hasnan(p) || isnan(k) && return Poly(promote_type(T,S)[NaN])
+    (hasnan(p) || isnan(k)) && return Poly(promote_type(T,S)[NaN])
     _polyint(p, k)
 end
 

test/runtests.jl

@@ -309,3 +309,7 @@ p2s = Poly([1], :s)
 @test p1s ≠ 2. ≠ p1s
 
 @test nnz(map(Poly, speye(5,5))) == 5
+
+@test Poly([0.5]) + 2 == Poly([2.5])
+@test 2 - Poly([0.5]) == Poly([1.5])
+