Update for MP renamings (#35)

blegat · web-flow · commit d211700efa38 · 2023-05-10T15:47:52.000+02:00
* Update for MP renamings

* Add stdlib packages
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -27,7 +27,7 @@ jobs:
             os: ubuntu-latest
             arch: x64
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: julia-actions/setup-julia@v1
         with:
           version: ${{ matrix.version }}
@@ -42,26 +42,20 @@ jobs:
             ${{ runner.os }}-test-${{ env.cache-name }}-
             ${{ runner.os }}-test-
             ${{ runner.os }}-
-      - name: MultivariatePolynomials#master
+      - name: dev
         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"))
+          Pkg.add([
+              PackageSpec(name="MultivariatePolynomials", rev="master"),
+              PackageSpec(name="TypedPolynomials", rev="master"),
+              PackageSpec(name="DynamicPolynomials", rev="master"),
+          ])
       - uses: julia-actions/julia-buildpkg@v1
       - uses: julia-actions/julia-runtest@v1
         with:
           depwarn: error
       - uses: julia-actions/julia-processcoverage@v1
-      - uses: codecov/codecov-action@v1
+      - uses: codecov/codecov-action@v3
         with:
           file: lcov.info
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@ Manifest.toml
 *.jl.cov
 *.jl.*.cov
 *.jl.mem
+.vscode
diff --git a/src/SemialgebraicSets.jl b/src/SemialgebraicSets.jl
@@ -28,10 +28,10 @@ function Base.show(io::IO, ::FullSpace)
 end
 nequalities(::FullSpace) = 0
 equalities(::FullSpace) = []
-MP.changecoefficienttype(S::Type{FullSpace}, T::Type) = S
+MP.similar_type(S::Type{FullSpace}, T::Type) = S
 
-function MP.changecoefficienttype(set::AbstractSemialgebraicSet, T::Type)
-    return convert(MP.changecoefficienttype(typeof(set), T), set)
+function Base.similar(set::AbstractSemialgebraicSet, T::Type)
+    return convert(MP.similar_type(typeof(set), T), set)
 end
 
 Base.intersect(S::AbstractAlgebraicSet, T::FullSpace) = S
diff --git a/src/basic.jl b/src/basic.jl
@@ -20,7 +20,7 @@ function basicsemialgebraicset(V, p)
     BasicSemialgebraicSet(V, p)
 end
 
-MP.changecoefficienttype(::Type{BasicSemialgebraicSet{S, PS, AT}}, T::Type) where {S, PS, AT} = BasicSemialgebraicSet{T, MP.changecoefficienttype(PS, T), MP.changecoefficienttype(AT, T)}
+MP.similar_type(::Type{BasicSemialgebraicSet{S, PS, AT}}, T::Type) where {S, PS, AT} = BasicSemialgebraicSet{T, MP.similar_type(PS, T), MP.similar_type(AT, T)}
 
 function Base.convert(::Type{BasicSemialgebraicSet{T, PT, AT}}, set::BasicSemialgebraicSet) where {T, PT, AT}
     return BasicSemialgebraicSet{T, PT, AT}(set.V, set.p)
diff --git a/src/fix.jl b/src/fix.jl
@@ -37,7 +37,7 @@ end
 struct FixedVariablesSet{V, T, MT} <: AbstractAlgebraicSet
     ideal::FixedVariablesIdeal{V, T, MT}
 end
-MP.changecoefficienttype(::Type{FixedVariablesSet{V, S, MT}}, T::Type) where {V, S, MT} = FixedVariablesSet{V, T, MT}
+MP.similar_type(::Type{FixedVariablesSet{V, S, MT}}, T::Type) where {V, S, MT} = FixedVariablesSet{V, T, MT}
 function Base.convert(::Type{FixedVariablesSet{V, T, MT}}, set::FixedVariablesSet{V, T, MT}) where {V, T, MT}
     return set
 end
@@ -56,7 +56,7 @@ function nequalities(set::FixedVariablesSet)
 end
 function equalities(set::FixedVariablesSet{V, T, MT}) where {V, T, MT}
     if set.ideal.substitutions === nothing
-        return [constantterm(one(T), MT)]
+        return [constant_term(one(T), MT)]
     else
         return [key - value for (key, value) in set.ideal.substitutions]
     end
diff --git a/src/groebner.jl b/src/groebner.jl
@@ -11,13 +11,13 @@ S(p, q) =  \\frac{m}{\\mathrm{\\mathsc{LT}}(p)} \\cdot p - \\frac{m}{\\mathrm{\\
 where ``m = \\mathrm{lcm}(\\mathrm{\\mathsc{LM}}(p), \\mathrm{\\mathsc{LM}}(q))``.
 """
 function spolynomial(p::APL, q::APL)
-    m = lcm(leadingmonomial(p), leadingmonomial(q))
-    ltp = leadingterm(p)
+    m = lcm(leading_monomial(p), leading_monomial(q))
+    ltp = leading_term(p)
     # `MA.operate` ensures that the returned value can be mutated without
     # affecting either `a` or `p`.
     a = MA.operate(*, MP.div_multiple(m, monomial(ltp)), p)
     ad = MA.operate!!(/, a, MP.coefficient(ltp))
-    ltq = leadingterm(q)
+    ltq = leading_term(q)
     b = MA.operate(*, MP.div_multiple(m, monomial(ltq)), q)
     bd = MA.operate!!(/, b, MP.coefficient(ltq))
     return MA.operate!!(-, ad, bd)
@@ -36,7 +36,7 @@ function reducebasis!(F::AbstractVector{<:APL}; kwargs...)
                 deleteat!(keep, findfirst(isequal(j), keep))
                 push!(del, j)
                 changed = true # Should probably not set that, no need to do one more loop int this case
-            elseif leadingmonomial(r) != leadingmonomial(F[j])
+            elseif leading_monomial(r) != leading_monomial(F[j])
                 F[j] = r
                 changed = true
             end
@@ -47,14 +47,14 @@ end
 
 ext(i, j) = (min(i, j), max(i, j))
 
-lcmlm(F, i, j) = lcm(leadingmonomial(F[i]), leadingmonomial(F[j]))
+lcmlm(F, i, j) = lcm(leading_monomial(F[i]), leading_monomial(F[j]))
 
 function criterion(F, B, i, j)
     m = lcmlm(F, i, j)
     for k in eachindex(F)
         if k != i && k != j &&
             !(ext(i, k) in B) && !(ext(j, k) in B) &&
-            divides(leadingmonomial(F[k]), m)
+            divides(leading_monomial(F[k]), m)
             return true
         end
     end
@@ -71,7 +71,7 @@ end
 # Ideals, Varieties, and Algorithms
 # Cox, Little and O'Shea, Fourth edition p. 116
 function presort!(F)
-    sort!(F, by=leadingmonomial)
+    sort!(F, by=leading_monomial)
 end
 
 # Selection of (i, j) ∈ B
@@ -122,8 +122,8 @@ function gröbnerbasis!(F::AbstractVector{<:APL}, algo=defaultgröbnerbasisalgor
     B = Set{NTuple{2, Int}}(Iterators.filter(t -> t[1] < t[2], (i, j) for i in eachindex(F), j in eachindex(F)))
     while !isempty(B)
         (i, j) = algo.sel(F, B)
-        lmi = leadingmonomial(F[i])
-        lmj = leadingmonomial(F[j])
+        lmi = leading_monomial(F[i])
+        lmj = leading_monomial(F[j])
         if !isconstant(gcd(lmi, lmj)) && !criterion(F, B, i, j)
             #r = rem(spolynomial(F[i], F[j]), F; ztol=algo.ztol)
             r = rem(spolynomial(F[i], F[j]), F)
diff --git a/src/ideal.jl b/src/ideal.jl
@@ -23,7 +23,7 @@ function PolynomialIdeal{T, PT}(p::Vector{PT}, algo::A) where {T, PT<:APL{T}, A<
 end
 function PolynomialIdeal(p::Vector{PT}, algo) where {T, PT<:APL{T}}
     S = promote_for_division(T)
-    PolynomialIdeal{S, polynomialtype(PT, S)}(AbstractVector{polynomialtype(PT, S)}(p), algo)
+    PolynomialIdeal{S, polynomial_type(PT, S)}(AbstractVector{polynomial_type(PT, S)}(p), algo)
 end
 function PolynomialIdeal{T, PT}() where {T, PT<:APL{T}}
     PolynomialIdeal(PT[], defaultgröbnerbasisalgorithm(PT))
@@ -57,10 +57,10 @@ end
 function monomialbasis(I, vars=variables(I))
     computegröbnerbasis!(I)
     if isempty(I.p)
-        return false, monomialtype(eltype(I.p))[]
+        return false, monomial_type(eltype(I.p))[]
     end
-    mv = monovec(leadingmonomial.(I.p))
-    # monovec makes sure all monomials have the same variables
+    mv = monomial_vector(leading_monomial.(I.p))
+    # monomial_vector makes sure all monomials have the same variables
     # if x_i^n is in the leading monomials, lv[i] <= n
     lv = -ones(Int, length(vars))
     for m in mv
@@ -75,7 +75,7 @@ function monomialbasis(I, vars=variables(I))
         end
     end
     if any(lv .< 0)
-        return false, monomialtype(eltype(I.p))[]
+        return false, monomial_type(eltype(I.p))[]
     end
     return true, monomials(vars, 0:(sum(lv)-1), m -> !any(map(m2 -> divides(m2, m), mv)))
 end
diff --git a/src/solve.jl b/src/solve.jl
@@ -110,6 +110,9 @@ function _solvemultiplicationmatrices(Ms::AbstractVector{<:AbstractMatrix{T}}, 
     @assert length(Ms) == length(λ)
     n = length(λ)
     Z, clusters = clusterordschur(sum(λ .* Ms), solver.ɛ)
+    for i in 1:n
+        display(Z' * Ms[i] * Z)
+    end
     r = length(clusters)
     vals = [zeros(T, n) for k in 1:r]
     for k in 1:r
diff --git a/src/variety.jl b/src/variety.jl
@@ -21,7 +21,7 @@ AlgebraicSet(I::PolynomialIdeal{T, PT, A}, solver::S) where {T, PT, A, S} = Alge
 AlgebraicSet{T, PT}() where {T, PT} = AlgebraicSet(PolynomialIdeal{T, PT}(), defaultalgebraicsolver(T))
 AlgebraicSet(p::Vector, algo::AbstractGröbnerBasisAlgorithm, solver) = AlgebraicSet(ideal(p, algo), solver)
 
-MP.changecoefficienttype(::Type{AlgebraicSet{U, PU, A, S, UU}}, T::Type) where {U, PU, A, S, UU} = AlgebraicSet{T, MP.changecoefficienttype(PU, T), A, S, float(T)}
+MP.similar_type(::Type{AlgebraicSet{U, PU, A, S, UU}}, T::Type) where {U, PU, A, S, UU} = AlgebraicSet{T, MP.similar_type(PU, T), A, S, float(T)}
 function Base.convert(::Type{AlgebraicSet{T, PT, A, S, U}}, set::AlgebraicSet{T, PT, A, S, U}) where {T, PT<:APL{T}, A, S<:AbstractAlgebraicSolver, U}
     return set
 end
diff --git a/test/Project.toml b/test/Project.toml
@@ -0,0 +1,7 @@
+[deps]
+DynamicPolynomials = "7c1d4256-1411-5781-91ec-d7bc3513ac07"
+LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
+MultivariatePolynomials = "102ac46a-7ee4-5c85-9060-abc95bfdeaa3"
+Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
+SemialgebraicSets = "8e049039-38e8-557d-ae3a-bc521ccf6204"
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
diff --git a/test/REQUIRE b/test/REQUIRE
diff --git a/test/bug.jl b/test/bug.jl
@@ -0,0 +1,12 @@
+function test(ztol=Base.rtoldefault(Float64))
+    X = [0.5459627556242905, 1.7288950489507429, 0.7167681447476535]
+    Y = [-54.06002080721971, 173.77393714162503, 71.48154370522498]
+    n = 3
+    @polyvar W[1:n] α β
+    I = @set(sum([W[i] * X[i] * (β * X[i] + α - Y[i]) for i = 1:n]) == 0, library = Buchberger(ztol))
+    for i in 1:n
+        addequality!(I, W[i] - W[i]^2)
+    end
+    SemialgebraicSets.computegröbnerbasis!(I.I)
+    I
+end
diff --git a/test/macro.jl b/test/macro.jl
@@ -18,12 +18,12 @@ struct DummySolver <: SemialgebraicSets.AbstractAlgebraicSolver end
         @test S.V isa AlgebraicSet{Rational{BigInt}}
         @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 === similar(S, Rational{BigInt})
+        @test S.V === similar(S.V, Rational{BigInt})
         @test S.V.I === convert(typeof(S.V.I), S.V.I)
-        @test BasicSemialgebraicSet{Int, polynomialtype(x, Int)}() isa BasicSemialgebraicSet{Rational{BigInt}, polynomialtype(x, Rational{BigInt})}
+        @test BasicSemialgebraicSet{Int, polynomial_type(x, Int)}() isa BasicSemialgebraicSet{Rational{BigInt}, polynomial_type(x, Rational{BigInt})}
         @test Int32(2)*x^2*y isa MultivariatePolynomials.AbstractTerm{Int32}
-        Sf = MultivariatePolynomials.changecoefficienttype(S, Float32)
+        Sf = similar(S, Float32)
         @test Sf isa BasicSemialgebraicSet{Float32}
         @test Sf.V isa AlgebraicSet{Float32}
 
@@ -63,17 +63,17 @@ Basic semialgebraic Set defined by no equality
 Algebraic Set defined by no equality
 """
         @test S isa BasicSemialgebraicSet{Int}
-        @test S === MultivariatePolynomials.changecoefficienttype(S, Int)
+        @test S === similar(S, Int)
         @test S.V isa FullSpace
-        Sf = MultivariatePolynomials.changecoefficienttype(S, Float64)
+        Sf = similar(S, Float64)
         @test Sf isa BasicSemialgebraicSet{Float64}
         @test Sf.V isa FullSpace
 
         @test S ∩ FullSpace() === S
         @test S.V ∩ FullSpace() === S.V
         @test FullSpace() ∩ S  === S
         @test FullSpace() ∩ S.V  === S.V
-        @test S.V === MultivariatePolynomials.changecoefficienttype(S.V, Float64)
+        @test S.V === similar(S.V, Float64)
     end
     @testset "Basic with fixed variables" begin
         S = @set x == 1 && x ≤ x^2
@@ -86,10 +86,10 @@ Algebraic Set defined by no equality
         @test S isa BasicSemialgebraicSet{Int}
         @test S.V isa FixedVariablesSet{<:AbstractVariable, Int}
         @test rem(x + y, ideal(S.V)) == 3
-        @test S === MultivariatePolynomials.changecoefficienttype(S, Int)
-        @test S.V === MultivariatePolynomials.changecoefficienttype(S.V, Int)
+        @test S === similar(S, Int)
+        @test S.V === similar(S.V, Int)
         @test S.V.ideal === convert(typeof(S.V.ideal), S.V.ideal)
-        Sf = MultivariatePolynomials.changecoefficienttype(S, Float64)
+        Sf = similar(S, Float64)
         @test Sf isa BasicSemialgebraicSet{Float64}
         @test Sf.V isa FixedVariablesSet{<:AbstractVariable, Float64}
         @test rem(x + y, ideal(Sf.V)) == 3
@@ -98,7 +98,7 @@ Algebraic Set defined by no equality
         @test S isa BasicSemialgebraicSet{Int}
         @test S.V isa FixedVariablesSet{<:AbstractVariable, Int}
         @test rem(x + y, ideal(S.V)) == 3
-        Sf = MultivariatePolynomials.changecoefficienttype(S, Float64)
+        Sf = similar(S, Float64)
         @test Sf isa BasicSemialgebraicSet{Float64}
         @test Sf.V isa FixedVariablesSet{<:AbstractVariable, Float64}
         @test rem(x + y, ideal(Sf.V)) == 3
diff --git a/test/rename.jl b/test/rename.jl
@@ -0,0 +1 @@
+functi
diff --git a/test/solve.jl b/test/solve.jl
@@ -40,7 +40,7 @@ function testelementstypes(X, Y; kwargs...)
         else
             U = float(T)
         end
-        V = MultivariatePolynomials.changecoefficienttype(X, T)
+        V = similar(X, T)
         testelements(V, Y; kwargs...)
         @test eltype(V) == Vector{U}
         @test collect(V) isa Vector{Vector{U}}
diff --git a/test/update.sh b/test/update.sh
@@ -0,0 +1,2 @@
+find . -type f -name "*.txt" -print0 | xargs -0 sed -i '' -e 's/foo/bar/g'
+
