[Bio] / FigKernelPackages / FIGO.pm Repository:
ViewVC logotype

Diff of /FigKernelPackages/FIGO.pm

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.14, Sun Mar 4 18:35:59 2007 UTC revision 1.15, Sun Mar 4 18:49:52 2007 UTC
# Line 1280  Line 1280 
1280    
1281      my $hsp1 = shift @$hsps;      my $hsp1 = shift @$hsps;
1282      my $hsp2;      my $hsp2;
1283        my $merged = 0;
1284      while ($hsp1 && ($hsp2 = shift @$hsps) &&      while ($hsp1 && ($hsp2 = shift @$hsps) &&
1285             ($must_shift ? &diff_frames($hsp1,$hsp2) : 1) &&             ($must_shift ? &diff_frames($hsp1,$hsp2) : 1) &&
1286             ($hsp1 = &merge($hsp1,$hsp2,$diff))) {}             ($hsp1 = &merge($hsp1,$hsp2,$diff))) { $merged = 1 }
1287      return ($hsp1 && (($hsp1->[1] - $hsp1->[0]) > (0.9 * $ln)));      return ($merged && $hsp1 && (($hsp1->[1] - $hsp1->[0]) > (0.9 * $ln)));
1288  }  }
1289    
1290  sub diff_frames {  sub diff_frames {
1291      my($hsp1,$hsp2) = @_;      my($hsp1,$hsp2) = @_;
   
1292      return (($hsp1->[0] % 3) != ($hsp2->[0] % 3));      return (($hsp1->[0] % 3) != ($hsp2->[0] % 3));
1293  }  }
1294    

Legend:
Removed from v.1.14  
changed lines
  Added in v.1.15

MCS Webmaster
ViewVC Help
Powered by ViewVC 1.0.3