Ensure that coverage and number_of_read_tuples will be numbers

karel-brinda · Jun 21, 2017 · 6acbb31 · 6acbb31
1 parent 84be382
commit 6acbb31
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/rnftools/mishmash/ArtIllumina.py b/rnftools/mishmash/ArtIllumina.py
@@ -65,6 +65,8 @@ def __init__(
 		self.read_length_2 = read_length_2
 		self.other_params = other_params
 
+		coverage=float(coverage)
+		number_of_read_tuples=int(number_of_read_tuples)
 		if coverage * number_of_read_tuples != 0:
 			rnftools.utils.error(
 				"coverage or number_of_read_tuples must be equal to zero",

diff --git a/rnftools/mishmash/CuReSim.py b/rnftools/mishmash/CuReSim.py
@@ -57,6 +57,8 @@ def __init__(
 		self.read_length_2 = read_length_2
 		self.other_params = other_params
 
+		coverage=float(coverage)
+		number_of_read_tuples=int(number_of_read_tuples)
 		if coverage * number_of_read_tuples != 0:
 			rnftools.utils.error(
 				"coverage or number_of_read_tuples must be equal to zero",

diff --git a/rnftools/mishmash/DwgSim.py b/rnftools/mishmash/DwgSim.py
@@ -92,9 +92,15 @@ def __init__(
 		self.read_length_2 = read_length_2
 		self.other_params = other_params
 
+		coverage=float(coverage)
+		number_of_read_tuples=int(number_of_read_tuples)
 		if coverage * number_of_read_tuples != 0:
-			rnftools.utils.error("coverage or number_of_read_tuples must be equal to zero", program="RNFtools",
-				subprogram="MIShmash", exception=ValueError)
+			rnftools.utils.error(
+				"coverage or number_of_read_tuples must be equal to zero",
+				program="RNFtools",
+				subprogram="MIShmash",
+				exception=ValueError,
+			)
 
 		self.number_of_read_tuples = number_of_read_tuples
 		self.coverage = coverage

diff --git a/rnftools/mishmash/WgSim.py b/rnftools/mishmash/WgSim.py
@@ -78,6 +78,8 @@ def __init__(
 		self.indels = indels
 		self.prob_indel_ext = prob_indel_ext
 
+		coverage=float(coverage)
+		number_of_read_tuples=int(number_of_read_tuples)
 		if coverage * number_of_read_tuples != 0:
 			rnftools.utils.error("coverage or number_of_read_tuples must be equal to zero", program="RNFtools",
 				subprogram="MIShmash", exception=ValueError)