Skip to content

Commit cf2764a

Browse files
committed
Fix format
1 parent ba95bea commit cf2764a

File tree

3 files changed

+41
-11
lines changed

3 files changed

+41
-11
lines changed

src/RelativeEntropy/RelativeEntropy.jl

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,28 @@ function _exponents_matrix(monos)
5555
end
5656

5757
struct SignomialSAGESet <: PolyJuMP.PolynomialSet end
58-
JuMP.reshape_set(::SignomialSAGECone, ::PolyJuMP.PolynomialShape) = SignomialSAGESet()
59-
JuMP.moi_set(::SignomialSAGESet, monos) = SignomialSAGECone(_exponents_matrix(monos))
58+
function JuMP.reshape_set(::SignomialSAGECone, ::PolyJuMP.PolynomialShape)
59+
return SignomialSAGESet()
60+
end
61+
function JuMP.moi_set(::SignomialSAGESet, monos)
62+
return SignomialSAGECone(_exponents_matrix(monos))
63+
end
6064

6165
struct PolynomialSAGESet <: PolyJuMP.PolynomialSet end
62-
JuMP.reshape_set(::PolynomialSAGECone, ::PolyJuMP.PolynomialShape) = PolynomialSAGESet()
63-
JuMP.moi_set(::PolynomialSAGESet, monos) = PolynomialSAGECone(_exponents_matrix(monos))
66+
function JuMP.reshape_set(::PolynomialSAGECone, ::PolyJuMP.PolynomialShape)
67+
return PolynomialSAGESet()
68+
end
69+
function JuMP.moi_set(::PolynomialSAGESet, monos)
70+
return PolynomialSAGECone(_exponents_matrix(monos))
71+
end
6472

6573
struct SignomialAGESet{MT<:MP.AbstractMonomial} <: PolyJuMP.PolynomialSet
6674
monomial::MT
6775
end
68-
function JuMP.reshape_set(set::SignomialAGECone, shape::PolyJuMP.PolynomialShape)
76+
function JuMP.reshape_set(
77+
set::SignomialAGECone,
78+
shape::PolyJuMP.PolynomialShape,
79+
)
6980
return SignomialAGESet(shape.monomials[set.k])
7081
end
7182
function JuMP.moi_set(set::SignomialAGESet, monos)
@@ -76,7 +87,10 @@ end
7687
struct PolynomialAGESet{MT<:MP.AbstractMonomial} <: PolyJuMP.PolynomialSet
7788
monomial::MT
7889
end
79-
function JuMP.reshape_set(set::PolynomialAGECone, shape::PolyJuMP.PolynomialShape)
90+
function JuMP.reshape_set(
91+
set::PolynomialAGECone,
92+
shape::PolyJuMP.PolynomialShape,
93+
)
8094
return PolynomialAGESet(shape.monomials[set.k])
8195
end
8296
function JuMP.moi_set(set::PolynomialAGESet, monos)
@@ -138,5 +152,4 @@ function PolyJuMP.bridges(
138152
return [(SignomialBridge, PolyJuMP._coef_type(F))]
139153
end
140154

141-
142155
end

src/RelativeEntropy/bridges/sage.jl

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
struct SAGEBridge{T,F,G} <: MOI.Bridges.Constraint.AbstractBridge
22
ν::Matrix{MOI.VariableIndex}
3-
age_constraints::Vector{MOI.ConstraintIndex{MOI.VectorOfVariables,SignomialAGECone}}
3+
age_constraints::Vector{
4+
MOI.ConstraintIndex{MOI.VectorOfVariables,SignomialAGECone},
5+
}
46
equality_constraints::Vector{MOI.ConstraintIndex{F,MOI.EqualTo{T}}}
57
end
68

@@ -13,7 +15,10 @@ function MOI.Bridges.Constraint.bridge_constraint(
1315
m = size(set.α, 1)
1416
ν = Matrix{MOI.VariableIndex}(undef, m, m)
1517
age_constraints =
16-
Vector{MOI.ConstraintIndex{MOI.VectorOfVariables,SignomialAGECone}}(undef, m)
18+
Vector{MOI.ConstraintIndex{MOI.VectorOfVariables,SignomialAGECone}}(
19+
undef,
20+
m,
21+
)
1722
for k in 1:m
1823
ν[k, :], age_constraints[k] =
1924
MOI.add_constrained_variables(model, SignomialAGECone(set.α, k))

test/relative_entropy.jl

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,20 @@ function _test_motzkin(x, y, T, solver, set)
2222
end
2323

2424
function test_motzkin(x, y, T, solver)
25-
_test_motzkin(x, y, T, solver, PolyJuMP.RelativeEntropy.SignomialAGESet(x^2 * y^2))
26-
_test_motzkin(x, y, T, solver, PolyJuMP.RelativeEntropy.SignomialSAGESet())
25+
_test_motzkin(
26+
x,
27+
y,
28+
T,
29+
solver,
30+
PolyJuMP.RelativeEntropy.SignomialAGESet(x^2 * y^2),
31+
)
32+
return _test_motzkin(
33+
x,
34+
y,
35+
T,
36+
solver,
37+
PolyJuMP.RelativeEntropy.SignomialSAGESet(),
38+
)
2739
end
2840

2941
import ECOS

0 commit comments

Comments
 (0)