use strict; use warnings;
use Test::More;
use lib 'lib';
-use Text::Tradition::Graph;
+use Text::Tradition;
use XML::LibXML;
use XML::LibXML::XPathContext;
open( GRAPHFILE, $datafile ) or die "Could not open $datafile";
my @lines = <GRAPHFILE>;
close GRAPHFILE;
-my $graph = Text::Tradition::Graph->new( 'GraphML' => join( '', @lines ) );
+my $tradition = Text::Tradition->new( 'CollateX' => join( '', @lines ) );
+my $collation = $tradition->collation;
# Test the svg creation
my $parser = XML::LibXML->new();
$parser->load_ext_dtd( 0 );
-my $svg = $parser->parse_string( $graph->as_svg() );
+my $svg = $parser->parse_string( $collation->as_svg() );
is( $svg->documentElement->nodeName(), 'svg', 'Got an svg document' );
# Test for the correct number of nodes in the SVG
my $svg_xpc = XML::LibXML::XPathContext->new( $svg->documentElement() );
$svg_xpc->registerNs( 'svg', 'http://www.w3.org/2000/svg' );
my @svg_nodes = $svg_xpc->findnodes( '//svg:g[@class="node"]' );
-is( scalar @svg_nodes, 21, "Correct number of nodes in the graph" );
+is( scalar @svg_nodes, 26, "Correct number of nodes in the graph" );
# Test for the correct number of edges
my @svg_edges = $svg_xpc->findnodes( '//svg:g[@class="edge"]' );
-is( scalar @svg_edges, 27, "Correct number of edges in the graph" );
+is( scalar @svg_edges, 32, "Correct number of edges in the graph" );
# Test for the correct common nodes
-my @expected_nodes = map { [ $_, 1 ] } qw/#START# 1 8 12 13 16 19 20 23 27/;
-foreach my $idx ( qw/2 3 5 8 10 13 15/ ) {
+my @expected_nodes = map { [ $_, 1 ] } qw/ #START# n1 n5 n6 n7 n12
+ n16 n19 n20 n27 /;
+foreach my $idx ( qw/2 3 4 8 10 11 13 16 17 18/ ) {
splice( @expected_nodes, $idx, 0, [ "node_null", undef ] );
}
-my @active_nodes = $graph->active_nodes();
-# is_deeply( \@active_nodes, \@expected_nodes, "Initial common points" );
+my @active_nodes = $collation->lemma_readings();
subtest 'Initial common points' => \&compare_active;
-my $string = '# when ... ... showers sweet with ... fruit the ... of ... has pierced ... the ... #';
+my $string = '# when ... ... ... showers sweet with ... fruit ... ... of ... has pierced ... ... ... #';
is( make_text( @active_nodes ), $string, "Got the right starting text" );
sub compare_active {
"Element has same toggle value" );
if( defined $active_nodes[$_]->[1] ) {
is( $active_nodes[$_]->[0], $expected_nodes[$_]->[0],
- "Active or toggled element has same node name" );
+ "Active or toggled element has same node name "
+ . $active_nodes[$_]->[0] );
}
}
}
my @words;
foreach my $n ( @_ ) {
if( $n->[1] ) {
- push( @words, $graph->text_of_node( $n->[0] ) );
+ push( @words, $collation->reading( $n->[0] )->label );
} elsif ( !defined $n->[1] ) {
push( @words, '...' );
}
# Test the manuscript paths
my $wit_a = '# when april with his showers sweet with fruit the drought of march has pierced unto the root #';
my $wit_b = '# when showers sweet with april fruit the march of drought has pierced to the root #';
-my $wit_c = '# when showers sweet with april fruit the drought of march has pierced the rood #';
-is( $graph->text_for_witness( "A" ), $wit_a, "Correct path for witness A" );
-is( $graph->text_for_witness( "B" ), $wit_b, "Correct path for witness B" );
-is( $graph->text_for_witness( "C" ), $wit_c, "Correct path for witness C" );
+my $wit_c = '# when showers sweet with april fruit teh drought of march has pierced teh rood #';
+is( join( ' ', @{$tradition->witness( "A" )->text} ), $wit_a, "Correct path for witness A" );
+is( join( ' ', @{$tradition->witness( "B" )->text} ), $wit_b, "Correct path for witness B" );
+is( join( ' ', @{$tradition->witness( "C" )->text} ), $wit_c, "Correct path for witness C" );
# Test the transposition identifiers
-my $transposition_pools = [ [ 2, 9 ], [ 14, 18 ], [ 15, 17 ] ];
-my $transposed_nodes = { 2 => $transposition_pools->[0],
- 9 => $transposition_pools->[0],
- 14 => $transposition_pools->[1],
- 15 => $transposition_pools->[2],
- 17 => $transposition_pools->[2],
- 18 => $transposition_pools->[1],
+my $transposition_pools = [ [ 'n2', 'n11' ], [ 'n14', 'n18' ],
+ [ 'n17', 'n15' ] ];
+my $transposed_nodes = { 'n2' => $transposition_pools->[0],
+ 'n11' => $transposition_pools->[0],
+ 'n14' => $transposition_pools->[1],
+ 'n15' => $transposition_pools->[2],
+ 'n17' => $transposition_pools->[2],
+ 'n18' => $transposition_pools->[1],
};
-foreach my $n ( $graph->nodes() ) {
- $transposed_nodes->{ $n->name() } = [ $n->name() ]
- unless exists $transposed_nodes->{ $n->name() };
+
+my $real_transposed_nodes = {};
+foreach my $r ( $collation->readings ) {
+ my @same = map { $_->name } @{$r->same_as};
+ $real_transposed_nodes->{ $r->name } = \@same if @same > 1;
}
-is_deeply( $graph->{'identical_nodes'}, $transposed_nodes, "Found the right transpositions" );
+
+is_deeply( $real_transposed_nodes, $transposed_nodes, "Found the right transpositions" );
# Test turning on a node
-my @off = $graph->toggle_node( '24' );
-$expected_nodes[ 15 ] = [ "24", 1 ];
-@active_nodes = $graph->active_nodes( @off );
+my @off = $collation->toggle_reading( 'n21' );
+$expected_nodes[ 16 ] = [ "n21", 1 ];
+@active_nodes = $collation->lemma_readings( @off );
subtest 'Turned on node for new location' => \&compare_active;
-$string = '# when ... ... showers sweet with ... fruit the ... of ... has pierced ... the root #';
+$string = '# when ... ... ... showers sweet with ... fruit ... ... of ... has pierced unto ... ... #';
is( make_text( @active_nodes ), $string, "Got the right text" );
# Test the toggling effects of same-column
-@off = $graph->toggle_node( '26' );
-splice( @expected_nodes, 15, 1, ( [ "24", 0 ], [ "26", 1 ] ) );
-@active_nodes = $graph->active_nodes( @off );
+@off = $collation->toggle_reading( 'n22' );
+splice( @expected_nodes, 16, 1, ( [ "n21", 0 ], [ "n22", 1 ] ) );
+@active_nodes = $collation->lemma_readings( @off );
subtest 'Turned on other node in that location' => \&compare_active;
-$string = '# when ... ... showers sweet with ... fruit the ... of ... has pierced ... the rood #';
+$string = '# when ... ... ... showers sweet with ... fruit ... ... of ... has pierced to ... ... #';
is( make_text( @active_nodes ), $string, "Got the right text" );
# Test the toggling effects of transposition
-@off = $graph->toggle_node( '14' );
+@off = $collation->toggle_reading( 'n14' );
# Add the turned on node
-$expected_nodes[ 8 ] = [ "14", 1 ];
+$expected_nodes[ 11 ] = [ "n14", 1 ];
# Remove the 'off' for the previous node
-splice( @expected_nodes, 15, 1 );
-@active_nodes = $graph->active_nodes( @off );
+splice( @expected_nodes, 16, 1 );
+@active_nodes = $collation->lemma_readings( @off );
subtest 'Turned on transposition node' => \&compare_active;
-$string = '# when ... ... showers sweet with ... fruit the drought of ... has pierced ... the rood #';
+$string = '# when ... ... ... showers sweet with ... fruit ... drought of ... has pierced to ... ... #';
is( make_text( @active_nodes ), $string, "Got the right text" );
-@off = $graph->toggle_node( '18' );
+@off = $collation->toggle_reading( 'n18' );
# Toggle on the new node
-$expected_nodes[ 10 ] = [ "18", 1 ];
+$expected_nodes[ 13 ] = [ "n18", 1 ];
# Toggle off the transposed node
-$expected_nodes[ 8 ] = [ "14", undef ];
-@active_nodes = $graph->active_nodes( @off );
+$expected_nodes[ 11 ] = [ "n14", undef ];
+@active_nodes = $collation->lemma_readings( @off );
subtest 'Turned on that node\'s partner' => \&compare_active;
-$string = '# when ... ... showers sweet with ... fruit the ... of drought has pierced ... the rood #';
+$string = '# when ... ... ... showers sweet with ... fruit ... ... of drought has pierced to ... ... #';
is( make_text( @active_nodes ), $string, "Got the right text" );
-@off = $graph->toggle_node( '14' );
+@off = $collation->toggle_reading( 'n14' );
# Toggle on the new node
-$expected_nodes[ 8 ] = [ "14", 1 ];
+$expected_nodes[ 11 ] = [ "n14", 1 ];
# Toggle off the transposed node
-$expected_nodes[ 10 ] = [ "18", undef ];
-@active_nodes = $graph->active_nodes( @off );
+$expected_nodes[ 13 ] = [ "n18", undef ];
+@active_nodes = $collation->lemma_readings( @off );
subtest 'Turned on the original node' => \&compare_active;
-$string = '# when ... ... showers sweet with ... fruit the drought of ... has pierced ... the rood #';
+$string = '# when ... ... ... showers sweet with ... fruit ... drought of ... has pierced to ... ... #';
is( make_text( @active_nodes ), $string, "Got the right text" );
-@off = $graph->toggle_node( '15' );
+@off = $collation->toggle_reading( 'n15' );
# Toggle on the new node, and off with the old
-splice( @expected_nodes, 8, 1, [ "14", 0 ], [ "15", 1 ] );
-@active_nodes = $graph->active_nodes( @off );
+splice( @expected_nodes, 11, 1, [ "n14", 0 ], [ "n15", 1 ] );
+@active_nodes = $collation->lemma_readings( @off );
subtest 'Turned on the colocated node' => \&compare_active;
-$string = '# when ... ... showers sweet with ... fruit the march of ... has pierced ... the rood #';
+$string = '# when ... ... ... showers sweet with ... fruit ... march of ... has pierced to ... ... #';
is( make_text( @active_nodes ), $string, "Got the right text" );
-@off = $graph->toggle_node( '3' );
+@off = $collation->toggle_reading( 'n3' );
# Toggle on the new node
-splice( @expected_nodes, 3, 1, [ "3", 1 ] );
+splice( @expected_nodes, 3, 1, [ "n3", 1 ] );
# Remove the old toggle-off
-splice( @expected_nodes, 8, 1 );
-@active_nodes = $graph->active_nodes( @off );
+splice( @expected_nodes, 11, 1 );
+@active_nodes = $collation->lemma_readings( @off );
subtest 'Turned on a singleton node' => \&compare_active;
-$string = '# when ... with his showers sweet with ... fruit the march of ... has pierced ... the rood #';
+$string = '# when ... with ... showers sweet with ... fruit ... march of ... has pierced to ... ... #';
is( make_text( @active_nodes ), $string, "Got the right text" );
-@off = $graph->toggle_node( '3' );
+@off = $collation->toggle_reading( 'n3' );
# Toggle off this node
-splice( @expected_nodes, 3, 1, [ "3", 0 ] );
-@active_nodes = $graph->active_nodes( @off );
+splice( @expected_nodes, 3, 1, [ "n3", 0 ] );
+@active_nodes = $collation->lemma_readings( @off );
subtest 'Turned off a singleton node' => \&compare_active;
-$string = '# when ... showers sweet with ... fruit the march of ... has pierced ... the rood #';
+$string = '# when ... ... showers sweet with ... fruit ... march of ... has pierced to ... ... #';
is( make_text( @active_nodes ), $string, "Got the right text" );
-@off = $graph->toggle_node( '21' );
-splice( @expected_nodes, 13, 1, [ "21", 1 ] );
-@active_nodes = $graph->active_nodes( @off );
-subtest 'Turned on a new node after singleton switchoff' => \&compare_active;
-$string = '# when ... showers sweet with ... fruit the march of ... has pierced unto the rood #';
+@off = $collation->toggle_reading( 'n21' );
+splice( @expected_nodes, 16, 1, ["n22", 0 ], [ "n21", 1 ] );
+@active_nodes = $collation->lemma_readings( @off );
+subtest 'Turned on another node after singleton switchoff' => \&compare_active;
+$string = '# when ... ... showers sweet with ... fruit ... march of ... has pierced unto ... ... #';
is( make_text( @active_nodes ), $string, "Got the right text" );
done_testing();
projects / scpubgit/stemmatology.git / blobdiff