From: Tara L Andrews Date: Mon, 16 Jan 2012 13:43:00 +0000 (+0100) Subject: add method to generate a part of the graph specified by rank range X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=scpubgit%2Fstemmatology.git;a=commitdiff_plain;h=b22576c6f952c20c58a01b4689ff1dac40b3f0bc add method to generate a part of the graph specified by rank range --- diff --git a/TODO b/TODO new file mode 100644 index 0000000..b02cc5f --- /dev/null +++ b/TODO @@ -0,0 +1,3 @@ +* support and test deletion of a tradition +* support and test deletion of a relationship +* support and test graphml output for relationships diff --git a/lib/Text/Tradition/Collation.pm b/lib/Text/Tradition/Collation.pm index 2743526..6891065 100644 --- a/lib/Text/Tradition/Collation.pm +++ b/lib/Text/Tradition/Collation.pm @@ -285,7 +285,7 @@ sub reading_witnesses { =item B -print $graph->as_svg( $recalculate ); +print $collation->as_svg(); Returns an SVG string that represents the graph, via as_dot and graphviz. @@ -307,9 +307,41 @@ sub as_svg { return $svg; } +=item B + +print $collation->svg_subgraph( $from, $to ) + +Returns an SVG string that represents the portion of the graph given by the +specified range. The $from and $to variables refer to ranks within the graph. + +=cut + +sub svg_subgraph { + my( $self, $from, $to ) = @_; + + my $dot = $self->as_dot( $from, $to ); + unless( $dot ) { + warn "Could not output a graph with range $from - $to"; + return; + } + + my @cmd = qw/dot -Tsvg/; + my( $svg, $err ); + my $dotfile = File::Temp->new(); + ## TODO REMOVE + # $dotfile->unlink_on_destroy(0); + binmode $dotfile, ':utf8'; + print $dotfile $dot; + push( @cmd, $dotfile->filename ); + run( \@cmd, ">", binary(), \$svg ); + $svg = decode_utf8( $svg ); + return $svg; +} + + =item B -print $graph->as_dot( $view, $recalculate ); +print $collation->as_dot(); Returns a string that is the collation graph expressed in dot (i.e. GraphViz) format. The 'view' argument determines what kind of @@ -321,8 +353,17 @@ graph is produced. =cut sub as_dot { - my( $self, $view ) = @_; - $view = 'sequence' unless $view; + my( $self, $startrank, $endrank ) = @_; + + # Check the arguments + if( $startrank ) { + return if $endrank && $startrank > $endrank; + return if $startrank > $self->end->rank; + } + if( defined $endrank ) { + return if $endrank < 0; + } + # TODO consider making some of these things configurable my $graph_name = $self->tradition->name; $graph_name =~ s/[^\w\s]//g; @@ -333,7 +374,25 @@ sub as_dot { $dot .= sprintf( "\tnode [ fontsize=%d, fillcolor=%s, style=%s, shape=%s ];\n", 11, "white", "filled", "ellipse" ); + # Output substitute start/end readings if necessary + if( $startrank ) { + $dot .= "\t\"#SUBSTART#\" [ label=\"...\" ];\n"; + } + if( $endrank ) { + $dot .= "\t\"#SUBEND#\" [ label=\"...\" ];\n"; + } + my %used; # Keep track of the readings that actually appear in the graph + my %subedges; + my %subend; foreach my $reading ( $self->readings ) { + # Only output readings within our rank range. + next if $startrank && $reading->rank < $startrank; + next if $endrank && $reading->rank > $endrank; + $used{$reading->id} = 1; + $subedges{$reading->id} = '#SUBSTART#' + if $startrank && $startrank == $reading->rank; + $subedges{$reading->id} = '#SUBEND#' + if $endrank && $endrank == $reading->rank; # Need not output nodes without separate labels next if $reading->id eq $reading->text; my $label = $reading->text; @@ -341,22 +400,38 @@ sub as_dot { $dot .= sprintf( "\t\"%s\" [ label=\"%s\" ];\n", $reading->id, $label ); } - # TODO do something sensible for relationships - - my @edges = $self->paths; - foreach my $edge ( @edges ) { - my %variables = ( 'color' => '#000000', + # Add substitute start and end edges if necessary + foreach my $node ( keys %subedges ) { + my @vector = ( $subedges{$node}, $node ); + @vector = reverse( @vector ) if $vector[0] =~ /END/; + my $witstr = join( ', ', sort $self->reading_witnesses( $self->reading( $node ) ) ); + my %variables = ( 'color' => '#000000', 'fontcolor' => '#000000', - 'label' => join( ', ', $self->path_display_label( $edge ) ), + 'label' => $witstr, ); my $varopts = join( ', ', map { $_.'="'.$variables{$_}.'"' } sort keys %variables ); - # Account for the rank gap if necessary - my $rankgap = $self->reading( $edge->[1] )->rank - - $self->reading( $edge->[0] )->rank; - $varopts .= ", minlen=$rankgap" if $rankgap > 1; - $dot .= sprintf( "\t\"%s\" -> \"%s\" [ %s ];\n", - $edge->[0], $edge->[1], $varopts ); + $dot .= sprintf( "\t\"%s\" -> \"%s\" [ %s ];\n", @vector, $varopts ); + } + + # Add the real edges + my @edges = $self->paths; + foreach my $edge ( @edges ) { + # Do we need to output this edge? + if( $used{$edge->[0]} && $used{$edge->[1]} ) {; + my %variables = ( 'color' => '#000000', + 'fontcolor' => '#000000', + 'label' => join( ', ', $self->path_display_label( $edge ) ), + ); + my $varopts = join( ', ', map { $_.'="'.$variables{$_}.'"' } sort keys %variables ); + # Account for the rank gap if necessary + my $rankgap = $self->reading( $edge->[1] )->rank + - $self->reading( $edge->[0] )->rank; + $varopts .= ", minlen=$rankgap" if $rankgap > 1; + $dot .= sprintf( "\t\"%s\" -> \"%s\" [ %s ];\n", + $edge->[0], $edge->[1], $varopts ); + } } + $dot .= "}\n"; return $dot; } @@ -386,7 +461,7 @@ sub path_display_label { =item B -print $graph->as_graphml( $recalculate ) +print $collation->as_graphml( $recalculate ) Returns a GraphML representation of the collation graph, with transposition information and position information. Unless @@ -544,7 +619,7 @@ sub _add_graphml_data { =item B -print $graph->as_csv( $recalculate ) +print $collation->as_csv( $recalculate ) Returns a CSV alignment table representation of the collation graph, one row per witness (or witness uncorrected.) @@ -571,7 +646,7 @@ sub as_csv { =item B -my $table = $graph->make_alignment_table( $use_refs, \@wits_to_include ) +my $table = $collation->make_alignment_table( $use_refs, \@wits_to_include ) Return a reference to an alignment table, in a slightly enhanced CollateX format which looks like this: @@ -692,7 +767,7 @@ Returns the end of the collation, a meta-reading with label '#END#'. =item B -my @readings = $graph->reading_sequence( $first, $last, $path[, $alt_path] ); +my @readings = $collation->reading_sequence( $first, $last, $path[, $alt_path] ); Returns the ordered list of readings, starting with $first and ending with $last, along the given witness path. If no path is specified, @@ -735,7 +810,7 @@ sub reading_sequence { =item B -my $next_reading = $graph->next_reading( $reading, $witpath ); +my $next_reading = $collation->next_reading( $reading, $witpath ); Returns the reading that follows the given reading along the given witness path. @@ -752,7 +827,7 @@ sub next_reading { =item B -my $prior_reading = $graph->prior_reading( $reading, $witpath ); +my $prior_reading = $collation->prior_reading( $reading, $witpath ); Returns the reading that precedes the given reading along the given witness path. diff --git a/t/graph.t b/t/graph.t index c65f516..d379d5d 100644 --- a/t/graph.t +++ b/t/graph.t @@ -1,7 +1,7 @@ #!/usr/bin/perl use strict; use warnings; -use Test::More skip_all => "lemmatization disabled for now"; +use Test::More; use lib 'lib'; use Text::Tradition; use XML::LibXML; @@ -32,272 +32,313 @@ is( scalar @svg_nodes, 26, "Correct number of nodes in the graph" ); my @svg_edges = $svg_xpc->findnodes( '//svg:g[@class="edge"]' ); is( scalar @svg_edges, 32, "Correct number of edges in the graph" ); -# Test for the correct common nodes -my @common_nodes = ( '#START#' ); -push( @common_nodes, qw/ n1 n5 n6 n7 n12 n16 n19 n20 n27 / ); -my @expected_nodes = map { [ $_, 1 ] } @common_nodes; -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 = $collation->lemma_readings(); -subtest 'Initial common points' => \&compare_active; -my $string = '# when ... ... ... showers sweet with ... fruit ... ... of ... has pierced ... ... ... #'; -is( make_text( @active_nodes ), $string, "Got the right starting text" ); - -sub compare_active { - is( scalar( @active_nodes ), scalar ( @expected_nodes ), - "Arrays are same length" ); - - foreach ( 0 .. scalar(@active_nodes)-1 ) { - is( $active_nodes[$_]->[1], $expected_nodes[$_]->[1], - "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_nodes[$_]->[0] ); +# Test svg creation for a subgraph +my $part_svg = $parser->parse_string( $collation->svg_subgraph( 15 ) ); # start, no end +is( $part_svg->documentElement->nodeName(), 'svg', "Got an svg subgraph to end" ); +my $part_xpc = XML::LibXML::XPathContext->new( $part_svg->documentElement() ); +$part_xpc->registerNs( 'svg', 'http://www.w3.org/2000/svg' ); +@svg_nodes = $part_xpc->findnodes( '//svg:g[@class="node"]' ); +is( scalar( @svg_nodes ), 9, + "Correct number of nodes in the subgraph" ); +@svg_edges = $part_xpc->findnodes( '//svg:g[@class="edge"]' ); +is( scalar( @svg_edges ), 10, + "Correct number of edges in the subgraph" ); +open( OUT, ">test.svg" ); +print OUT $part_svg->toString(); +close OUT; + +$part_svg = $parser->parse_string( $collation->svg_subgraph( 10, 13 ) ); # start, no end +is( $part_svg->documentElement->nodeName(), 'svg', "Got an svg subgraph in the middle" ); +$part_xpc = XML::LibXML::XPathContext->new( $part_svg->documentElement() ); +$part_xpc->registerNs( 'svg', 'http://www.w3.org/2000/svg' ); +@svg_nodes = $part_xpc->findnodes( '//svg:g[@class="node"]' ); +is( scalar( @svg_nodes ), 9, + "Correct number of nodes in the subgraph" ); +@svg_edges = $part_xpc->findnodes( '//svg:g[@class="edge"]' ); +is( scalar( @svg_edges ), 11, + "Correct number of edges in the subgraph" ); + + +$part_svg = $parser->parse_string( $collation->svg_subgraph( 0, 5 ) ); # start, no end +is( $part_svg->documentElement->nodeName(), 'svg', "Got an svg subgraph from start" ); +$part_xpc = XML::LibXML::XPathContext->new( $part_svg->documentElement() ); +$part_xpc->registerNs( 'svg', 'http://www.w3.org/2000/svg' ); +@svg_nodes = $part_xpc->findnodes( '//svg:g[@class="node"]' ); +is( scalar( @svg_nodes ), 7, + "Correct number of nodes in the subgraph" ); +@svg_edges = $part_xpc->findnodes( '//svg:g[@class="edge"]' ); +is( scalar( @svg_edges ), 7, + "Correct number of edges in the subgraph" ); + +SKIP: { + skip "lemmatization disabled for now", 1; + # Test for the correct common nodes + my @common_nodes = ( '#START#' ); + push( @common_nodes, qw/ n1 n5 n6 n7 n12 n16 n19 n20 n27 / ); + my @expected_nodes = map { [ $_, 1 ] } @common_nodes; + foreach my $idx ( qw/2 3 4 8 10 11 13 16 17 18/ ) { + splice( @expected_nodes, $idx, 0, [ "node_null", undef ] ); } - } -} - -sub make_text { - my @words; - foreach my $n ( @_ ) { - if( $n->[1] ) { - push( @words, $collation->reading( $n->[0] )->text ); - } elsif ( !defined $n->[1] ) { - push( @words, '...' ); + my @active_nodes = $collation->lemma_readings(); + subtest 'Initial common points' => \&compare_active; + my $string = '# when ... ... ... showers sweet with ... fruit ... ... of ... has pierced ... ... ... #'; + is( make_text( @active_nodes ), $string, "Got the right starting text" ); + + sub compare_active { + is( scalar( @active_nodes ), scalar ( @expected_nodes ), + "Arrays are same length" ); + + foreach ( 0 .. scalar(@active_nodes)-1 ) { + is( $active_nodes[$_]->[1], $expected_nodes[$_]->[1], + "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_nodes[$_]->[0] ); + } + } } - } - return join( ' ', @words ); -} - -# Test that the common nodes are marked common -foreach my $cn ( @common_nodes ) { - ok( $collation->reading( $cn )->is_common, "Node $cn is marked common" ); -} - -# 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 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 = [ [ '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], -}; - -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( $real_transposed_nodes, $transposed_nodes, "Found the right transpositions" ); - -# Test turning on a node -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 ... ... of ... has pierced unto ... ... #'; -is( make_text( @active_nodes ), $string, "Got the right text" ); - -# Test the toggling effects of same-column -@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 ... ... of ... has pierced to ... ... #'; -is( make_text( @active_nodes ), $string, "Got the right text" ); - -# Test the toggling effects of transposition -@off = $collation->toggle_reading( 'n14' ); -# Add the turned on node -$expected_nodes[ 11 ] = [ "n14", 1 ]; -# Remove the 'off' for the previous node -splice( @expected_nodes, 16, 1 ); -@active_nodes = $collation->lemma_readings( @off ); -subtest 'Turned on transposition node' => \&compare_active; -$string = '# when ... ... ... showers sweet with ... fruit ... drought of ... has pierced to ... ... #'; -is( make_text( @active_nodes ), $string, "Got the right text" ); - -@off = $collation->toggle_reading( 'n18' ); -# Toggle on the new node -$expected_nodes[ 13 ] = [ "n18", 1 ]; -# Toggle off the transposed node -$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 ... ... of drought has pierced to ... ... #'; -is( make_text( @active_nodes ), $string, "Got the right text" ); - -@off = $collation->toggle_reading( 'n14' ); -# Toggle on the new node -$expected_nodes[ 11 ] = [ "n14", 1 ]; -# Toggle off the transposed node -$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 ... drought of ... has pierced to ... ... #'; -is( make_text( @active_nodes ), $string, "Got the right text" ); - -@off = $collation->toggle_reading( 'n15' ); -# Toggle on the new node, and off with the old -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 ... march of ... has pierced to ... ... #'; -is( make_text( @active_nodes ), $string, "Got the right text" ); - -@off = $collation->toggle_reading( 'n3' ); -# Toggle on the new node -splice( @expected_nodes, 3, 1, [ "n3", 1 ] ); -# Remove the old toggle-off -splice( @expected_nodes, 11, 1 ); -@active_nodes = $collation->lemma_readings( @off ); -subtest 'Turned on a singleton node' => \&compare_active; -$string = '# when ... with ... showers sweet with ... fruit ... march of ... has pierced to ... ... #'; -is( make_text( @active_nodes ), $string, "Got the right text" ); - -@off = $collation->toggle_reading( 'n3' ); -# Toggle off this node -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 ... march of ... has pierced to ... ... #'; -is( make_text( @active_nodes ), $string, "Got the right text" ); - -@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" ); - -# Now start testing some position identifiers -# 2. 'april with his' have no colocated -# 3. 'april' 2 has no colocated -# 4. 'teh' and 'the' -# 5. 'drought' & 'march' -# 6. 'march' & 'drought' -# 7. 'unto' 'the' 'root'... -# 'unto can match 'to' or 'teh' -# 'the' can match 'teh' or 'rood' -# 'root' can mach 'rood' - -foreach my $cn ( @common_nodes ) { - my $cnr = $collation->reading( $cn ); - is( scalar( $collation->same_position_as( $cnr ) ), 0, "Node $cn has no colocations" ); -} - -my %expected_colocations = ( - 'n2' => [], # april - 'n3' => [], # with - 'n4' => [], # his - 'n11' => [], # april - 'n8' => [ 'n13' ], # teh -> the - 'n13' => [ 'n8' ], # the -> teh - 'n14' => [ 'n15' ], # drought -> march - 'n18' => [ 'n17' ], # drought -> march - 'n17' => [ 'n18' ], # march -> drought - 'n15' => [ 'n14' ], # march -> drought - 'n21' => [ 'n22', 'n9' ], # unto -> to, teh - 'n22' => [ 'n21', 'n9' ], # to -> unto, teh - 'n9' => [ 'n21', 'n22', 'n23' ], # teh -> unto, to, the - 'n23' => [ 'n25', 'n9' ], # the -> teh, rood - 'n25' => [ 'n23', 'n26' ], # rood -> the, root - 'n26' => [ 'n25' ], # root -> rood -); - -foreach my $n ( keys %expected_colocations ) { - my $nr = $collation->reading( $n ); - my @colocated = sort( map { $_->name } $collation->same_position_as( $nr ) ); - is_deeply( \@colocated, $expected_colocations{$n}, "Colocated nodes for $n correct" ); -} - -# Test strict colocations -$expected_colocations{'n9'} = []; -$expected_colocations{'n21'} = ['n22']; -$expected_colocations{'n22'} = ['n21']; -$expected_colocations{'n23'} = []; -$expected_colocations{'n25'} = []; -$expected_colocations{'n26'} = []; - -foreach my $n ( keys %expected_colocations ) { - my $nr = $collation->reading( $n ); - my @colocated = sort( map { $_->name } $collation->same_position_as( $nr, 1 ) ); - is_deeply( \@colocated, $expected_colocations{$n}, "Strictly colocated nodes for $n correct" ); + + sub make_text { + my @words; + foreach my $n ( @_ ) { + if( $n->[1] ) { + push( @words, $collation->reading( $n->[0] )->text ); + } elsif ( !defined $n->[1] ) { + push( @words, '...' ); + } + } + return join( ' ', @words ); + } + + # Test that the common nodes are marked common + foreach my $cn ( @common_nodes ) { + ok( $collation->reading( $cn )->is_common, "Node $cn is marked common" ); + } + + # 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 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 = [ [ '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], + }; + + 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( $real_transposed_nodes, $transposed_nodes, "Found the right transpositions" ); + + # Test turning on a node + 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 ... ... of ... has pierced unto ... ... #'; + is( make_text( @active_nodes ), $string, "Got the right text" ); + + # Test the toggling effects of same-column + @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 ... ... of ... has pierced to ... ... #'; + is( make_text( @active_nodes ), $string, "Got the right text" ); + + # Test the toggling effects of transposition + @off = $collation->toggle_reading( 'n14' ); + # Add the turned on node + $expected_nodes[ 11 ] = [ "n14", 1 ]; + # Remove the 'off' for the previous node + splice( @expected_nodes, 16, 1 ); + @active_nodes = $collation->lemma_readings( @off ); + subtest 'Turned on transposition node' => \&compare_active; + $string = '# when ... ... ... showers sweet with ... fruit ... drought of ... has pierced to ... ... #'; + is( make_text( @active_nodes ), $string, "Got the right text" ); + + @off = $collation->toggle_reading( 'n18' ); + # Toggle on the new node + $expected_nodes[ 13 ] = [ "n18", 1 ]; + # Toggle off the transposed node + $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 ... ... of drought has pierced to ... ... #'; + is( make_text( @active_nodes ), $string, "Got the right text" ); + + @off = $collation->toggle_reading( 'n14' ); + # Toggle on the new node + $expected_nodes[ 11 ] = [ "n14", 1 ]; + # Toggle off the transposed node + $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 ... drought of ... has pierced to ... ... #'; + is( make_text( @active_nodes ), $string, "Got the right text" ); + + @off = $collation->toggle_reading( 'n15' ); + # Toggle on the new node, and off with the old + 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 ... march of ... has pierced to ... ... #'; + is( make_text( @active_nodes ), $string, "Got the right text" ); + + @off = $collation->toggle_reading( 'n3' ); + # Toggle on the new node + splice( @expected_nodes, 3, 1, [ "n3", 1 ] ); + # Remove the old toggle-off + splice( @expected_nodes, 11, 1 ); + @active_nodes = $collation->lemma_readings( @off ); + subtest 'Turned on a singleton node' => \&compare_active; + $string = '# when ... with ... showers sweet with ... fruit ... march of ... has pierced to ... ... #'; + is( make_text( @active_nodes ), $string, "Got the right text" ); + + @off = $collation->toggle_reading( 'n3' ); + # Toggle off this node + 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 ... march of ... has pierced to ... ... #'; + is( make_text( @active_nodes ), $string, "Got the right text" ); + + @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" ); + + # Now start testing some position identifiers + # 2. 'april with his' have no colocated + # 3. 'april' 2 has no colocated + # 4. 'teh' and 'the' + # 5. 'drought' & 'march' + # 6. 'march' & 'drought' + # 7. 'unto' 'the' 'root'... + # 'unto can match 'to' or 'teh' + # 'the' can match 'teh' or 'rood' + # 'root' can mach 'rood' + + foreach my $cn ( @common_nodes ) { + my $cnr = $collation->reading( $cn ); + is( scalar( $collation->same_position_as( $cnr ) ), 0, "Node $cn has no colocations" ); + } + + my %expected_colocations = ( + 'n2' => [], # april + 'n3' => [], # with + 'n4' => [], # his + 'n11' => [], # april + 'n8' => [ 'n13' ], # teh -> the + 'n13' => [ 'n8' ], # the -> teh + 'n14' => [ 'n15' ], # drought -> march + 'n18' => [ 'n17' ], # drought -> march + 'n17' => [ 'n18' ], # march -> drought + 'n15' => [ 'n14' ], # march -> drought + 'n21' => [ 'n22', 'n9' ], # unto -> to, teh + 'n22' => [ 'n21', 'n9' ], # to -> unto, teh + 'n9' => [ 'n21', 'n22', 'n23' ], # teh -> unto, to, the + 'n23' => [ 'n25', 'n9' ], # the -> teh, rood + 'n25' => [ 'n23', 'n26' ], # rood -> the, root + 'n26' => [ 'n25' ], # root -> rood + ); + + foreach my $n ( keys %expected_colocations ) { + my $nr = $collation->reading( $n ); + my @colocated = sort( map { $_->name } $collation->same_position_as( $nr ) ); + is_deeply( \@colocated, $expected_colocations{$n}, "Colocated nodes for $n correct" ); + } + + # Test strict colocations + $expected_colocations{'n9'} = []; + $expected_colocations{'n21'} = ['n22']; + $expected_colocations{'n22'} = ['n21']; + $expected_colocations{'n23'} = []; + $expected_colocations{'n25'} = []; + $expected_colocations{'n26'} = []; + + foreach my $n ( keys %expected_colocations ) { + my $nr = $collation->reading( $n ); + my @colocated = sort( map { $_->name } $collation->same_position_as( $nr, 1 ) ); + is_deeply( \@colocated, $expected_colocations{$n}, "Strictly colocated nodes for $n correct" ); + } + + # Test turning on, then off, an annoyingly overlapping node + + @off = $collation->toggle_reading( 'n9' ); + # Remove the old toggle-off + splice( @expected_nodes, 16, 1 ); + splice( @expected_nodes, 17, 0, [ "n9", 1 ] ); + @active_nodes = $collation->lemma_readings( @off ); + subtest 'Turned on a node without fixed position' => \&compare_active; + $string = '# when ... ... showers sweet with ... fruit ... march of ... has pierced unto teh ... ... #'; + is( make_text( @active_nodes ), $string, "Got the right text" ); + + @off = $collation->toggle_reading( 'n23' ); + splice( @expected_nodes, 18, 1, [ "n23", 1 ] ); + @active_nodes = $collation->lemma_readings( @off ); + subtest 'Turned on a node colocated to one without fixed position' => \&compare_active; + $string = '# when ... ... showers sweet with ... fruit ... march of ... has pierced unto teh the ... #'; + is( make_text( @active_nodes ), $string, "Got the right text" ); + + @off = $collation->toggle_reading( 'n9' ); + splice( @expected_nodes, 17, 1, [ "n9", 0 ] ); + @active_nodes = $collation->lemma_readings( @off ); + subtest 'Turned on a node colocated to one without fixed position' => \&compare_active; + $string = '# when ... ... showers sweet with ... fruit ... march of ... has pierced unto the ... #'; + is( make_text( @active_nodes ), $string, "Got the right text" ); + + ### Now test relationship madness. + + my( $result, @relations ) = $collation->add_relationship( 'n25', 'n23', {'type' => 'lexical'} ); # rood -> the + ok( $result, "Added relationship between nodes" ); + is( scalar @relations, 1, "Returned only the one collapse" ); + is_deeply( $relations[0], [ 'n25', 'n23' ], "Returned the correct collapse" ); + is( $collation->reading( 'n25' )->position->reference, '9,3', "Harmonized position for n25 correct" ); + is( $collation->reading( 'n23' )->position->reference, '9,3', "Harmonized position for n23 correct" ); + is( $collation->reading( 'n9' )->position->reference, '9,2', "Adjusted position for n9 correct" ); + + # Do some yucky hardcoded cleanup to undo this relationship. + $collation->reading('n25')->position->max( 4 ); + $collation->reading('n9')->position->max( 3 ); + $collation->graph->del_edge( $collation->reading('n25')->edges_to( $collation->reading('n23')) ); + + ( $result, @relations ) = $collation->add_relationship( 'n26', 'n25', {'type' => 'spelling'} ); # root -> rood + ok( $result, "Added relationship between nodes" ); + is( scalar @relations, 1, "Returned only the one collapse" ); + is_deeply( $relations[0], [ 'n26', 'n25' ], "Returned the correct collapse" ); + is( $collation->reading( 'n26' )->position->reference, '9,4', "Harmonized position for n26 correct" ); + is( $collation->reading( 'n25' )->position->reference, '9,4', "Harmonized position for n25 correct" ); + is( $collation->reading( 'n9' )->position->reference, '9,2-3', "Adjusted position for n9 correct" ); + + ( $result, @relations ) = $collation->add_relationship( 'n15', 'n9', {'type' => 'lexical'} ); # bogus march -> teh + ok( !$result, "Refused to add skewed relationship: " . $relations[0] ); + + ( $result, @relations ) = $collation->add_relationship( 'n25', 'n26', {'type' => 'spelling'} ); # root -> rood + ok( !$result, "Refused to add dupe relationship: " . $relations[0] ); + + ( $result, @relations ) = $collation->add_relationship( 'n8', 'n13', {'type' => 'spelling', 'global' => 1 } ); # teh -> the + ok( $result, "Added global relationship between nodes" ); + is( scalar @relations, 2, "Returned two relationship creations" ); + is_deeply( $relations[0], [ 'n8', 'n13' ], "Returned the original collapse" ); + is_deeply( $relations[1], [ 'n9', 'n23' ], "Returned the other collapse" ); + is( $collation->reading( 'n8' )->position->reference, '6,2', "Harmonized position for n8 correct" ); + is( $collation->reading( 'n9' )->position->reference, '9,3', "Harmonized position for n9 correct" ); } -# Test turning on, then off, an annoyingly overlapping node - -@off = $collation->toggle_reading( 'n9' ); -# Remove the old toggle-off -splice( @expected_nodes, 16, 1 ); -splice( @expected_nodes, 17, 0, [ "n9", 1 ] ); -@active_nodes = $collation->lemma_readings( @off ); -subtest 'Turned on a node without fixed position' => \&compare_active; -$string = '# when ... ... showers sweet with ... fruit ... march of ... has pierced unto teh ... ... #'; -is( make_text( @active_nodes ), $string, "Got the right text" ); - -@off = $collation->toggle_reading( 'n23' ); -splice( @expected_nodes, 18, 1, [ "n23", 1 ] ); -@active_nodes = $collation->lemma_readings( @off ); -subtest 'Turned on a node colocated to one without fixed position' => \&compare_active; -$string = '# when ... ... showers sweet with ... fruit ... march of ... has pierced unto teh the ... #'; -is( make_text( @active_nodes ), $string, "Got the right text" ); - -@off = $collation->toggle_reading( 'n9' ); -splice( @expected_nodes, 17, 1, [ "n9", 0 ] ); -@active_nodes = $collation->lemma_readings( @off ); -subtest 'Turned on a node colocated to one without fixed position' => \&compare_active; -$string = '# when ... ... showers sweet with ... fruit ... march of ... has pierced unto the ... #'; -is( make_text( @active_nodes ), $string, "Got the right text" ); - -### Now test relationship madness. - -my( $result, @relations ) = $collation->add_relationship( 'n25', 'n23', {'type' => 'lexical'} ); # rood -> the -ok( $result, "Added relationship between nodes" ); -is( scalar @relations, 1, "Returned only the one collapse" ); -is_deeply( $relations[0], [ 'n25', 'n23' ], "Returned the correct collapse" ); -is( $collation->reading( 'n25' )->position->reference, '9,3', "Harmonized position for n25 correct" ); -is( $collation->reading( 'n23' )->position->reference, '9,3', "Harmonized position for n23 correct" ); -is( $collation->reading( 'n9' )->position->reference, '9,2', "Adjusted position for n9 correct" ); - -# Do some yucky hardcoded cleanup to undo this relationship. -$collation->reading('n25')->position->max( 4 ); -$collation->reading('n9')->position->max( 3 ); -$collation->graph->del_edge( $collation->reading('n25')->edges_to( $collation->reading('n23')) ); - -( $result, @relations ) = $collation->add_relationship( 'n26', 'n25', {'type' => 'spelling'} ); # root -> rood -ok( $result, "Added relationship between nodes" ); -is( scalar @relations, 1, "Returned only the one collapse" ); -is_deeply( $relations[0], [ 'n26', 'n25' ], "Returned the correct collapse" ); -is( $collation->reading( 'n26' )->position->reference, '9,4', "Harmonized position for n26 correct" ); -is( $collation->reading( 'n25' )->position->reference, '9,4', "Harmonized position for n25 correct" ); -is( $collation->reading( 'n9' )->position->reference, '9,2-3', "Adjusted position for n9 correct" ); - -( $result, @relations ) = $collation->add_relationship( 'n15', 'n9', {'type' => 'lexical'} ); # bogus march -> teh -ok( !$result, "Refused to add skewed relationship: " . $relations[0] ); - -( $result, @relations ) = $collation->add_relationship( 'n25', 'n26', {'type' => 'spelling'} ); # root -> rood -ok( !$result, "Refused to add dupe relationship: " . $relations[0] ); - -( $result, @relations ) = $collation->add_relationship( 'n8', 'n13', {'type' => 'spelling', 'global' => 1 } ); # teh -> the -ok( $result, "Added global relationship between nodes" ); -is( scalar @relations, 2, "Returned two relationship creations" ); -is_deeply( $relations[0], [ 'n8', 'n13' ], "Returned the original collapse" ); -is_deeply( $relations[1], [ 'n9', 'n23' ], "Returned the other collapse" ); -is( $collation->reading( 'n8' )->position->reference, '6,2', "Harmonized position for n8 correct" ); -is( $collation->reading( 'n9' )->position->reference, '9,3', "Harmonized position for n9 correct" ); - done_testing();