Skip to content

Commit 4197a97

Browse files
authored
Merge pull request #691 from JuliaOpt/bl/zero_constant_copy
Use zero constant in scalar constraint function of copy test
2 parents 1c4efbd + 0e26909 commit 4197a97

File tree

1 file changed

+23
-7
lines changed

1 file changed

+23
-7
lines changed

src/Test/modellike.jl

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ function emptytest(model::MOI.ModelLike)
131131
@test MOI.supports_constraint(model, MOI.VectorOfVariables, MOI.Nonnegatives)
132132
vc = MOI.add_constraint(model, MOI.VectorOfVariables(v), MOI.Nonnegatives(3))
133133
@test MOI.supports_constraint(model, MOI.VectorAffineFunction{Float64}, MOI.Zeros)
134-
c = MOI.add_constraint(model, MOI.VectorAffineFunction(MOI.VectorAffineTerm.([1,1,1,2,2], MOI.ScalarAffineTerm.(1.0, [v;v[2];v[3]])), [-3.0,-2.0]), MOI.Zeros(2))
134+
c = MOI.add_constraint(model, MOI.VectorAffineFunction(MOI.VectorAffineTerm.([1,1,1,2,2], MOI.ScalarAffineTerm.(1.0, [v;v[2];v[3]])), [-3.0, -2.0]), MOI.Zeros(2))
135135
MOI.set(model, MOI.ObjectiveFunction{MOI.ScalarAffineFunction{Float64}}(), MOI.ScalarAffineFunction(MOI.ScalarAffineTerm.([-3.0, -2.0, -4.0], v), 0.0))
136136
MOI.set(model, MOI.ObjectiveSense(), MOI.MIN_SENSE)
137137

@@ -270,11 +270,24 @@ function copytest(dest::MOI.ModelLike, src::MOI.ModelLike)
270270
MOI.set(src, MOI.ConstraintName(), csv, "csv")
271271
cvv = MOI.add_constraint(src, MOI.VectorOfVariables(v), MOI.Nonnegatives(3))
272272
MOI.set(src, MOI.ConstraintName(), cvv, "cvv")
273-
csa = MOI.add_constraint(src, MOI.ScalarAffineFunction(MOI.ScalarAffineTerm.([1., 3.], [v[3], v[1]]), 2.), MOI.LessThan(2.))
273+
csa = MOI.add_constraint(
274+
src,
275+
MOI.ScalarAffineFunction(
276+
MOI.ScalarAffineTerm.([1.0, 3.0], [v[3], v[1]]), 0.0),
277+
MOI.LessThan(2.))
274278
MOI.set(src, MOI.ConstraintName(), csa, "csa")
275-
cva = MOI.add_constraint(src, MOI.VectorAffineFunction(MOI.VectorAffineTerm.([1, 2], MOI.ScalarAffineTerm.(1.0, [v[3], v[2]])), [-3.0,-2.0]), MOI.Zeros(2))
279+
cva = MOI.add_constraint(
280+
src,
281+
MOI.VectorAffineFunction(
282+
MOI.VectorAffineTerm.(
283+
[1, 2],
284+
MOI.ScalarAffineTerm.(1.0, [v[3], v[2]])),
285+
[-3.0, -2.0]),
286+
MOI.Zeros(2))
276287
MOI.set(src, MOI.ConstraintName(), cva, "cva")
277-
MOI.set(src, MOI.ObjectiveFunction{MOI.ScalarAffineFunction{Float64}}(), MOI.ScalarAffineFunction(MOI.ScalarAffineTerm.([-3.0, -2.0, -4.0], v), 0.0))
288+
MOI.set(src, MOI.ObjectiveFunction{MOI.ScalarAffineFunction{Float64}}(),
289+
MOI.ScalarAffineFunction(
290+
MOI.ScalarAffineTerm.([-3.0, -2.0, -4.0], v), 2.0))
278291
MOI.set(src, MOI.ObjectiveSense(), MOI.MIN_SENSE)
279292

280293
@test MOI.supports(dest, MOI.ObjectiveFunction{MOI.ScalarAffineFunction{Float64}}())
@@ -310,13 +323,16 @@ function copytest(dest::MOI.ModelLike, src::MOI.ModelLike)
310323
@test MOI.get(dest, MOI.ConstraintFunction(), dict[cvv]) == MOI.VectorOfVariables(getindex.(Ref(dict), v))
311324
@test MOI.get(dest, MOI.ConstraintSet(), dict[cvv]) == MOI.Nonnegatives(3)
312325
@test !MOI.supports(dest, MOI.ConstraintName(), typeof(csa)) || MOI.get(dest, MOI.ConstraintName(), csa) == ""
313-
@test MOI.get(dest, MOI.ConstraintFunction(), dict[csa]) MOI.ScalarAffineFunction(MOI.ScalarAffineTerm.([1., 3.], [dict[v[3]], dict[v[1]]]), 2.)
326+
@test MOI.get(dest, MOI.ConstraintFunction(), dict[csa]) MOI.ScalarAffineFunction(
327+
MOI.ScalarAffineTerm.([1., 3.], [dict[v[3]], dict[v[1]]]), 0.0)
314328
@test MOI.get(dest, MOI.ConstraintSet(), dict[csa]) == MOI.LessThan(2.)
315329
@test !MOI.supports(dest, MOI.ConstraintName(), typeof(cva)) || MOI.get(dest, MOI.ConstraintName(), cva) == ""
316-
@test MOI.get(dest, MOI.ConstraintFunction(), dict[cva]) MOI.VectorAffineFunction(MOI.VectorAffineTerm.([1, 2], MOI.ScalarAffineTerm.(1.0, [dict[v[3]], dict[v[2]]])), [-3.0,-2.0])
330+
@test MOI.get(dest, MOI.ConstraintFunction(), dict[cva]) MOI.VectorAffineFunction(MOI.VectorAffineTerm.([1, 2], MOI.ScalarAffineTerm.(1.0, [dict[v[3]], dict[v[2]]])), [-3.0, -2.0])
317331
@test MOI.get(dest, MOI.ConstraintSet(), dict[cva]) == MOI.Zeros(2)
318332

319-
@test MOI.get(dest, MOI.ObjectiveFunction{MOI.ScalarAffineFunction{Float64}}()) MOI.ScalarAffineFunction(MOI.ScalarAffineTerm.([-3.0, -2.0, -4.0], [dict[v[1]], dict[v[2]], dict[v[3]]]), 0.0)
333+
@test MOI.get(dest, MOI.ObjectiveFunction{MOI.ScalarAffineFunction{Float64}}()) MOI.ScalarAffineFunction(
334+
MOI.ScalarAffineTerm.([-3.0, -2.0, -4.0],
335+
[dict[v[1]], dict[v[2]], dict[v[3]]]), 2.0)
320336
@test MOI.get(dest, MOI.ObjectiveFunctionType()) == MOI.ScalarAffineFunction{Float64}
321337
@test MOI.get(dest, MOI.ObjectiveSense()) == MOI.MIN_SENSE
322338
end

0 commit comments

Comments
 (0)