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

Commit

Permalink
Merge commit '485ed39a9482fb8336f58c778f2f6a0f847b7caa' of git://trac…
Browse files Browse the repository at this point in the history
….sagemath.org/sage into 28753
  • Loading branch information
aodesky committed Dec 30, 2019
2 parents 0160c01 + 485ed39 commit fa92c61
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion src/sage/calculus/calculus.py
Original file line number Diff line number Diff line change
Expand Up @@ -592,7 +592,7 @@ def symbolic_sum(expression, v, a, b, algorithm='maxima', hold=False):
Sage can currently only understand a subset of the output of Maxima,
Maple and Mathematica, so even if the chosen backend can perform
the summation the result might not be convertable into a Sage
the summation the result might not be convertible into a Sage
expression.
"""
if not is_SymbolicVariable(v):
Expand Down
10 changes: 5 additions & 5 deletions src/sage/geometry/toric_lattice.py
Original file line number Diff line number Diff line change
Expand Up @@ -1745,15 +1745,15 @@ def rank(self):

def coordinate_vector(self, x, reduce=False):
"""
Return coordinates of x with respect to the optimized
representation of self.
Return coordinates of ``x`` with respect to the optimized
representation of ``self``.
INPUT:
- ``x`` -- element of ``self`` or convertable to ``self``.
- ``x`` -- element of ``self`` or convertible to ``self``
- ``reduce`` -- (default: False); if True, reduce coefficients
modulo invariants.
- ``reduce`` -- (default: ``False``); if ``True``, reduce coefficients
modulo invariants
OUTPUT:
Expand Down
2 changes: 1 addition & 1 deletion src/sage/matrix/matrix2.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -12595,7 +12595,7 @@ cdef class Matrix(Matrix1):
The base ring for the elements of the matrix needs to
have a fraction field implemented and the computations
that result from the indefinite factorization must be
convertable to real numbers that are comparable to zero.
convertible to real numbers that are comparable to zero.

EXAMPLES:

Expand Down
4 changes: 2 additions & 2 deletions src/sage/misc/functional.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
# http://www.gnu.org/licenses/
# https://www.gnu.org/licenses/
#*****************************************************************************
from __future__ import absolute_import
from six.moves import range, builtins
Expand Down Expand Up @@ -568,7 +568,7 @@ def symbolic_sum(expression, *args, **kwds):
#. Sage can currently only understand a subset of the output of Maxima, Maple and
Mathematica, so even if the chosen backend can perform the summation the
result might not be convertable into a Sage expression.
result might not be convertible into a Sage expression.
"""
if hasattr(expression, 'sum'):
Expand Down
10 changes: 5 additions & 5 deletions src/sage/modular/modform_hecketriangle/analytic_type.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# Distributed under the terms of the GNU General Public License (GPL)
# as published by the Free Software Foundation; either version 2 of
# the License, or (at your option) any later version.
# http://www.gnu.org/licenses/
# https://www.gnu.org/licenses/
#*****************************************************************************

from sage.sets.set import Set
Expand Down Expand Up @@ -211,8 +211,8 @@ def reduce_to(self, reduce_type):
INPUT:
- ``reduce_type`` -- An analytic type or something which is
convertable to an analytic type.
- ``reduce_type`` -- an analytic type or something which is
convertible to an analytic type
OUTPUT:
Expand Down Expand Up @@ -241,8 +241,8 @@ def extend_by(self, extend_type):
INPUT:
- ``extend_type`` -- An analytic type or something which is
convertable to an analytic type.
- ``extend_type`` -- an analytic type or something which is
convertible to an analytic type
OUTPUT:
Expand Down
2 changes: 1 addition & 1 deletion src/sage/symbolic/expression.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -12211,7 +12211,7 @@ cdef class Expression(CommutativeRingElement):
#. Sage can currently only understand a subset of the output of Maxima, Maple and
Mathematica, so even if the chosen backend can perform the summation the
result might not be convertable into a usable Sage expression.
result might not be convertible into a usable Sage expression.
TESTS:
Expand Down
6 changes: 3 additions & 3 deletions src/sage/symbolic/expression_conversions.py
Original file line number Diff line number Diff line change
Expand Up @@ -1904,9 +1904,9 @@ def __init__(self, R, subs_dict=None):

def symbol(self, ex):
"""
All symbols appearing in the expression must either appear in *subs_dict*
or be convertable by the ring's element constructor in order for the
conversion to be successful.
All symbols appearing in the expression must either appear in
*subs_dict* or be convertible by the ring's element
constructor in order for the conversion to be successful.
EXAMPLES::
Expand Down

0 comments on commit fa92c61

Please sign in to comment.