registerN, bug

src/abstract.jl

@@ -3,7 +3,7 @@ export AbstractPolynomial
 const SymbolLike = Union{AbstractString,Char,Symbol}
 
 """
- AbstractPolynomial{T}
+ AbstractPolynomial{T,X}
 
 An abstract container for various polynomials. 
 
@@ -27,7 +27,7 @@ Given a polynomial with `name`, creates some common convenience constructors and
 
 # Example
 ```julia
-struct MyPolynomial{T} <: AbstractPolynomial{T} end
+struct MyPolynomial{T,X} <: AbstractPolynomial{T,X} end
 
 Polynomials.@register MyPolynomial
 ```
@@ -72,68 +72,21 @@ macro registerN(name, params...)
  quote
  Base.convert(::Type{P}, q::Q) where {$(αs...),T, P<:$poly{$(αs...),T}, Q <: $poly{$(αs...),T}} = q
  Base.convert(::Type{$poly{$(αs...)}}, q::Q) where {$(αs...),T, Q <: $poly{$(αs...),T}} = q 
- Base.promote(p::P, q::Q) where {$(αs...),T, P <:$poly{$(αs...),T}, Q <: $poly{$(αs...),T}} = p,q
- Base.promote_rule(::Type{<:$poly{$(αs...),T}}, ::Type{<:$poly{$(αs...),S}}) where {$(αs...),T,S} =
- $poly{$(αs...),promote_type(T, S)}
- Base.promote_rule(::Type{<:$poly{$(αs...),T}}, ::Type{S}) where {$(αs...),T,S<:Number} = 
- $poly{$(αs...),promote_type(T,S)}
+ Base.promote(p::P, q::Q) where {$(αs...),T, X, P <:$poly{$(αs...),T,X}, Q <: $poly{$(αs...),T,X}} = p,q
+ Base.promote_rule(::Type{<:$poly{$(αs...),T,X}}, ::Type{<:$poly{$(αs...),S,X}}) where {$(αs...),T,S,X} =
+ $poly{$(αs...),promote_type(T, S),X}
+ Base.promote_rule(::Type{<:$poly{$(αs...),T,X}}, ::Type{S}) where {$(αs...),T,X,S<:Number} = 
+ $poly{$(αs...),promote_type(T,S),X}
 
  function $poly{$(αs...),T}(x::AbstractVector{S}, var::SymbolLike = :x) where {$(αs...),T,S}
  $poly{$(αs...),T}(T.(x), Symbol(var))
  end
  $poly{$(αs...)}(coeffs::AbstractVector{T}, var::SymbolLike=:x) where {$(αs...),T} =
- $poly{$(αs...),T}(coeffs, Symbol(var))
+ $poly{$(αs...),T,Symbol(var)}(coeffs)
  $poly{$(αs...),T}(n::Number, var::SymbolLike = :x) where {$(αs...),T} = n*one($poly{$(αs...),T}, Symbol(var))
  $poly{$(αs...)}(n::Number, var::SymbolLike = :x) where {$(αs...)} = n*one($poly{$(αs...)}, Symbol(var))
  $poly{$(αs...),T}(var::SymbolLike=:x) where {$(αs...), T} = variable($poly{$(αs...),T}, Symbol(var))
  $poly{$(αs...)}(var::SymbolLike=:x) where {$(αs...)} = variable($poly{$(αs...)}, Symbol(var))
  end
 end
 
-
-# deprecated. If desired, replace with @registerN type parameters... macro
-# Macros to register POLY{α, T} and POLY{α, β, T}
-macro register1(name)
- @warn "@register1 is deprecated use @registerN"
- poly = esc(name)
- quote
- Base.convert(::Type{P}, p::P) where {P<:$poly} = p
- Base.promote(p::P, q::Q) where {α,T, P <:$poly{α,T}, Q <: $poly{α,T}} = p,q
- Base.promote_rule(::Type{<:$poly{α,T}}, ::Type{<:$poly{α,S}}) where {α,T,S} =
- $poly{α,promote_type(T, S)}
- Base.promote_rule(::Type{<:$poly{α,T}}, ::Type{S}) where {α,T,S<:Number} = 
- $poly{α,promote_type(T,S)}
- function $poly{α,T}(x::AbstractVector{S}, var::SymbolLike = :x) where {α,T,S}
- $poly{α,T}(T.(x), Symbol(var))
- end
- $poly{α}(coeffs::AbstractVector{T}, var::SymbolLike=:x) where {α,T} =
- $poly{α,T}(coeffs, Symbol(var))
- $poly{α,T}(n::Number, var::SymbolLike = :x) where {α,T} = n*one($poly{α,T}, Symbol(var))
- $poly{α}(n::Number, var::SymbolLike = :x) where {α} = n*one($poly{α}, Symbol(var))
- $poly{α,T}(var::SymbolLike=:x) where {α, T} = variable($poly{α,T}, Symbol(var))
- $poly{α}(var::SymbolLike=:x) where {α} = variable($poly{α}, Symbol(var))
- end
-end
-
-
-# Macro to register POLY{α, β, T}
-macro register2(name)
- @warn "@register2 is deprecated use @registerN"
- poly = esc(name)
- quote
- Base.convert(::Type{P}, p::P) where {P<:$poly} = p
- Base.promote(p::P, q::Q) where {α,β,T, P <:$poly{α,β,T}, Q <: $poly{α,β,T}} = p,q 
- Base.promote_rule(::Type{<:$poly{α,β,T}}, ::Type{<:$poly{α,β,S}}) where {α,β,T,S} =
- $poly{α,β,promote_type(T, S)}
- Base.promote_rule(::Type{<:$poly{α,β,T}}, ::Type{S}) where {α,β,T,S<:Number} =
- $poly{α,β,promote_type(T, S)}
- $poly{α,β}(coeffs::AbstractVector{T}, var::SymbolLike = :x) where {α,β,T} =
- $poly{α,β,T}(coeffs, Symbol(var))
- $poly{α,β,T}(x::AbstractVector{S}, var::SymbolLike = :x) where {α,β,T,S<:Number} = $poly{α,β,T}(T.(x), var)
- $poly{α,β,T}(n::Number, var::SymbolLike = :x) where {α,β,T} = n*one($poly{α,β,T}, Symbol(var))
- $poly{α,β}(n::Number, va::SymbolLiker = :x) where {α,β} = n*one($poly{α,β}, Symbol(var))
- $poly{α,β,T}(var::SymbolLike=:x) where {α,β, T} = variable($poly{α,β,T}, Symbol(var))
- $poly{α,β}(var::SymbolLike=:x) where {α,β} = variable($poly{α,β}, Symbol(var))
- end
-end
-

src/polynomials/ImmutablePolynomial.jl

@@ -66,7 +66,7 @@ function ImmutablePolynomial{T,X}(coeffs::AbstractVector{S}) where {T,X,S}
  @warn "ignoring the axis offset of the coefficient vector"
  end
  N = findlast(!iszero, coeffs)
- N = nothing && return ImmutablePolynomial{R,X,0}(())
+ N == nothing && return ImmutablePolynomial{R,X,0}(())
  N′ = N + 1 - firstindex(coeffs)
  cs = NTuple{N′,T}(coeffs[i] for i ∈ firstindex(coeffs):N)
  ImmutablePolynomial{T, X, N′}(cs)