add tests and some fixes for tests...

Author: LukasBarner

src/Bridges/Objective/bridges/FunctionConversionBridge.jl

@@ -14,7 +14,7 @@
 
 for these pairs of functions:
 
- * [`MOI.ScalarAffineFunction`](@ref)` to [`MOI.ScalarQuadraticFunction`](@ref)
+ * [`MOI.ScalarAffineFunction`](@ref) to [`MOI.ScalarQuadraticFunction`](@ref)
  * [`MOI.ScalarQuadraticFunction`](@ref)  to [`MOI.ScalarNonlinearFunction`](@ref)
  * [`MOI.VectorAffineFunction`](@ref) to [`MOI.VectorQuadraticFunction`](@ref)
 

test/Bridges/Objective/NonlinearizeBridge.jl

@@ -0,0 +1,113 @@
+# Copyright (c) 2017: Miles Lubin and contributors
+# Copyright (c) 2017: Google Inc.
+#
+# 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.
+
+module TestObjectiveNonlinearize
+
+using Test
+
+import MathOptInterface as MOI
+
+function runtests()
+    for name in names(@__MODULE__; all = true)
+        if startswith("$(name)", "test_")
+            @testset "$(name)" begin
+                getfield(@__MODULE__, name)()
+            end
+        end
+    end
+    return
+end
+
+include("../utilities.jl")
+
+function test_solve_singlevariable_obj()
+    mock = MOI.Utilities.MockOptimizer(MOI.Utilities.Model{Float64}())
+    model = MOI.Bridges.Objective.Nonlinearize{Float64}(mock)
+    MOI.Utilities.set_mock_optimize!(
+        mock,
+        (mock::MOI.Utilities.MockOptimizer) ->
+            MOI.Utilities.mock_optimize!(mock, [1.0], MOI.FEASIBLE_POINT),
+    )
+    MOI.Test.test_objective_ObjectiveFunction_duplicate_terms(
+        model,
+        MOI.Test.Config(;exclude = Any[MOI.DualObjectiveValue, MOI.ConstraintDual, ]),
+    )
+    @test MOI.get(mock, MOI.ObjectiveFunctionType()) ==
+          MOI.ScalarNonlinearFunction
+    @test MOI.get(model, MOI.ObjectiveFunctionType()) ==
+          MOI.ScalarAffineFunction{Float64}
+    @test MOI.get(mock, MOI.ObjectiveSense()) == MOI.MIN_SENSE
+    @test MOI.get(model, MOI.ObjectiveSense()) == MOI.MIN_SENSE
+    vis = MOI.get(model, MOI.ListOfVariableIndices())
+    func = 3.0 * vis[1] + 0.0
+    
+    @test MOI.get(
+        model,
+        MOI.ObjectiveFunction{MOI.ScalarAffineFunction{Float64}}(),
+    ) ≈ func
+    MOI.set(model, MOI.ObjectiveSense(), MOI.MAX_SENSE)
+    @test MOI.get(mock, MOI.ObjectiveSense()) == MOI.MAX_SENSE
+    @test MOI.get(model, MOI.ObjectiveSense()) == MOI.MAX_SENSE
+
+    _test_delete_objective(model, 1, tuple())
+    return
+end
+
+function test_solve_result_index()
+    mock = MOI.Utilities.MockOptimizer(MOI.Utilities.Model{Float64}())
+    model = MOI.Bridges.Objective.Nonlinearize{Float64}(mock)
+    MOI.Utilities.set_mock_optimize!(
+        mock,
+        (mock::MOI.Utilities.MockOptimizer) -> MOI.Utilities.mock_optimize!(
+            mock,
+            MOI.OPTIMAL,
+            (MOI.FEASIBLE_POINT, [1.0]),
+            MOI.FEASIBLE_POINT,
+            (MOI.VariableIndex, MOI.GreaterThan{Float64}) => [1.0],
+        ),
+    )
+    MOI.Test.test_solve_result_index(model, MOI.Test.Config(;exclude = Any[MOI.DualObjectiveValue, MOI.ConstraintDual, ]))
+
+    return
+end
+
+function test_runtests()
+    MOI.Bridges.runtests(
+        MOI.Bridges.Objective.NonlinearizeBridge,
+        model -> begin 
+            x = MOI.add_variable(model)
+            aff = MOI.ScalarAffineFunction(MOI.ScalarAffineTerm.([2.0], [x]), 1.0)
+            MOI.set(model, MOI.ObjectiveFunction{MOI.ScalarAffineFunction{Float64}}(), aff)
+            MOI.set(model, MOI.ObjectiveSense(), MOI.MIN_SENSE)
+        end,
+        model -> begin
+            x = MOI.add_variable(model)
+            exp = MOI.ScalarNonlinearFunction(:+, [MOI.ScalarNonlinearFunction(:*, [2.0, MOI.VariableIndex(1)]), 1.0])
+            MOI.set(model, MOI.ObjectiveFunction{MOI.ScalarNonlinearFunction}(), exp)
+            MOI.set(model, MOI.ObjectiveSense(), MOI.MIN_SENSE)
+        end,
+    )
+    MOI.Bridges.runtests(
+        MOI.Bridges.Objective.NonlinearizeBridge,
+        model -> begin 
+            x = MOI.add_variable(model)
+            aff = MOI.ScalarAffineFunction(MOI.ScalarAffineTerm.([2.0], [x]), 1.0)
+            MOI.set(model, MOI.ObjectiveFunction{MOI.ScalarAffineFunction{Float64}}(), aff)
+            MOI.set(model, MOI.ObjectiveSense(), MOI.MAX_SENSE)
+        end,
+        model -> begin
+            x = MOI.add_variable(model)
+            exp = MOI.ScalarNonlinearFunction(:+, [MOI.ScalarNonlinearFunction(:*, [2.0, MOI.VariableIndex(1)]), 1.0])
+            MOI.set(model, MOI.ObjectiveFunction{MOI.ScalarNonlinearFunction}(), exp)
+            MOI.set(model, MOI.ObjectiveSense(), MOI.MAX_SENSE)
+        end,
+    )
+    return
+end
+
+end  # module
+
+TestObjectiveNonlinearize.runtests()

test/Bridges/Objective/SlackBridge.jl

@@ -525,6 +525,7 @@ function test_complex_objective()
             MOI.Utilities.Model{Float64}(),
             Float64,
         )
+        MOI.Bridges.remove_bridge(dest, MOI.Bridges.Objective.NonlinearizeBridge{Float64}) # Otherwise, would be bridged to Nonlinear. 
         @test_throws MOI.UnsupportedAttribute(attr) MOI.copy_to(dest, model)
     end
     return

test/Bridges/debug.jl

@@ -188,6 +188,7 @@ end
 
 function test_print_active_bridges_objective_unsupported()
     model = MOI.Bridges.full_bridge_optimizer(Model{Float64}(), Float64)
+    MOI.Bridges.remove_bridge(model, MOI.Bridges.Objective.NonlinearizeBridge{Float64}) # Otherwise, Int would be bridged to Nonlinear.
     F = MOI.ScalarAffineFunction{Int}
     @test_throws(
         MOI.UnsupportedAttribute{MOI.ObjectiveFunction{F}},