Merge pull request #708 from KOLANICH/cython_code_fix

Integer division is needed here.
This commit is contained in:
Zhenwen Dai 2019-04-11 07:57:15 +01:00 committed by GitHub
commit 0b8fd0d951
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -14,7 +14,7 @@ np.import_array()
def flat_to_triang(double[:, :] flat, int M): def flat_to_triang(double[:, :] flat, int M):
"""take a matrix N x D and return a D X M x M array where """take a matrix N x D and return a D X M x M array where
N = M(M+1)/2 N = M(M+1)//2
the lower triangluar portion of the d'th slice of the result is filled by the d'th column of flat. the lower triangluar portion of the d'th slice of the result is filled by the d'th column of flat.
""" """
@ -35,7 +35,7 @@ def flat_to_triang(double[:, :] flat, int M):
def triang_to_flat(double[:, :, :] L): def triang_to_flat(double[:, :, :] L):
cdef int D = L.shape[0] cdef int D = L.shape[0]
cdef int M = L.shape[1] cdef int M = L.shape[1]
cdef int N = M*(M+1)/2 cdef int N = M*(M+1)//2
cdef int count = 0 cdef int count = 0
cdef double[:, ::1] flat = np.empty((N, D)) cdef double[:, ::1] flat = np.empty((N, D))
cdef int d, m, mm cdef int d, m, mm