Remove SVF constant

Author: blegat

src/SemidefiniteOptInterface.jl

@@ -10,11 +10,10 @@ abstract type AbstractSDOptimizer <: MOI.AbstractOptimizer end
 
 include("interface.jl")
 
-const SVF = MOI.SingleVariable
 const VVF = MOI.VectorOfVariables
-const VF  = Union{SVF, VVF}
+const VF  = Union{MOI.SingleVariable, VVF}
 const SAF{T} = MOI.ScalarAffineFunction{T}
-const ASF{T} = Union{SVF, SAF{T}}
+const ASF{T} = Union{MOI.SingleVariable, SAF{T}}
 
 const ZS = Union{MOI.EqualTo, MOI.Zeros}
 const NS = Union{MOI.GreaterThan, MOI.Nonnegatives}

src/constraint.jl

@@ -1,4 +1,4 @@
-nconstraints(f::Union{SVF, SAF}, s) = 1
+nconstraints(f::Union{MOI.SingleVariable, SAF}, s) = 1
 nconstraints(f::VVF, s) = length(f.variables)
 
 function _allocate_constraint(m::SOItoMOIBridge, f, s)

src/variable.jl

@@ -58,7 +58,7 @@ function _constraintvariable!(m::SOItoMOIBridge{T}, vs::VIS, ::DS) where T
     end
     blk
 end
-_var(f::SVF) = f.variable
+_var(f::MOI.SingleVariable) = f.variable
 _var(f::VVF) = f.variables
 function _throw_error_if_unfree(m, vi::MOI.VariableIndex)
     if !isfree(m, vi)
@@ -87,7 +87,7 @@ end
 _constant(m::SOItoMOIBridge, s::MOI.AbstractScalarSet) = MOI.constant(s)
 _constant(m::SOItoMOIBridge{T}, s::MOI.AbstractSet) where T = zero(T)
 
-_var(f::SVF, j) = f.variable
+_var(f::MOI.SingleVariable, j) = f.variable
 _var(f::VVF, j) = f.variables[j]
 function MOIU.load_constraint(m::SOItoMOIBridge, ci::CI, f::VF, s::SupportedSets)
     if ci.value >= 0 # i.e. s is ZS or _var(f) wasn't free at allocate_constraint