Fixes for SciPy 1.0 compatibility #170
Merged
Conversation
This file contains hidden or 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
This was referenced Dec 23, 2017
roryyorke
reviewed
Dec 30, 2017
| @@ -221,18 +222,18 @@ def feedback(sys1, sys2=1, sign=-1): | |||
| """ | |||
|
|
|||
| # Check for correct input types. | |||
| if not isinstance(sys1, (int, float, complex, tf.TransferFunction, | |||
| ss.StateSpace, frd.FRD)): | |||
| if not isinstance(sys1, (int, float, complex, np.number, | |||
There was a problem hiding this comment.
I'm struggling to find docs on numpy.number; it has a __doc__ string, but no entry, e.g., here: https://docs.scipy.org/doc/numpy-1.13.0/genindex.html . This use seems reasonable, just not sure how standard it is.
There was a problem hiding this comment.
Numpy scalar type hierarchy is here: https://docs.scipy.org/doc/numpy-1.13.0/reference/arrays.scalars.html
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.
This PR fixes the SciPy 1.0 compatibility issues raised in issue #164. There are two main changes:
Updated
statesp.pyandxferfcn.pyto use the new forms of thescipy.signallibrary, for which thelticlass no longer has accessors fornum,den, etc. The fix is to directly call thess2tfandtf2ssfunctions.Also had to add a check for scalars that are of a
numpydata type, specifically forint64. Prior to Python 3, checking againstintworked correctly, but this is no longer the case. As a fix, I added checks throughout the library againstnumpy.number, which captures all scalar data types innumpy.I also checked (manually) to insure that this version works against
scipy-0.19.0, which should mean it is OK for backward compatibility (this can be checked with PR #169 is merged).