Add constraints tests

Author: blegat

src/Bridges/detbridge.jl

@@ -108,7 +108,8 @@ Constrains ``t \\le l_1 + \\cdots + l_n`` where `n` is the length of `l` and ret
 function subsum(model, t::MOI.ScalarAffineFunction, l::Vector{MOI.VariableIndex}, ::Type{T}) where T
     n = length(l)
     f = MOIU.operate!(-, T, t, MOIU.operate(sum, T, l))
-    return MOIU.add_scalar_constraint(model, f, MOI.LessThan(zero(T)))
+    return MOIU.add_scalar_constraint(model, f, MOI.LessThan(zero(T)),
+                                      own_function=true)
 end
 
 # Attributes, Bridge acting as an model

src/Bridges/geomeanbridge.jl

@@ -70,7 +70,8 @@ function GeoMeanBridge{T, F, G}(model, f::MOI.AbstractVectorFunction,
     # With sqrt(2)^l*t - xl1, we should scale both the ConstraintPrimal and ConstraintDual
     tubc = MOIU.add_scalar_constraint(model,
                                       MOIU.operate!(+, T, t, -sN * xl1),
-                                      MOI.LessThan(zero(T)))
+                                      MOI.LessThan(zero(T)),
+                                      own_function=true)
 
     socrc = Vector{CI{G, MOI.RotatedSecondOrderCone}}(undef, N-1)
     offset = offsetnext = 0

src/Bridges/squarepsdbridge.jl

@@ -95,7 +95,8 @@ function SquarePSDBridge{T, F, G}(model::MOI.ModelLike, f::F,
             # functions at entries (i, j) and (j, i) are almost identical
             if !MOIU.isapprox_zero(diff, 1e-10)
                 push!(sym, (i, j) => MOIU.add_scalar_constraint(model, diff,
-                                                                MOI.EqualTo(zero(T))))
+                                                                MOI.EqualTo(zero(T)),
+                                                                own_function=true))
             end
         end
         k += dim - j

src/Utilities/constraints.jl

@@ -1,12 +1,28 @@
+"""
+    add_scalar_constraint(model::MOI.ModelLike,
+                          func::MOI.AbstractScalarFunction,
+                          set::MOI.AbstractScalarSet;
+                          own_function::Bool=false)
+
+Adds the scalar constraint obtained by moving the constant term in `func` to
+the set in `model`. If `own_function` is `true` then the function `func`, can
+be modified.
+"""
+function add_scalar_constraint end
+
 function add_scalar_constraint(model::MOI.ModelLike, func::MOI.SingleVariable,
                                set::MOI.AbstractScalarSet)
     return MOI.addconstraint!(model, func, set)
 end
 function add_scalar_constraint(model::MOI.ModelLike,
                                func::Union{MOI.ScalarAffineFunction{T},
                                            MOI.ScalarQuadraticFunction{T}},
-                               set::MOI.AbstractScalarSet) where T
+                               set::MOI.AbstractScalarSet;
+                               own::Bool=false) where T
     set = shift_constant(set, -func.constant)
+    if !own
+        func = copy(func)
+    end
     func.constant = zero(T)
     return MOI.addconstraint!(model, func, set)
 end

test/constraints.jl

@@ -0,0 +1,23 @@
+@testset "Scalar constraints" begin
+    model = Model{Float64}()
+    x = MOI.addvariable!(model)
+    @testset "SingleVariable" begin
+        f = MOI.SingleVariable(x)
+        ci = MOIU.add_scalar_constraint(model, f, MOI.EqualTo(1.0))
+        @test MOI.get(model, MOI.ConstraintFunction(), ci) == f
+        @test MOI.get(model, MOI.ConstraintSet(), ci) == MOI.EqualTo(1.0)
+    end
+    @testset "ScalarAffineFunction" begin
+        f = MOI.ScalarAffineFunction([MOI.ScalarAffineTerm(1.0, x)], 2.0)
+        g = MOI.ScalarAffineFunction([MOI.ScalarAffineTerm(1.0, x)], 0.0)
+        ci = MOIU.add_scalar_constraint(model, f, MOI.EqualTo(3.0))
+        @test f.constant == 2.0
+        @test MOI.get(model, MOI.ConstraintFunction(), ci) ≈ g
+        @test MOI.get(model, MOI.ConstraintSet(), ci) == MOI.EqualTo(1.0)
+        ci = MOIU.add_scalar_constraint(model, f, MOI.Interval(-1.0, 1.0))
+        @test f.constant == 2.0
+        @test MOI.get(model, MOI.ConstraintFunction(), ci) ≈ g
+        @test MOI.get(model, MOI.ConstraintSet(), ci) == MOI.Interval(-3.0,
+                                                                      -1.0)
+    end
+end

test/runtests.jl

@@ -35,6 +35,7 @@ MOIU.@model(Model,
 @testset "MOI.Utilities" begin
     include("functions.jl")
     include("sets.jl")
+    include("constraints.jl")
     include("model.jl")
     include("universalfallback.jl")
     include("parser.jl")