removed name option from asseble_seq_idba

git-svn-id: http://biopieces.googlecode.com/svn/trunk@1372 74ccb610-7750-0410-82ae-013aeee3265d

diff --git a/bp_bin/assemble_seq_idba b/bp_bin/assemble_seq_idba
index c1d72a23f778a5aa7d4c54f1642ad0fccba2f294..31a1e686fb88404e3e2e41a2feea0cc311a25ab3 100755 (executable)
--- a/bp_bin/assemble_seq_idba
+++ b/bp_bin/assemble_seq_idba
@@ -32,7 +32,6 @@ require 'biopieces'
 require 'fasta'
 
 casts = []
-casts << {:long=>'name',       :short=>'n', :type=>'string', :mandatory=>true,  :default=>nil, :allowed=>nil, :disallowed=>nil}
 casts << {:long=>'directory',  :short=>'d', :type=>'dir',    :mandatory=>true,  :default=>nil, :allowed=>nil, :disallowed=>nil}
 casts << {:long=>'scaffold',   :short=>'s', :type=>'flag',   :mandatory=>false, :default=>nil, :allowed=>nil, :disallowed=>nil}
 casts << {:long=>'kmer_min',   :short=>'k', :type=>'uint',   :mandatory=>false, :default=>25,  :allowed=>nil, :disallowed=>nil}
@@ -49,7 +48,7 @@ options = bp.parse(ARGV, casts)
 
 Dir.mkdir(options[:directory]) unless Dir.exists?(options[:directory])
 
-file_fasta = [options[:directory], options[:name]].join(File::SEPARATOR) + ".fna"
+file_fasta = [options[:directory], "IDBA"].join(File::SEPARATOR) + ".fna"
 
 Fasta.open(file_fasta, mode="w") do |fasta_io|
   bp.each_record do |record|
@@ -58,7 +57,7 @@ Fasta.open(file_fasta, mode="w") do |fasta_io|
 end
 
 unless File.size(file_fasta) == 0
-  output = [options[:directory], options[:name]].join(File::SEPARATOR)
+  output = [options[:directory], "IDBA"].join(File::SEPARATOR)
 
   commands = []
   commands << "nice -n 19"
@@ -75,10 +74,15 @@ unless File.size(file_fasta) == 0
   commands << "> /dev/null 2>&1" unless options[:verbose]
 
   command = commands.join(" ")
-  system(command)
-  raise "Command failed: #{command}" unless $?.success?
 
-  file_contig = [options[:directory], options[:name] ].join(File::SEPARATOR) + "-contig.fa"
+  begin
+    system(command)
+    raise "Command failed: #{command}" unless $?.success?
+  rescue
+    $stderr.puts "Command failed: #{command}"
+  end
+
+  file_contig = [options[:directory], "IDBA"].join(File::SEPARATOR) + "-contig.fa"
 
   Fasta.open(file_contig, mode="r") do |fasta_io|
     fasta_io.each do |entry|

diff --git a/bp_bin/assemble_seq_velvet b/bp_bin/assemble_seq_velvet
index cf6160f05ede5477b57c6f366d88cfad05686ae6..557aa569e88c09562f2f33fa7f879b14dd6f4b81 100755 (executable)
--- a/bp_bin/assemble_seq_velvet
+++ b/bp_bin/assemble_seq_velvet
@@ -46,7 +46,7 @@ class Velvet
     kmer = @kmer_min
 
     while kmer <= @kmer_max
-      dir_velveth = [@directory, "Velvet_#{kmer}"].join(File::SEPARATOR)
+      dir_velveth = [@directory, "Kmer_#{kmer}"].join(File::SEPARATOR)
 
       Dir.mkdir(dir_velveth)
 
@@ -65,7 +65,7 @@ class Velvet
   end
 
   def run_velvetg(cov_cutoffs, exp_cov)
-    Dir.glob("#{@directory}/Velvet_*").each do |dir_velveth|
+    Dir.glob("#{@directory}/Kmer_*").each do |dir_velveth|
       files_velveth = Dir.glob("#{dir_velveth}/*")
 
       cov_cutoffs.each do |cov_cutoff|
@@ -79,6 +79,7 @@ class Velvet
         commands << dir_velvetg
         commands << "-cov_cutoff #{cov_cutoff}"
         commands << "-exp_cov #{exp_cov}"
+        commands << "-clean yes"
 
         execute(commands)
       end
@@ -88,7 +89,7 @@ class Velvet
   def pick_best_assembly
     list = []
 
-    Dir.glob("#{@directory}/Velvet_*/Cov_cutoff_*/contigs.fa").each do |file|
+    Dir.glob("#{@directory}/Kmer_*/Cov_cutoff_*/contigs.fa").each do |file|
       n50 = fasta_n50(file)
       list << [file, n50]
     end