Fixes

JuliaAlgebra · Jun 17, 2024 · 97e0aea · 97e0aea
1 parent fee4ab8
commit 97e0aea
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 19 deletions.
diff --git a/src/MultivariateBases.jl b/src/MultivariateBases.jl
@@ -40,7 +40,7 @@ export AbstractMultipleOrthogonal,
     ProbabilistsHermite, PhysicistsHermite, Laguerre
 export AbstractGegenbauer,
     Legendre, Chebyshev, ChebyshevFirstKind, ChebyshevSecondKind
-export generators,
+export algebra_element, sparse_coefficients,
     univariate_orthogonal_basis,
     reccurence_first_coef,
     reccurence_second_coef,

diff --git a/src/monomial.jl b/src/monomial.jl
@@ -166,7 +166,7 @@ function sparse_coefficients(p::MP.AbstractPolynomial)
     return SA.SparseCoefficients(MP.monomials(p), MP.coefficients(p))
 end
 
-function sparse_coefficients(t::MP.AbstractTerm)
+function sparse_coefficients(t::MP.AbstractTermLike)
     return SA.SparseCoefficients((MP.monomial(t),), (MP.coefficient(t),))
 end
 
@@ -186,13 +186,6 @@ function algebra_element(p::MP.AbstractPolynomialLike)
     )
 end
 
-function algebra_element(p::Polynomial{B,M}) where {B,M}
-    return algebra_element(
-        sparse_coefficients(MP.term(1, p.monomial)),
-        FullBasis{B,M}(),
-    )
-end
-
 function algebra_element(f::Function, basis::SubBasis)
     return algebra_element(map(f, eachindex(basis)), basis)
 end

diff --git a/src/polynomial.jl b/src/polynomial.jl
@@ -72,16 +72,17 @@ MP.variables(p::Polynomial) = MP.variables(p.monomial)
 MP.nvariables(p::Polynomial) = MP.nvariables(p.monomial)
 
 MP.monomial_type(::Type{<:SA.SparseCoefficients{K}}) where {K} = K
+MP.polynomial(p::Polynomial) = MP.polynomial(algebra_element(p))
 
 function algebra_element(p, basis::SA.AbstractBasis)
     return SA.AlgebraElement(p, algebra(basis))
 end
 
 function _algebra_element(p, ::Type{B}) where {B<:AbstractMonomialIndexed}
-    return algebra_element(p, FullBasis{B,MP.monomial_type(typeof(p))}())
+    return algebra_element(sparse_coefficients(p), FullBasis{B,MP.monomial_type(typeof(p))}())
 end
 
-function _algebra_element(p::Polynomial{B,M}) where {B,M}
+function algebra_element(p::Polynomial{B,M}) where {B,M}
     return _algebra_element(p.monomial, B)
 end
 
@@ -151,7 +152,7 @@ function MA.operate_to!(
 end
 
 function MP.polynomial(a::SA.AbstractCoefficients)
-    return MP.polynomial(SA.values(a), SA.keys(a))
+    return MP.polynomial(collect(SA.values(a)), collect(SA.keys(a)))
 end
 
 function MP.polynomial(a::SA.AlgebraElement)

diff --git a/test/monomial.jl b/test/monomial.jl
@@ -8,8 +8,8 @@ using DynamicPolynomials
     @polyvar x
     a = MB.Polynomial{MB.Monomial}(x)
     b = a * a
-    @test b.coeffs == x^2
-    @test typeof(b.coeffs) == typeof(x^2)
+    @test b.coeffs == sparse_coefficients(x^2)
+    @test typeof(b.coeffs) == typeof(sparse_coefficients(x^2))
     @test MB.Polynomial{MB.Monomial}(x^2) == MB.Polynomial{MB.Monomial}(x^2)
     @test MB.Polynomial{MB.Monomial}(x^3) != MB.Polynomial{MB.Monomial}(x^2)
 end

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -26,10 +26,6 @@ function api_test(B::Type{<:MB.AbstractMonomialIndexed}, degree)
         @test length(empty_basis(typeof(basis))) == 0
         @test polynomial_type(basis, Float64) == polynomial_type(x[1], Float64)
         @test polynomial(i -> 0.0, basis) isa polynomial_type(basis, Float64)
-        @test polynomial(zeros(n, n), basis, Float64) isa
-              polynomial_type(basis, Float64)
-        @test polynomial(ones(n, n), basis, Float64) isa
-              polynomial_type(basis, Float64)
     end
 end
 
@@ -99,7 +95,7 @@ end
 function coefficient_test(basis::SubBasis, p, coefs; kwargs...)
     cc = coefficients(p, basis)
     @test isapprox(coefs, cc; kwargs...)
-    @test isapprox(p, polynomial(cc, basis); kwargs...)
+    @test isapprox(p, algebra_element(cc, basis); kwargs...)
 end
 
 function coefficient_test(basis::SubBasis, coefs::AbstractVector; kwargs...)