X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=bp_bin%2Fanalyze_seq;h=2c38a274beeb593394ec5d33663d4dec1129de23;hb=29d03f83dfadfdb5f856cac227c5fbf0b3180761;hp=f79d94a92134882b25584e65feccaccfc4be9882;hpb=c10572040e209047afd5b964f9f91c4f49d50528;p=biopieces.git

diff --git a/bp_bin/analyze_seq b/bp_bin/analyze_seq
index f79d94a..2c38a27 100755
--- a/bp_bin/analyze_seq
+++ b/bp_bin/analyze_seq
@@ -29,35 +29,33 @@
 # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 
 
-require 'biopieces'
-require 'seq'
-require 'pp'
+require 'maasha/biopieces'
+require 'maasha/seq'
 
 casts = []
 
-bp = Biopieces.new
+options = Biopieces.options_parse(ARGV, casts)
 
-options = bp.parse(ARGV, casts)
+Biopieces.open(options[:stream_in], options[:stream_out]) do |input, output|
+  input.each_record do |record|
+    if record[:SEQ]
+      seq  = Seq.new_bp(record)
+      comp = seq.composition
 
-bp.each_record do |record|
-  if record.has_key? :SEQ
-    seq  = Seq.new(record[:SEQ_NAME], record[:SEQ], record[:SEQ_TYPE], record[:SCORE])
-    comp = seq.composition
+      comp.each_pair do |key,val|
+        record["RES[#{key}]"] = val
+      end
 
-    comp.each_pair do |key,val|
-      record["RES[#{key}]"] = val
+      record["SOFT_MASK%"] = seq.soft_mask
+      record["HARD_MASK%"] = (comp["N"].to_f / (seq.len - seq.indels).to_f * 100.0).round(2)
+      record["GC%"]        = ((comp["G"] + comp["C"]).to_f / (seq.len - seq.indels).to_f * 100.0).round(2)
     end
 
-    record["SOFT_MASK%"] = seq.soft_mask
-    record["HARD_MASK%"] = (comp["N"].to_f / (seq.len - seq.indels).to_f * 100.0).round(2)
-    record["GC%"]        = ((comp["G"] + comp["C"]).to_f / (seq.len - seq.indels).to_f * 100.0).round(2)
+    output.puts record
   end
-
-  bp.puts record
 end
 
 
-
 # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<