Skip to content

Commit c23eac6

Browse files
authored
Merge pull request #125 from JuliaAlgebra/bl/ma_tests
Enable MA tests needed mutability of polynomials
2 parents 35ae814 + a96cf23 commit c23eac6

File tree

2 files changed

+22
-28
lines changed

2 files changed

+22
-28
lines changed

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name = "MultivariatePolynomials"
22
uuid = "102ac46a-7ee4-5c85-9060-abc95bfdeaa3"
33
license = "MIT"
44
repo = "https://github.com/JuliaAlgebra/MultivariatePolynomials.jl"
5-
version = "0.3.3"
5+
version = "0.3.4"
66

77
[deps]
88
DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"

test/mutable_arithmetics.jl

Lines changed: 21 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,14 @@ function all_tests(a, b, c, d, e, f, g)
99
e_copy = deepcopy(e)
1010
f_copy = deepcopy(f)
1111
g_copy = deepcopy(g)
12-
# Remove exclude in v0.3.4
13-
exclude = ["scalar_uniform_scaling"]
1412
@testset "Scalar" begin
15-
MA.Test.scalar_test(a, exclude = exclude)
16-
MA.Test.scalar_test(b, exclude = exclude)
17-
MA.Test.scalar_test(c, exclude = exclude)
18-
MA.Test.scalar_test(d, exclude = exclude)
19-
MA.Test.scalar_test(e, exclude = exclude)
20-
MA.Test.scalar_test(f, exclude = exclude)
21-
MA.Test.scalar_test(g, exclude = exclude)
13+
MA.Test.scalar_test(a)
14+
MA.Test.scalar_test(b)
15+
MA.Test.scalar_test(c)
16+
MA.Test.scalar_test(d)
17+
MA.Test.scalar_test(e)
18+
MA.Test.scalar_test(f)
19+
MA.Test.scalar_test(g)
2220
end
2321
@test isequal(a, a_copy)
2422
@test isequal(b, b_copy)
@@ -59,13 +57,11 @@ function all_tests(a, b, c, d, e, f, g)
5957
@test isequal(c, c_copy)
6058
@test isequal(d, d_copy)
6159
@test isequal(e, e_copy)
62-
# Remove exclude in v0.3.4
63-
exclude = ["matrix_uniform_scaling", "symmetric_matrix_uniform_scaling"]
6460
@testset "Matrix" begin
65-
MA.Test.array_test([a b; c d], exclude = exclude)
66-
MA.Test.array_test([c e; e d], exclude = exclude)
67-
MA.Test.array_test([a b c; b c a; a b a], exclude = exclude)
68-
MA.Test.array_test([d b c; d c e; e b a], exclude = exclude)
61+
MA.Test.array_test([a b; c d])
62+
MA.Test.array_test([c e; e d])
63+
MA.Test.array_test([a b c; b c a; a b a])
64+
MA.Test.array_test([d b c; d c e; e b a])
6965
end
7066
@test isequal(a, a_copy)
7167
@test isequal(b, b_copy)
@@ -93,12 +89,11 @@ end
9389
end
9490

9591
@testset "MutableArithmetics with terms in $T" for T in [Int, BigInt]
96-
# Reenable for v0.3.4
97-
# if MA.mutability(T) isa MA.IsMutable && MA.mutability(typeof(x * y)) isa MA.IsMutable
98-
# @testset "Int" begin
99-
# MA.Test.int_test(termtype(x, T), exclude = ["int_add", "int_add_mul", "int_zero"])
100-
# end
101-
# end
92+
if MA.mutability(T) isa MA.IsMutable && MA.mutability(typeof(x * y)) isa MA.IsMutable
93+
@testset "Int" begin
94+
MA.Test.int_test(termtype(x, T), exclude = ["int_add", "int_add_mul", "int_zero"])
95+
end
96+
end
10297
a = T(2) * x^2
10398
b = T(4) * y^2
10499
c = T(3) * x
@@ -110,12 +105,11 @@ end
110105
end
111106

112107
@testset "MutableArithmetics with polynomials in $T" for T in [Int, BigInt]
113-
# Reenable for v0.3.4
114-
# if MA.mutability(T) isa MA.IsMutable
115-
# @testset "Int" begin
116-
# MA.Test.int_test(polynomialtype(x, T))
117-
# end
118-
# end
108+
if MA.mutability(T) isa MA.IsMutable
109+
@testset "Int" begin
110+
MA.Test.int_test(polynomialtype(x, T))
111+
end
112+
end
119113
a = T(2) * x^2 + T(3) * x * y + T(4) * y
120114
b = T(4) * y^2 - T(1) * x * y + T(4) * x
121115
c = T(1) * x^2 + T(3) * x - T(4)

0 commit comments

Comments
 (0)