X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=bp_bin%2Fdenoise_seq;h=baa62ad7eb6102e724f7ad7b02d842ceb9d2d2d3;hb=48bea5c28b89dc5586d0bddb338ccd6ba23aa1f9;hp=5e67ab8b57633592f99d26fc9910a36dbdfa51cd;hpb=789478ebeceefec32d6c222f8bfff19f1078076d;p=biopieces.git

diff --git a/bp_bin/denoise_seq b/bp_bin/denoise_seq
index 5e67ab8..baa62ad 100755
--- a/bp_bin/denoise_seq
+++ b/bp_bin/denoise_seq
@@ -37,11 +37,13 @@ require 'maasha/align'
 require 'maasha/usearch'
 
 casts = []
-casts << {:long=>'identity',      :short=>'i', :type=>'float', :mandatory=>true, :default=>0.97, :allowed=>nil, :disallowed=>nil}
-casts << {:long=>'cluster_min',   :short=>'c', :type=>'uint',  :mandatory=>true, :default=>2,    :allowed=>nil, :disallowed=>"0"}
-casts << {:long=>'frequency_min', :short=>'f', :type=>'uint',  :mandatory=>true, :default=>2,    :allowed=>nil, :disallowed=>"0"}
-casts << {:long=>'quality_min',   :short=>'q', :type=>'uint',  :mandatory=>true, :default=>20,   :allowed=>nil, :disallowed=>nil}
-casts << {:long=>'consensus_min', :short=>'C', :type=>'float', :mandatory=>true, :default=>0.2,  :allowed=>nil, :disallowed=>nil}
+casts << {:long=>'cluster_ident', :short=>'i', :type=>'float', :mandatory=>true,  :default=>0.97, :allowed=>nil, :disallowed=>nil}
+casts << {:long=>'cluster_min',   :short=>'c', :type=>'uint',  :mandatory=>true,  :default=>1,    :allowed=>nil, :disallowed=>"0"}
+casts << {:long=>'sequence_min',  :short=>'s', :type=>'uint',  :mandatory=>true,  :default=>1,    :allowed=>nil, :disallowed=>"0"}
+casts << {:long=>'residue_min',   :short=>'r', :type=>'float', :mandatory=>true,  :default=>0.3,  :allowed=>nil, :disallowed=>nil}
+casts << {:long=>'gap_max',       :short=>'g', :type=>'float', :mandatory=>true,  :default=>0.4,  :allowed=>nil, :disallowed=>nil}
+casts << {:long=>'quality_min',   :short=>'q', :type=>'uint',  :mandatory=>true,  :default=>10,   :allowed=>nil, :disallowed=>nil}
+casts << {:long=>'quality_mean',  :short=>'Q', :type=>'uint',  :mandatory=>true,  :default=>15,   :allowed=>nil, :disallowed=>nil}
 
 options          = Biopieces.options_parse(ARGV, casts)
 tmpdir           = Biopieces.mktmpdir
@@ -49,6 +51,8 @@ fastq_file       = File.join(tmpdir, "test.fq")
 fasta_file       = File.join(tmpdir, "test.fna")
 fasta_file_align = File.join(tmpdir, "test.aln.fna")
 
+options[:identity] = options[:cluster_ident]
+
 def alignment_to_fastq(entries, index)
   entries.each do |entry|
     cluster, ident, name = entry.seq_name.split('|')
@@ -68,7 +72,7 @@ Biopieces.open(options[:stream_in], options[:stream_out]) do |input, output|
   Fasta.open(fasta_file, "w") do |fasta_io|
     Fastq.open(fastq_file, "w") do |fastq_io|
       input.each_record do |record|
-        if record.has_key? :SEQ and record.has_key? :SCORES
+        if record[:SEQ] and record[:SCORES]
           entry = Seq.new_bp(record)
           entry.seq_name = seq_count.to_s