Matexpr: DiagonalMatrix and DiagonalOf enhancements #12459
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
smichr
force-pushed
the
matexpr
branch
2 times, most recently
from
cf5dcaf
to
a1a336f
Compare
- added docstrings - shape of DiagonalMatrix matches underlying matrix shape (issue 12427) - updated _entry to detect out-of-square references - added size attribute to access the length of the diagonal - single-index indexing is relaxed to be allowed if the number of columns is known - updated the error messages regarding single-index indexing
|
Should the |
szymag
reviewed
Apr 1, 2017
| class DiagonalMatrix(MatrixExpr): | ||
| """DiagonalMatrix(M) will create a create a matrix expression that |
There was a problem hiding this comment.
I suppose, that something is wrong here: "will create a create a matrix"
szymag
reviewed
Apr 1, 2017
| class DiagonalOf(MatrixExpr): | ||
| """DiagonalOf(M) will create a create a matrix expression that |
There was a problem hiding this comment.
Here is the same: "will create a create a matrix"
There was a problem hiding this comment.
Got both changes and added "Examples" to the docstring and changed the name from size to diagonal_length.
|
|
@szymag , thanks for the review. Changes have been made as a new commit. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #12427 and gives DiagonalOf and DiagonalMatrix docstrings that demonstrate how they behave.
A break from the previous behavior is that concrete indices are assumed to be smaller than symbolic ones and None is returned if the length of the diagonal cannot be determined. (Previously, the number of rows was always taken to be the length of the diagonal and the DiagonalMatrix was assumed to be square.)
Single-index indexing, e.g.
M[3]is now allowed as long as the number of columns is known. This means that DiagonalOf can always be addressed wth a single index (since its number of columns is always 1).A couple of inconsequential edits of other files were made as they were noticed along the way.