Skip to content

Commit

Permalink
Fix format
Browse files Browse the repository at this point in the history
  • Loading branch information
blegat committed Oct 16, 2023
1 parent c2dd903 commit 5e2f529
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 14 deletions.
16 changes: 9 additions & 7 deletions src/SAGE/SAGE.jl
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ end
**S**ums of **A**M/**G**M **E**xponential for signomials.
"""
struct Signomials{M<:Union{Nothing,Int,MP.AbstractMonomial}} <: PolyJuMP.PolynomialSet
struct Signomials{M<:Union{Nothing,Int,MP.AbstractMonomial}} <:
PolyJuMP.PolynomialSet
monomial::M
end
Signomials() = Signomials(nothing)
Expand All @@ -49,12 +50,16 @@ end
**S**ums of **A**M/**G**M **E**xponential for polynomials.
"""
struct Polynomials{M<:Union{Nothing,Int,MP.AbstractMonomial}} <: PolyJuMP.PolynomialSet
struct Polynomials{M<:Union{Nothing,Int,MP.AbstractMonomial}} <:
PolyJuMP.PolynomialSet
monomial::M
end
Polynomials() = Polynomials(nothing)
function JuMP.moi_set(c::Polynomials, monos)
return Cone(Polynomials(_index(monos, c.monomial)), _exponents_matrix(monos))
return Cone(
Polynomials(_index(monos, c.monomial)),
_exponents_matrix(monos),
)
end

function setdefaults!(data::PolyJuMP.Data)
Expand All @@ -65,10 +70,7 @@ end
function JuMP.build_constraint(
_error::Function,
p,
set::Union{
Signomials,
Polynomials,
};
set::Union{Signomials,Polynomials};
kws...,
)
coefs = PolyJuMP.non_constant_coefficients(p)
Expand Down
6 changes: 5 additions & 1 deletion src/SAGE/bridges/age.jl
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,11 @@ function MOI.Bridges.Constraint.bridge_constraint(
)
relative_entropy_constraint =
MOI.add_constraint(model, f, MOI.RelativeEntropyCone(2m - 1))
return AGEBridge{T,F,G,H}(set.cone.monomial, ceq, relative_entropy_constraint)
return AGEBridge{T,F,G,H}(
set.cone.monomial,
ceq,
relative_entropy_constraint,
)
end

function MOI.supports_constraint(
Expand Down
13 changes: 8 additions & 5 deletions src/SAGE/bridges/sage.jl
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,13 @@ function MOI.get(
!isempty,
[
filter(
x -> !isapprox(x, zero(x), atol=attr.tol),
MOI.get(model, MOI.VariablePrimal(attr.result_index), bridge.ν[k, :])
)
for k in axes(bridge.ν, 1)
]
x -> !isapprox(x, zero(x), atol = attr.tol),
MOI.get(
model,
MOI.VariablePrimal(attr.result_index),
bridge.ν[k, :],
),
) for k in axes(bridge.ν, 1)
],
)
end
4 changes: 3 additions & 1 deletion src/SAGE/bridges/signomial.jl
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,9 @@ function MOI.supports_constraint(
return true
end

function MOI.Bridges.added_constrained_variable_types(::Type{<:SignomialsBridge})
function MOI.Bridges.added_constrained_variable_types(
::Type{<:SignomialsBridge},
)
return Tuple{Type}[(MOI.Reals,)]
end

Expand Down

0 comments on commit 5e2f529

Please sign in to comment.