Skip to content

[Test] various fixes to MOI.Test #1428

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 2, 2021
Merged

[Test] various fixes to MOI.Test #1428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6dcf960
[Test] various fixes to MOI.Test
odow Jul 1, 2021
22df6ee
Fix formatting
odow Jul 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions src/Test/test_constraint.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,6 @@ function test_constraint_ScalarAffineFunction_duplicate(
model::MOI.ModelLike,
config::Config,
)
MOI.empty!(model)
x = MOI.add_variable(model)
objective_function =
MOI.ScalarAffineFunction([MOI.ScalarAffineTerm(1.0, x)], 0.0)
Expand Down Expand Up @@ -337,7 +336,6 @@ function test_constraint_VectorAffineFunction_duplicate(
model::MOI.ModelLike,
config::Config,
)
MOI.empty!(model)
x = MOI.add_variable(model)
objective_function =
MOI.ScalarAffineFunction([MOI.ScalarAffineTerm(1.0, x)], 0.0)
Expand Down Expand Up @@ -398,7 +396,6 @@ function test_constraint_qcp_duplicate_diagonal(
MOI.ScalarQuadraticFunction{Float64},
MOI.LessThan{Float64},
)
MOI.empty!(model)
x = MOI.add_variables(model, 2)
MOI.set(model, MOI.ObjectiveSense(), MOI.MAX_SENSE)
MOI.set(
Expand Down Expand Up @@ -471,7 +468,6 @@ function test_constraint_qcp_duplicate_off_diagonal(
MOI.ScalarQuadraticFunction{Float64},
MOI.LessThan{Float64},
)
MOI.empty!(model)
x = MOI.add_variables(model, 2)
MOI.set(model, MOI.ObjectiveSense(), MOI.MAX_SENSE)
MOI.set(
Expand Down Expand Up @@ -536,7 +532,6 @@ Test a problem with a bounded ZeroOne variable.
"""
function test_constraint_ZeroOne_bounds(model::MOI.ModelLike, config::Config)
@requires MOI.supports_constraint(model, MOI.SingleVariable, MOI.ZeroOne)
MOI.empty!(model)
MOIU.loadfromstring!(
model,
"""
Expand Down Expand Up @@ -577,7 +572,6 @@ Test a problem with a ZeroOne and binding fractional upper bound.
"""
function test_constraint_ZeroOne_bounds_2(model::MOI.ModelLike, config::Config)
@requires MOI.supports_constraint(model, MOI.SingleVariable, MOI.ZeroOne)
MOI.empty!(model)
MOIU.loadfromstring!(
model,
"""
Expand Down Expand Up @@ -619,7 +613,6 @@ Test a problem with a ZeroOne and infeasible fractional bounds.
function test_constraint_ZeroOne_bounds_3(model::MOI.ModelLike, config::Config)
@requires MOI.supports_constraint(model, MOI.SingleVariable, MOI.ZeroOne)
@requires _supports(config, MOI.optimize!)
MOI.empty!(model)
MOIU.loadfromstring!(
model,
"""
Expand Down Expand Up @@ -668,7 +661,6 @@ function test_constraint_PrimalStart_DualStart_SecondOrderCone(
MOI.SecondOrderCone,
)
@requires _supports(config, MOI.optimize!)
MOI.empty!(model)
x = MOI.add_variable(model)
fx = MOI.SingleVariable(x)
o = one(T)
Expand Down
38 changes: 0 additions & 38 deletions src/Test/test_linear.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ function test_linear_integration(
MOI.SingleVariable,
MOI.GreaterThan{T},
)
MOI.empty!(model)
@test MOI.is_empty(model)
v = MOI.add_variables(model, 2)
@test MOI.get(model, MOI.NumberOfVariables()) == 2
cf = MOI.ScalarAffineFunction{T}(
Expand Down Expand Up @@ -573,8 +571,6 @@ function test_linear_integration_2(
MOI.SingleVariable,
MOI.GreaterThan{T},
)
MOI.empty!(model)
@test MOI.is_empty(model)
x = MOI.add_variable(model)
y = MOI.add_variable(model)
@test MOI.get(model, MOI.NumberOfVariables()) == 2
Expand Down Expand Up @@ -715,8 +711,6 @@ function test_linear_inactive_bounds(
MOI.SingleVariable,
MOI.LessThan{T},
)
MOI.empty!(model)
@test MOI.is_empty(model)
x = MOI.add_variable(model)
@test MOI.get(model, MOI.NumberOfVariables()) == 1
vc = MOI.add_constraint(
Expand Down Expand Up @@ -869,8 +863,6 @@ function test_linear_LessThan_and_GreaterThan(
MOI.SingleVariable,
MOI.LessThan{T},
)
MOI.empty!(model)
@test MOI.is_empty(model)
x = MOI.add_variable(model)
y = MOI.add_variable(model)
# Min x - y
Expand Down Expand Up @@ -994,8 +986,6 @@ function test_linear_integration_modification(
MOI.ScalarAffineFunction{T},
MOI.LessThan{T},
)
MOI.empty!(model)
@test MOI.is_empty(model)
x = MOI.add_variable(model)
y = MOI.add_variable(model)
@test MOI.get(model, MOI.NumberOfVariables()) == 2
Expand Down Expand Up @@ -1159,8 +1149,6 @@ function test_linear_modify_GreaterThan_and_LessThan_constraints(
MOI.ScalarAffineFunction{T},
MOI.LessThan{T},
)
MOI.empty!(model)
@test MOI.is_empty(model)
x = MOI.add_variable(model)
y = MOI.add_variable(model)
# Min x - y
Expand Down Expand Up @@ -1302,8 +1290,6 @@ function test_linear_VectorAffineFunction(
MOI.VectorAffineFunction{T},
MOI.Nonpositives,
)
MOI.empty!(model)
@test MOI.is_empty(model)
x = MOI.add_variable(model)
y = MOI.add_variable(model)
# Min x - y
Expand Down Expand Up @@ -1459,8 +1445,6 @@ function test_linear_INFEASIBLE(
MOI.SingleVariable,
MOI.GreaterThan{T},
)
MOI.empty!(model)
@test MOI.is_empty(model)
x = MOI.add_variable(model)
y = MOI.add_variable(model)
c = MOI.add_constraint(
Expand Down Expand Up @@ -1567,8 +1551,6 @@ function test_linear_DUAL_INFEASIBLE(
MOI.SingleVariable,
MOI.GreaterThan{T},
)
MOI.empty!(model)
@test MOI.is_empty(model)
x = MOI.add_variable(model)
y = MOI.add_variable(model)
MOI.add_constraint(
Expand Down Expand Up @@ -1662,8 +1644,6 @@ function test_linear_DUAL_INFEASIBLE_2(
MOI.SingleVariable,
MOI.GreaterThan{T},
)
MOI.empty!(model)
@test MOI.is_empty(model)
x = MOI.add_variable(model)
y = MOI.add_variable(model)
MOI.add_constraint(
Expand Down Expand Up @@ -1772,8 +1752,6 @@ function test_linear_add_constraints(
MOI.SingleVariable,
MOI.GreaterThan{T},
)
MOI.empty!(model)
@test MOI.is_empty(model)
x = MOI.add_variable(model)
y = MOI.add_variable(model)
vc12 = MOI.add_constraints(
Expand Down Expand Up @@ -1895,8 +1873,6 @@ function test_linear_integration_Interval(
MOI.SingleVariable,
MOI.GreaterThan{T},
)
MOI.empty!(model)
@test MOI.is_empty(model)
x = MOI.add_variable(model)
y = MOI.add_variable(model)
vc = MOI.add_constraints(
Expand Down Expand Up @@ -2141,8 +2117,6 @@ function test_linear_Interval_inactive(
MOI.SingleVariable,
MOI.GreaterThan{T},
)
MOI.empty!(model)
@test MOI.is_empty(model)
x = MOI.add_variable(model)
y = MOI.add_variable(model)
vc = MOI.add_constraints(
Expand Down Expand Up @@ -2284,8 +2258,6 @@ function test_linear_transform(
MOI.ScalarAffineFunction{T},
MOI.LessThan{T},
)
MOI.empty!(model)
@test MOI.is_empty(model)
v = MOI.add_variables(model, 2)
c1 = MOI.add_constraint(
model,
Expand Down Expand Up @@ -2387,8 +2359,6 @@ function test_linear_INFEASIBLE_2(
MOI.SingleVariable,
MOI.GreaterThan{T},
)
MOI.empty!(model)
@test MOI.is_empty(model)
x = MOI.add_variable(model)
y = MOI.add_variable(model)
c1 = MOI.add_constraint(
Expand Down Expand Up @@ -2501,8 +2471,6 @@ function test_linear_FEASIBILITY_SENSE(
MOI.ScalarAffineFunction{T},
MOI.GreaterThan{T},
)
MOI.empty!(model)
@test MOI.is_empty(model)
x = MOI.add_variable(model)
y = MOI.add_variable(model)
c1 = MOI.add_constraint(
Expand Down Expand Up @@ -2607,8 +2575,6 @@ function test_linear_integration_delete_variables(
MOI.SingleVariable,
MOI.LessThan{T},
)
MOI.empty!(model)
@test MOI.is_empty(model)
x, y, z = MOI.add_variables(model, 3)
c = MOI.add_constraint(
model,
Expand Down Expand Up @@ -2792,8 +2758,6 @@ function test_linear_VectorAffineFunction_empty_row(
MOI.VectorAffineFunction{T},
MOI.Zeros,
)
MOI.empty!(model)
@test MOI.is_empty(model)
x = MOI.add_variables(model, 1)
# Create a VectorAffineFunction with two rows, but only one term, belonging
# to the second row. The first row, which is empty, is essentially a
Expand Down Expand Up @@ -2875,8 +2839,6 @@ function test_linear_VariablePrimalStart_partial(
) where {T}
atol = config.atol
rtol = config.rtol
MOI.empty!(model)
@test MOI.is_empty(model)
x = MOI.add_variable(model)
y = MOI.add_variable(model)
MOI.set(model, MOI.VariablePrimalStart(), x, one(T))
Expand Down
26 changes: 11 additions & 15 deletions src/Test/test_model.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@ end
Test that the default ObjectiveSense is FEASIBILITY_SENSE.
"""
function test_model_default_ObjectiveSense(model::MOI.ModelLike, ::Config)
@test MOI.is_empty(model)
MOI.get(model, MOI.ObjectiveSense()) == MOI.FEASIBILITY_SENSE
return
end
Expand All @@ -149,7 +148,6 @@ end
Test that the default TerminationStatus is OPTIMIZE_NOT_CALLED.
"""
function test_model_default_TerminationStatus(model::MOI.ModelLike, ::Config)
@test MOI.is_empty(model)
MOI.get(model, MOI.TerminationStatus()) == MOI.OPTIMIZE_NOT_CALLED
return
end
Expand All @@ -160,7 +158,6 @@ end
Test that the default PrimalStatus is NO_SOLUTION.
"""
function test_model_default_PrimalStatus(model::MOI.ModelLike, ::Config)
@test MOI.is_empty(model)
MOI.get(model, MOI.PrimalStatus()) == MOI.NO_SOLUTION
return
end
Expand All @@ -171,7 +168,6 @@ end
Test that the default DualStatus is NO_SOLUTION.
"""
function test_model_default_DualStatus(model::MOI.ModelLike, ::Config)
@test MOI.is_empty(model)
MOI.get(model, MOI.DualStatus()) == MOI.NO_SOLUTION
return
end
Expand Down Expand Up @@ -285,7 +281,6 @@ function test_model_Name_VariableName_ConstraintName(
MOI.LessThan{Float64},
}(),
) == 0
@test MOI.supports(model, MOI.VariableName(), MOI.VariableIndex)
v = MOI.add_variables(model, 2)
@test MOI.get(model, MOI.VariableName(), v[1]) == ""
x, cx = MOI.add_constrained_variable(model, MOI.GreaterThan(0.0))
Expand Down Expand Up @@ -321,7 +316,7 @@ function test_model_Name_VariableName_ConstraintName(
@test MOI.get(model, MOI.VariableName(), v) == vynames[1:2]
@test MOI.get(model, MOI.VariableName(), y) == vynames[3:6]
@test MOI.get(model, MOI.VariableName(), [v; y]) == vynames
@test MOI.supports_constraint(
@requires MOI.supports_constraint(
model,
MOI.ScalarAffineFunction{Float64},
MOI.LessThan{Float64},
Expand All @@ -331,7 +326,7 @@ function test_model_Name_VariableName_ConstraintName(
MOI.ScalarAffineFunction(MOI.ScalarAffineTerm.([1.0, 1.0], v), 0.0),
MOI.LessThan(1.0),
)
@test MOI.supports_constraint(
@requires MOI.supports_constraint(
model,
MOI.ScalarAffineFunction{Float64},
MOI.EqualTo{Float64},
Expand All @@ -344,11 +339,11 @@ function test_model_Name_VariableName_ConstraintName(
@test MOI.get(model, MOI.ConstraintName(), c) == ""
@test MOI.get(model, MOI.ConstraintName(), c2) == ""
@test MOI.get(model, MOI.ConstraintName(), cy) == ""
@test MOI.supports(model, MOI.ConstraintName(), typeof(c))
@requires MOI.supports(model, MOI.ConstraintName(), typeof(c))
MOI.set(model, MOI.ConstraintName(), c, "")
@test MOI.supports(model, MOI.ConstraintName(), typeof(c2))
@requires MOI.supports(model, MOI.ConstraintName(), typeof(c2))
MOI.set(model, MOI.ConstraintName(), c2, "") # Shouldn't error with duplicate empty name
@test MOI.supports(model, MOI.ConstraintName(), typeof(cy))
@requires MOI.supports(model, MOI.ConstraintName(), typeof(cy))
MOI.set(model, MOI.ConstraintName(), cy, "")
MOI.set(model, MOI.ConstraintName(), c, "Con0")
@test MOI.get(model, MOI.ConstraintName(), c) == "Con0"
Expand Down Expand Up @@ -519,7 +514,7 @@ function test_model_is_valid(model::MOI.ModelLike, config::Config)
@test !MOI.is_valid(model, x)
end
cf = MOI.ScalarAffineFunction(MOI.ScalarAffineTerm.([1.0, 1.0], v), 0.0)
@test MOI.supports_constraint(model, typeof(cf), MOI.LessThan{Float64})
@requires MOI.supports_constraint(model, typeof(cf), MOI.LessThan{Float64})
c = MOI.add_constraint(model, cf, MOI.LessThan(1.0))
@test MOI.is_valid(model, c)
@test !MOI.is_valid(
Expand Down Expand Up @@ -694,7 +689,6 @@ sorted by creation time.
"""
function test_model_ordered_indices(model::MOI.ModelLike, ::Config)
@requires MOI.supports_incremental_interface(model, false)
MOI.empty!(model)
v1 = MOI.add_variable(model)
@test MOI.get(model, MOI.ListOfVariableIndices()) == [v1]
v2 = MOI.add_variable(model)
Expand Down Expand Up @@ -840,12 +834,14 @@ function test_model_UpperBoundAlreadySet(
model::MOI.ModelLike,
::Config{T},
) where {T}
MOI.empty!(model)
@test MOI.is_empty(model)
x = MOI.add_variable(model)
f = MOI.SingleVariable(x)
ub = zero(T)
@test MOI.supports_constraint(model, MOI.SingleVariable, MOI.LessThan{T})
@requires MOI.supports_constraint(
model,
MOI.SingleVariable,
MOI.LessThan{T},
)
sets = [
MOI.EqualTo(ub),
MOI.Interval(ub, ub),
Expand Down
3 changes: 0 additions & 3 deletions src/Test/test_modification.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -781,8 +781,6 @@ function test_modification_delete_variables_in_a_batch(
model::MOI.ModelLike,
config::Config,
)
MOI.empty!(model)
@test MOI.is_empty(model)
MOIU.loadfromstring!(
model,
"""
Expand Down Expand Up @@ -849,7 +847,6 @@ function test_modification_affine_deletion_edge_cases(
model::MOI.ModelLike,
config::Config,
)
MOI.empty!(model)
x = MOI.add_variable(model)
# helpers. The function 1.0x + 0.0
saf = MOI.ScalarAffineFunction([MOI.ScalarAffineTerm(1.0, x)], 0.0)
Expand Down
6 changes: 0 additions & 6 deletions src/Test/test_nonlinear.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,8 +281,6 @@ function _test_HS071(model::MOI.ModelLike, config::Config, evaluator::HS071)
MOI.GreaterThan{Float64},
)
@requires MOI.supports(model, MOI.VariablePrimalStart(), MOI.VariableIndex)
MOI.empty!(model)
@test MOI.is_empty(model)
lb = [25.0, 40.0]
ub = [Inf, 40.0]
block_data = MOI.NLPBlockData(MOI.NLPBoundsPair.(lb, ub), evaluator, true)
Expand Down Expand Up @@ -458,8 +456,6 @@ function test_nonlinear_objective_and_moi_objective_test(
)
@requires MOI.supports(model, MOI.NLPBlock())
@requires MOI.supports(model, MOI.VariablePrimalStart(), MOI.VariableIndex)
MOI.empty!(model)
@test MOI.is_empty(model)
lb = [1.0]
ub = [2.0]
block_data = MOI.NLPBlockData(
Expand Down Expand Up @@ -521,7 +517,6 @@ function test_nonlinear_mixed_complementarity(
MOI.VectorAffineFunction{Float64},
MOI.Complements,
)
MOI.empty!(model)
x = MOI.add_variables(model, 4)
MOI.add_constraint.(model, MOI.SingleVariable.(x), MOI.Interval(0.0, 10.0))
MOI.set.(model, MOI.VariablePrimalStart(), x, 0.0)
Expand Down Expand Up @@ -614,7 +609,6 @@ function test_nonlinear_qp_complementarity_constraint(
MOI.VectorOfVariables,
MOI.Complements,
)
MOI.empty!(model)
x = MOI.add_variables(model, 8)
MOI.set.(model, MOI.VariablePrimalStart(), x, 0.0)
MOI.add_constraint.(model, MOI.SingleVariable.(x), MOI.GreaterThan(0.0))
Expand Down
Loading