Fix format

Author: blegat

src/RelativeEntropy/RelativeEntropy.jl

@@ -40,7 +40,7 @@ end
 MOI.dimension(set::AGECone) = size(set.α, 1)
 Base.copy(set::AGECone) = set
 
-struct AGESet{MT <: MP.AbstractMonomial} <: PolyJuMP.PolynomialSet
+struct AGESet{MT<:MP.AbstractMonomial} <: PolyJuMP.PolynomialSet
     monomial::MT
 end
 function JuMP.reshape_set(set::AGECone, shape::PolyJuMP.PolynomialShape)
@@ -56,7 +56,12 @@ function setdefaults!(data::PolyJuMP.Data)
     return
 end
 
-function JuMP.build_constraint(_error::Function, p, set::Union{SAGESet,AGESet}; kws...)
+function JuMP.build_constraint(
+    _error::Function,
+    p,
+    set::Union{SAGESet,AGESet};
+    kws...,
+)
     coefs = PolyJuMP.non_constant_coefficients(p)
     monos = MP.monomials(p)
     cone = JuMP.moi_set(set, monos)

src/RelativeEntropy/bridges/age.jl

@@ -22,17 +22,22 @@ function MOI.Bridges.Constraint.bridge_constraint(
                 MA.add_mul!!(f, convert(T, set.α[i, var]), ν[j])
             end
         end
-        MOI.Utilities.normalize_and_add_constraint(model, f, MOI.EqualTo(zero(T)))
+        return MOI.Utilities.normalize_and_add_constraint(
+            model,
+            f,
+            MOI.EqualTo(zero(T)),
+        )
     end
     scalars = MOI.Utilities.eachscalar(func)
     f = MOI.Utilities.operate(
         vcat,
         T,
         scalars[set.k] + sumν,
         scalars[setdiff(1:m, set.k)],
-        MOI.VectorOfVariables(ν)
+        MOI.VectorOfVariables(ν),
     )
-    relative_entropy_constraint = MOI.add_constraint(model, f, MOI.RelativeEntropyCone(2m - 1))
+    relative_entropy_constraint =
+        MOI.add_constraint(model, f, MOI.RelativeEntropyCone(2m - 1))
     return AGEBridge{T,F,G,H}(set.k, ceq, relative_entropy_constraint)
 end
 
@@ -48,7 +53,9 @@ function MOI.Bridges.added_constrained_variable_types(::Type{<:AGEBridge})
     return Tuple{Type}[]
 end
 
-function MOI.Bridges.added_constraint_types(::Type{<:AGEBridge{T,F,G}}) where {T,F,G}
+function MOI.Bridges.added_constraint_types(
+    ::Type{<:AGEBridge{T,F,G}},
+) where {T,F,G}
     return [(F, MOI.EqualTo{T}), (G, MOI.RelativeEntropyCone)]
 end
 
@@ -58,7 +65,12 @@ function MOI.Bridges.Constraint.concrete_bridge_type(
     ::Type{<:AGECone},
 ) where {T}
     S = MOI.Utilities.scalar_type(H)
-    F = MOI.Utilities.promote_operation(+, T, S, MOI.ScalarAffineFunction{Float64})
+    F = MOI.Utilities.promote_operation(
+        +,
+        T,
+        S,
+        MOI.ScalarAffineFunction{Float64},
+    )
     G = MOI.Utilities.promote_operation(vcat, T, S, F)
     return AGEBridge{T,F,G,H}
 end

src/RelativeEntropy/bridges/sage.jl

@@ -12,15 +12,24 @@ function MOI.Bridges.Constraint.bridge_constraint(
 ) where {T,F,G}
     m = size(set.α, 1)
     ν = Vector{Vector{MOI.VariableIndex}}(undef, m)
-    age_constraints = Vector{MOI.ConstraintIndex{MOI.VectorOfVariables,AGECone}}(undef, m)
+    age_constraints =
+        Vector{MOI.ConstraintIndex{MOI.VectorOfVariables,AGECone}}(undef, m)
     for k in 1:m
-        ν[i], age_constraints[i] = MOI.add_constrained_variables(model, AGECone(set.α, k))
+        ν[i], age_constraints[i] =
+            MOI.add_constrained_variables(model, AGECone(set.α, k))
     end
     scalars = MOI.Utilities.eachscalar(func)
     n = size(set.α, 2)
     equality_constraints = map(1:n) do i
-        f = MOI.ScalarAffineFunction(MOI.ScalarAffineTerm.(one(T), ν[:, i]), zero(T))
-        MOI.add_constraint(model, MA.sub!(f, scalars[i]), MOI.EqualTo(zero(T)))
+        f = MOI.ScalarAffineFunction(
+            MOI.ScalarAffineTerm.(one(T), ν[:, i]),
+            zero(T),
+        )
+        return MOI.add_constraint(
+            model,
+            MA.sub!(f, scalars[i]),
+            MOI.EqualTo(zero(T)),
+        )
     end
     return SAGEBridge{T,F,G}(ν, age_constraints, equality_constraints)
 end
@@ -37,7 +46,9 @@ function MOI.Bridges.added_constrained_variable_types(::Type{<:SAGEBridge})
     return Tuple{Type}[AGECone]
 end
 
-function MOI.Bridges.added_constraint_types(::Type{<:SAGEBridge{T,F}}) where {T,F}
+function MOI.Bridges.added_constraint_types(
+    ::Type{<:SAGEBridge{T,F}},
+) where {T,F}
     return Tuple{Type,Type}[(F, MOI.EqualTo{T})]
 end
 
@@ -47,6 +58,11 @@ function MOI.Bridges.Constraint.concrete_bridge_type(
     ::Type{<:SAGECone},
 ) where {T}
     S = MOI.Utilities.scalar_type(G)
-    F = MOI.Utilities.promote_operation(-, T, MOI.ScalarAffineFunction{Float64}, S)
+    F = MOI.Utilities.promote_operation(
+        -,
+        T,
+        MOI.ScalarAffineFunction{Float64},
+        S,
+    )
     return AGEBridge{T,F,G}
 end

test/relative_entropy.jl

@@ -14,15 +14,16 @@ using PolyJuMP
 function test_motzkin(x, y, T, solver)
     model = Model(solver)
     PolyJuMP.setpolymodule!(model, PolyJuMP.RelativeEntropy)
-    motzkin = x^4*y^2 + x^2*y^4 + one(T) - 3x^2*y^2
-    @constraint(model, motzkin in PolyJuMP.RelativeEntropy.AGESet(x^2*y^2))
+    motzkin = x^4 * y^2 + x^2 * y^4 + one(T) - 3x^2 * y^2
+    @constraint(model, motzkin in PolyJuMP.RelativeEntropy.AGESet(x^2 * y^2))
     optimize!(model)
     @test termination_status(model) == MOI.OPTIMAL
     @test primal_status(model) == MOI.FEASIBLE_POINT
 end
 
 import ECOS
-const SOLVERS = [optimizer_with_attributes(ECOS.Optimizer, MOI.Silent() => true)]
+const SOLVERS =
+    [optimizer_with_attributes(ECOS.Optimizer, MOI.Silent() => true)]
 
 function runtests(x, y, T)
     for name in names(@__MODULE__; all = true)