@@ -228,27 +228,28 @@ def test_linexpr_varseries(self):
228
228
self .assert_expression_equal (result [i ], 2 * y * x [i ])
229
229
230
230
def test_dataseries_quadexpr (self ):
231
- s = pd .Series (list (range (5 )))
231
+ s = pd .Series (list (range (1 , 6 )))
232
232
y = self .model .addVar (name = "y" )
233
233
qe = y * y
234
234
self .model .update ()
235
235
result = s * qe
236
236
self .assertIsInstance (result , pd .Series )
237
237
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 )
239
239
240
240
@unittest .skipIf (GUROBIPY_MAJOR_VERSION < 10 , "Operator precedence in v9" )
241
241
def test_quadexpr_dataseries (self ):
242
- s = pd .Series (list (range (5 )))
242
+ s = pd .Series (list (range (1 , 6 )))
243
243
y = self .model .addVar (name = "y" )
244
244
qe = y * y
245
245
self .model .update ()
246
246
result = qe * s
247
247
self .assertIsInstance (result , pd .Series )
248
248
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 )
250
250
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 ):
252
253
# Cannot multiply, should get a GurobiError
253
254
# (Note in gurobipy, QuadExpr * QuadExpr is technically allowed as long
254
255
# as it won't introduce degree > 2 terms)
0 commit comments