File tree Expand file tree Collapse file tree 1 file changed +4
-6
lines changed Expand file tree Collapse file tree 1 file changed +4
-6
lines changed Original file line number Diff line number Diff line change @@ -2468,17 +2468,15 @@ cdef class _VarArray:
2468
2468
2469
2469
def __cinit__ (self , object vars ):
2470
2470
if isinstance (vars , Variable):
2471
- self .size = 1
2472
2471
vars = [vars ]
2473
- elif isinstance (vars , (list , tuple )):
2474
- self .size = len (vars )
2475
- elif isinstance (vars , MatrixVariable):
2476
- self .size = vars .size
2472
+ elif isinstance (vars , (list , tuple , MatrixVariable)):
2473
+ vars = np.ravel(vars )
2477
2474
else :
2478
2475
raise TypeError (f" Expected Variable or list of Variable, got {type(vars)}." )
2479
2476
2477
+ self .size = len (vars )
2480
2478
self .ptr = < SCIP_VAR** > malloc(self .size * sizeof(SCIP_VAR* )) if self .size else NULL
2481
- for i, var in enumerate (np.ravel( vars ) ):
2479
+ for i, var in enumerate (vars ):
2482
2480
if not isinstance (var, Variable):
2483
2481
raise TypeError (f" Expected Variable, got {type(var)}." )
2484
2482
self .ptr[i] = (< Variable> var).scip_var
You can’t perform that action at this time.
0 commit comments