Update for MultivariatePolynomials#master (#33)

* Update for MultivariatePolynomials#master

* Fix show tests

* Fix test

Author: blegat

.github/workflows/ci.yml

@@ -42,6 +42,21 @@ jobs:
             ${{ runner.os }}-test-${{ env.cache-name }}-
             ${{ runner.os }}-test-
             ${{ runner.os }}-
+      - name: MultivariatePolynomials#master
+        shell: julia --project=@. {0}
+        run: |
+          using Pkg
+          Pkg.add(PackageSpec(name="MultivariatePolynomials", rev="master"))
+      - name: DynamicPolynomials#master
+        shell: julia --project=@. {0}
+        run: |
+          using Pkg
+          Pkg.add(PackageSpec(name="DynamicPolynomials", rev="master"))
+      - name: TypedPolynomials#master
+        shell: julia --project=@. {0}
+        run: |
+          using Pkg
+          Pkg.add(PackageSpec(name="TypedPolynomials", rev="master"))
       - uses: julia-actions/julia-buildpkg@v1
       - uses: julia-actions/julia-runtest@v1
         with:

src/groebner.jl

@@ -15,10 +15,10 @@ function spolynomial(p::APL, q::APL)
     ltp = leadingterm(p)
     # `MA.operate` ensures that the returned value can be mutated without
     # affecting either `a` or `p`.
-    a = MA.operate(*, MP._div(m, monomial(ltp)), p)
+    a = MA.operate(*, MP.div_multiple(m, monomial(ltp)), p)
     ad = MA.operate!!(/, a, MP.coefficient(ltp))
     ltq = leadingterm(q)
-    b = MA.operate(*, MP._div(m, monomial(ltq)), q)
+    b = MA.operate(*, MP.div_multiple(m, monomial(ltq)), q)
     bd = MA.operate!!(/, b, MP.coefficient(ltq))
     return MA.operate!!(-, ad, bd)
 end

src/schur.jl

@@ -67,7 +67,7 @@ function _clusterordschur(M::AbstractMatrix{<:Real}, ɛ)
     σ = sortperm(λ)
 
     # For eigenvalues not clustered yet, their eigenvalues is quite large.
-    # Therefore, if we cluster all i, j close enough at once we migth cluster too much
+    # Therefore, if we cluster all i, j close enough at once we might cluster too much
     # The technique used here is to cluster only the closest pair.
     # Once they are matched, a new atol is computed and if the cluster is complete,
     # this atol will be small which will avoid addition of new eigenvalues.

test/macro.jl

@@ -13,11 +13,11 @@ struct DummySolver <: SemialgebraicSets.AbstractAlgebraicSolver end
         # Algebraic set forces `Rational{BigInt}`
         @test S isa BasicSemialgebraicSet{Rational{BigInt}}
         @test S == basicsemialgebraicset(S.V, S.p)
-        @test sprint(show, S) == "{ (x, y) | x - y = 0, x^2 - y = 0, x^2*y - 1//1 ≥ 0, x + y - 1//1 ≥ 0 }"
-        @test sprint(show, MIME"text/plain"(), S) == "Basic semialgebraic Set defined by 2 equalities\n x - y = 0\n x^2 - y = 0\n2 inequalities\n x^2*y - 1//1 ≥ 0\n x + y - 1//1 ≥ 0\n"
+        @test sprint(show, S) == "{ (x, y) | -y + x = 0, -y + x^2 = 0, -1//1 + x^2*y ≥ 0, -1//1 + y + x ≥ 0 }"
+        @test sprint(show, MIME"text/plain"(), S) == "Basic semialgebraic Set defined by 2 equalities\n -y + x = 0\n -y + x^2 = 0\n2 inequalities\n -1//1 + x^2*y ≥ 0\n -1//1 + y + x ≥ 0\n"
         @test S.V isa AlgebraicSet{Rational{BigInt}}
-        @test sprint(show, S.V) == "{ (x, y) | x - y = 0, x^2 - y = 0 }"
-        @test sprint(show, MIME"text/plain"(), S.V) == "Algebraic Set defined by 2 equalities\n x - y = 0\n x^2 - y = 0\n"
+        @test sprint(show, S.V) == "{ (x, y) | -y + x = 0, -y + x^2 = 0 }"
+        @test sprint(show, MIME"text/plain"(), S.V) == "Algebraic Set defined by 2 equalities\n -y + x = 0\n -y + x^2 = 0\n"
         @test S === MultivariatePolynomials.changecoefficienttype(S, Rational{BigInt})
         @test S.V === MultivariatePolynomials.changecoefficienttype(S.V, Rational{BigInt})
         @test S.V.I === convert(typeof(S.V.I), S.V.I)
@@ -45,18 +45,18 @@ struct DummySolver <: SemialgebraicSets.AbstractAlgebraicSolver end
 
         @testset "Different variables" begin
             T = (@set x == x^2 && y <= y^2)
-            @test sprint(show, T) == "{ (x, y) | -x^2 + x = 0, y^2 - y ≥ 0 }"
-            @test sprint(show, MIME"text/plain"(), T) == "Basic semialgebraic Set defined by 1 equalitty\n -x^2 + x = 0\n1 inequalitty\n y^2 - y ≥ 0\n"
+            @test sprint(show, T) == "{ (x, y) | x - x^2 = 0, -y + y^2 ≥ 0 }"
+            @test sprint(show, MIME"text/plain"(), T) == "Basic semialgebraic Set defined by 1 equalitty\n x - x^2 = 0\n1 inequalitty\n -y + y^2 ≥ 0\n"
         end
     end
     @testset "Basic with no equality" begin
         S = @set x + y ≥ 1 && x ≤ y
-        @test sprint(show, S) == "{ (x, y) | x + y - 1 ≥ 0, -x + y ≥ 0 }"
+        @test sprint(show, S) == "{ (x, y) | -1 + y + x ≥ 0, y - x ≥ 0 }"
         @test sprint(show, MIME"text/plain"(), S) == """
 Basic semialgebraic Set defined by no equality
 2 inequalities
- x + y - 1 ≥ 0
- -x + y ≥ 0
+ -1 + y + x ≥ 0
+ y - x ≥ 0
 """
         @test sprint(show, S.V) == "R^n"
         @test sprint(show, MIME"text/plain"(), S.V) == """
@@ -77,10 +77,10 @@ Algebraic Set defined by no equality
     end
     @testset "Basic with fixed variables" begin
         S = @set x == 1 && x ≤ x^2
-        @test sprint(show, S) == "{ (x) | x - 1 = 0, x^2 - x ≥ 0 }"
-        @test sprint(show, MIME"text/plain"(), S) == "Basic semialgebraic Set defined by 1 equalitty\n x - 1 = 0\n1 inequalitty\n x^2 - x ≥ 0\n"
-        @test sprint(show, S.V) == "{ (x) | x - 1 = 0 }"
-        @test sprint(show, MIME"text/plain"(), S.V) == "Algebraic Set defined by 1 equalitty\n x - 1 = 0\n"
+        @test sprint(show, S) == "{ (x) | -1 + x = 0, -x + x^2 ≥ 0 }"
+        @test sprint(show, MIME"text/plain"(), S) == "Basic semialgebraic Set defined by 1 equalitty\n -1 + x = 0\n1 inequalitty\n -x + x^2 ≥ 0\n"
+        @test sprint(show, S.V) == "{ (x) | -1 + x = 0 }"
+        @test sprint(show, MIME"text/plain"(), S.V) == "Algebraic Set defined by 1 equalitty\n -1 + x = 0\n"
 
         S = @set x == 1 && x ≤ y && 2 == y
         @test S isa BasicSemialgebraicSet{Int}

test/solve.jl

@@ -134,7 +134,7 @@ end
     @test iszerodimensional(V)
     iszd, B = monomialbasis(V.I)
     @test iszd
-    @test B == [y^3*z, x*y*z, y^3, y^2*z, x*y, x*z, y^2, y*z, x, y, z, 1]
+    @test B == [1, z, y, x, y*z, y^2, x*z, x*y, y^2*z, y^3, x*y*z, y^3*z]
     testelements(V, [[0, 1, √2], [0, 1, -√2], [1, 0, -√2], [1, 0, √2], [-√2/2, -√2/2, √2], [√2/2, √2/2, -√2]])
 end