DRAFT: Added elif statement MarginalizingNmat.solve to allow for 2D left_array #402
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
…alculation and OS statistics. We changed her original elif-condition from: elif right.ndim == 2 and left_array is not None and left_array.ndim == 2:, to: elif left_array is not None and right.ndim == left_array.ndim and right.ndim<=2:. This was done in order to include the case where both right and left_array have dimension 1, but they are not the same.
vhaasteren
changed the title
vhaasteren
previously approved these changes
Sep 27, 2024
|
This change is ok. However, we need to add a unit test for the newly added code. |
JacobCT
changed the title
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.
Added elif statement made by @kgrunthal that is needed for Fe calculation and OS statistics. @bvgoncharov and I changed her original elif-condition from:
elif right.ndim == 2 and left_array is not None and left_array.ndim == 2:, to:elif left_array is not None and right.ndim == left_array.ndim and right.ndim<=2:. This was done to include the case where both right and left_array have dimension 1, but they are not the same.Matrix algebra should be double-checked to ensure that it is still applicable to this condition. It is possible that it is only valid with @kgrunthal's original conditions.
This PR fixes issue #401