int division returns floor. fixes #16

Author: tompollard

wfdb/_rdann.py

@@ -59,7 +59,7 @@ def rdann(recordname, annot, sampfrom=0, sampto=[], anndisp=1):
         # First 2 bytes indicate dt=0 and anntype=NOTE. Next 2 indicate auxlen and anntype=AUX. Then follows "## time resolution: "
         if [testbytes[i] for i in [0, 1]+list(range(3, 24))]==[0, 88, 252, 35, 35, 32, 116, 105, 109, 101, 32, 114, 101, 115, 111, 108, 117, 116, 105, 111, 110, 58, 32]: # The file's leading bytes match the expected pattern for encoding fs. 
             auxlen=testbytes[2] # Length of the auxilliary string that includes the fs written into the file. 
-            testbytes=filebytes[:(12+math.ceil(auxlen/2)),:].flatten()
+            testbytes=filebytes[:(12+math.ceil(auxlen/2.)),:].flatten()
             annfs=int("".join([chr(char) for char in testbytes[24:auxlen+4]]))
             bpi=0.5*(auxlen+12+(auxlen & 1)) # byte pair index to start reading actual annotations. 
 
@@ -100,11 +100,11 @@ def rdann(recordname, annot, sampfrom=0, sampto=[], anndisp=1):
                 bpi=bpi+1
             elif AT==63: # AUX
                 auxlen=filebytes[bpi,0] # length of aux string. Max 256? No need to check other bits of second byte? 
-                auxbytes=filebytes[bpi+1:bpi+1+math.ceil(auxlen/2), :].flatten() # The aux bytes
+                auxbytes=filebytes[bpi+1:bpi+1+math.ceil(auxlen/2.), :].flatten() # The aux bytes
                 if auxlen&1:
                     auxbytes=auxbytes[:-1]
                 aux[ai]="".join([chr(char) for char in auxbytes]) # The aux string
-                bpi=bpi+1+math.ceil(auxlen/2)
+                bpi=bpi+1+math.ceil(auxlen/2.)
             # Only aux and sub are reset between annotations. Chan and num keep previous value if missing. 
             AT=filebytes[bpi,1] >> 2
 

wfdb/_rdsamp.py

@@ -425,7 +425,7 @@ def processwfdbbytes(fp, fmt, siglen, nsig, sampsperframe, floorsamp=0):
 
     elif fmt=='310': # Three 10 bit samples packed into 4 bytes with 2 bits discarded
 
-        nbytesload=int(((nsamp)+2)/3)*4 # The number of bytes needed to be loaded given the number of samples needed
+        nbytesload=int(((nsamp)+2)/3.)*4 # The number of bytes needed to be loaded given the number of samples needed
         if (nsamp-1)%3==0:
             nbytesload-=2
         sigbytes=np.fromfile(fp, dtype=np.dtype(datatypes[fmt]), count=nbytesload).astype('uint') # Loaded as unsigned 1 byte blocks
@@ -471,7 +471,7 @@ def processwfdbbytes(fp, fmt, siglen, nsig, sampsperframe, floorsamp=0):
             sig=(sig/sampsperframe).astype('int')
 
     elif fmt=='311': # Three 10 bit samples packed into 4 bytes with 2 bits discarded
-        nbytesload=int((nsamp-1)/3)+nsamp+1
+        nbytesload=int((nsamp-1)/3.)+nsamp+1
         sigbytes=np.fromfile(fp, dtype=np.dtype(datatypes[fmt]), count=nbytesload).astype('uint') # Loaded as unsigned 1 byte blocks
 
         if tsampsperframe==nsig: # No extra samples/frame
@@ -539,7 +539,7 @@ def processwfdbbytes(fp, fmt, siglen, nsig, sampsperframe, floorsamp=0):
 
 # Bytes required to hold each sample (including wasted space) for different wfdb formats
 bytespersample={'8': 1, '16': 2, '24': 3, '32': 4, '61': 2, 
-                    '80': 1, '160':2, '212': 1.5, '310': 4/3, '311': 4/3}
+                    '80': 1, '160':2, '212': 1.5, '310': 4/3., '311': 4/3.}
 
 # Values that correspond to NAN (Format 8 has no NANs)
 wfdbInvalids={'16': -32768, '24': -8388608, '32': -2147483648, '61': -32768,