Skip to content

Commit 12d1da4

Browse files
committed
Update tests for gurobipy 12.0
1 parent 88ab828 commit 12d1da4

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

tests/test_operators.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -228,27 +228,28 @@ def test_linexpr_varseries(self):
228228
self.assert_expression_equal(result[i], 2 * y * x[i])
229229

230230
def test_dataseries_quadexpr(self):
231-
s = pd.Series(list(range(5)))
231+
s = pd.Series(list(range(1, 6)))
232232
y = self.model.addVar(name="y")
233233
qe = y * y
234234
self.model.update()
235235
result = s * qe
236236
self.assertIsInstance(result, pd.Series)
237237
for i in range(5):
238-
self.assert_expression_equal(result[i], i * y * y)
238+
self.assert_expression_equal(result[i], (i + 1) * y * y)
239239

240240
@unittest.skipIf(GUROBIPY_MAJOR_VERSION < 10, "Operator precedence in v9")
241241
def test_quadexpr_dataseries(self):
242-
s = pd.Series(list(range(5)))
242+
s = pd.Series(list(range(1, 6)))
243243
y = self.model.addVar(name="y")
244244
qe = y * y
245245
self.model.update()
246246
result = qe * s
247247
self.assertIsInstance(result, pd.Series)
248248
for i in range(5):
249-
self.assert_expression_equal(result[i], i * y * y)
249+
self.assert_expression_equal(result[i], (i + 1) * y * y)
250250

251-
def test_varseries_quadexpr(self):
251+
@unittest.skipIf(GUROBIPY_MAJOR_VERSION >= 12, "NLExpr takes over in v12")
252+
def test_varseries_quadexpr_fail(self):
252253
# Cannot multiply, should get a GurobiError
253254
# (Note in gurobipy, QuadExpr * QuadExpr is technically allowed as long
254255
# as it won't introduce degree > 2 terms)

0 commit comments

Comments
 (0)