Improve code coverage

src/FileFormats/MPS/MPS.jl

@@ -1153,7 +1153,7 @@ function Base.read!(io::IO, model::Model)
     end
     data = TempMPSModel()
     header = HEADER_NAME
-    while !eof(io)
+    while !eof(io) && header != HEADER_ENDATA
         raw_line = readline(io)
         if startswith(raw_line, '*')
             continue  # Lines starting with `*` are comments
@@ -1219,7 +1219,6 @@ function Base.read!(io::IO, model::Model)
             parse_indicators_line(data, items)
         else
             @assert header == HEADER_ENDATA
-            break
         end
     end
     copy_to(model, data)
@@ -1556,7 +1555,7 @@ function parse_single_rhs(
         data.row_upper[row] = value
     else
         @assert data.sense[row] == SENSE_N
-        error("Cannot have RHS for objective: $(join(items, " "))")
+        error("Cannot have RHS for free row: $(join(items, " "))")
     end
     return
 end

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/cachingoptimizer.jl

@@ -341,11 +341,8 @@
                 vindex_optimizer =
                     MOI.add_variable(m.optimizer)::MOI.VariableIndex
             catch err
-                if err isa MOI.NotAllowedError
-                    reset_optimizer(m)
-                else
-                    rethrow(err)
-                end
+                _rethrow_if_not_NotAllowedError(err)
+                reset_optimizer(m)
             end
         else
             vindex_optimizer = MOI.add_variable(m.optimizer)::MOI.VariableIndex
@@ -366,11 +363,8 @@
                 vindices_optimizer =
                     MOI.add_variables(m.optimizer, n)::Vector{MOI.VariableIndex}
             catch err
-                if err isa MOI.NotAllowedError
-                    reset_optimizer(m)
-                else
-                    rethrow(err)
-                end
+                _rethrow_if_not_NotAllowedError(err)
+                reset_optimizer(m)
             end
         else
             vindices_optimizer =
@@ -413,11 +407,8 @@
                         MOI.ConstraintIndex{MOI.VariableIndex,S},
                     }
             catch err
-                if err isa MOI.NotAllowedError
-                    reset_optimizer(m)
-                else
-                    rethrow(err)
-                end
+                _rethrow_if_not_NotAllowedError(err)
+                reset_optimizer(m)
             end
         else
             vindex_optimizer, cindex_optimizer = MOI.add_constrained_variable(
@@ -480,11 +471,8 @@
                         MOI.ConstraintIndex{MOI.VectorOfVariables,S},
                     }
             catch err
-                if err isa MOI.NotAllowedError
-                    reset_optimizer(m)
-                else
-                    rethrow(err)
-                end
+                _rethrow_if_not_NotAllowedError(err)
+                reset_optimizer(m)
             end
         else
             vindices_optimizer, cindex_optimizer =
@@ -534,14 +522,11 @@
                     set,
                 )::MOI.ConstraintIndex{F,S}
             catch err
-                if err isa MOI.NotAllowedError
-                    # It could be MOI.AddConstraintNotAllowed{F', S'} with F' != F
-                    # or S' != S if, for example, the `F`-in-`S` constraint is bridged
-                    # to other constraints in `m.optimizer`
-                    reset_optimizer(m)
-                else
-                    rethrow(err)
-                end
+                _rethrow_if_not_NotAllowedError(err)
+                # It could be MOI.AddConstraintNotAllowed{F', S'} with F' != F
+                # or S' != S if, for example, the `F`-in-`S` constraint is bridged
+                # to other constraints in `m.optimizer`
+                reset_optimizer(m)
             end
         else
             cindex_optimizer = MOI.add_constraint(
@@ -571,11 +556,8 @@
             try
                 MOI.modify(m.optimizer, cindex_optimizer, change_optimizer)
             catch err
-                if err isa MOI.NotAllowedError
-                    reset_optimizer(m)
-                else
-                    rethrow(err)
-                end
+                _rethrow_if_not_NotAllowedError(err)
+                reset_optimizer(m)
             end
         else
             MOI.modify(m.optimizer, cindex_optimizer, change_optimizer)
@@ -607,11 +589,8 @@
                     replacement_optimizer,
                 )
             catch err
-                if err isa MOI.NotAllowedError
-                    reset_optimizer(m)
-                else
-                    rethrow(err)
-                end
+                _rethrow_if_not_NotAllowedError(err)
+                reset_optimizer(m)
             end
         else
             MOI.set(
@@ -671,11 +650,8 @@
             try
                 MOI.modify(m.optimizer, obj, change_optimizer)
             catch err
-                if err isa MOI.NotAllowedError
-                    reset_optimizer(m)
-                else
-                    rethrow(err)
-                end
+                _rethrow_if_not_NotAllowedError(err)
+                reset_optimizer(m)
             end
         else
             MOI.modify(m.optimizer, obj, change_optimizer)
@@ -700,11 +676,8 @@
             try
                 MOI.delete(m.optimizer, index_optimizer)
             catch err
-                if err isa MOI.NotAllowedError
-                    reset_optimizer(m)
-                else
-                    rethrow(err)
-                end
+                _rethrow_if_not_NotAllowedError(err)
+                reset_optimizer(m)
             end
         else
             MOI.delete(m.optimizer, index_optimizer)
@@ -734,11 +707,8 @@
             try
                 MOI.delete(m.optimizer, indices_optimizer)
             catch err
-                if err isa MOI.NotAllowedError
-                    reset_optimizer(m)
-                else
-                    rethrow(err)
-                end
+                _rethrow_if_not_NotAllowedError(err)
+                reset_optimizer(m)
             end
         else
             MOI.delete(m.optimizer, indices_optimizer)
@@ -771,11 +741,8 @@
             try
                 MOI.set(m.optimizer, attr, optimizer_value)
             catch err
-                if err isa MOI.NotAllowedError
-                    reset_optimizer(m)
-                else
-                    rethrow(err)
-                end
+                _rethrow_if_not_NotAllowedError(err)
+                reset_optimizer(m)
             end
         else
             MOI.set(m.optimizer, attr, optimizer_value)
@@ -798,11 +765,8 @@
             try
                 MOI.set(m.optimizer, attr, optimizer_index, optimizer_value)
             catch err
-                if err isa MOI.NotAllowedError
-                    reset_optimizer(m)
-                else
-                    rethrow(err)
-                end
+                _rethrow_if_not_NotAllowedError(err)
+                reset_optimizer(m)
             end
         else
             MOI.set(m.optimizer, attr, optimizer_index, optimizer_value)
@@ -831,13 +795,15 @@
            (m.state == NO_OPTIMIZER || MOI.supports(m.optimizer, attr)::Bool)
 end
 
+_rethrow_if_not_NotAllowedError(err) = rethrow(err)
+
+_rethrow_if_not_NotAllowedError(::MOI.NotAllowedError) = nothing
+
 function _get_model_attribute(model::CachingOptimizer, attr::MOI.ObjectiveValue)
     try
         return MOI.get(model.optimizer, attr)
     catch err
-        if !(err isa MOI.GetAttributeNotAllowed)
-            rethrow(err)
-        end
+        _rethrow_if_not_NotAllowedError(err)
         return get_fallback(model, attr)
     end
 end
@@ -849,9 +815,7 @@
     try
         return MOI.get(model.optimizer, attr)
     catch err
-        if !(err isa MOI.GetAttributeNotAllowed)
-            rethrow(err)
-        end
+        _rethrow_if_not_NotAllowedError(err)
         MOI.check_result_index_bounds(model, attr)
         # We don't know what coefficient type to use, so just use whatever the
         # objective value type is. This is slightly inefficient, but it
@@ -996,10 +960,7 @@
             model.model_to_optimizer_map[index],
         )
     catch err
-        # Thrown if .optimizer doesn't support attr
-        if !(err isa MOI.GetAttributeNotAllowed)
-            rethrow(err)
-        end
+        _rethrow_if_not_NotAllowedError(err)
         return get_fallback(model, attr, index)
     end
 end
@@ -1016,10 +977,7 @@
             [model.model_to_optimizer_map[i] for i in indices],
         )
     catch err
-        # Thrown if .optimizer doesn't support attr
-        if !(err isa MOI.GetAttributeNotAllowed)
-            rethrow(err)
-        end
+        _rethrow_if_not_NotAllowedError(err)
         return [get_fallback(model, attr, i) for i in indices]
     end
 end

src/Utilities/print.jl

@@ -683,13 +683,25 @@ end
 
 Base.show(io::IO, ::MIME"text/latex", model::_LatexModel) = show(io, model)
 
-function Base.print(model::MOI.ModelLike; kwargs...)
+function _get_ijulia_latex_display()
     for d in Base.Multimedia.displays
         if Base.Multimedia.displayable(d, "text/latex") &&
            startswith("$(typeof(d))", "IJulia.")
-            return display(d, "text/latex", latex_formulation(model; kwargs...))
+            return d
         end
     end
+    return
+end
+
+function Base.print(
+    model::MOI.ModelLike;
+    _latex_display = _get_ijulia_latex_display(),
+    kwargs...,
+)
+    if _latex_display !== nothing
+        formulation = latex_formulation(model; kwargs...)
+        return display(_latex_display, "text/latex", formulation)
+    end
     return print(stdout, model; kwargs...)
 end
 

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)

src/indextypes.jl

@@ -93,6 +93,7 @@ end
 
 function Base.showerror(io::IO, err::InvalidIndex)
     return print(
+        io,
         "The index $(err.index) is invalid. Note that an index becomes invalid after it has been deleted.",
     )
 end

src/instantiate.jl

@@ -24,6 +24,7 @@ struct OptimizerWithAttributes
 end
 
 _to_param(param::Pair{<:AbstractOptimizerAttribute}) = param
+
 function _to_param(param::Pair{String})
     return RawOptimizerAttribute(param.first) => param.second
 end

test/Benchmarks/Benchmarks.jl

@@ -43,6 +43,16 @@ function test_baseline()
     suite = MOI.Benchmarks.suite() do
         return MOI.Utilities.MockOptimizer(MOI.Utilities.Model{Float64}())
     end
+    @test_throws(
+        ErrorException("You create a baseline with `create_baseline` first."),
+        MOI.Benchmarks.compare_against_baseline(
+            suite,
+            "baseline";
+            directory = @__DIR__,
+            samples = 1,
+            verbose = true,
+        ),
+    )
     MOI.Benchmarks.create_baseline(
         suite,
         "baseline";

test/FileFormats/FileFormats.jl

@@ -189,6 +189,19 @@ function test_generic_names()
     return
 end
 
+function test_unique_names()
+    model = MOI.Utilities.Model{Float64}()
+    x = MOI.add_variables(model, 3)
+    MOI.set.(model, MOI.VariableName(), x, "x")
+    c = MOI.add_constraint.(model, 1.0 .* x, MOI.EqualTo(1.0))
+    MOI.set.(model, MOI.ConstraintName(), c, "c")
+    MOI.set(model, MOI.ConstraintName(), c[2], "c_1")
+    MOI.FileFormats.create_unique_names(model)
+    @test MOI.get.(model, MOI.VariableName(), x) == ["x", "x_1", "x_2"]
+    @test MOI.get.(model, MOI.ConstraintName(), c) == ["c", "c_1", "c_2"]
+    return
+end
+
 end
 
 TestFileFormats.runtests()