Skip to content
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

Deprecate power_series_ring variant #1493

Closed
wants to merge 1 commit into from
Closed

Deprecate power_series_ring variant #1493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions src/Deprecations.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,7 @@ end

# deprecated in 0.32.x
@deprecate mat(f::Map(FPModuleHomomorphism)) matrix(f::Map(FPModuleHomomorphism))

# deprecated in 0.34.x
@deprecate power_series_ring(R::AbstractAlgebra.Ring, weights::Vector{Int},
prec::Int, s::Vector{Symbol}; kw...) power_series_ring(R, prec, s; weights, kw...)
4 changes: 0 additions & 4 deletions src/generic/AbsMSeries.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -744,7 +744,3 @@ function power_series_ring(R::AbstractAlgebra.Ring, prec::Int,

return parent_obj, gens(parent_obj)
end

power_series_ring(R::AbstractAlgebra.Ring, weights::Vector{Int},
prec::Int, s::Vector{Symbol}; kw...
) = power_series_ring(R, prec, s; weights, kw...)
38 changes: 19 additions & 19 deletions test/generic/AbsMSeries-test.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
for nvars in 1:5
weights = [rand(1:4) for i in 1:nvars]
prec = rand(0:40)
R, gens = power_series_ring(QQ, weights, prec, ["x$(i)" for i in 1:nvars])
R, gens = power_series_ring(QQ, prec, "x#" => 1:nvars; weights)

f = rand(R, 0:10, -10:10)

Expand All @@ -75,7 +75,7 @@

@test R(p, [0 for i in 1:nvars]) isa Generic.AbsMSeries

R, gens = power_series_ring(S, weights, prec, ["x$(i)" for i in 1:nvars])
R, gens = power_series_ring(S, prec, "x#" => 1:nvars; weights)

@test R(ZZ(2)) isa Generic.AbsMSeries

Expand All @@ -84,7 +84,7 @@
end

@testset "Generic.AbsMSeries.printing" begin
R, (x, y) = power_series_ring(ZZ, [5, 3], ["x", "y"])
R, (x, y) = power_series_ring(ZZ, ["x", "y"]; weights=[5, 3])

@test string(zero(R)) == "O(y^3) + O(x^5)"
@test string(one(R)) == "1 + O(y^3) + O(x^5)"
Expand All @@ -94,7 +94,7 @@ end

# weighted

R, (x, y) = power_series_ring(ZZ, [2, 3], 10, ["x", "y"])
R, (x, y) = power_series_ring(ZZ, 10, ["x", "y"]; weights=[2, 3])

@test string(zero(R)) == "O(10)"
@test string(one(R)) == "1 + O(10)"
Expand All @@ -106,7 +106,7 @@ end
end

@testset "Generic.AbsMSeries.manipulation" begin
R, (x, y) = power_series_ring(ZZ, [5, 3], ["x", "y"])
R, (x, y) = power_series_ring(ZZ, ["x", "y"]; weights=[5, 3])

f = x^2 + 2x*y + y + 1 + O(x^3) + O(y^2)

Expand Down Expand Up @@ -171,13 +171,13 @@ end
@test characteristic(R) == 0

S = residue_ring(ZZ, 7)
R, (x, y) = power_series_ring(S, [2, 3], ["x", "y"])
R, (x, y) = power_series_ring(S, ["x", "y"]; weights=[2, 3])

@test characteristic(R) == 7

# weighted

R, (x, y) = power_series_ring(ZZ, [2, 3], 10, ["x", "y"])
R, (x, y) = power_series_ring(ZZ, 10, ["x", "y"]; weights=[2, 3])

f = x^2 + 2x*y + y + 1

Expand Down Expand Up @@ -230,7 +230,7 @@ end
@test characteristic(R) == 0

S = residue_ring(ZZ, 7)
R, (x, y) = power_series_ring(S, [2, 3], 10, ["x", "y"])
R, (x, y) = power_series_ring(S, 10, ["x", "y"]; weights=[2, 3])

@test characteristic(R) == 7
end
Expand Down Expand Up @@ -274,7 +274,7 @@ end
for nvars in 1:5
weights = [rand(1:4) for i in 1:nvars]
prec = rand(0:20)
R, gens = power_series_ring(ZZ, weights, prec, ["x$(i)" for i in 1:nvars])
R, gens = power_series_ring(ZZ, prec, ["x$(i)" for i in 1:nvars]; weights)

for iters = 1:100
f = rand(R, 0:10, -10:10)
Expand Down Expand Up @@ -311,7 +311,7 @@ end
for nvars in 1:5
weights = [rand(1:4) for i in 1:nvars]
prec = rand(0:20)
R, gens = power_series_ring(ZZ, weights, prec, ["x$(i)" for i in 1:nvars])
R, gens = power_series_ring(ZZ, prec, ["x$(i)" for i in 1:nvars]; weights)

for iters = 1:100
f = rand(R, 0:12, -10:10)
Expand Down Expand Up @@ -379,7 +379,7 @@ end
for nvars in 1:5
weights = [rand(1:4) for i in 1:nvars]
prec = rand(0:20)
R, gens = power_series_ring(ZZ, weights, prec, ["x$(i)" for i in 1:nvars])
R, gens = power_series_ring(ZZ, prec, ["x$(i)" for i in 1:nvars]; weights)

for iters = 1:100
f = rand(R, 0:12, -10:10)
Expand All @@ -401,7 +401,7 @@ end

weights = [rand(1:4) for i in 1:nvars]
prec = rand(0:20)
R, gens = power_series_ring(S, weights, prec, ["x$(i)" for i in 1:nvars])
R, gens = power_series_ring(S, prec, ["x$(i)" for i in 1:nvars]; weights)

for iters = 1:100
f = rand(R, 0:12, -1:2, -10:10)
Expand Down Expand Up @@ -444,7 +444,7 @@ end
for nvars in 1:5
weights = [rand(1:4) for i in 1:nvars]
prec = rand(0:20)
R, gens = power_series_ring(ZZ, weights, prec, ["x$(i)" for i in 1:nvars])
R, gens = power_series_ring(ZZ, prec, ["x$(i)" for i in 1:nvars]; weights)

for iter = 1:100
f = rand(R, 0:12, -10:10)
Expand Down Expand Up @@ -485,7 +485,7 @@ end
for nvars in 1:5
weights = [rand(1:4) for i in 1:nvars]
prec = rand(0:20)
R, gens = power_series_ring(ZZ, weights, prec, ["x$(i)" for i in 1:nvars])
R, gens = power_series_ring(ZZ, prec, ["x$(i)" for i in 1:nvars]; weights)

for iter = 1:100
f = rand(R, 0:12, -10:10)
Expand Down Expand Up @@ -519,7 +519,7 @@ end
for nvars in 1:5
weights = [rand(1:4) for i in 1:nvars]
prec = rand(0:20)
R, gens = power_series_ring(ZZ, weights, prec, ["x$(i)" for i in 1:nvars])
R, gens = power_series_ring(ZZ, prec, ["x$(i)" for i in 1:nvars]; weights)

for iter = 1:100
c = rand(ZZ, -10:10)
Expand Down Expand Up @@ -553,7 +553,7 @@ end
for nvars in 1:4
weights = [rand(1:4) for i in 1:nvars]
prec = rand(0:20)
R, gens = power_series_ring(QQ, weights, prec, ["x$(i)" for i in 1:nvars])
R, gens = power_series_ring(QQ, prec, ["x$(i)" for i in 1:nvars]; weights)
for iter = 1:20*nvars
f = rand(R, 0:8, -10:10)
if is_unit(f)
Expand Down Expand Up @@ -582,7 +582,7 @@ end
for nvars in 1:4
weights = [rand(1:4) for i in 1:nvars]
prec = rand(0:20)
R, gens = power_series_ring(QQ, weights, prec, ["x$(i)" for i in 1:nvars])
R, gens = power_series_ring(QQ, prec, ["x$(i)" for i in 1:nvars]; weights)

for iter = 1:20*nvars
f = rand(R, 0:8, -10:10)
Expand All @@ -595,7 +595,7 @@ end
end

@testset "Generic.AbsMSeries.evaluation" begin
R, (x, y) = power_series_ring(ZZ, [10, 10], ["x", "y"])
R, (x, y) = power_series_ring(ZZ, ["x", "y"]; weights=[10, 10])

f = x^2 + y

Expand All @@ -617,7 +617,7 @@ end

# weighted

R, (x, y) = power_series_ring(ZZ, [2, 3], 30, ["x", "y"])
R, (x, y) = power_series_ring(ZZ, 30, ["x", "y"]; weights=[2, 3])

f = x^2 + y

Expand Down
Loading