Skip to content

Commit aed15a5

Browse files
odowodow
committed
Update
1 parent 45c1676 commit aed15a5

File tree

1 file changed

+13
-41
lines changed

1 file changed

+13
-41
lines changed

‎test/Utilities/cachingoptimizer.jl‎

Lines changed: 13 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1109,9 +1109,7 @@ end
11091109
function test_add_variable()
11101110
for mode in (MOI.Utilities.AUTOMATIC, MOI.Utilities.MANUAL)
11111111
cache = MOI.Utilities.Model{Float64}()
1112-
optimizer = MOI.Utilities.MockOptimizer(
1113-
MOI.Utilities.Model{Float64}(),
1114-
)
1112+
optimizer = MOI.Utilities.MockOptimizer(MOI.Utilities.Model{Float64}())
11151113
model = MOI.Utilities.CachingOptimizer(cache, mode)
11161114
MOI.Utilities.reset_optimizer(model, optimizer)
11171115
MOI.Utilities.attach_optimizer(model)
@@ -1124,9 +1122,7 @@ end
11241122
function test_add_variables()
11251123
for mode in (MOI.Utilities.AUTOMATIC, MOI.Utilities.MANUAL)
11261124
cache = MOI.Utilities.Model{Float64}()
1127-
optimizer = MOI.Utilities.MockOptimizer(
1128-
MOI.Utilities.Model{Float64}(),
1129-
)
1125+
optimizer = MOI.Utilities.MockOptimizer(MOI.Utilities.Model{Float64}())
11301126
model = MOI.Utilities.CachingOptimizer(cache, mode)
11311127
MOI.Utilities.reset_optimizer(model, optimizer)
11321128
MOI.Utilities.attach_optimizer(model)
@@ -1141,9 +1137,7 @@ end
11411137
function test_add_constrained_variable()
11421138
for mode in (MOI.Utilities.AUTOMATIC, MOI.Utilities.MANUAL)
11431139
cache = MOI.Utilities.Model{Float64}()
1144-
optimizer = MOI.Utilities.MockOptimizer(
1145-
MOI.Utilities.Model{Float64}(),
1146-
)
1140+
optimizer = MOI.Utilities.MockOptimizer(MOI.Utilities.Model{Float64}())
11471141
model = MOI.Utilities.CachingOptimizer(cache, mode)
11481142
MOI.Utilities.reset_optimizer(model, optimizer)
11491143
MOI.Utilities.attach_optimizer(model)
@@ -1157,9 +1151,7 @@ end
11571151
function test_add_constrained_variables()
11581152
for mode in (MOI.Utilities.AUTOMATIC, MOI.Utilities.MANUAL)
11591153
cache = MOI.Utilities.Model{Float64}()
1160-
optimizer = MOI.Utilities.MockOptimizer(
1161-
MOI.Utilities.Model{Float64}(),
1162-
)
1154+
optimizer = MOI.Utilities.MockOptimizer(MOI.Utilities.Model{Float64}())
11631155
model = MOI.Utilities.CachingOptimizer(cache, mode)
11641156
MOI.Utilities.reset_optimizer(model, optimizer)
11651157
MOI.Utilities.attach_optimizer(model)
@@ -1175,9 +1167,7 @@ end
11751167
function test_modify_constraint()
11761168
for mode in (MOI.Utilities.AUTOMATIC, MOI.Utilities.MANUAL)
11771169
cache = MOI.Utilities.Model{Float64}()
1178-
optimizer = MOI.Utilities.MockOptimizer(
1179-
MOI.Utilities.Model{Float64}(),
1180-
)
1170+
optimizer = MOI.Utilities.MockOptimizer(MOI.Utilities.Model{Float64}())
11811171
model = MOI.Utilities.CachingOptimizer(cache, mode)
11821172
MOI.Utilities.reset_optimizer(model, optimizer)
11831173
MOI.Utilities.attach_optimizer(model)
@@ -1186,11 +1176,7 @@ function test_modify_constraint()
11861176
c_opt = model.model_to_optimizer_map[c]
11871177
f = MOI.get(optimizer, MOI.ConstraintFunction(), c_opt)
11881178
@test f ≈ 1.0 * model.model_to_optimizer_map[x]
1189-
MOI.modify(
1190-
model,
1191-
c,
1192-
MOI.ScalarCoefficientChange(x, 2.0),
1193-
)
1179+
MOI.modify(model, c, MOI.ScalarCoefficientChange(x, 2.0))
11941180
c_opt = model.model_to_optimizer_map[c]
11951181
f = MOI.get(optimizer, MOI.ConstraintFunction(), c_opt)
11961182
@test f ≈ 2.0 * model.model_to_optimizer_map[x]
@@ -1201,9 +1187,7 @@ end
12011187
function test_modify_constraint()
12021188
for mode in (MOI.Utilities.AUTOMATIC, MOI.Utilities.MANUAL)
12031189
cache = MOI.Utilities.Model{Float64}()
1204-
optimizer = MOI.Utilities.MockOptimizer(
1205-
MOI.Utilities.Model{Float64}(),
1206-
)
1190+
optimizer = MOI.Utilities.MockOptimizer(MOI.Utilities.Model{Float64}())
12071191
model = MOI.Utilities.CachingOptimizer(cache, mode)
12081192
MOI.Utilities.reset_optimizer(model, optimizer)
12091193
MOI.Utilities.attach_optimizer(model)
@@ -1212,11 +1196,7 @@ function test_modify_constraint()
12121196
attr = MOI.ObjectiveFunction{typeof(f)}()
12131197
MOI.set(model, attr, f)
12141198
@test MOI.get(optimizer, attr) ≈ 1.0 * model.model_to_optimizer_map[x]
1215-
MOI.modify(
1216-
model,
1217-
attr,
1218-
MOI.ScalarCoefficientChange(x, 2.0),
1219-
)
1199+
MOI.modify(model, attr, MOI.ScalarCoefficientChange(x, 2.0))
12201200
@test MOI.get(optimizer, attr) ≈ 2.0 * model.model_to_optimizer_map[x]
12211201
end
12221202
return
@@ -1225,16 +1205,14 @@ end
12251205
function test_delete_invalid_index()
12261206
for mode in (MOI.Utilities.AUTOMATIC, MOI.Utilities.MANUAL)
12271207
cache = MOI.Utilities.Model{Float64}()
1228-
optimizer = MOI.Utilities.MockOptimizer(
1229-
MOI.Utilities.Model{Float64}(),
1230-
)
1208+
optimizer = MOI.Utilities.MockOptimizer(MOI.Utilities.Model{Float64}())
12311209
model = MOI.Utilities.CachingOptimizer(cache, mode)
12321210
MOI.Utilities.reset_optimizer(model, optimizer)
12331211
MOI.Utilities.attach_optimizer(model)
12341212
x = MOI.add_variable(model)
12351213
@test MOI.is_valid(optimizer, model.model_to_optimizer_map[x])
12361214
MOI.delete(model, x)
1237-
@test !MOI.is_valid(optimizer, model.model_to_optimizer_map[x])
1215+
@test_throws(KeyError, model.model_to_optimizer_map[x])
12381216
@test_throws(MOI.InvalidIndex, MOI.delete(model, x))
12391217
end
12401218
return
@@ -1243,9 +1221,7 @@ end
12431221
function test_delete_variables()
12441222
for mode in (MOI.Utilities.AUTOMATIC, MOI.Utilities.MANUAL)
12451223
cache = MOI.Utilities.Model{Float64}()
1246-
optimizer = MOI.Utilities.MockOptimizer(
1247-
MOI.Utilities.Model{Float64}(),
1248-
)
1224+
optimizer = MOI.Utilities.MockOptimizer(MOI.Utilities.Model{Float64}())
12491225
model = MOI.Utilities.CachingOptimizer(cache, mode)
12501226
MOI.Utilities.reset_optimizer(model, optimizer)
12511227
MOI.Utilities.attach_optimizer(model)
@@ -1283,9 +1259,7 @@ end
12831259

12841260
function test_get_AttributeFromOptimizer()
12851261
cache = MOI.Utilities.Model{Float64}()
1286-
optimizer = MOI.Utilities.MockOptimizer(
1287-
MOI.Utilities.Model{Float64}(),
1288-
)
1262+
optimizer = MOI.Utilities.MockOptimizer(MOI.Utilities.Model{Float64}())
12891263
model = MOI.Utilities.CachingOptimizer(cache, optimizer)
12901264
x = MOI.add_variable(model)
12911265
MOI.Utilities.attach_optimizer(model)
@@ -1301,9 +1275,7 @@ end
13011275

13021276
function test_get_AttributeFromModelCache()
13031277
cache = MOI.Utilities.Model{Float64}()
1304-
optimizer = MOI.Utilities.MockOptimizer(
1305-
MOI.Utilities.Model{Float64}(),
1306-
)
1278+
optimizer = MOI.Utilities.MockOptimizer(MOI.Utilities.Model{Float64}())
13071279
model = MOI.Utilities.CachingOptimizer(cache, optimizer)
13081280
x = MOI.add_variable(model)
13091281
MOI.Utilities.attach_optimizer(model)

0 commit comments

Comments
 (0)