Update to the new StarAlgebra (#133)

* Update to MultivariateBases refactoring

* update

* up

* Fix format

* bump

* Fixes

* fix sage

Author: blegat

Project.toml

@@ -18,9 +18,9 @@ SemialgebraicSets = "8e049039-38e8-557d-ae3a-bc521ccf6204"
 StarAlgebras = "0c0c59c1-dc5f-42e9-9a8b-b5dc384a6cd1"
 
 [compat]
-DataStructures = "0.18"
-DynamicPolynomials = "0.5,0.6"
-IntervalArithmetic = "0.20, 0.21, 0.22" # Needs v0.20 for Julia v1.6 support
+DataStructures = "0.19"
+DynamicPolynomials = "0.5, 0.6"
+IntervalArithmetic = "0.20, 0.21, 0.22, 1" # Needs v0.20 for Julia v1.6 support
 JuMP = "1"
 MathOptInterface = "1"
 MultivariateBases = "0.2"

src/Bridges/Constraint/zero_polynomial.jl

@@ -72,11 +72,11 @@ end
 function MOI.get(
     ::MOI.ModelLike,
     ::MOI.ConstraintSet,
-    bridge::ZeroPolynomialBridge{T,F,MB.SubBasis{MB.Monomial,M,V}},
-) where {T,F,M,V}
+    bridge::ZeroPolynomialBridge,
+)
     return PolyJuMP.ZeroPolynomialSet(
         SS.FullSpace(),
-        MB.FullBasis{MB.Monomial,M}(),
+        parent(bridge.basis),
         bridge.basis,
     )
 end

src/Bridges/Constraint/zero_polynomial_in_algebraic_set.jl

@@ -5,31 +5,22 @@ struct ZeroPolynomialInAlgebraicSetBridge{
     F<:MOI.AbstractVectorFunction,
     Z<:SA.AbstractBasis,
     DT<:SS.AbstractAlgebraicSet,
-    MT<:MP.AbstractMonomial,
-    MVT<:AbstractVector{MT},
+    B<:MB.SubBasis,
 } <: MOI.Bridges.Constraint.AbstractBridge
     zero_constraint::MOI.ConstraintIndex{
         F,
-        PolyJuMP.ZeroPolynomialSet{
-            SS.FullSpace,
-            Z,
-            MB.SubBasis{MB.Monomial,MT,MVT},
-        },
+        PolyJuMP.ZeroPolynomialSet{SS.FullSpace,Z,B},
     }
     domain::DT
-    basis::MB.SubBasis{MB.Monomial,MT,MVT}
+    basis::B
 end
 
 function MOI.Bridges.Constraint.bridge_constraint(
-    ::Type{ZeroPolynomialInAlgebraicSetBridge{T,F,Z,DT,MT,MVT}},
+    ::Type{ZeroPolynomialInAlgebraicSetBridge{T,F,Z,DT,B}},
     model::MOI.ModelLike,
     f::MOI.AbstractVectorFunction,
-    s::PolyJuMP.ZeroPolynomialSet{
-        <:SS.AbstractAlgebraicSet,
-        Z,
-        MB.SubBasis{MB.Monomial,MT,MVT},
-    },
-) where {T,F,Z,DT,MT,MVT}
+    s::PolyJuMP.ZeroPolynomialSet{<:SS.AbstractAlgebraicSet,Z,B},
+) where {T,F,Z,DT,B}
     p = MP.polynomial(MB.algebra_element(MOI.Utilities.scalarize(f), s.basis))
     # As `*(::MOI.ScalarAffineFunction{T}, ::S)` is only defined if `S == T`, we
     # need to call `similar`. This is critical since `T` is
@@ -46,7 +37,7 @@ function MOI.Bridges.Constraint.bridge_constraint(
             MB.SubBasis{MB.Monomial}(MP.monomials(r)),
         ),
     )
-    return ZeroPolynomialInAlgebraicSetBridge{T,F,Z,DT,MT,MVT}(
+    return ZeroPolynomialInAlgebraicSetBridge{T,F,Z,DT,B}(
         zero_constraint,
         s.domain,
         s.basis,
@@ -68,52 +59,34 @@ function MOI.Bridges.added_constrained_variable_types(
 end
 
 function MOI.Bridges.added_constraint_types(
-    ::Type{<:ZeroPolynomialInAlgebraicSetBridge{T,F,Z,DT,MT,MVT}},
-) where {T,F,Z,DT,MT,MVT}
-    return [(
-        F,
-        PolyJuMP.ZeroPolynomialSet{
-            SS.FullSpace,
-            Z,
-            MB.SubBasis{MB.Monomial,MT,MVT},
-        },
-    )]
+    ::Type{<:ZeroPolynomialInAlgebraicSetBridge{T,F,Z,DT,B}},
+) where {T,F,Z,DT,B}
+    return [(F, PolyJuMP.ZeroPolynomialSet{SS.FullSpace,Z,B})]
 end
 
 function MOI.Bridges.Constraint.concrete_bridge_type(
     ::Type{<:ZeroPolynomialInAlgebraicSetBridge{T}},
     F::Type{<:MOI.AbstractVectorFunction},
-    ::Type{<:PolyJuMP.ZeroPolynomialSet{DT,Z,MB.SubBasis{MB.Monomial,MT,MVT}}},
-) where {T,Z,DT<:SS.AbstractAlgebraicSet,MT,MVT}
+    ::Type{<:PolyJuMP.ZeroPolynomialSet{DT,Z,B}},
+) where {T,Z,DT<:SS.AbstractAlgebraicSet,B}
     G = MOI.Utilities.promote_operation(-, T, F, F)
-    return ZeroPolynomialInAlgebraicSetBridge{T,G,Z,DT,MT,MVT}
+    return ZeroPolynomialInAlgebraicSetBridge{T,G,Z,DT,B}
 end
 
 # Attributes, Bridge acting as an model
 function MOI.get(
-    ::ZeroPolynomialInAlgebraicSetBridge{T,F,Z,DT,MT,MVT},
-    ::MOI.NumberOfConstraints{
-        F,
-        PolyJuMP.ZeroPolynomialSet{
-            SS.FullSpace,
-            Z,
-            MB.SubBasis{MB.Monomial,MT,MVT},
-        },
-    },
-) where {T,F,Z,DT,MT,MVT}
+    ::ZeroPolynomialInAlgebraicSetBridge{T,F,Z,DT,B},
+    ::MOI.NumberOfConstraints{F,PolyJuMP.ZeroPolynomialSet{SS.FullSpace,Z,B}},
+) where {T,F,Z,DT,B}
     return 1
 end
 function MOI.get(
-    b::ZeroPolynomialInAlgebraicSetBridge{T,F,Z,DT,MT,MVT},
+    b::ZeroPolynomialInAlgebraicSetBridge{T,F,Z,DT,B},
     ::MOI.ListOfConstraintIndices{
         F,
-        PolyJuMP.ZeroPolynomialSet{
-            SS.FullSpace,
-            Z,
-            MB.SubBasis{MB.Monomial,MT,MVT},
-        },
+        PolyJuMP.ZeroPolynomialSet{SS.FullSpace,Z,B},
     },
-) where {T,F,Z,DT,MT,MVT}
+) where {T,F,Z,DT,B}
     return [b.zero_constraint]
 end
 
@@ -153,7 +126,7 @@ function MOI.get(
     set = MOI.get(model, MOI.ConstraintSet(), bridge.zero_constraint)
     μ = MM.measure(dual, set.basis)
     I = SS.ideal(bridge.domain)
-    return [dot(rem(mono, I), μ) for mono in bridge.basis.monomials]
+    return [dot(rem(mono, I), μ) for mono in MB.keys_as_monomials(bridge.basis)]
 end
 
 function MOI.get(

src/KKT/KKT.jl

@@ -215,8 +215,7 @@ function _optimize!(model::Optimizer{T}) where {T}
     try # We could check `SS.is_zero_dimensional(system)` but that would only work for Gröbner basis based
         solutions = collect(system)
     catch err
-        model.extrema = Vector{T}[]
-        model.objective_values = zeros(T, 0)
+        model.solutions = PolyJuMP.Solution{T}[]
         model.termination_status = MOI.OTHER_ERROR
         model.raw_status = "KKT system solver failed with : $(sprint(showerror, err))."
         return

src/SAGE/SAGE.jl

@@ -1,6 +1,7 @@
 module SAGE
 
 import MutableArithmetics as MA
+import StarAlgebras as SA
 import MultivariateBases as MB
 import MultivariatePolynomials as MP
 import MathOptInterface as MOI
@@ -41,9 +42,11 @@ struct Signomials{M<:Union{Nothing,Int,MP.AbstractMonomial}} <:
 end
 Signomials() = Signomials(nothing)
 _index(_, ::Nothing) = nothing
-_index(basis, mono::MP.AbstractMonomial) = MB.monomial_index(basis, mono)::Int
+function _index(basis, mono::MP.AbstractMonomial)
+    return SA.key_index(basis, MP.exponents(mono))::Int
+end
 function JuMP.moi_set(c::Signomials, basis::MB.SubBasis{MB.Monomial})
-    monos = basis.monomials
+    monos = MB.keys_as_monomials(basis)
     return Cone(Signomials(_index(basis, c.monomial)), _exponents_matrix(monos))
 end
 
@@ -58,7 +61,7 @@ struct Polynomials{M<:Union{Nothing,Int,MP.AbstractMonomial}} <:
 end
 Polynomials() = Polynomials(nothing)
 function JuMP.moi_set(c::Polynomials, basis::MB.SubBasis{MB.Monomial})
-    monos = basis.monomials
+    monos = MB.keys_as_monomials(basis)
     return Cone(
         Polynomials(_index(basis, c.monomial)),
         _exponents_matrix(monos),
@@ -139,7 +142,7 @@ function decomposition(
     tol::Real,
     result_index::Int = 1,
 )
-    monos = con_ref.shape.basis.monomials
+    monos = MB.keys_as_monomials(con_ref.shape.basis)
     attr = DecompositionAttribute(tol, result_index)
     return Decomposition([
         MP.polynomial(a, monos) for

src/constraint.jl

@@ -45,7 +45,7 @@ function JuMP.moi_set(
     ::ZeroPoly,
     b::MB.SubBasis{MB.Monomial,M};
     domain::SS.AbstractSemialgebraicSet = SS.FullSpace(),
-    basis = MB.FullBasis{MB.Monomial,M}(),
+    basis = parent(b),
 ) where {M}
     return ZeroPolynomialSet(domain, basis, b)
 end

src/variable.jl

@@ -17,16 +17,16 @@ end
 
 function JuMP.value(
     f::Function,
-    p::SA.AlgebraElement{A,<:JuMP.AbstractJuMPScalar},
-) where {A}
+    p::SA.AlgebraElement{<:JuMP.AbstractJuMPScalar},
+)
     return SA.AlgebraElement(JuMP.value.(f, SA.coeffs(p)), parent(p))
 end
 
 function JuMP.value(p::MP.AbstractPolynomialLike{<:JuMP.AbstractJuMPScalar})
     return JuMP.value(JuMP.value, p)
 end
 
-function JuMP.value(p::SA.AlgebraElement{A,<:JuMP.AbstractJuMPScalar}) where {A}
+function JuMP.value(p::SA.AlgebraElement{<:JuMP.AbstractJuMPScalar})
     return JuMP.value(JuMP.value, p)
 end
 

test/Mock/plus_minus.jl

@@ -7,10 +7,12 @@ using DynamicPolynomials
 
 using SemialgebraicSets
 using PolyJuMP
+const _full_basis_type = typeof(MB.FullBasis{MB.Monomial}(x))
+const _sub_basis_type = MB.explicit_basis_type(_full_basis_type)
 const NonNeg = DummyPolyModule.NonNeg{
-    MB.FullBasis{MB.Monomial,monomial_type(x)},
+    _full_basis_type,
     typeof(@set x^2 ≤ 0),
-    MB.SubBasis{MB.Monomial,monomial_type(x),monomial_vector_type(x)},
+    _sub_basis_type,
 }
 
 MOI.Utilities.@model(

test/Mock/zero_polynomial.jl

@@ -29,7 +29,7 @@ end
     function optimize!(mock)
         return MOI.Utilities.mock_optimize!(
             mock,
-            [1.0, 0.0, 1.0, 0.0, 0.0, 0.0],
+            [1.0, 0.0, 0.0, 0.0, 0.0],
             (MOI.ScalarAffineFunction{Float64}, MOI.LessThan{Float64}) =>
                 [-1.0],
             (MOI.VectorAffineFunction{Float64}, MOI.Zeros) => [[-1.0], [-1.0]],

test/Tests/zero_polynomial.jl

@@ -51,16 +51,10 @@ function _zero_polynomial_test(
     end
 
     F = MOI.VectorAffineFunction{Float64}
-    ST = PolyJuMP.ZeroPolynomialSet{
-        FullSpace,
-        MB.FullBasis{MB.Monomial,monomial_type(x)},
-        MB.SubBasis{MB.Monomial,monomial_type(x),monomial_vector_type(x)},
-    }
-    SP = PolyJuMP.ZeroPolynomialSet{
-        FullSpace,
-        MB.FullBasis{MB.Monomial,monomial_type(x)},
-        MB.SubBasis{MB.Monomial,monomial_type(x),monomial_vector_type(x)},
-    }
+    full_basis_type = typeof(MB.FullBasis{MB.Monomial}(x))
+    sub_basis_type = MB.explicit_basis_type(full_basis_type)
+    ST = PolyJuMP.ZeroPolynomialSet{FullSpace,full_basis_type,sub_basis_type}
+    SP = PolyJuMP.ZeroPolynomialSet{FullSpace,full_basis_type,sub_basis_type}
     @test Set(MOI.get(model, MOI.ListOfConstraintTypesPresent())) == Set([
         (MOI.VariableIndex, MOI.LessThan{Float64}),
         (F, SP),