Skip to content

Commit a0f3f57

Browse files
committed
Reorder imports and reformat addMatrixVar and addCons loop
Moved Cython and C imports below standard library imports for better organization. Reformatted the addMatrixVar method signature and the addCons loop for improved readability and consistency.
1 parent 64097ee commit a0f3f57

File tree

1 file changed

+21
-13
lines changed

1 file changed

+21
-13
lines changed

src/pyscipopt/scip.pxi

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,19 @@ import os
55
import sys
66
import warnings
77
import weakref
8-
9-
cimport cython
10-
from cpython cimport Py_INCREF, Py_DECREF
11-
from cpython.pycapsule cimport PyCapsule_New, PyCapsule_IsValid, PyCapsule_GetPointer
12-
from libc.stdlib cimport malloc, free
13-
from libc.stdio cimport stdout, stderr, fdopen, fputs, fflush, fclose
14-
from posix.stdio cimport fileno
158
from collections.abc import Iterable
169
from dataclasses import dataclass
1710
from itertools import repeat
1811
from numbers import Number
1912
from os.path import abspath, splitext
2013
from typing import Union
2114

15+
cimport cython
16+
from cpython cimport Py_INCREF, Py_DECREF
17+
from cpython.pycapsule cimport PyCapsule_New, PyCapsule_IsValid, PyCapsule_GetPointer
18+
from libc.stdlib cimport malloc, free
19+
from libc.stdio cimport stdout, stderr, fdopen, fputs, fflush, fclose
20+
from posix.stdio cimport fileno
2221
import numpy as np
2322

2423
include "expr.pxi"
@@ -4090,7 +4089,8 @@ cdef class Model:
40904089
PY_SCIP_CALL(SCIPreleaseVar(self._scip, &scip_var))
40914090
return pyVar
40924091

4093-
def addMatrixVar(self,
4092+
def addMatrixVar(
4093+
self,
40944094
shape: Union[int, Tuple],
40954095
name: Union[str, np.ndarray] = '',
40964096
vtype: Union[str, np.ndarray] = 'C',
@@ -6135,11 +6135,19 @@ cdef class Model:
61356135
matrix_stickingatnode = stickingatnode
61366136

61376137
for idx in np.ndindex(cons.shape):
6138-
matrix_cons[idx] = self.addCons(cons[idx], name=matrix_names[idx], initial=matrix_initial[idx],
6139-
separate=matrix_separate[idx], check=matrix_check[idx],
6140-
propagate=matrix_propagate[idx], local=matrix_local[idx],
6141-
modifiable=matrix_modifiable[idx], dynamic=matrix_dynamic[idx],
6142-
removable=matrix_removable[idx], stickingatnode=matrix_stickingatnode[idx])
6138+
matrix_cons[idx] = self.addCons(
6139+
cons[idx],
6140+
name=matrix_names[idx],
6141+
initial=matrix_initial[idx],
6142+
separate=matrix_separate[idx],
6143+
check=matrix_check[idx],
6144+
propagate=matrix_propagate[idx],
6145+
local=matrix_local[idx],
6146+
modifiable=matrix_modifiable[idx],
6147+
dynamic=matrix_dynamic[idx],
6148+
removable=matrix_removable[idx],
6149+
stickingatnode=matrix_stickingatnode[idx]
6150+
)
61436151

61446152
return matrix_cons.view(MatrixConstraint)
61456153

0 commit comments

Comments
 (0)