Skip to content

Migrate tests of mockoptimizer.jl #1456

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 11 commits into from
Jul 19, 2021
Merged

Migrate tests of mockoptimizer.jl #1456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
bf12e5d
Migreate tests of mockoptimizer.jl
odow Jul 14, 2021
d6842d6
Fix formatting
odow Jul 14, 2021
d4b1b10
Fix
odow Jul 14, 2021
d9c45c3
Fixes
odow Jul 14, 2021
57a47c7
Fixes
odow Jul 14, 2021
f841cd6
Fixes
odow Jul 14, 2021
b3c7673
Remove un-used allocate-load
odow Jul 15, 2021
2ce3c12
Fixes
odow Jul 15, 2021
f6f619e
Fixes
odow Jul 16, 2021
e0cc510
Rename fields for clarity
odow Jul 16, 2021
ad37343
Update mockoptimizer.jl
odow Jul 18, 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
3 changes: 0 additions & 3 deletions src/DeprecatedTest/contlinear.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,9 +263,6 @@ function linear1test(model::MOI.ModelLike, config::Config{T}) where {T}
end
@test MOI.get(model, MOI.VariablePrimal(), v) ≈ [-1, 0, 2] atol = atol rtol =
rtol
if config.duals
@test MOI.get(model, MOI.DualStatus()) == MOI.FEASIBLE_POINT
end
end
# put lb of x back to 0 and fix z to zero to get :
# max x + 2z
Expand Down
3 changes: 2 additions & 1 deletion src/Test/test_conic.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2488,7 +2488,8 @@ function setup_test(
(mock::MOIU.MockOptimizer) -> MOIU.mock_optimize!(
mock,
MOI.INFEASIBLE,
tuple(),
MOI.NO_SOLUTION,
MOI.INFEASIBILITY_CERTIFICATE,
(MOI.SingleVariable, MOI.LessThan{Float64}) => [-1],
(MOI.SingleVariable, MOI.EqualTo{Float64}) => [-1],
(MOI.SingleVariable, MOI.GreaterThan{Float64}) => [1],
Expand Down
52 changes: 27 additions & 25 deletions src/Test/test_linear.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,9 +265,6 @@ function test_linear_integration(
end
@test MOI.get(model, MOI.VariablePrimal(), v) ≈ [-1, 0, 2] atol = atol rtol =
rtol
if _supports(config, MOI.ConstraintDual)
@test MOI.get(model, MOI.DualStatus()) == MOI.FEASIBLE_POINT
end
end
# put lb of x back to 0 and fix z to zero to get :
# max x + 2z
Expand Down Expand Up @@ -659,10 +656,10 @@ function setup_test(
[1, 0],
(MOI.ScalarAffineFunction{Float64}, MOI.LessThan{Float64}) =>
[-1],
con_basis = [
constraint_basis_status = [
(MOI.ScalarAffineFunction{Float64}, MOI.LessThan{Float64}) => [MOI.NONBASIC],
],
var_basis = [MOI.BASIC, MOI.NONBASIC_AT_LOWER],
variable_basis_status = [MOI.BASIC, MOI.NONBASIC_AT_LOWER],
),
)
return
Expand Down Expand Up @@ -816,18 +813,18 @@ function setup_test(
(mock::MOIU.MockOptimizer) -> MOIU.mock_optimize!(
mock,
[3],
con_basis = [
constraint_basis_status = [
(MOI.ScalarAffineFunction{Float64}, MOI.GreaterThan{Float64}) => [MOI.NONBASIC],
],
var_basis = [MOI.BASIC],
variable_basis_status = [MOI.BASIC],
),
(mock::MOIU.MockOptimizer) -> MOIU.mock_optimize!(
mock,
[0],
con_basis = [
constraint_basis_status = [
(MOI.ScalarAffineFunction{Float64}, MOI.LessThan{Float64}) => [MOI.BASIC],
],
var_basis = [MOI.NONBASIC_AT_UPPER],
variable_basis_status = [MOI.NONBASIC_AT_UPPER],
),
)
return
Expand Down Expand Up @@ -1510,7 +1507,8 @@ function setup_test(
(mock::MOIU.MockOptimizer) -> MOIU.mock_optimize!(
mock,
MOI.INFEASIBLE,
tuple(),
MOI.NO_SOLUTION,
MOI.INFEASIBILITY_CERTIFICATE,
(MOI.ScalarAffineFunction{Float64}, MOI.LessThan{Float64}) =>
[-1],
),
Expand Down Expand Up @@ -1828,11 +1826,11 @@ function setup_test(
(mock::MOIU.MockOptimizer) -> MOIU.mock_optimize!(
mock,
[650 / 11, 400 / 11],
con_basis = [
constraint_basis_status = [
(MOI.ScalarAffineFunction{Float64}, MOI.LessThan{Float64}) => [MOI.NONBASIC, MOI.NONBASIC],
(MOI.ScalarAffineFunction{Float64}, MOI.GreaterThan{Float64}) => [MOI.BASIC],
],
var_basis = [MOI.BASIC, MOI.BASIC],
variable_basis_status = [MOI.BASIC, MOI.BASIC],
),
)
return
Expand Down Expand Up @@ -2041,20 +2039,20 @@ function setup_test(
(mock::MOIU.MockOptimizer) -> MOIU.mock_optimize!(
mock,
[5.0, 5.0],
con_basis = [
constraint_basis_status = [
(MOI.ScalarAffineFunction{Float64}, MOI.Interval{Float64}) => [MOI.NONBASIC_AT_UPPER],
],
var_basis = [MOI.BASIC, MOI.BASIC],
variable_basis_status = [MOI.BASIC, MOI.BASIC],
(MOI.ScalarAffineFunction{Float64}, MOI.Interval{Float64}) =>
[-1],
),
(mock::MOIU.MockOptimizer) -> MOIU.mock_optimize!(
mock,
[2.5, 2.5],
con_basis = [
constraint_basis_status = [
(MOI.ScalarAffineFunction{Float64}, MOI.Interval{Float64}) => [MOI.NONBASIC_AT_LOWER],
],
var_basis = [MOI.BASIC, MOI.BASIC],
variable_basis_status = [MOI.BASIC, MOI.BASIC],
(MOI.ScalarAffineFunction{Float64}, MOI.Interval{Float64}) =>
[1],
),
Expand All @@ -2063,20 +2061,20 @@ function setup_test(
[1.0, 1.0],
(MOI.ScalarAffineFunction{Float64}, MOI.Interval{Float64}) =>
[1],
con_basis = [
constraint_basis_status = [
(MOI.ScalarAffineFunction{Float64}, MOI.Interval{Float64}) => [MOI.NONBASIC_AT_LOWER],
],
var_basis = [MOI.BASIC, MOI.BASIC],
variable_basis_status = [MOI.BASIC, MOI.BASIC],
),
(mock::MOIU.MockOptimizer) -> MOIU.mock_optimize!(
mock,
[6.0, 6.0],
(MOI.ScalarAffineFunction{Float64}, MOI.Interval{Float64}) =>
[-1],
con_basis = [
constraint_basis_status = [
(MOI.ScalarAffineFunction{Float64}, MOI.Interval{Float64}) => [MOI.NONBASIC_AT_UPPER],
],
var_basis = [MOI.BASIC, MOI.BASIC],
variable_basis_status = [MOI.BASIC, MOI.BASIC],
),
)
return
Expand Down Expand Up @@ -2186,10 +2184,13 @@ function setup_test(
(mock::MOIU.MockOptimizer) -> MOIU.mock_optimize!(
mock,
[0.0, 0.0],
con_basis = [
constraint_basis_status = [
(MOI.ScalarAffineFunction{Float64}, MOI.Interval{Float64}) => [MOI.BASIC],
],
var_basis = [MOI.NONBASIC_AT_LOWER, MOI.NONBASIC_AT_LOWER],
variable_basis_status = [
MOI.NONBASIC_AT_LOWER,
MOI.NONBASIC_AT_LOWER,
],
(MOI.ScalarAffineFunction{Float64}, MOI.Interval{Float64}) =>
[0],
),
Expand Down Expand Up @@ -2431,7 +2432,8 @@ function setup_test(
(mock::MOIU.MockOptimizer) -> MOIU.mock_optimize!(
mock,
MOI.INFEASIBLE,
tuple(),
MOI.NO_SOLUTION,
MOI.INFEASIBILITY_CERTIFICATE,
(MOI.ScalarAffineFunction{Float64}, MOI.LessThan{Float64}) =>
[-1, -1],
),
Expand Down Expand Up @@ -2699,10 +2701,10 @@ function setup_test(
(mock::MOIU.MockOptimizer) -> MOIU.mock_optimize!(
mock,
[0, 1 / 2, 1],
con_basis = [
constraint_basis_status = [
(MOI.ScalarAffineFunction{Float64}, MOI.LessThan{Float64}) => [MOI.NONBASIC],
],
var_basis = [
variable_basis_status = [
MOI.NONBASIC_AT_LOWER,
MOI.BASIC,
MOI.NONBASIC_AT_UPPER,
Expand Down
Loading