Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve handling of strings supplied as matrix entries #39505

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Improve handling of strings supplied as matrix entries #39505

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f2dd36f
#34821 strings as matrix entries
DaveWitteMorris Feb 12, 2025
0bdb8e2
fix doctest
DaveWitteMorris Feb 12, 2025
71ad7c8
Merge branch 'develop' into 34821matrix
DaveWitteMorris Feb 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 24 additions & 9 deletions src/sage/matrix/args.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,9 +297,12 @@ cdef class MatrixArgs:
Test invalid input::

sage: MatrixArgs(ZZ, 2, 2, entries='abcd').finalized()
<MatrixArgs for Full MatrixSpace of 2 by 2 dense matrices
over Integer Ring; typ=SCALAR; entries='abcd'>
sage: matrix(ZZ, 2, 2, entries='abcd')
Traceback (most recent call last):
...
TypeError: unable to convert 'abcd' to a matrix
TypeError: unable to convert 'abcd' to an integer
sage: MatrixArgs(ZZ, 2, 2, entries=MatrixArgs()).finalized()
Traceback (most recent call last):
...
Expand Down Expand Up @@ -1515,12 +1518,19 @@ cdef class MatrixArgs:
[() 0 0]
[ 0 () 0]
[ 0 0 ()]

Verify that :issue:`34821` is fixed::

sage: matrix(ZZ, 2, 2, "3")
[3 0]
[0 3]
"""
# Check basic Python types. This is very fast, so it doesn't
# hurt to do these first.
if self.entries is None:
return MA_ENTRIES_ZERO
if isinstance(self.entries, (int, float, complex, Integer)):
if isinstance(self.entries, (int, float, complex, Integer, str)):
# Note that a string is not considered to be a sequence.
if self.entries:
return MA_ENTRIES_SCALAR
return MA_ENTRIES_ZERO
Expand Down Expand Up @@ -1565,9 +1575,6 @@ cdef class MatrixArgs:
if isinstance(self.entries, MatrixArgs):
# Prevent recursion
return MA_ENTRIES_UNKNOWN
if isinstance(self.entries, str):
# Blacklist strings, we don't want them to be considered a sequence
return MA_ENTRIES_UNKNOWN
try:
self.entries = list(self.entries)
except TypeError:
Expand All @@ -1586,6 +1593,16 @@ cdef class MatrixArgs:
is a sequence.

If the entries are invalid, return ``MA_ENTRIES_UNKNOWN``.

TESTS:

Verify that :issue:`34821` is fixed::

sage: matrix(ZZ, 1,2, ["1", "2"])
[1 2]
sage: matrix(ZZ, 2,1, ["1", "2"])
[1]
[2]
"""
if not self.entries:
return MA_ENTRIES_SEQ_FLAT
Expand All @@ -1601,13 +1618,11 @@ cdef class MatrixArgs:
return MA_ENTRIES_SEQ_SEQ
else:
return MA_ENTRIES_SEQ_FLAT
if isinstance(x, (int, float, complex)):
if isinstance(x, (int, float, complex, str)):
# Note that a string is not considered to be a sequence.
return MA_ENTRIES_SEQ_FLAT
if isinstance(x, Element) and element_is_scalar(<Element>x):
return MA_ENTRIES_SEQ_FLAT
if isinstance(x, str):
# Blacklist strings, we don't want them to be considered a sequence
return MA_ENTRIES_UNKNOWN
try:
iter(x)
except TypeError:
Expand Down
Loading