fixed wrap bug in seq.rb

[biopieces.git] / code_ruby / lib / maasha / seq.rb

diff --git a/code_ruby/lib/maasha/seq.rb b/code_ruby/lib/maasha/seq.rb
index b291803f94074bb64412aa064f3584e221ded2c8..c22ecec8948a0230079aacd05af1e552a168819e 100644 (file)
--- a/code_ruby/lib/maasha/seq.rb
+++ b/code_ruby/lib/maasha/seq.rb
@@ -294,8 +294,8 @@ class Seq
     raise SeqError, "Missing seq_name" if self.seq_name.nil? or self.seq_name == ''
     raise SeqError, "Missing seq"      if self.seq.nil?      or self.seq.empty?
 
-    seq_name = self.seq_name.to_s
-    seq      = self.seq.to_s
+    seq_name = self.seq_name
+    seq      = self.seq.dup
 
     unless wrap.nil?
       seq.gsub!(/(.{#{wrap}})/) do |match|
@@ -669,22 +669,26 @@ class Seq
     regex_start = Regexp.new(start_codons.join('|'), true)
     regex_stop  = Regexp.new(stop_codons.join('|'), true)
 
-    while pos_beg and pos_beg < self.length - size_min
-      if pos_beg = self.seq.index(regex_start, pos_beg)
-        if pos_end = self.seq.index(regex_stop, pos_beg)
-          length = (pos_end - pos_beg) + 3
+    while pos_beg = self.seq.index(regex_start, pos_beg)
+      pos_end = pos_beg + 3
+       
+      while pos_end = self.seq.index(regex_stop, pos_end)
+        length = (pos_end - pos_beg) + 3
 
-          if (length % 3) == 0
-            if size_min <= length and length <= size_max
-              subseq = self.subseq(pos_beg, length)
+        if (length % 3) == 0
+          if size_min <= length and length <= size_max
+            subseq = self.subseq(pos_beg, length)
 
-              orfs << [subseq, pos_beg, pos_end + 3]
-            end
+            orfs << [subseq, pos_beg, pos_end + 3]
           end
+
+          break
         end
 
-        pos_beg += 1
+        pos_end += 1
       end
+
+      pos_beg += 1
     end
 
     if pick_longest