Skip to content

Commit e05f419

Browse files
authored
Update for MP renamings (#128)
* Update for MP renamings * update ci * Rename file monovec * MP#master
1 parent 0c1525f commit e05f419

File tree

12 files changed

+101
-101
lines changed

12 files changed

+101
-101
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
os: ubuntu-latest
2828
arch: x64
2929
steps:
30-
- uses: actions/checkout@v2
30+
- uses: actions/checkout@v3
3131
- uses: julia-actions/setup-julia@v1
3232
with:
3333
version: ${{ matrix.version }}

src/DynamicPolynomials.jl

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,31 +17,31 @@ const DMonomialLike{C} = Union{Monomial{C}, PolyVar{C}}
1717
MA.mutability(::Type{<:Monomial}) = MA.IsMutable()
1818
include("term.jl")
1919
MA.mutability(::Type{Term{C, T}}) where {C, T} = MA.mutability(T)
20-
include("monovec.jl")
20+
include("monomial_vector.jl")
2121
include("poly.jl")
2222
MA.mutability(::Type{<:Polynomial}) = MA.IsMutable()
2323
const TermPoly{C, T} = Union{Term{C, T}, Polynomial{C, T}}
2424
const PolyType{C} = Union{Polynomial{C}, Term{C}, Monomial{C}, PolyVar{C}}
2525
MP.variable_union_type(::Union{PolyType{C}, Type{<:PolyType{C}}}) where {C} = PolyVar{C}
26-
MP.constantmonomial(::Type{<:PolyType{C}}) where {C} = Monomial{C}()
27-
MP.constantmonomial(p::PolyType) = Monomial(_vars(p), zeros(Int, nvariables(p)))
28-
MP.monomialtype(::Type{<:PolyType{C}}) where C = Monomial{C}
29-
MP.monomialtype(::PolyType{C}) where C = Monomial{C}
30-
#function MP.constantmonomial(::Type{Monomial{C}}, vars=PolyVar{C}[]) where {C}
26+
MP.constant_monomial(::Type{<:PolyType{C}}) where {C} = Monomial{C}()
27+
MP.constant_monomial(p::PolyType) = Monomial(_vars(p), zeros(Int, nvariables(p)))
28+
MP.monomial_type(::Type{<:PolyType{C}}) where C = Monomial{C}
29+
MP.monomial_type(::PolyType{C}) where C = Monomial{C}
30+
#function MP.constant_monomial(::Type{Monomial{C}}, vars=PolyVar{C}[]) where {C}
3131
# return Monomial{C}(vars, zeros(Int, length(vars)))
3232
#end
33-
MP.termtype(::Union{TermPoly{C, T}, Type{<:TermPoly{C, T}}}) where {C, T} = Term{C, T}
34-
MP.termtype(::Union{PolyType{C}, Type{<:PolyType{C}}}, ::Type{T}) where {C, T} = Term{C, T}
35-
MP.termtype(::Type{Polynomial{C}}) where {C} = Term{C}
36-
MP.polynomialtype(::Type{Term{C}}) where {C} = Polynomial{C}
37-
MP.polynomialtype(::Type{Term{C, T}}) where {T, C} = Polynomial{C, T}
38-
MP.polynomialtype(::Type{T}, ::Type{<:DMonomialLike{C}}) where {T, C} = Polynomial{C, T}
39-
MP.polynomialtype(::Union{PolyType{C}, Type{<:PolyType{C}}}, ::Type{T}) where {C, T} = Polynomial{C, T}
33+
MP.term_type(::Union{TermPoly{C, T}, Type{<:TermPoly{C, T}}}) where {C, T} = Term{C, T}
34+
MP.term_type(::Union{PolyType{C}, Type{<:PolyType{C}}}, ::Type{T}) where {C, T} = Term{C, T}
35+
MP.term_type(::Type{Polynomial{C}}) where {C} = Term{C}
36+
MP.polynomial_type(::Type{Term{C}}) where {C} = Polynomial{C}
37+
MP.polynomial_type(::Type{Term{C, T}}) where {T, C} = Polynomial{C, T}
38+
MP.polynomial_type(::Type{T}, ::Type{<:DMonomialLike{C}}) where {T, C} = Polynomial{C, T}
39+
MP.polynomial_type(::Union{PolyType{C}, Type{<:PolyType{C}}}, ::Type{T}) where {C, T} = Polynomial{C, T}
4040
_vars(p::AbstractArray{<:PolyType}) = mergevars(_vars.(p))[1]
4141
MP.variables(p::Union{PolyType, MonomialVector, AbstractArray{<:PolyType}}) = _vars(p) # tuple(_vars(p))
4242
MP.nvariables(p::Union{PolyType, MonomialVector, AbstractArray{<:PolyType}}) = length(_vars(p))
43-
MP.similarvariable(p::Union{PolyType{C}, Type{<:PolyType{C}}}, ::Type{Val{V}}) where {C, V} = PolyVar{C}(string(V))
44-
MP.similarvariable(p::Union{PolyType{C}, Type{<:PolyType{C}}}, V::Symbol) where {C} = PolyVar{C}(string(V))
43+
MP.similar_variable(p::Union{PolyType{C}, Type{<:PolyType{C}}}, ::Type{Val{V}}) where {C, V} = PolyVar{C}(string(V))
44+
MP.similar_variable(p::Union{PolyType{C}, Type{<:PolyType{C}}}, V::Symbol) where {C} = PolyVar{C}(string(V))
4545

4646
include("promote.jl")
4747

src/cmult.jl

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ function multdivmono(v::Vector{PolyVar{true}}, x::Monomial{true}, op, z)
123123
end
124124
return w, z_new
125125
end
126-
function MP.mapexponents_to!(output::Monomial{true}, f::Function, x::Monomial{true}, y::Monomial{true})
126+
function MP.map_exponents_to!(output::Monomial{true}, f::Function, x::Monomial{true}, y::Monomial{true})
127127
if x.vars == y.vars
128128
if output.vars != x.vars
129129
n = length(x.vars)
@@ -137,35 +137,35 @@ function MP.mapexponents_to!(output::Monomial{true}, f::Function, x::Monomial{tr
137137
end
138138
return output
139139
end
140-
function MP.mapexponents!(f::Function, x::Monomial{true}, y::Monomial{true})
140+
function MP.map_exponents!(f::Function, x::Monomial{true}, y::Monomial{true})
141141
if x.vars == y.vars
142142
_operate_exponents_to!(x.z, f, x.z, y.z)
143143
else
144144
_multdivmono!(x.z, x.vars, copy(x.vars), y, f, copy(x.z))
145145
end
146146
return x
147147
end
148-
function MP.mapexponents(f::Function, x::Monomial{true}, y::Monomial{true})
148+
function MP.map_exponents(f::Function, x::Monomial{true}, y::Monomial{true})
149149
w, z = multdivmono(x.vars, y, f, x.z)
150150
return Monomial{true}(w, z)
151151
end
152-
function MP.mapexponents(f::Function, x::MonomialVector{true}, y::Monomial{true})
152+
function MP.map_exponents(f::Function, x::MonomialVector{true}, y::Monomial{true})
153153
w, Z = multdivmono(x.vars, y, f, x.Z)
154154
return MonomialVector{true}(w, Z)
155155
end
156-
function MP.mapexponents!(f::Function, x::MonomialVector{true}, y::Monomial{true})
156+
function MP.map_exponents!(f::Function, x::MonomialVector{true}, y::Monomial{true})
157157
_multdivmono!(x.Z, x.vars, copy(x.vars), y, f, copy.(x.Z))
158158
return x
159159
end
160-
function MP.mapexponents(f::Function, x::MonomialVector{true}, y::PolyVar{true})
161-
return MP.mapexponents(f, x, MP.monomial(y))
160+
function MP.map_exponents(f::Function, x::MonomialVector{true}, y::PolyVar{true})
161+
return MP.map_exponents(f, x, MP.monomial(y))
162162
end
163-
function MP.mapexponents!(f::Function, x::MonomialVector{true}, y::PolyVar{true})
164-
return MP.mapexponents!(f, x, MP.monomial(y))
163+
function MP.map_exponents!(f::Function, x::MonomialVector{true}, y::PolyVar{true})
164+
return MP.map_exponents!(f, x, MP.monomial(y))
165165
end
166166
function MA.operate!(::typeof(*), x::MonomialVector{true}, y::DMonomialLike{true})
167-
return MP.mapexponents!(+, x, y)
167+
return MP.map_exponents!(+, x, y)
168168
end
169-
Base.:(*)(y::MonomialVector{true}, x::DMonomialLike{true}) = MP.mapexponents(+, y, x)
169+
Base.:(*)(y::MonomialVector{true}, x::DMonomialLike{true}) = MP.map_exponents(+, y, x)
170170
Base.:(*)(x::DMonomialLike{true}, y::MonomialVector{true}) = y * x
171171
Base.:(*)(x::Monomial{true}, y::PolyVar{true}) = y * x

src/comp.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ function (==)(x::MonomialVector{C}, y::MonomialVector{C}) where C
109109
end
110110
return true
111111
end
112-
(==)(mv::AbstractVector, x::MonomialVector) = monovec(mv) == x
113-
(==)(x::MonomialVector, mv::AbstractVector) = x == monovec(mv)
112+
(==)(mv::AbstractVector, x::MonomialVector) = monomial_vector(mv) == x
113+
(==)(x::MonomialVector, mv::AbstractVector) = x == monomial_vector(mv)
114114

115115
# Comparison of Term
116116
function (==)(p::Polynomial{C}, q::Polynomial{C}) where {C}

src/diff.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
function MP.differentiate(m::Monomial{C}, x::PolyVar{C}) where C
22
i = findfirst(isequal(x), _vars(m))
33
if (i === nothing || i == 0) || m.z[i] == 0
4-
zeroterm(m)
4+
zero_term(m)
55
else
66
z = copy(m.z)
77
z[i] -= 1

src/mono.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ function Base.convert(::Type{Monomial{C}}, x::PolyVar{C}) where C
2626
return Monomial{C}([x], [1])
2727
end
2828
Monomial(x::PolyVar{C}) where C = convert(Monomial{C}, x)
29-
function MP.convertconstant(::Type{Monomial{C}}, α) where C
29+
function MP.convert_constant(::Type{Monomial{C}}, α) where C
3030
α == 1 || error("Cannot convert to a Monomial{$C} as it is not one")
3131
Monomial{C}(PolyVar{C}[], Int[])
3232
end

src/monovec.jl renamed to src/monomial_vector.jl

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,14 @@ _vars(m::Union{Monomial, MonomialVector}) = m.vars
7777
# [x, y] -> Vector{PolyVar}
7878
# [x, x*y] -> Vector{Monomial}
7979
# [1, x] -> Vector{Term{Int}}
80-
const DMonoVecElemNonConstant{C} = Union{PolyVar{C}, Monomial{C}, Term{C}}
80+
const Dmonomial_vectorElemNonConstant{C} = Union{PolyVar{C}, Monomial{C}, Term{C}}
8181
# [1] -> Vector{Int}
82-
const DMonoVecElem{C} = Union{Int, DMonoVecElemNonConstant{C}}
83-
const DMonoVec{C} = AbstractVector{<:DMonoVecElem{C}}
82+
const Dmonomial_vectorElem{C} = Union{Int, Dmonomial_vectorElemNonConstant{C}}
83+
const Dmonomial_vector{C} = AbstractVector{<:Dmonomial_vectorElem{C}}
8484

85-
MP.emptymonovec(vars::AbstractVector{PolyVar{C}}) where {C} = MonomialVector{C}(vars, Vector{Int}[])
86-
MP.emptymonovec(t::DMonoVecElemNonConstant) = emptymonovec(_vars(t))
87-
MP.emptymonovec(::Type{<:DMonoVecElemNonConstant{C}}) where {C} = MonomialVector{C}()
85+
MP.empty_monomial_vector(vars::AbstractVector{PolyVar{C}}) where {C} = MonomialVector{C}(vars, Vector{Int}[])
86+
MP.empty_monomial_vector(t::Dmonomial_vectorElemNonConstant) = empty_monomial_vector(_vars(t))
87+
MP.empty_monomial_vector(::Type{<:Dmonomial_vectorElemNonConstant{C}}) where {C} = MonomialVector{C}()
8888

8989
function fillZfordeg!(Z, n, deg, ::Type{Val{true}}, filter::Function, ::Int)
9090
z = zeros(Int, n)
@@ -167,8 +167,8 @@ MP.monomials(vars::Tuple{Vararg{PolyVar}}, args...) = monomials([vars...], args.
167167
#end
168168
#MP.monomials(vars::TupOrVec{PV}, degs::Int, filter::Function = x->true) where {PV<:PolyVar} = monomials(vars, [degs], filter)
169169

170-
function buildZvarsvec(::Type{PV}, X::DMonoVec) where {PV<:PolyVar}
171-
varsvec = Vector{PV}[ (isa(x, DMonoVecElemNonConstant) ? _vars(x) : PolyVar[]) for x in X ]
170+
function buildZvarsvec(::Type{PV}, X::Dmonomial_vector) where {PV<:PolyVar}
171+
varsvec = Vector{PV}[ (isa(x, Dmonomial_vectorElemNonConstant) ? _vars(x) : PolyVar[]) for x in X ]
172172
allvars, maps = mergevars(varsvec)
173173
nvars = length(allvars)
174174
Z = [zeros(Int, nvars) for i in 1:length(X)]
@@ -190,8 +190,8 @@ function buildZvarsvec(::Type{PV}, X::DMonoVec) where {PV<:PolyVar}
190190
allvars, Z
191191
end
192192

193-
MP.sortmonovec(X::MonomialVector) = (1:length(X), X)
194-
function _sortmonovec(X::DMonoVec{C}) where {C}
193+
MP.sort_monomial_vector(X::MonomialVector) = (1:length(X), X)
194+
function _sort_monomial_vector(X::Dmonomial_vector{C}) where {C}
195195
allvars, Z = buildZvarsvec(PolyVar{C}, X)
196196
σ = sortperm(Z, lt=grlex)
197197
allvars, Z, σ
@@ -200,34 +200,34 @@ function _removedups!(Z::Vector{Vector{Int}}, σ::Vector{Int})
200200
dups = findall(i -> Z[σ[i]] == Z[σ[i-1]], 2:length(σ))
201201
deleteat!(σ, dups)
202202
end
203-
function MP.sortmonovec(X::DMonoVec{C}) where {C}
203+
function MP.sort_monomial_vector(X::Dmonomial_vector{C}) where {C}
204204
if isempty(X)
205205
Int[], MonomialVector{C}()
206206
else
207-
allvars, Z, σ = _sortmonovec(X)
207+
allvars, Z, σ = _sort_monomial_vector(X)
208208
_removedups!(Z, σ)
209209
σ, MonomialVector{C}(allvars, Z[σ])
210210
end
211211
end
212212

213-
function MonomialVector{C}(X::DMonoVec{C}) where C
213+
function MonomialVector{C}(X::Dmonomial_vector{C}) where C
214214
allvars, Z = buildZvarsvec(PolyVar{C}, X)
215215
sort!(Z, lt=grlex)
216216
dups = findall(i -> Z[i] == Z[i-1], 2:length(Z))
217217
deleteat!(Z, dups)
218218
MonomialVector{C}(allvars, Z)
219219
end
220220
function MonomialVector(X)
221-
monovectype(X)(X)
221+
monomial_vector_type(X)(X)
222222
end
223223

224-
MP.monovectype(X::Union{DMonoVecElemNonConstant{C}, Type{<:DMonoVecElemNonConstant{C}}, DMonoVec{C}, Type{<:DMonoVec{C}}}) where {C} = MonomialVector{C}
225-
function MP.monovec(X::DMonoVec)
224+
MP.monomial_vector_type(X::Union{Dmonomial_vectorElemNonConstant{C}, Type{<:Dmonomial_vectorElemNonConstant{C}}, Dmonomial_vector{C}, Type{<:Dmonomial_vector{C}}}) where {C} = MonomialVector{C}
225+
function MP.monomial_vector(X::Dmonomial_vector)
226226
MonomialVector(X)
227227
end
228-
MP.monovec(a, mv::MonomialVector) = (a, mv)
228+
MP.monomial_vector(a, mv::MonomialVector) = (a, mv)
229229

230-
function MP.mergemonovec(ms::Vector{MonomialVector{C}}) where {C}
230+
function MP.merge_monomial_vectors(ms::Vector{MonomialVector{C}}) where {C}
231231
m = length(ms)
232232
I = ones(Int, length(ms))
233233
L = length.(ms)

src/mult.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ include("ncmult.jl")
3838
MP.left_constant_mult(α, x::Monomial) = MP.term(α, MA.mutable_copy(x))
3939

4040
function zero_with_variables(::Type{Polynomial{C,T}}, vars::Vector{PolyVar{C}}) where{C, T}
41-
Polynomial(T[], emptymonovec(vars))
41+
Polynomial(T[], empty_monomial_vector(vars))
4242
end
4343

4444
# I do not want to cast x to TermContainer because that would force the promotion of eltype(q) with Int
@@ -47,7 +47,7 @@ function Base.:(*)(x::DMonomialLike, p::Polynomial)
4747
end
4848
function Base.:(*)(x::DMonomialLike{false}, p::Polynomial)
4949
# Order may change, e.g. y * (x + y) = y^2 + yx
50-
Polynomial(monovec(MA.mutable_copy(p.a), [x*m for m in p.x])...)
50+
Polynomial(monomial_vector(MA.mutable_copy(p.a), [x*m for m in p.x])...)
5151
end
5252

5353
function _term_poly_mult(t::Term{C, S}, p::Polynomial{C, T}, op::Function) where {C, S, T}
@@ -133,7 +133,7 @@ function MA.operate!(::typeof(*), p::Polynomial{C}, q::Polynomial{C}) where C
133133
if iszero(q)
134134
return MA.operate!(zero, p)
135135
elseif nterms(q) == 1
136-
return MA.operate!(*, p, MP.leadingterm(q))
136+
return MA.operate!(*, p, MP.leading_term(q))
137137
else
138138
return MA.operate_to!(p, *, p, q)
139139
end

src/poly.jl

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ MA.mutable_copy(p::Polynomial{C, T}) where {C, T} = Polynomial{C, T}(MA.mutable_
3434
Base.copy(p::Polynomial) = MA.mutable_copy(p)
3535
Base.zero(::Type{Polynomial{C, T}}) where {C, T} = Polynomial(T[], MonomialVector{C}())
3636
Base.one(::Type{Polynomial{C, T}}) where {C, T} = Polynomial([one(T)], MonomialVector{C}(PolyVar{C}[], [Int[]]))
37-
Base.zero(p::Polynomial{C, T}) where {C, T} = Polynomial(T[], emptymonovec(copy(_vars(p))))
37+
Base.zero(p::Polynomial{C, T}) where {C, T} = Polynomial(T[], empty_monomial_vector(copy(_vars(p))))
3838
Base.one(p::Polynomial{C, T}) where {C, T} = Polynomial([one(T)], MonomialVector(copy(_vars(p)), [zeros(Int, nvariables(p))]))
3939

4040
Polynomial{C, T}(a::AbstractVector, x::MonomialVector) where {C, T} = Polynomial{C, T}(Vector{T}(a), x)
41-
Polynomial{C, T}(a::AbstractVector, X::DMonoVec) where {C, T} = Polynomial{C, T}(monovec(a, X)...)
41+
Polynomial{C, T}(a::AbstractVector, X::Dmonomial_vector) where {C, T} = Polynomial{C, T}(monomial_vector(a, X)...)
4242
Polynomial{C}(a::Vector{T}, x) where {C, T} = Polynomial{C, T}(a, x)
43-
Polynomial(af::Union{Function, Vector}, x::DMonoVec{C}) where {C} = Polynomial{C}(af, x)
43+
Polynomial(af::Union{Function, Vector}, x::Dmonomial_vector{C}) where {C} = Polynomial{C}(af, x)
4444

45-
# TODO Remove with MP v0.2.8
45+
# This is called by the default implementation of `Base.oneunit`, still in Julia v1.8 at least
4646
Polynomial{C, T}(p::Polynomial{C, T}) where {C, T} = p
4747

4848
Base.convert(::Type{Polynomial{C, T}}, p::Polynomial{C, T}) where {C, T} = p
@@ -72,7 +72,7 @@ function Polynomial{C, T}(f::Function, x::MonomialVector{C}) where {C, T}
7272
Polynomial{C, T}(a, x)
7373
end
7474
function Polynomial{C, T}(f::Function, x::AbstractVector) where {C, T}
75-
σ, X = sortmonovec(x)
75+
σ, X = sort_monomial_vector(x)
7676
a = T[f(i) for i in σ]
7777
if length(x) > length(X)
7878
rev = Dict(X[j] => j for j in eachindex(σ))
@@ -90,8 +90,8 @@ Polynomial{C}(f::Function, x) where {C} = Polynomial{C, Base.promote_op(f, Int)}
9090
#Base.convert(::Type{PolyType{C}}, p::TermContainer{C}) where {C} = p
9191

9292
# needed to build [p Q; Q p] where p is a polynomial and Q is a matpolynomial in Julia v0.5
93-
#Base.convert(::Type{TermType{C}}, p::TermContainer{C}) where {C} = p
94-
#Base.convert(::Type{TermType{C, T}}, p::TermContainer{C, T}) where {C, T} = p
93+
#Base.convert(::Type{term_type{C}}, p::TermContainer{C}) where {C} = p
94+
#Base.convert(::Type{term_type{C, T}}, p::TermContainer{C, T}) where {C, T} = p
9595

9696
Base.length(p::Polynomial) = length(p.a)
9797
Base.isempty(p::Polynomial) = isempty(p.a)
@@ -128,19 +128,19 @@ MP.extdegree(p::Polynomial) = extdegree(p.x)
128128
MP.mindegree(p::Polynomial) = mindegree(p.x)
129129
MP.maxdegree(p::Polynomial) = maxdegree(p.x)
130130

131-
MP.leadingcoefficient(p::Polynomial{C, T}) where {C, T} = iszero(p) ? zero(T) : last(p.a)
132-
MP.leadingmonomial(p::Polynomial) = iszero(p) ? constantmonomial(p) : last(p.x)
133-
MP.leadingterm(p::Polynomial) = iszero(p) ? zeroterm(p) : last(terms(p))
131+
MP.leading_coefficient(p::Polynomial{C, T}) where {C, T} = iszero(p) ? zero(T) : last(p.a)
132+
MP.leading_monomial(p::Polynomial) = iszero(p) ? constant_monomial(p) : last(p.x)
133+
MP.leading_term(p::Polynomial) = iszero(p) ? zero_term(p) : last(terms(p))
134134

135-
function MP.removeleadingterm(p::Polynomial)
135+
function MP.remove_leading_term(p::Polynomial)
136136
Polynomial(p.a[1:end-1], p.x[1:end-1])
137137
end
138-
function MA.operate!(::typeof(MP.removeleadingterm), p::Polynomial)
138+
function MA.operate!(::typeof(MP.remove_leading_term), p::Polynomial)
139139
pop!(p.a)
140140
pop!(p.x)
141141
return p
142142
end
143-
function MP.removemonomials(p::Polynomial, x::MonomialVector)
143+
function MP.remove_monomials(p::Polynomial, x::MonomialVector)
144144
# use the fact that monomials are sorted to do this O(n) instead of O(n^2)
145145
j = 1
146146
I = Int[]
@@ -154,7 +154,7 @@ function MP.removemonomials(p::Polynomial, x::MonomialVector)
154154
end
155155
Polynomial(p.a[I], p.x[I])
156156
end
157-
MP.removemonomials(p::Polynomial, x::Vector) = removemonomials(p, MonomialVector(x))
157+
MP.remove_monomials(p::Polynomial, x::Vector) = remove_monomials(p, MonomialVector(x))
158158

159159
function _remove_zeros!(p::Polynomial)
160160
zeroidx = Int[]
@@ -201,8 +201,8 @@ function polynomialclean_to!(p::Polynomial{C, T}, vars::Vector{PolyVar{C}}, adup
201201
return p
202202
end
203203

204-
MP.polynomial!(a::Vector, x::DMonoVec, ::MP.ListState) = Polynomial(a, x)
205-
MP.polynomial(a::AbstractVector, x::DMonoVec, s::MP.ListState) = MP.polynomial!(collect(a), MA.mutable_copy(x), s)
204+
MP.polynomial!(a::Vector, x::Dmonomial_vector, ::MP.ListState) = Polynomial(a, x)
205+
MP.polynomial(a::AbstractVector, x::Dmonomial_vector, s::MP.ListState) = MP.polynomial!(collect(a), MA.mutable_copy(x), s)
206206

207207
#MP.polynomial(f::Function, x::AbstractVector) = Polynomial(f, x)
208208
#MP.polynomial(ts::AbstractVector{Term{C, T}}) where {C, T} = Polynomial(coefficient.(ts), monomial.(ts)) # FIXME invalid age range update
@@ -251,7 +251,7 @@ function MP.polynomial(Q::AbstractMatrix, mv::MonomialVector{C}, ::Type{T}) wher
251251
end
252252
end
253253
end
254-
a, X = monovec(a, x)
254+
a, X = monomial_vector(a, x)
255255
v = _vars(X)
256256
Z = X.Z
257257
end
@@ -277,22 +277,22 @@ function MA.operate!(::typeof(one), p::Polynomial{C, T}) where {C, T}
277277
return p
278278
end
279279

280-
function MP.mapcoefficients(f::Function, p::Polynomial; nonzero = false)
280+
function MP.map_coefficients(f::Function, p::Polynomial; nonzero = false)
281281
return Polynomial(map(f, p.a), MA.mutable_copy(p.x))
282282
end
283283

284-
function MP.mapcoefficients!(f::Function, p::Polynomial; nonzero = false)
284+
function MP.map_coefficients!(f::Function, p::Polynomial; nonzero = false)
285285
map!(f, p.a, p.a)
286286
if !nonzero
287287
_remove_zeros!(p)
288288
end
289289
return p
290290
end
291291

292-
function MP.mapcoefficients_to!(output::Polynomial, f::Function, t::MP.AbstractTermLike; nonzero = false)
293-
return MP.mapcoefficients_to!(output, f, polynomial(t); nonzero = nonzero)
292+
function MP.map_coefficients_to!(output::Polynomial, f::Function, t::MP.AbstractTermLike; nonzero = false)
293+
return MP.map_coefficients_to!(output, f, polynomial(t); nonzero = nonzero)
294294
end
295-
function MP.mapcoefficients_to!(output::Polynomial, f::Function, p::Polynomial; nonzero = false)
295+
function MP.map_coefficients_to!(output::Polynomial, f::Function, p::Polynomial; nonzero = false)
296296
resize!(output.a, length(p.a))
297297
map!(f, output.a, p.a)
298298
Future.copy!(output.x.vars, p.x.vars)
@@ -307,11 +307,11 @@ function MP.mapcoefficients_to!(output::Polynomial, f::Function, p::Polynomial;
307307
return output
308308
end
309309

310-
function MP.mapexponents(f::Function, p::Polynomial, m::DMonomialLike)
311-
return Polynomial(MA.mutable_copy(p.a), MP.mapexponents(f, p.x, m))
310+
function MP.map_exponents(f::Function, p::Polynomial, m::DMonomialLike)
311+
return Polynomial(MA.mutable_copy(p.a), MP.map_exponents(f, p.x, m))
312312
end
313313

314-
function MP.mapexponents!(f::Function, p::Polynomial, m::DMonomialLike)
315-
MP.mapexponents!(f, p.x, m)
314+
function MP.map_exponents!(f::Function, p::Polynomial, m::DMonomialLike)
315+
MP.map_exponents!(f, p.x, m)
316316
return p
317317
end

0 commit comments

Comments
 (0)