From 852959a8bec1f6da8c5a2f0d69edb8b23b9d0c59 Mon Sep 17 00:00:00 2001 From: Daniel Krenn Date: Tue, 22 Sep 2015 11:03:55 +0200 Subject: [PATCH] rename only_constants --> no_variables --- src/sage/symbolic/ring.pyx | 6 +++--- src/sage/symbolic/subring.py | 36 ++++++++++++++++++------------------ 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/sage/symbolic/ring.pyx b/src/sage/symbolic/ring.pyx index a411da5c53c..e48091b2942 100644 --- a/src/sage/symbolic/ring.pyx +++ b/src/sage/symbolic/ring.pyx @@ -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): @@ -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. @@ -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 diff --git a/src/sage/symbolic/subring.py b/src/sage/symbolic/subring.py index 2e7419fb0d3..978e1c5127a 100644 --- a/src/sage/symbolic/subring.py +++ b/src/sage/symbolic/subring.py @@ -28,7 +28,7 @@ :class:`SymbolicConstantsSubring`). E.g. :: - sage: SR.subring(only_constants=True) + sage: SR.subring(no_variables=True) Symbolic Constants Subring @@ -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 :: @@ -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. @@ -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), @@ -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. @@ -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.') @@ -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 @@ -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 @@ -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 @@ -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 .. SEEALSO:: @@ -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>' % ( @@ -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' @@ -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') @@ -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')