Skip to content

Commit ff5d11c

Browse files
committed
Stop needing master versions of DP and TP
1 parent 08d8b3c commit ff5d11c

File tree

3 files changed

+28
-24
lines changed

3 files changed

+28
-24
lines changed

Project.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@ version = "0.3.2"
66

77
[deps]
88
DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
9-
DynamicPolynomials = "7c1d4256-1411-5781-91ec-d7bc3513ac07"
109
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
1110
MutableArithmetics = "d8a4904e-b15c-11e9-3269-09a3773c0cb0"
12-
TypedPolynomials = "afbbf031-7a57-5f58-a1b9-b774a0fad08d"
1311

1412
[compat]
1513
DataStructures = "0.17"
14+
MutableArithmetics = "0.1"
1615
julia = "1"
1716

1817
[extras]

src/MultivariatePolynomials.jl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ abstract type AbstractTerm{T} <: AbstractTermLike{T} end
5959
Abstract type for a polynomial of coefficient type `T`, i.e. a sum of `AbstractTerm{T}`s.
6060
"""
6161
abstract type AbstractPolynomial{T} <: AbstractPolynomialLike{T} end
62-
MA.mutability(::Type{<:AbstractPolynomial}) = MA.IsMutable()
6362

6463
const APL{T} = AbstractPolynomialLike{T}
6564

test/mutable_arithmetics.jl

Lines changed: 27 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,16 @@ 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"]
1214
@testset "Scalar" begin
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)
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)
2022
end
2123
@test isequal(a, a_copy)
2224
@test isequal(b, b_copy)
@@ -57,11 +59,13 @@ function all_tests(a, b, c, d, e, f, g)
5759
@test isequal(c, c_copy)
5860
@test isequal(d, d_copy)
5961
@test isequal(e, e_copy)
62+
# Remove exclude in v0.3.4
63+
exclude = ["matrix_uniform_scaling", "symmetric_matrix_uniform_scaling"]
6064
@testset "Matrix" begin
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])
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)
6569
end
6670
@test isequal(a, a_copy)
6771
@test isequal(b, b_copy)
@@ -89,11 +93,12 @@ end
8993
end
9094

9195
@testset "MutableArithmetics with terms in $T" for T in [Int, BigInt]
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
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
97102
a = T(2) * x^2
98103
b = T(4) * y^2
99104
c = T(3) * x
@@ -105,11 +110,12 @@ end
105110
end
106111

107112
@testset "MutableArithmetics with polynomials in $T" for T in [Int, BigInt]
108-
if MA.mutability(T) isa MA.IsMutable
109-
@testset "Int" begin
110-
MA.Test.int_test(polynomialtype(x, T))
111-
end
112-
end
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
113119
a = T(2) * x^2 + T(3) * x * y + T(4) * y
114120
b = T(4) * y^2 - T(1) * x * y + T(4) * x
115121
c = T(1) * x^2 + T(3) * x - T(4)

0 commit comments

Comments
 (0)