Skip to content

Commit 6c7dabc

Browse files
author
Matthias Koeppe
committed
for a in "CLASS='LinearFunction';SUFFIX=" ; do eval "$a"; git --no-pager grep -l -E 'is_('$CLASS')' src/sage | xargs sed -E -i.bak 's/import is_('$CLASS')/import \1'$SUFFIX'/;/^ +/s/is_('$CLASS')[(]([^()]*([(][^()]*[)])?[^()]*)[)]/isinstance(\2, \1'$SUFFIX')/g'; done
1 parent 19934c1 commit 6c7dabc

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

src/sage/numerical/linear_functions.pyx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -690,7 +690,7 @@ cdef class LinearFunctionsParent_class(Parent):
690690
sage: LF_QQ(f) is f
691691
False
692692
"""
693-
if is_LinearFunction(x):
693+
if isinstance(x, LinearFunction):
694694
return LinearFunction(self, (<LinearFunction>x)._f)
695695
return LinearFunction(self, x)
696696

@@ -891,7 +891,7 @@ cdef class LinearFunction(LinearFunctionOrConstraint):
891891
...
892892
ValueError: x is from a different linear functions module
893893
"""
894-
if is_LinearFunction(x):
894+
if isinstance(x, LinearFunction):
895895
if self.parent() != x.parent():
896896
raise ValueError('x is from a different linear functions module')
897897
if len((<LinearFunction>x)._f) != 1:

src/sage/numerical/linear_tensor.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999

100100
from sage.structure.parent import Parent
101101
from sage.misc.cachefunc import cached_function
102-
from sage.numerical.linear_functions import is_LinearFunction, LinearFunctionsParent_class
102+
from sage.numerical.linear_functions import LinearFunction, LinearFunctionsParent_class
103103
from sage.numerical.linear_tensor_element import LinearTensor
104104

105105

@@ -415,7 +415,7 @@ def _element_constructor_(self, x):
415415
M = self.free_module()
416416
if isinstance(x, LinearTensor):
417417
x = x.dict()
418-
elif is_LinearFunction(x):
418+
elif isinstance(x, LinearFunction):
419419
x = dict([key, self._convert_constant(value)] for key, value in x.dict().items())
420420
elif isinstance(x, dict):
421421
x = dict([int(key), M(value)] for key, value in x.items())

src/sage/numerical/linear_tensor_element.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ cdef class LinearTensor(ModuleElement):
169169
...
170170
ValueError: x is from a different linear functions module
171171
"""
172-
if is_LinearFunction(x):
172+
if isinstance(x, LinearFunction):
173173
if self.parent().linear_functions() != x.parent():
174174
raise ValueError('x is from a different linear functions module')
175175
if len((<LinearFunction>x)._f) != 1:

src/sage/numerical/mip.pyx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2134,12 +2134,12 @@ cdef class MixedIntegerLinearProgram(SageObject):
21342134
sage: p.solve()
21352135
6.0
21362136
"""
2137-
from sage.numerical.linear_functions import is_LinearFunction, is_LinearConstraint
2137+
from sage.numerical.linear_functions import LinearFunction, LinearConstraint
21382138
from sage.numerical.linear_tensor import LinearTensor
21392139
from sage.numerical.linear_tensor_constraints import LinearTensorConstraint
2140-
if is_LinearFunction(linear_function) or isinstance(linear_function, LinearTensor):
2140+
if isinstance(linear_function, LinearFunction) or isinstance(linear_function, LinearTensor):
21412141
# Find the parent for the coefficients
2142-
if is_LinearFunction(linear_function):
2142+
if isinstance(linear_function, LinearFunction):
21432143
M = linear_function.parent().base_ring()
21442144
elif isinstance(linear_function, LinearTensor):
21452145
if not linear_function.parent().is_vector_space():
@@ -2164,7 +2164,7 @@ cdef class MixedIntegerLinearProgram(SageObject):
21642164
except KeyError:
21652165
pass
21662166
# Send to backend
2167-
if is_LinearFunction(linear_function):
2167+
if isinstance(linear_function, LinearFunction):
21682168
if self._check_redundant and self._is_redundant_constraint(constraint, min, max):
21692169
if return_indices:
21702170
return []

src/sage/numerical/sdp.pyx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ AUTHORS:
233233

234234
from sage.structure.parent cimport Parent
235235
from sage.structure.element cimport Element
236-
from sage.numerical.linear_functions import is_LinearFunction, is_LinearConstraint
236+
from sage.numerical.linear_functions import LinearFunction, LinearConstraint
237237
from sage.matrix.constructor import matrix
238238
from sage.structure.element import Matrix
239239

@@ -906,7 +906,7 @@ cdef class SemidefiniteProgram(SageObject):
906906
else:
907907
self.add_constraint(c.lhs()-c.rhs(), name=name)
908908
909-
elif is_LinearFunction(linear_function) or isinstance(linear_function, LinearTensor):
909+
elif isinstance(linear_function, LinearFunction) or isinstance(linear_function, LinearTensor):
910910
l = sorted(linear_function.dict().items())
911911
self._backend.add_linear_constraint(l, name)
912912

0 commit comments

Comments
 (0)