Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Test and export ScaledMonomialBasis #23

Merged
merged 2 commits into from
Aug 8, 2018
Merged

Test and export ScaledMonomialBasis #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
899c429
Test and export ScaledMonomialBasis
blegat Aug 8, 2018
679af28
Fix deprecations
femtocleaner[bot] Aug 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/basis.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export FixedPolynomialBasis, MonomialBasis
export FixedPolynomialBasis, ScaledMonomialBasis, MonomialBasis

"""
abstract type AbstractPolynomialBasis end
Expand Down
2 changes: 1 addition & 1 deletion src/constraint.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/data.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# PolyJuMP Data
type Data
mutable struct Data
# Default set for NonNegPoly
nonnegpolydefault::Nullable
# Default set for NonNegPolyMatrix
Expand Down
8 changes: 7 additions & 1 deletion test/variable.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down