lib/bio/shell/plugin/seq.rb in bio-1.4.3.0001 vs lib/bio/shell/plugin/seq.rb in bio-1.5.0

@@ -3,11 +3,10 @@
 #
 # Copyright::   Copyright (C) 2005
 #               Toshiaki Katayama <[e-mail]>
 # License::     The Ruby License
 #
-# $Id: seq.rb,v 1.21 2007/04/05 23:35:41 trevor Exp $
 #
 
 module Bio::Shell
 
   private
@@ -159,23 +158,25 @@
 
 
 class String
 
   def step(window_size)
-    i = 0
+    j = 0
     0.step(self.length - window_size, window_size) do |i|
       yield self[i, window_size]
+      j = i
     end
-    yield self[i + window_size .. -1] if i + window_size < self.length
+    yield self[j + window_size .. -1] if j + window_size < self.length
   end
 
   def skip(window_size, step_size = 1)
-    i = 0
+    j = 0
     0.step(self.length - window_size, step_size) do |i|
       yield [self[i, window_size], i + 1, i + window_size]
+      j = i
     end
-    from = i + step_size
-    to  = [self.length, i + step_size + window_size].min
+    from = j + step_size
+    to  = [self.length, j + step_size + window_size].min
     yield [self[from, window_size], from + 1, to] if from + 1 <= to
   end
 
   def to_naseq
     Bio::Sequence::NA.new(self)