Skip to content

Fix mapexponents! with different variables #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 19, 2022
Merged

Fix mapexponents! with different variables #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0175d69
Fix mapexponents! with different variables
blegat Jan 17, 2022
81a2efc
Fixes
blegat Jan 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 25 additions & 17 deletions src/cmult.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,25 +28,19 @@ function _operate_exponents_to!(output::Vector{Int}, op::F, z1::Vector{Int}, z2:
@. output = op(z1, z2)
return
end
function _operate_exponents_to!(output::Vector{Int}, op::F, z1::Vector{Int}, z2::Vector{Int}, n) where {F<:Function}
resize!(output, n)
@. output = op(z1, z2)
return
end
function _operate_exponents_to!(output::Vector{Int}, op::F, z1::Vector{Int}, z2::Vector{Int}, n, maps) where {F<:Function}
resize!(output, n)
function _operate_exponents_to!(output::Vector{Int}, op::F, z1::Vector{Int}, z2::Vector{Int}, maps) where {F<:Function}
I = maps[1]; i = 1; lI = length(I)
J = maps[2]; j = 1; lJ = length(J)
while i <= lI || j <= lJ
if i > lI || (j <= lJ && J[j] < I[i])
output[J[j]] = op(0, z2[j])
j += 1
elseif j > lJ || (i <= lI && I[i] < J[j])
output[I[i]] = op(z1[I[i]], 0)
output[I[i]] = op(z1[i], 0)
i += 1
else
@assert I[i] == J[j]
output[I[i]] = op(z1[I[i]], z2[j])
output[I[i]] = op(z1[i], z2[j])
i += 1
j += 1
end
Expand All @@ -57,19 +51,19 @@ end
#function _operate_exponents!(op::F, Z::Vector{Vector{Int}}, z2::Vector{Int}, args::Vararg{Any,N}) where {F<:Function,N}
# return Vector{Int}[_operate_exponents!(op, z, z2, args...) for z in Z]
#end
function multdivmono!(output, output_variables::Vector{PolyVar{true}},
function _multdivmono!(output, output_variables::Vector{PolyVar{true}},
v::Vector{PolyVar{true}}, x::Monomial{true}, op, z)
if v == x.vars
if output_variables == v
_operate_exponents_to!(output, op, z, x.z)
else
if output_variables != v
resize!(output_variables, length(v))
copyto!(output_variables, v)
_operate_exponents_to!(output, op, z, x.z, length(output_variables))
resize!(output, length(output_variables))
end
_operate_exponents_to!(output, op, z, x.z)
else
maps = mergevars_to!(output_variables, [v, x.vars])
_operate_exponents_to!(output, op, z, x.z, length(output_variables), maps)
resize!(output, length(output_variables))
_operate_exponents_to!(output, op, z, x.z, maps)
end
return
end
Expand Down Expand Up @@ -110,11 +104,25 @@ function multdivmono(v::Vector{PolyVar{true}}, x::Monomial{true}, op, z)
return w, z_new
end
function MP.mapexponents_to!(output::Monomial{true}, f::Function, x::Monomial{true}, y::Monomial{true})
multdivmono!(output.z, output.vars, x.vars, y, f, x.z)
if x.vars == y.vars
if output.vars != x.vars
n = length(x.vars)
resize!(output.vars, n)
copyto!(output.vars, x.vars)
resize!(output.z, n)
end
_operate_exponents_to!(x.z, f, x.z, y.z)
else
_multdivmono!(output.z, output.vars, x.vars, y, f, x.z)
end
return output
end
function MP.mapexponents!(f::Function, x::Monomial{true}, y::Monomial{true})
multdivmono!(x.z, x.vars, x.vars, y, f, x.z)
if x.vars == y.vars
_operate_exponents_to!(x.z, f, x.z, y.z)
else
_multdivmono!(x.z, x.vars, copy(x.vars), y, f, copy(x.z))
end
return x
end
function MP.mapexponents(f::Function, x::Monomial{true}, y::Monomial{true})
Expand Down
4 changes: 4 additions & 0 deletions test/mono.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,4 +133,8 @@
@test (x^2)(3) == 9
@test (x)(3) == 3
end
@testset "TODO remove when added to MP" begin
@polyvar x y
@test x == DynamicPolynomials.MP.mapexponents!(div, x^1, x * y^2)
end
end