Fix format

Author: blegat

src/DSDP.jl

@@ -10,7 +10,7 @@ import DSDP_jll
 using LinearAlgebra
 
 macro dsdp_ccall(f, args...)
-    quote
+    return quote
         # QuoteNode prevents the interpretion of the symbol
         # and leave it as a symbol
         info =

src/MOI_wrapper.jl

@@ -234,11 +234,8 @@ const _SetWithDotProd = MOI.SetWithDotProducts{
     MOI.TriangleVectorization{Cdouble,MOI.LowRankMatrix{Cdouble}},
 }
 
-const SupportedSets = Union{
-    MOI.Nonnegatives,
-    MOI.PositiveSemidefiniteConeTriangle,
-    _SetWithDotProd,
-}
+const SupportedSets =
+    Union{MOI.Nonnegatives,MOI.PositiveSemidefiniteConeTriangle,_SetWithDotProd}
 
 function MOI.supports_add_constrained_variables(
     ::Optimizer,
@@ -287,7 +284,7 @@ function new_block(model::Optimizer, set::_SetWithDotProd)
         push!(model.varmap, (blk, 0, 0))
         push!(model.rank_one, set.vectors[i].matrix)
     end
-    new_block(model, set.set)
+    return new_block(model, set.set)
 end
 
 function _add_constrained_variables(optimizer::Optimizer, set::SupportedSets)
@@ -339,7 +336,12 @@ function constrain_variables_on_creation(
     return
 end
 
-function _setcoefficient!(dest::Optimizer, coef, constr::Integer, vi::MOI.VariableIndex)
+function _setcoefficient!(
+    dest::Optimizer,
+    coef,
+    constr::Integer,
+    vi::MOI.VariableIndex,
+)
     blk, i, j = varmap(dest, vi)
     rank_one = dest.rank_one[vi.value]
     if isnothing(rank_one)
@@ -350,15 +352,18 @@ function _setcoefficient!(dest::Optimizer, coef, constr::Integer, vi::MOI.Variab
             push!(dest.lpcoefs, coef)
         else
             sdp = dest.blk[blk]
-            push!(dest.sdpdinds[end][sdp], i + (j - 1) * dest.blockdims[blk] - 1)
+            push!(
+                dest.sdpdinds[end][sdp],
+                i + (j - 1) * dest.blockdims[blk] - 1,
+            )
             if i != j
                 coef /= 2
             end
             push!(dest.sdpdcoefs[end][sdp], coef)
         end
     else
         d = Cint(dest.blockdims[blk])
-        push!(dest.cached_ind, collect(Cint(0):(d - 1)))
+        push!(dest.cached_ind, collect(Cint(0):(d-1)))
         # We use `Add` and not `Set` because I think (if I interpret the name correctly) that would allow mixing with sparse matrices for the same block and constraint
         DSDP.SDPCone.SetARankOneMat(
             dest.sdpcone,
@@ -385,8 +390,27 @@ end
 function _set_A_matrices(m::Optimizer, i)
     for (blk, blkdim) in zip(m.blk, m.blockdims)
         if blkdim > 0 && !isempty(m.sdpdcoefs[end][blk])
-            @show (blk - 1, i, blkdim, 1.0, 0, m.sdpdinds[end][blk], m.sdpdcoefs[end][blk], length(m.sdpdcoefs[end][blk]))
-            SDPCone.SetASparseVecMat(m.sdpcone, blk - 1, i, blkdim, 1.0, 0, m.sdpdinds[end][blk], m.sdpdcoefs[end][blk], length(m.sdpdcoefs[end][blk]))
+            @show (
+                blk - 1,
+                i,
+                blkdim,
+                1.0,
+                0,
+                m.sdpdinds[end][blk],
+                m.sdpdcoefs[end][blk],
+                length(m.sdpdcoefs[end][blk]),
+            )
+            SDPCone.SetASparseVecMat(
+                m.sdpcone,
+                blk - 1,
+                i,
+                blkdim,
+                1.0,
+                0,
+                m.sdpdinds[end][blk],
+                m.sdpdcoefs[end][blk],
+                length(m.sdpdcoefs[end][blk]),
+            )
         end
     end
     return
@@ -416,12 +440,7 @@ function MOI.copy_to(dest::Optimizer, src::MOI.ModelLike)
         index_map,
         MOI.PositiveSemidefiniteConeTriangle,
     )
-    constrain_variables_on_creation(
-        dest,
-        src,
-        index_map,
-        _SetWithDotProd,
-    )
+    constrain_variables_on_creation(dest, src, index_map, _SetWithDotProd)
     vis_src = MOI.get(src, MOI.ListOfVariableIndices())
     if length(vis_src) < length(index_map.var_map)
         _error(

src/sdpcone.jl

@@ -95,8 +95,28 @@ function SetADenseVecMat(
     ) sdpcone arg2 arg3 arg4 arg5 arg6 arg7
 end
 
-function SetARankOneMat(sdpcone::SDPConeT, blockj::Integer, vari::Integer, n::Integer, alpha::Cdouble, ishift::Integer, ind::Vector{Cint}, val::Vector{Cdouble}, nnz::Integer)
-    @dsdp_ccall SDPConeSetARankOneMat (SDPConeT, Cint, Cint, Cint, Cdouble, Cint, Ptr{Cint}, Ptr{Cdouble}, Cint) sdpcone blockj vari n alpha ishift ind val nnz
+function SetARankOneMat(
+    sdpcone::SDPConeT,
+    blockj::Integer,
+    vari::Integer,
+    n::Integer,
+    alpha::Cdouble,
+    ishift::Integer,
+    ind::Vector{Cint},
+    val::Vector{Cdouble},
+    nnz::Integer,
+)
+    @dsdp_ccall SDPConeSetARankOneMat (
+        SDPConeT,
+        Cint,
+        Cint,
+        Cint,
+        Cdouble,
+        Cint,
+        Ptr{Cint},
+        Ptr{Cdouble},
+        Cint,
+    ) sdpcone blockj vari n alpha ishift ind val nnz
 end
 
 function SetConstantMat(
@@ -200,8 +220,28 @@ function AddIdentity(
     @dsdp_ccall SDPConeAddIdentity (SDPConeT, Cint, Cint, Cint, Cdouble) sdpcone arg2 arg3 arg4 arg5
 end
 
-function AddARankOneMat(sdpcone::SDPConeT, blockj::Integer, vari::Integer, n::Integer, alpha::Cdouble, ishift::Integer, ind::Vector{Cint}, val::Vector{Cdouble}, nnz::Integer)
-    @dsdp_ccall SDPConeAddARankOneMat (SDPConeT, Cint, Cint, Cint, Cdouble, Cint, Ptr{Cint}, Ptr{Cdouble}, Cint) sdpcone blockj vari n alpha ishift ind val nnz
+function AddARankOneMat(
+    sdpcone::SDPConeT,
+    blockj::Integer,
+    vari::Integer,
+    n::Integer,
+    alpha::Cdouble,
+    ishift::Integer,
+    ind::Vector{Cint},
+    val::Vector{Cdouble},
+    nnz::Integer,
+)
+    @dsdp_ccall SDPConeAddARankOneMat (
+        SDPConeT,
+        Cint,
+        Cint,
+        Cint,
+        Cdouble,
+        Cint,
+        Ptr{Cint},
+        Ptr{Cdouble},
+        Cint,
+    ) sdpcone blockj vari n alpha ishift ind val nnz
 end
 
 function AddSparseVecMat(

test/maxcut.jl

@@ -70,7 +70,7 @@ function maxcut(nnodes, edges)
     yy = zeros(nnodes)
     indd = zeros(Cint, nnodes + nedges)
     val = zeros(nnodes + nedges)
-    indd[nedges.+(1:nnodes)] = iptr
+    indd[nedges .+ (1:nnodes)] = iptr
     tval = 0.0
     for (i, (u, v, w)) in enumerate(edges)
         indd[i] = di(u, v)