use Test::More;
use lib 'lib';
use Text::Tradition;
-use Text::Tradition::StemmaUtil qw/ phylip_pars_input /;
+use Text::Tradition::StemmaUtil qw/ make_character_matrix /;
use XML::LibXML;
use XML::LibXML::XPathContext;
is( $stemma->graph, '1-2,1-A,2-B,2-C', "Got the correct graph" );
# Test for character matrix creation
-my $m = phylip_pars_input( $c->make_alignment_table() );
+my $m = make_character_matrix( $c->make_alignment_table() );
## check number of rows
-my $expected = "\t3\t18\n";
-$expected .= 'A AAAAAAAXAAAAAAAAAA
-B AXXXAAAAAABABAABAA
-C AXXXAAAAABAAAAAXBB';
-$expected .= "\n";
-is( $m, $expected, "Got the right pars input" );
-# is( scalar @$m, 3, "Found three witnesses in char matrix" );
-# ## check number of columns
-# is( scalar( @{$m->[0]} ), 19, "Found 18 rows plus sigla in char matrix" );
-# ## check matrix
-# my %expected = (
-# 'A' => 'AAAAAAAXAAAAAAAAAA',
-# 'B' => 'AXXXAAAAAABABAABAA',
-# 'C' => 'AXXXAAAAABAAAAAXBB',
-# );
-# my @wits = map { shift @$_; } @$m;
-# map { s/\s+//g } @wits;
-# foreach my $i ( 0 .. $#wits ) {
-# my $w = $wits[$i];
-# is( join( '', @{$m->[$i]} ), $expected{$w}, "Row for witness $w is correct" );
-# }
+is( scalar @$m, 3, "Found three witnesses in char matrix" );
+ ## check number of columns
+is( scalar( @{$m->[0]} ), 19, "Found 18 rows plus sigla in char matrix" );
+ ## check matrix
+my %expected = (
+ 'A' => 'AAAAAAAXAAAAAAAAAA',
+ 'B' => 'AXXXAAAAAABABAABAA',
+ 'C' => 'AXXXAAAAABAAAAAXBB',
+ );
+my @wits = map { shift @$_; } @$m;
+map { s/\s+//g } @wits;
+foreach my $i ( 0 .. $#wits ) {
+ my $w = $wits[$i];
+ is( join( '', @{$m->[$i]} ), $expected{$w}, "Row for witness $w is correct" );
+}
# Test that pars runs
SKIP: {