Skip to content

Commit

Permalink
Merge pull request #1168 from dib-lab/autoargs/force
Browse files Browse the repository at this point in the history
added --force check to #1126
  • Loading branch information
mr-c committed Jul 10, 2015
2 parents 5cfce15 + 9e7c27f commit 98f0680
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
4 changes: 4 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
2015-07-10 Jacob Fenton <bocajnotnef@gmail.com>

* oxli/functions.py: added '--force' check to sanity check

2015-07-09 Jacob Fenton <bocajnotnef@gmail.com>

* oxli/functions.py: moved optimization/sanity check func to oxli
Expand Down
8 changes: 5 additions & 3 deletions oxli/functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,11 @@ def do_sanity_checking(args, desired_max_fp):
if res.fp_rate > desired_max_fp:
print("""
*** ERROR: The given restrictions yield an estimate false positive rate of {0},
*** which is above the recommended false positive ceiling of {1}!
*** Aborting!""".format(res.fp_rate, desired_max_fp), file=sys.stderr)
sys.exit(1)
*** which is above the recommended false positive ceiling of {1}!"""
.format(res.fp_rate, desired_max_fp), file=sys.stderr)
if not args.force:
print("*** Aborting...!", file=sys.stderr)
sys.exit(1)
else:
res = estimate_optimal_with_N_and_f(args.unique_kmers,
desired_max_fp)
Expand Down

0 comments on commit 98f0680

Please sign in to comment.