use average and overall percentage identity methods

svn path=/bioperl-run/branches/branch-1-0-0/; revision=13051
bioperl · Mar 18, 2002 · d4371f0 · d4371f0
1 parent 75d16d9
commit d4371f0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/t/EMBOSS.t b/t/EMBOSS.t
@@ -17,7 +17,7 @@ BEGIN {
 	use lib 't';
     }
     use Test;
-    $NTESTS = 16;
+    $NTESTS = 18;
     plan tests => $NTESTS }
 
 use Bio::Factory::EMBOSS;
@@ -102,13 +102,16 @@ ok( $alnin);
 my $aln = $alnin->next_aln;
 ok($aln);
 ok($aln->length, 43);
-ok($aln->percentage_identity, 100);
+ok($aln->overall_percentage_identity, 100);
+ok($aln->average_percentage_identity, 100);
+
 my ($first) = $aln->each_seq();
 ok($first->seq(), 'SCWSFSTTGNVEGQHFISQNKLVSLSEQNLVDCDHECMEYEGE');
 $aln = $alnin->next_aln;
 ok($aln);
 ok($aln->length, 339);
-ok(sprintf("%.2f",$aln->percentage_identity), 33.04);
+ok(sprintf("%.2f",$aln->overall_percentage_identity), 33.04);
+ok(sprintf("%.2f",$aln->average_percentage_identity), 40.58);
 
 my $cons = $factory->program('cons');
 $cons->verbose(0);

diff --git a/t/TCoffee.t b/t/TCoffee.t
@@ -103,11 +103,13 @@ $str2 = Bio::SeqIO->new(-file=> Bio::Root::IO->catfile("t","data","cysprot1b.fa"
 my $seq = $str2->next_seq();
 
 ok $aln1->no_sequences, 3;
-ok( int($aln1->percentage_identity), 24) ;
+ok( int($aln1->average_percentage_identity), 39);
 $aln = $factory->profile_align($aln1,$seq);
 ok( $aln->no_sequences, 4);
 if( $version <= 1.22 ) {
-    ok( int($aln->percentage_identity), 18);    
+    ok( int($aln->overall_percentage_identity), 18);    
+    ok( int($aln->average_percentage_identity), 44);
 } else {
-    ok( int($aln->percentage_identity), 21);
+    ok( int($aln->overall_percentage_identity), 21);
+    ok( int($aln->average_percentage_identity), 39);    
 }