Skip to content

Commit f4ad627

Browse files
committed
Fix format
1 parent 0e52542 commit f4ad627

File tree

4 files changed

+35
-16
lines changed

4 files changed

+35
-16
lines changed

src/RelativeEntropy/RelativeEntropy.jl

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -169,13 +169,17 @@ function DecompositionAttribute(tol::Real)
169169
return DecompositionAttribute(tol, 1)
170170
end
171171

172-
function decomposition(con_ref::JuMP.ConstraintRef; tol::Real, result_index::Int = 1)
172+
function decomposition(
173+
con_ref::JuMP.ConstraintRef;
174+
tol::Real,
175+
result_index::Int = 1,
176+
)
173177
monos = con_ref.shape.monomials
174178
attr = DecompositionAttribute(tol, result_index)
175-
return Decomposition(
176-
[MP.polynomial(a, monos)
177-
for a in MOI.get(JuMP.owner_model(con_ref), attr, con_ref)]
178-
)
179+
return Decomposition([
180+
MP.polynomial(a, monos) for
181+
a in MOI.get(JuMP.owner_model(con_ref), attr, con_ref)
182+
])
179183
end
180184

181185
MOI.is_set_by_optimize(::DecompositionAttribute) = true

src/RelativeEntropy/bridges/sage.jl

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,13 @@ function MOI.get(
7878
!isempty,
7979
[
8080
filter(
81-
x -> !isapprox(x, zero(x), atol=attr.tol),
82-
MOI.get(model, MOI.VariablePrimal(attr.result_index), bridge.ν[k, :])
83-
)
84-
for k in axes(bridge.ν, 1)
85-
]
81+
x -> !isapprox(x, zero(x), atol = attr.tol),
82+
MOI.get(
83+
model,
84+
MOI.VariablePrimal(attr.result_index),
85+
bridge.ν[k, :],
86+
),
87+
) for k in axes(bridge.ν, 1)
88+
],
8689
)
8790
end

src/RelativeEntropy/bridges/signomial.jl

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,21 @@ function MOI.Bridges.Constraint.bridge_constraint(
3131
if any(isodd, set.α[i, :])
3232
vi = MOI.add_variable(model)
3333
# vi ≤ -|g[i]|
34-
MOI.Utilities.normalize_and_add_constraint(model, one(T) * vi - g[i], MOI.LessThan(zero(T)))
35-
MOI.Utilities.normalize_and_add_constraint(model, one(T) * vi + g[i], MOI.LessThan(zero(T)))
34+
MOI.Utilities.normalize_and_add_constraint(
35+
model,
36+
one(T) * vi - g[i],
37+
MOI.LessThan(zero(T)),
38+
)
39+
MOI.Utilities.normalize_and_add_constraint(
40+
model,
41+
one(T) * vi + g[i],
42+
MOI.LessThan(zero(T)),
43+
)
3644
g[i] = vi
3745
end
3846
end
39-
constraint = MOI.add_constraint(model, MOI.Utilities.vectorize(g), _signomial(set))
47+
constraint =
48+
MOI.add_constraint(model, MOI.Utilities.vectorize(g), _signomial(set))
4049
return SignomialBridge{T,S,P,F}(constraint)
4150
end
4251

test/relative_entropy.jl

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,18 @@ function _test_motzkin(x, y, T, solver, set, feasible, square, neg)
2626
if feasible
2727
@test termination_status(model) == MOI.OPTIMAL
2828
@test primal_status(model) == MOI.FEASIBLE_POINT
29-
if set isa Union{PolyJuMP.RelativeEntropy.SignomialSAGESet,
30-
PolyJuMP.RelativeEntropy.PolynomialSAGESet}
29+
if set isa Union{
30+
PolyJuMP.RelativeEntropy.SignomialSAGESet,
31+
PolyJuMP.RelativeEntropy.PolynomialSAGESet,
32+
}
3133
d = PolyJuMP.RelativeEntropy.decomposition(con_ref; tol = 1e-6)
3234
p = MP.polynomial(d)
3335
if set isa PolyJuMP.RelativeEntropy.SignomialSAGESet
3436
@test p motzkin atol = 1e-6
3537
else
3638
for m in MP.monomials(p - motzkin)
37-
@test MP.coefficient(p, m) MP.coefficient(motzkin, m) atol = 1e-6
39+
@test MP.coefficient(p, m) MP.coefficient(motzkin, m) atol =
40+
1e-6
3841
end
3942
end
4043
end

0 commit comments

Comments
 (0)