Update

jump-dev · Jun 11, 2024 · aa6ac48 · aa6ac48
1 parent e9bf29d
commit aa6ac48
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/FileFormats/NL/read.jl b/src/FileFormats/NL/read.jl
@@ -234,7 +234,7 @@ function _expr_to_function(expr::Expr)
     @assert Meta.isexpr(expr, :call)
     f = _try_scalar_affine_function(expr)
     if f !== nothing
-        return f
+        return convert(MOI.ScalarAffineFunction{Float64}, f)
     end
     return MOI.ScalarNonlinearFunction(
         expr.args[1],

diff --git a/test/FileFormats/NL/read.jl b/test/FileFormats/NL/read.jl
@@ -720,10 +720,10 @@ function test_hs071_free_constraint_nlexpr()
     open(joinpath(@__DIR__, "data", "hs071_free_constraint.nl"), "r") do io
         return read!(io, model)
     end
-    @test MOI.get(model, MOI.ListOfConstraintTypesPresent()) == [
-        (MOI.ScalarNonlinearFunction, MOI.GreaterThan{Float64}),
-        (MOI.ScalarNonlinearFunction, MOI.Interval{Float64}),
-    ]
+    types = MOI.get(model, MOI.ListOfConstraintTypesPresent())
+    @test length(types) == 2
+    @test (MOI.ScalarAffineFunction{Float64}, MOI.GreaterThan{Float64}) in types
+    @test (MOI.ScalarNonlinearFunction, MOI.Interval{Float64}) in types
     for (F, S) in MOI.get(model, MOI.ListOfConstraintTypesPresent())
         @test MOI.get(model, MOI.NumberOfConstraints{F,S}()) == 1
     end