Skip to content

Updated syntax to be compatible with python 3.9 #7

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

Open
RudSmo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updated syntax to be compatible with python 3.9 #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 5 additions & 4 deletions nport/eigenshuffle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ def eigenshuffle(Asequence):
To see that eigenshuffle has done its work correctly, look at the
eigenvalues in sequence, after the shuffle.

>>> print np.hstack([np.asarray([tseq]).T, Dseq]).astype(float)
>>> print(np.hstack([np.asarray([tseq]).T, Dseq]).astype(float))

[[-1. 8.4535 5. 2.3447 0.2018]
[-0.9 7.8121 4.7687 2.3728 0.4464]
Expand Down Expand Up @@ -147,7 +147,7 @@ def eigenshuffle(Asequence):
# Is Asequence a 3-d array?
Ashape = np.shape(Asequence)
if Ashape[-1] != Ashape[-2]:
raise Exception, ("Asequence must be a (nxpxp) array of "
raise Exception("Asequence must be a (nxpxp) array of "
"eigen-problems, each of size pxp")
p = Ashape[-1]
if len(Ashape) < 3:
Expand All @@ -167,7 +167,7 @@ def eigenshuffle(Asequence):
# real part.
tags = np.argsort(D.real, axis=0)[::-1]

Dseq[i] = D[:, tags]
Dseq[i] = D[tags]
Vseq[i] = V[:, tags]

# now, treat each eigenproblem in sequence (after the first one.)
Expand All @@ -194,7 +194,7 @@ def eigenshuffle(Asequence):
# were consistent if possible
S = np.squeeze( np.sum( Vseq[i - 1] * Vseq[i], 0 ).real ) < 0

Vseq[i] = Vseq[i] * (-S * 2 - 1)
Vseq[i] = Vseq[i] * (~S * 2 - 1)

return Dseq, Vseq

Expand All @@ -203,3 +203,4 @@ def distancematrix(vec1, vec2):
"""simple interpoint distance matrix"""
v1, v2 = np.meshgrid(vec1, vec2)
return np.abs(v1 - v2)