Skip to content
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

Refactor test/mutable_arithmetics.jl #2284

Merged
merged 2 commits into from
Jul 17, 2020
Merged

Refactor test/mutable_arithmetics.jl #2284

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a128080
Refactor test/mutable_arithmetics.jl into functions as opposed to nes…
odow Jul 12, 2020
c5697b3
Test promote_operation on JuMPExtension
odow Jul 17, 2020
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
211 changes: 115 additions & 96 deletions test/mutable_arithmetics.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
module TestMutableArithmetics

using LinearAlgebra
using JuMP
using Test

const MA = JuMP._MA

@static if !(:JuMPExtension in names(Main))
include(joinpath(@__DIR__, "JuMPExtension.jl"))
end
include(joinpath(@__DIR__, "JuMPExtension.jl"))

struct DummyVariableRef <: JuMP.AbstractVariableRef end
JuMP.name(::DummyVariableRef) = "dummy"
Expand All @@ -22,109 +22,128 @@ function promote_operation_test(op::Function, x::Type, y::Type)
@test 0 == @allocated f()
end

function mutable_arithmetics_test(ModelType::Type{<:JuMP.AbstractModel},
VariableRefType::Type{<:JuMP.AbstractVariableRef})
function test_promote_operation(ModelType, VariableRefType)
AffExprType = JuMP.GenericAffExpr{Float64, VariableRefType}
QuadExprType = JuMP.GenericQuadExpr{Float64, VariableRefType}

@testset "promote_operation" begin
for op in [+, -, *]
for T in [Int, Float64]
promote_operation_test(op, T, VariableRefType)
promote_operation_test(op, VariableRefType, T)
promote_operation_test(op, T, AffExprType)
promote_operation_test(op, AffExprType, T)
promote_operation_test(op, T, QuadExprType)
promote_operation_test(op, QuadExprType, T)
end
promote_operation_test(op, VariableRefType, VariableRefType)
promote_operation_test(op, VariableRefType, AffExprType)
promote_operation_test(op, AffExprType, VariableRefType)
if op != *
promote_operation_test(op, VariableRefType, QuadExprType)
promote_operation_test(op, QuadExprType, VariableRefType)
promote_operation_test(op, AffExprType, QuadExprType)
promote_operation_test(op, QuadExprType, AffExprType)
end
for op in [+, -, *]
for T in [Int, Float64]
promote_operation_test(op, T, VariableRefType)
promote_operation_test(op, VariableRefType, T)
promote_operation_test(op, T, AffExprType)
promote_operation_test(op, AffExprType, T)
promote_operation_test(op, T, QuadExprType)
promote_operation_test(op, QuadExprType, T)
end
end

@testset "Int" begin
model = ModelType()
@variable(model, x)
@testset "Affine" begin
MA.Test.int_test(typeof(1x), exclude = ["int_mul", "int_add", "int_add_mul"])
end
@testset "Quadratic" begin
MA.Test.int_test(typeof(1x^2), exclude = ["int_mul", "int_add", "int_add_mul"])
promote_operation_test(op, VariableRefType, VariableRefType)
promote_operation_test(op, VariableRefType, AffExprType)
promote_operation_test(op, AffExprType, VariableRefType)
if op != *
promote_operation_test(op, VariableRefType, QuadExprType)
promote_operation_test(op, QuadExprType, VariableRefType)
promote_operation_test(op, AffExprType, QuadExprType)
promote_operation_test(op, QuadExprType, AffExprType)
end
end
end

@testset "Scalar" begin
model = ModelType()
@variable(model, x)
exclude = ["cube"]
MA.Test.scalar_test(x, exclude = exclude)
MA.Test.scalar_test(2x + 3, exclude = exclude)
MA.Test.scalar_test(2x^2 + 4x + 1, exclude = exclude)
end
@testset "Quadratic" begin
model = ModelType()
@variable(model, w)
@variable(model, x)
@variable(model, y)
@variable(model, z)
MA.Test.quadratic_test(w, x, y, z)
end
@testset "Sparse" begin
model = ModelType()
@variable(model, X11)
@variable(model, X23)
@variable(model, Xd[1:3, 1:3])
MA.Test.sparse_test(X11, X23, Xd)
end
@testset "Vector" begin
model = ModelType()
@variable(model, x[1:3])
MA.Test.array_test(x)
end
@testset "Matrix" begin
model = ModelType()
@variable(model, x[1:2, 1:2])
MA.Test.array_test(x)
@variable(model, y[1:2, 1:2], Symmetric)
MA.Test.array_test(y)
@variable(model, z[1:2, 1:3])
MA.Test.array_test(z)
end
@testset "DenseAxisVector" begin
model = ModelType()
@variable(model, y[2:5])
MA.Test.array_test(y, exclude = ["matrix_vector", "non_array"])
function test_int(ModelType, ::Any)
model = ModelType()
@variable(model, x)
MA.Test.int_test(typeof(1x), exclude = ["int_mul", "int_add", "int_add_mul"])
MA.Test.int_test(typeof(1x^2), exclude = ["int_mul", "int_add", "int_add_mul"])
end

function test_scalar(ModelType, ::Any)
model = ModelType()
@variable(model, x)
exclude = ["cube"]
MA.Test.scalar_test(x, exclude = exclude)
MA.Test.scalar_test(2x + 3, exclude = exclude)
MA.Test.scalar_test(2x^2 + 4x + 1, exclude = exclude)
end

function test_quadratic(ModelType, ::Any)
model = ModelType()
@variable(model, w)
@variable(model, x)
@variable(model, y)
@variable(model, z)
MA.Test.quadratic_test(w, x, y, z)
end

function test_sparse(ModelType, ::Any)
model = ModelType()
@variable(model, X11)
@variable(model, X23)
@variable(model, Xd[1:3, 1:3])
MA.Test.sparse_test(X11, X23, Xd)
end

function test_vector(ModelType, ::Any)
model = ModelType()
@variable(model, x[1:3])
MA.Test.array_test(x)
end

function test_symmetric_matrix(ModelType, ::Any)
model = ModelType()
@variable(model, y[1:2, 1:2], Symmetric)
MA.Test.array_test(y)
end

function test_nonsquare_matrix(ModelType, ::Any)
model = ModelType()
@variable(model, z[1:2, 1:3])
MA.Test.array_test(z)
end

function test_DenseAxisVector(ModelType, ::Any)
model = ModelType()
@variable(model, y[2:5])
MA.Test.array_test(y, exclude = ["matrix_vector", "non_array"])
end

function test_different_variables(ModelType, ::Any)
model = ModelType()
x = @variable(model)
y = DummyVariableRef()
aff = x + 1
function _promote_test(a, b)
A = typeof(a)
B = typeof(b)
@test MA.promote_operation(+, A, B) == DummyExpr
@test MA.promote_operation(-, A, B) == DummyExpr
@test MA.promote_operation(+, B, A) == DummyExpr
@test MA.promote_operation(-, B, A) == DummyExpr
end
@testset "Mix different variables" begin
model = ModelType()
x = @variable(model)
y = DummyVariableRef()
aff = x + 1
function _promote_test(a, b)
A = typeof(a)
B = typeof(b)
@test MA.promote_operation(+, A, B) == DummyExpr
@test MA.promote_operation(-, A, B) == DummyExpr
@test MA.promote_operation(+, B, A) == DummyExpr
@test MA.promote_operation(-, B, A) == DummyExpr
_promote_test(x, y)
_promote_test(aff, y)
end

function runtests()
for name in names(@__MODULE__; all = true)
if !startswith("$(name)", "test_")
continue
end
_promote_test(x, y)
_promote_test(aff, y)
f = getfield(@__MODULE__, name)
@testset "$(name)" begin
f(Model, VariableRef)
end
# Note(odow): We disable JuMPExtension tests for MutableArithmetics
# because they take far to looooooong. MutableArithmetics is a
# tested package. We're also testing that it works with JuMP. We
# don't need to double up on our tests.
# @testset "$(name)-JuMPExtension" begin
# f(JuMPExtension.MyModel, JuMPExtension.MyVariableRef)
# end
end
@testset "test_promote_operation-JuMPExtension" begin
test_promote_operation(
JuMPExtension.MyModel, JuMPExtension.MyVariableRef
)
end

end

@testset "Operators for JuMP.Model" begin
mutable_arithmetics_test(Model, VariableRef)
end

@testset "Operators for JuMPExtension.MyModel" begin
mutable_arithmetics_test(JuMPExtension.MyModel, JuMPExtension.MyVariableRef)
end
TestMutableArithmetics.runtests()