Update

Author: odow

src/Utilities/Utilities.jl

@@ -10,6 +10,8 @@ import LinearAlgebra
 import MathOptInterface as MOI
 import MutableArithmetics as MA
 import OrderedCollections: OrderedDict
+import SparseArrays
+import Unicode
 
 function print_with_acronym(io::IO, s::AbstractString)
     return print(io, replace_acronym(s))

src/Utilities/sparse_matrix.jl

@@ -4,8 +4,6 @@
 # Use of this source code is governed by an MIT-style license that can be found
 # in the LICENSE.md file or at https://opensource.org/licenses/MIT.
 
-import SparseArrays
-
 """
     abstract type AbstractIndexing end
 

src/Utilities/struct_of_constraints.jl

@@ -213,9 +213,6 @@ end
 
 _typed(s::SymbolFS) = s.typed ? Expr(:curly, esc(s.s), esc(:T)) : esc(s.s)
 
-# Base.lowercase is moved to Unicode.lowercase in Julia v0.7
-import Unicode
-
 function _field(s::SymbolFS)
     return Symbol(replace(Unicode.lowercase(string(s.s)), "." => "_"))
 end

src/Utilities/variables_container.jl

@@ -117,8 +117,7 @@ end
 # inference.
 function _throw_if_lower_bound_set_inner(variable, S2, mask, T)
     S1 = _flag_to_set_type(mask, T)
-    throw(MOI.LowerBoundAlreadySet{S1,S2}(variable))
-    return
+    return throw(MOI.LowerBoundAlreadySet{S1,S2}(variable))
 end
 
 function _throw_if_lower_bound_set(variable, S2, mask, T)
@@ -135,8 +134,7 @@ end
 # inference.
 function _throw_if_upper_bound_set_inner(variable, S2, mask, T)
     S1 = _flag_to_set_type(mask, T)
-    throw(MOI.UpperBoundAlreadySet{S1,S2}(variable))
-    return
+    return throw(MOI.UpperBoundAlreadySet{S1,S2}(variable))
 end
 
 function _throw_if_upper_bound_set(variable, S2, mask, T)

test/Utilities/sparse_matrix.jl

@@ -122,6 +122,11 @@ function test_extract_function()
     empty_f = MOI.Utilities.extract_function(A, 1:0, Float64[])
     @test empty_f ≈
           MOI.VectorAffineFunction(MOI.VectorAffineTerm{Float64}[], Float64[])
+    r10 = MOI.Utilities.extract_function(A, 10, 0.5)
+    @test r10 ≈ MOI.ScalarAffineFunction(MOI.ScalarAffineTerm{Float64}[], 0.5)
+    f1 = 0.6 + 1.0 * x[1] + 1.0 * x[2] + 1.0 * x[3]
+    r10 = MOI.Utilities.extract_function(A, 0:1, c)
+    @test r10 ≈ MOI.Utilities.vectorize([0.5, f1])
     return
 end
 

test/Utilities/variable_container.jl

@@ -98,6 +98,8 @@ function test_delete_constraint_LessThan()
     @test MOI.is_valid(a, c)
     MOI.delete(a, c)
     @test !MOI.is_valid(a, c)
+    ci = MOI.ConstraintIndex{MOI.VectorOfVariables,MOI.Zeros}(1)
+    @test !MOI.is_valid(a, ci)
     return
 end
 
@@ -314,6 +316,37 @@ function test_ListOfConstraintTypesPresent_2()
     return
 end
 
+function test_LowerBoundAlreadySet()
+    for set in (
+        MOI.EqualTo(1),
+        MOI.GreaterThan(1),
+        MOI.Interval(1),
+        MOI.Parameter(1),
+        MOI.Semicontinuous(1, 3),
+        MOI.Semiinteger(1, 3),
+    )
+        model = MOI.Utilities.VariablesContainer{Int}()
+        x = MOI.add_variable(model)
+        c = MOI.add_constraint(model, x, set)
+        @test_throws(
+            MOI.LowerBoundAlreadySet,
+            MOI.add_constraint(model, x, MOI.EqualTo(2)),
+        )
+    end
+    return
+end
+
+function test_UnsupportedConstraint()
+    model = MOI.Utilities.VariablesContainer{Int}()
+    x = [MOI.add_variable(model) for _ in 1:3]
+    f = MOI.VectorOfVariables(x)
+    @test_throws(
+        MOI.UnsupportedConstraint{MOI.VectorOfVariables,MOI.ExponentialCone},
+        MOI.add_constraint(model, f, MOI.ExponentialCone()),
+    )
+    return
+end
+
 end  # module
 
 TestVariableContainer.runtests()