Skip to content

Commit

Permalink
Revert erroneous merge conflict resolution
Browse files Browse the repository at this point in the history
Accidentally changed a few unrelated issues while fixing merge
conflcits. Reverted as asked to by @mr-c.

Also remove duplicated status line introduced in a similar manner.
	modified:   scripts/load-into-counting.py
  • Loading branch information
kdm9 committed Nov 21, 2014
1 parent a1e9131 commit d564155
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions scripts/load-into-counting.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ def main():
check_space(args.input_sequence_filename)
check_space_for_hashtable(args.n_tables * args.min_tablesize)

print >>sys.stderr, 'Saving k-mer counting table', base
print >>sys.stderr, 'Loading kmers from sequences in', repr(filenames)
print >>sys.stderr, 'Saving k-mer counting table to %s' % base
print >>sys.stderr, 'Loading kmers from sequences in %s' % repr(filenames)

# clobber the '.info' file now, as we always open in append mode below
if os.path.exists(base + '.info'):
Expand Down Expand Up @@ -134,7 +134,6 @@ def main():
fp_rate = khmer.calc_expected_collisions(htable)

with open(base + '.info', 'a') as info_fp:
print >> sys.stderr, "Writing run information to", base + '.info'
print >> info_fp, 'fp rate estimated to be %1.3f\n' % fp_rate

if args.summary_info:
Expand Down

0 comments on commit d564155

Please sign in to comment.