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

Commit

Permalink
rename only_constants --> no_variables
Browse files Browse the repository at this point in the history
  • Loading branch information
dkrenn committed Sep 22, 2015
1 parent 7938d95 commit 852959a
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 21 deletions.
6 changes: 3 additions & 3 deletions src/sage/symbolic/ring.pyx
Expand Up @@ -138,7 +138,7 @@ cdef class SymbolicRing(CommutativeRing):
True
sage: SR.has_coerce_map_from(SR.subring(rejecting_variables=('r',)))
True
sage: SR.has_coerce_map_from(SR.subring(only_constants=True))
sage: SR.has_coerce_map_from(SR.subring(no_variables=True))
True
"""
if isinstance(R, type):
Expand Down Expand Up @@ -816,7 +816,7 @@ cdef class SymbolicRing(CommutativeRing):
expressions in variables distinct to these variables is
created.
- ``only_constants`` (default: ``False``) -- a boolean. If set,
- ``no_variables`` (default: ``False``) -- a boolean. If set,
then a symbolic subring of constant expressions (i.e.,
expressions without a variable) is created.
Expand Down Expand Up @@ -867,7 +867,7 @@ cdef class SymbolicRing(CommutativeRing):
We have a third kind of subring, namely the subring of
symbolic constants::
sage: C = SR.subring(only_constants=True); C
sage: C = SR.subring(no_variables=True); C
Symbolic Constants Subring
Note that this subring can be considered as a special accepting
Expand Down
36 changes: 18 additions & 18 deletions src/sage/symbolic/subring.py
Expand Up @@ -28,7 +28,7 @@
:class:`SymbolicConstantsSubring`). E.g.
::
sage: SR.subring(only_constants=True)
sage: SR.subring(no_variables=True)
Symbolic Constants Subring
Expand All @@ -43,7 +43,7 @@
Symbolic Subring accepting the variable a
sage: R = SymbolicSubring(rejecting_variables=(r,)); R
Symbolic Subring rejecting the variable r
sage: C = SymbolicSubring(only_constants=True); C
sage: C = SymbolicSubring(no_variables=True); C
Symbolic Constants Subring
::
Expand Down Expand Up @@ -118,7 +118,7 @@ class SymbolicSubringFactory(UniqueFactory):
expressions in variables distinct to these variables is
created.
- ``only_constants`` (default: ``False``) -- a boolean. If set,
- ``no_variables`` (default: ``False``) -- a boolean. If set,
then a symbolic subring of constant expressions (i.e.,
expressions without a variable) is created.
Expand Down Expand Up @@ -147,7 +147,7 @@ class SymbolicSubringFactory(UniqueFactory):
::
sage: C = SymbolicSubring(only_constants=True); C
sage: C = SymbolicSubring(no_variables=True); C
Symbolic Constants Subring
sage: tuple((v, v in C) for v in V)
((a, False), (b, False), (c, False),
Expand All @@ -166,7 +166,7 @@ class SymbolicSubringFactory(UniqueFactory):
"""
def create_key_and_extra_args(
self, accepting_variables=None, rejecting_variables=None,
only_constants=False, **kwds):
no_variables=False, **kwds):
r"""
Given the arguments and keyword, create a key that uniquely
determines this object.
Expand All @@ -186,26 +186,26 @@ def create_key_and_extra_args(
...
ValueError: Cannot create a symbolic subring since input is ambiguous.
sage: SymbolicSubring.create_key_and_extra_args(
....: accepting_variables=('a',), only_constants=True)
....: accepting_variables=('a',), no_variables=True)
Traceback (most recent call last):
...
ValueError: Cannot create a symbolic subring since input is ambiguous.
sage: SymbolicSubring.create_key_and_extra_args(
....: rejecting_variables=('r',), only_constants=True)
....: rejecting_variables=('r',), no_variables=True)
Traceback (most recent call last):
...
ValueError: Cannot create a symbolic subring since input is ambiguous.
"""
if accepting_variables is None and \
rejecting_variables is None and \
only_constants == False:
no_variables == False:
raise ValueError('Cannot create a symbolic subring '
'since nothing specified.')
if accepting_variables is not None and \
rejecting_variables is not None or \
rejecting_variables is not None and \
only_constants == True or \
only_constants == True and \
no_variables == True or \
no_variables == True and \
accepting_variables is not None:
raise ValueError('Cannot create a symbolic subring '
'since input is ambiguous.')
Expand All @@ -219,7 +219,7 @@ def create_key_and_extra_args(
elif rejecting_variables is not None:
vars = tuple(rejecting_variables)
cls = SymbolicSubringRejectingVars
elif only_constants:
elif no_variables:
vars = tuple()
cls = SymbolicConstantsSubring

Expand Down Expand Up @@ -265,7 +265,7 @@ def __init__(self, vars):
Symbolic Subring accepting the variable a
sage: SymbolicSubring(rejecting_variables=('r',)) # indirect doctest
Symbolic Subring rejecting the variable r
sage: SymbolicSubring(only_constants=True) # indirect doctest
sage: SymbolicSubring(no_variables=True) # indirect doctest
Symbolic Constants Subring
sage: SymbolicSubring(rejecting_variables=tuple()) # indirect doctest
Symbolic Ring
Expand Down Expand Up @@ -374,7 +374,7 @@ def _coerce_map_from_(self, P):
::
sage: from sage.symbolic.subring import SymbolicSubring
sage: C = SymbolicSubring(only_constants=True)
sage: C = SymbolicSubring(no_variables=True)
sage: C.has_coerce_map_from(ZZ) # indirect doctest
True
sage: C.has_coerce_map_from(QQ) # indirect doctest
Expand Down Expand Up @@ -458,7 +458,7 @@ class GenericSymbolicSubringFunctor(ConstructionFunctor):
EXAMPLES::
sage: from sage.symbolic.subring import SymbolicSubring
sage: SymbolicSubring(only_constants=True).construction()[0] # indirect doctest
sage: SymbolicSubring(no_variables=True).construction()[0] # indirect doctest
Subring<accepting no variable>
.. SEEALSO::
Expand Down Expand Up @@ -525,7 +525,7 @@ def _repr_(self):
Symbolic Subring accepting the variable a
sage: SymbolicSubring(rejecting_variables=('r',)) # indirect doctest
Symbolic Subring rejecting the variable r
sage: SymbolicSubring(only_constants=True) # indirect doctest
sage: SymbolicSubring(no_variables=True) # indirect doctest
Symbolic Constants Subring
"""
return 'Subring<%s%s%s>' % (
Expand Down Expand Up @@ -997,7 +997,7 @@ def _repr_(self):
TESTS::
sage: from sage.symbolic.subring import SymbolicSubring
sage: SymbolicSubring(only_constants=True) # indirect doctest
sage: SymbolicSubring(no_variables=True) # indirect doctest
Symbolic Constants Subring
"""
return 'Symbolic Constants Subring'
Expand All @@ -1018,7 +1018,7 @@ def is_variable_valid(self, variable):
EXAMPLES::
sage: from sage.symbolic.subring import SymbolicSubring
sage: S = SymbolicSubring(only_constants=True)
sage: S = SymbolicSubring(no_variables=True)
sage: S.is_variable_valid('a')
False
sage: S.is_variable_valid('r')
Expand All @@ -1040,7 +1040,7 @@ def _an_element_(self):
TESTS::
sage: from sage.symbolic.subring import SymbolicSubring
sage: SymbolicSubring(only_constants=True).an_element()
sage: SymbolicSubring(no_variables=True).an_element()
I*pi*e
"""
return SR('I') * SR('pi') * SR('e')

0 comments on commit 852959a

Please sign in to comment.