summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormutantturkey <mutantturke@gmail.com>2013-03-08 14:26:35 -0500
committermutantturkey <mutantturke@gmail.com>2013-03-08 14:26:35 -0500
commitd1c402420cfe75a04a7c181d5b3e45cdde7bcf72 (patch)
treee3c327bf644e58b7125a7e7f317c5d4354790622
parent4a4ae4e3f5e86e5a45f5c027cca58f42f8b0b080 (diff)
fix quikr
-rwxr-xr-xquikr5
1 files changed, 4 insertions, 1 deletions
diff --git a/quikr b/quikr
index 26e1708..bac01ca 100755
--- a/quikr
+++ b/quikr
@@ -1,7 +1,9 @@
#!/usr/bin/python
import sys
+import os
import argparse
import quikr
+import numpy as np
def main():
@@ -36,7 +38,8 @@ def main():
if args.lamb is not None:
lamb = args.lamb
- xstar = quikr_load_trained_matrix_from_file(args.fasta, args.trained_matrix, args.kmer, lamb)
+ trained_matrix = quikr.load_trained_matrix_from_file(args.trained_matrix)
+ xstar = quikr.calculate_estimated_frequencies(args.fasta, trained_matrix, args.kmer, lamb)
np.savetxt(args.output, xstar, delimiter=",", fmt="%f")
return 0