Merge pull request #23 from JuliaOpt/bl/scaled

Test and export ScaledMonomialBasis
jump-dev · Aug 8, 2018 · 3f822e3 · 3f822e3
2 parents 77b1a3b + 679af28
commit 3f822e3
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/src/basis.jl b/src/basis.jl
@@ -1,4 +1,4 @@
-export FixedPolynomialBasis, MonomialBasis
+export FixedPolynomialBasis, ScaledMonomialBasis, MonomialBasis
 
 """
     abstract type AbstractPolynomialBasis end

diff --git a/src/constraint.jl b/src/constraint.jl
@@ -17,7 +17,7 @@ const PolyConstraintRef{CD<:ConstraintDelegate} = ConstraintRef{Model, CD}
 
 function JuMP.addconstraint(m::Model, pc::PolyConstraint, name::String; domain::AbstractSemialgebraicSet=FullSpace(), basis=MonomialBasis, kwargs...)
     delegate = addpolyconstraint!(m, pc.p, pc.set, domain, basis; kwargs...)
-    JuMP.ConstraintRef(m, delegate)
+    JuMP.ConstraintRef(m, delegate, JuMP.ScalarShape())
 end
 
 getdelegate(c::PolyConstraintRef) = c.index

diff --git a/src/data.jl b/src/data.jl
@@ -1,5 +1,5 @@
 # PolyJuMP Data
-type Data
+mutable struct Data
     # Default set for NonNegPoly
     nonnegpolydefault::Nullable
     # Default set for NonNegPolyMatrix

diff --git a/test/variable.jl b/test/variable.jl
@@ -43,10 +43,16 @@
         @variable m p5[1:3] Poly(X)
         @test isa(p5, Vector{DynamicPolynomials.Polynomial{true,JuMP.VariableRef}})
         testvar(m, p5[1], X)
-        @variable(m, p6, Poly(X), integer=true)
+        @variable(m, p6, Poly(MonomialBasis(X)), integer=true)
         testvar(m, p6, X, false, true)
     end
 
+    @testset "ScaledMonomialBasis" begin
+        m = Model()
+        @variable(m, p1, Poly(ScaledMonomialBasis([1, x, x^2])), Int)
+        testvar(m, p1, monovec([1, x, x^2]), false, true, false)
+    end
+
     @testset "FixedPolynomialBasis" begin
         m = Model()
         @variable(m, p1, Poly(FixedPolynomialBasis([1 - x^2, x^2 + 2])), Bin)