Skip to content
This repository has been archived by the owner on Jan 30, 2023. It is now read-only.

Commit

Permalink
Trac #19259: change to has_valid_variable
Browse files Browse the repository at this point in the history
  • Loading branch information
dkrenn committed Jan 23, 2016
1 parent e4837e9 commit ff99c7f
Showing 1 changed file with 16 additions and 16 deletions.
32 changes: 16 additions & 16 deletions src/sage/symbolic/subring.py
Expand Up @@ -301,7 +301,7 @@ def _repr_variables_(self):
return s + ', '.join(str(v) for v in sorted(self._vars_, key=str))


def is_variable_valid(self, variable):
def has_valid_variable(self, variable):
r"""
Return whether the given ``variable`` is valid in this subring.
Expand All @@ -316,7 +316,7 @@ def is_variable_valid(self, variable):
EXAMPLES::
sage: from sage.symbolic.subring import GenericSymbolicSubring
sage: GenericSymbolicSubring(vars=tuple()).is_variable_valid(x)
sage: GenericSymbolicSubring(vars=tuple()).has_valid_variable(x)
Traceback (most recent call last):
...
NotImplementedError: Not implemented in this abstract base class
Expand Down Expand Up @@ -351,7 +351,7 @@ def _element_constructor_(self, x):
"""
expression = super(GenericSymbolicSubring, self)._element_constructor_(x)
assert(expression.parent() is self)
if not all(self.is_variable_valid(var)
if not all(self.has_valid_variable(var)
for var in expression.variables()):
raise TypeError('%s is not contained in %s' % (x, self))
return expression
Expand Down Expand Up @@ -626,7 +626,7 @@ def _repr_(self):
(self._repr_variables_())


def is_variable_valid(self, variable):
def has_valid_variable(self, variable):
r"""
Return whether the given ``variable`` is valid in this subring.
Expand All @@ -642,11 +642,11 @@ def is_variable_valid(self, variable):
sage: from sage.symbolic.subring import SymbolicSubring
sage: S = SymbolicSubring(accepting_variables=('a',))
sage: S.is_variable_valid('a')
sage: S.has_valid_variable('a')
True
sage: S.is_variable_valid('r')
sage: S.has_valid_variable('r')
False
sage: S.is_variable_valid('x')
sage: S.has_valid_variable('x')
False
"""
return SR(variable) in self._vars_
Expand Down Expand Up @@ -811,7 +811,7 @@ def _repr_(self):
(self._repr_variables_())


def is_variable_valid(self, variable):
def has_valid_variable(self, variable):
r"""
Return whether the given ``variable`` is valid in this subring.
Expand All @@ -827,11 +827,11 @@ def is_variable_valid(self, variable):
sage: from sage.symbolic.subring import SymbolicSubring
sage: S = SymbolicSubring(rejecting_variables=('r',))
sage: S.is_variable_valid('a')
sage: S.has_valid_variable('a')
True
sage: S.is_variable_valid('r')
sage: S.has_valid_variable('r')
False
sage: S.is_variable_valid('x')
sage: S.has_valid_variable('x')
True
"""
return SR(variable) not in self._vars_
Expand Down Expand Up @@ -918,7 +918,7 @@ def _an_element_(self):
Symbolic Subring rejecting the variables some_some_variable, some_variable
"""
v = SR.an_element()
while not self.is_variable_valid(v):
while not self.has_valid_variable(v):
v = SR('some_' + str(v))
return self(v)

Expand Down Expand Up @@ -1016,7 +1016,7 @@ def _repr_(self):
return 'Symbolic Constants Subring'


def is_variable_valid(self, variable):
def has_valid_variable(self, variable):
r"""
Return whether the given ``variable`` is valid in this subring.
Expand All @@ -1032,11 +1032,11 @@ def is_variable_valid(self, variable):
sage: from sage.symbolic.subring import SymbolicSubring
sage: S = SymbolicSubring(no_variables=True)
sage: S.is_variable_valid('a')
sage: S.has_valid_variable('a')
False
sage: S.is_variable_valid('r')
sage: S.has_valid_variable('r')
False
sage: S.is_variable_valid('x')
sage: S.has_valid_variable('x')
False
"""
return False
Expand Down

0 comments on commit ff99c7f

Please sign in to comment.