diff --git a/MultiThreadIO.py b/MultiThreadIO.py index 1088f10..2577944 100644 --- a/MultiThreadIO.py +++ b/MultiThreadIO.py @@ -64,7 +64,10 @@ def process_input_line(line, startsnp, stopsnp, dtype): if startsnp is not None : parts = parts[startsnp : stopsnp + 1] #Offset 1 for id and 2 for id + include stopsnp - data=np.array([int(val) for val in parts], dtype = dtype) + if dtype in [np.float16, np.float32, np.float64] : + data = np.array([val for val in parts], dtype=dtype) + else : + data = np.array([int(val) for val in parts], dtype = dtype) return (idx, data) diff --git a/Pedigree.py b/Pedigree.py index 090f248..339f97e 100644 --- a/Pedigree.py +++ b/Pedigree.py @@ -942,7 +942,7 @@ def readInAAP(self, fileName): :param fileName: The file path :type fileName: str """ - data_list = MultiThreadIO.readLines(fileName, startsnp=None, stopsnp=None, dtype = np.int64) + data_list = MultiThreadIO.readLines(fileName, startsnp=None, stopsnp=None, dtype = np.float32) # flag of whether adding a default alternative allele probability default_aap = False