X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=scpubgit%2Fstemmatology.git;a=blobdiff_plain;f=lib%2FText%2FTradition%2FCollation.pm;h=d3a8567cdcd80a3ebcae936b3807bcce26bd6db8;hp=7176134b18ef4069ada09cd6b0d3c7a36b787d10;hb=96ba0418c65f3450b419aea78db41bf697612b63;hpb=bf6e338dd676742fbd0c6d88c98795adae40429f diff --git a/lib/Text/Tradition/Collation.pm b/lib/Text/Tradition/Collation.pm index 7176134..d3a8567 100644 --- a/lib/Text/Tradition/Collation.pm +++ b/lib/Text/Tradition/Collation.pm @@ -5,10 +5,11 @@ use File::Temp; use File::Which; use Graph; use IPC::Run qw( run binary ); -use Text::CSV_XS; +use Text::CSV; use Text::Tradition::Collation::Reading; use Text::Tradition::Collation::RelationshipStore; use Text::Tradition::Error; +use XML::Easy::Syntax qw( $xml10_namestartchar_rx $xml10_namechar_rx ); use XML::LibXML; use XML::LibXML::XPathContext; use Moose; @@ -30,6 +31,8 @@ has 'relations' => ( related_readings => 'related_readings', get_relationship => 'get_relationship', del_relationship => 'del_relationship', + equivalence => 'equivalence', + equivalence_graph => 'equivalence_graph', }, writer => '_set_relations', ); @@ -37,6 +40,7 @@ has 'relations' => ( has 'tradition' => ( is => 'ro', isa => 'Text::Tradition', + writer => '_set_tradition', weak_ref => 1, ); @@ -270,8 +274,10 @@ See L for the available options. sub BUILD { my $self = shift; $self->_set_relations( Text::Tradition::Collation::RelationshipStore->new( 'collation' => $self ) ); - $self->_set_start( $self->add_reading( { 'collation' => $self, 'is_start' => 1 } ) ); - $self->_set_end( $self->add_reading( { 'collation' => $self, 'is_end' => 1 } ) ); + $self->_set_start( $self->add_reading( + { 'collation' => $self, 'is_start' => 1, 'init' => 1 } ) ); + $self->_set_end( $self->add_reading( + { 'collation' => $self, 'is_end' => 1, 'init' => 1 } ) ); } ### Reading construct/destruct functions @@ -280,6 +286,13 @@ sub add_reading { my( $self, $reading ) = @_; unless( ref( $reading ) eq 'Text::Tradition::Collation::Reading' ) { my %args = %$reading; + if( $args{'init'} ) { + # If we are initializing an empty collation, don't assume that we + # have set a tradition. + delete $args{'init'}; + } elsif( $self->tradition->has_language && !exists $args{'language'} ) { + $args{'language'} = $self->tradition->language; + } $reading = Text::Tradition::Collation::Reading->new( 'collation' => $self, %args ); @@ -338,15 +351,15 @@ $c->flatten_ranks(); ok( $c->reading( 'n21p0' ), "New reading exists" ); is( scalar $c->readings, $rno, "Reading add offset by flatten_ranks" ); -# Combine n3 and n4 +# Combine n3 and n4 ( with his ) $c->merge_readings( 'n3', 'n4', 1 ); ok( !$c->reading('n4'), "Reading n4 is gone" ); is( $c->reading('n3')->text, 'with his', "Reading n3 has both words" ); -# Collapse n25 and n26 -$c->merge_readings( 'n25', 'n26' ); -ok( !$c->reading('n26'), "Reading n26 is gone" ); -is( $c->reading('n25')->text, 'rood', "Reading n25 has an unchanged word" ); +# Collapse n9 and n10 ( rood / root ) +$c->merge_readings( 'n9', 'n10' ); +ok( !$c->reading('n10'), "Reading n10 is gone" ); +is( $c->reading('n9')->text, 'rood', "Reading n9 has an unchanged word" ); # Combine n21 and n21p0 my $remaining = $c->reading('n21'); @@ -362,11 +375,23 @@ is( $c->reading('n21p0')->text, 'unto', "Reading n21p0 merged correctly" ); sub merge_readings { my $self = shift; + # Sanity check + my( $kept_obj, $del_obj, $combine, $combine_char ) = $self->_objectify_args( @_ ); + my $mergemeta = $kept_obj->is_meta; + throw( "Cannot merge meta and non-meta reading" ) + unless ( $mergemeta && $del_obj->is_meta ) + || ( !$mergemeta && !$del_obj->is_meta ); + if( $mergemeta ) { + throw( "Cannot merge with start or end node" ) + if( $kept_obj eq $self->start || $kept_obj eq $self->end + || $del_obj eq $self->start || $del_obj eq $self->end ); + } # We only need the IDs for adding paths to the graph, not the reading # objects themselves. - my( $kept, $deleted, $combine, $combine_char ) = $self->_stringify_args( @_ ); + my $kept = $kept_obj->id; + my $deleted = $del_obj->id; $self->_graphcalc_done(0); - + # The kept reading should inherit the paths and the relationships # of the deleted reading. foreach my $path ( $self->sequence->edges_at( $deleted ) ) { @@ -380,12 +405,10 @@ sub merge_readings { @wits{keys %$fwits} = values %$fwits; $self->sequence->set_edge_attributes( @vector, \%wits ); } - $self->relations->merge_readings( $kept, $deleted, $combine_char ); + $self->relations->merge_readings( $kept, $deleted, $combine ); # Do the deletion deed. if( $combine ) { - my $kept_obj = $self->reading( $kept ); - my $del_obj = $self->reading( $deleted ); my $joinstr = $combine_char; unless( defined $joinstr ) { $joinstr = '' if $kept_obj->join_next || $del_obj->join_prior; @@ -427,10 +450,13 @@ sub add_path { $self->_graphcalc_done(0); # Connect the readings - $self->sequence->add_edge( $source, $target ); + unless( $self->sequence->has_edge( $source, $target ) ) { + $self->sequence->add_edge( $source, $target ); + $self->relations->add_equivalence_edge( $source, $target ); + } # Note the witness in question $self->sequence->set_edge_attribute( $source, $target, $wit, 1 ); -}; +} sub del_path { my $self = shift; @@ -452,6 +478,7 @@ sub del_path { } unless( keys %{$self->sequence->get_edge_attributes( $source, $target )} ) { $self->sequence->delete_edge( $source, $target ); + $self->relations->delete_equivalence_edge( $source, $target ); } } @@ -494,8 +521,7 @@ sub clear_witness { sub add_relationship { my $self = shift; my( $source, $target, $opts ) = $self->_stringify_args( @_ ); - my( @vectors ) = $self->relations->add_relationship( $source, - $self->reading( $source ), $target, $self->reading( $target ), $opts ); + my( @vectors ) = $self->relations->add_relationship( $source, $target, $opts ); $self->_graphcalc_done(0); return @vectors; } @@ -550,7 +576,8 @@ sub as_svg { throw( "Need GraphViz installed to output SVG" ) unless File::Which::which( 'dot' ); my $want_subgraph = exists $opts->{'from'} || exists $opts->{'to'}; - $self->calculate_ranks() unless $self->_graphcalc_done; + $self->calculate_ranks() + unless( $self->_graphcalc_done || $opts->{'nocalc'} || !$self->linear ); if( !$self->has_cached_svg || $opts->{'recalc'} || $want_subgraph ) { my @cmd = qw/dot -Tsvg/; my( $svg, $err ); @@ -594,6 +621,7 @@ sub as_dot { my $color_common = $opts->{'color_common'} if $opts; my $STRAIGHTENHACK = !$startrank && !$endrank && $self->end->rank && $self->end->rank > 100; + $STRAIGHTENHACK = 1 if $opts->{'straight'}; # even for subgraphs or small graphs # Check the arguments if( $startrank ) { @@ -631,14 +659,15 @@ sub as_dot { # Output substitute start/end readings if necessary if( $startrank ) { - $dot .= "\t\"#SUBSTART#\" [ label=\"...\" ];\n"; + $dot .= "\t\"__SUBSTART__\" [ label=\"...\",id=\"__START__\" ];\n"; } if( $endrank ) { - $dot .= "\t\"#SUBEND#\" [ label=\"...\" ];\n"; + $dot .= "\t\"__SUBEND__\" [ label=\"...\",id=\"__END__\" ];\n"; } if( $STRAIGHTENHACK ) { ## HACK part 1 - $dot .= "\tsubgraph { rank=same \"#START#\" \"#SILENT#\" }\n"; + my $startlabel = $startrank ? '__SUBSTART__' : '__START__'; + $dot .= "\tsubgraph { rank=same \"$startlabel\" \"#SILENT#\" }\n"; $dot .= "\t\"#SILENT#\" [ shape=diamond,color=white,penwidth=0,label=\"\" ];" } my %used; # Keep track of the readings that actually appear in the graph @@ -660,6 +689,7 @@ sub as_dot { $label = "-$label" if $reading->join_prior; $label =~ s/\"/\\\"/g; $rattrs->{'label'} = $label; + $rattrs->{'id'} = $reading->id; $rattrs->{'fillcolor'} = '#b3f36d' if $reading->is_common && $color_common; $dot .= sprintf( "\t\"%s\" %s;\n", $reading->id, _dot_attr_string( $rattrs ) ); } @@ -699,27 +729,33 @@ sub as_dot { $dot .= sprintf( "\t\"%s\" -> \"%s\" %s;\n", $edge->[0], $edge->[1], $varopts ); } elsif( $used{$edge->[0]} ) { - $subend{$edge->[0]} = 1; + $subend{$edge->[0]} = $edge->[1]; } elsif( $used{$edge->[1]} ) { - $substart{$edge->[1]} = 1; + $substart{$edge->[1]} = $edge->[0]; } } # Add substitute start and end edges if necessary foreach my $node ( keys %substart ) { - my $witstr = $self->_path_display_label ( $self->reading_witnesses( $self->reading( $node ) ) ); + my $witstr = $self->_path_display_label ( $self->path_witnesses( $substart{$node}, $node ) ); my $variables = { %edge_attrs, 'label' => $witstr }; + my $nrdg = $self->reading( $node ); + if( $nrdg->has_rank && $nrdg->rank > $startrank ) { + # Substart is actually one lower than $startrank + $variables->{'minlen'} = $nrdg->rank - ( $startrank - 1 ); + } my $varopts = _dot_attr_string( $variables ); - $dot .= "\t\"#SUBSTART#\" -> \"$node\" $varopts;"; + $dot .= "\t\"__SUBSTART__\" -> \"$node\" $varopts;\n"; } foreach my $node ( keys %subend ) { - my $witstr = $self->_path_display_label ( $self->reading_witnesses( $self->reading( $node ) ) ); + my $witstr = $self->_path_display_label ( $self->path_witnesses( $node, $subend{$node} ) ); my $variables = { %edge_attrs, 'label' => $witstr }; my $varopts = _dot_attr_string( $variables ); - $dot .= "\t\"$node\" -> \"#SUBEND#\" $varopts;"; + $dot .= "\t\"$node\" -> \"__SUBEND__\" $varopts;\n"; } # HACK part 2 if( $STRAIGHTENHACK ) { - $dot .= "\t\"#END#\" -> \"#SILENT#\" [ color=white,penwidth=0 ];\n"; + my $endlabel = $endrank ? '__SUBEND__' : '__END__'; + $dot .= "\t\"$endlabel\" -> \"#SILENT#\" [ color=white,penwidth=0 ];\n"; } $dot .= "}\n"; @@ -780,15 +816,35 @@ sub path_witnesses { return @wits; } +# Helper function. Make a display label for the given witnesses, showing a.c. +# witnesses only where the main witness is not also in the list. sub _path_display_label { my $self = shift; - my @wits = sort @_; + my %wits; + map { $wits{$_} = 1 } @_; + + # If an a.c. wit is listed, remove it if the main wit is also listed. + # Otherwise keep it for explicit listing. + my $aclabel = $self->ac_label; + my @disp_ac; + foreach my $w ( sort keys %wits ) { + if( $w =~ /^(.*)\Q$aclabel\E$/ ) { + if( exists $wits{$1} ) { + delete $wits{$w}; + } else { + push( @disp_ac, $w ); + } + } + } + + # See if we are in a majority situation. my $maj = scalar( $self->tradition->witnesses ) * 0.6; - if( scalar @wits > $maj ) { - # TODO break out a.c. wits - return 'majority'; + $maj = $maj > 5 ? $maj : 5; + if( scalar keys %wits > $maj ) { + unshift( @disp_ac, 'majority' ); + return join( ', ', @disp_ac ); } else { - return join( ', ', @wits ); + return join( ', ', sort keys %wits ); } } @@ -854,14 +910,37 @@ is( scalar $st->collation->readings, $READINGS, "Reparsed collation has all read is( scalar $st->collation->paths, $PATHS, "Reparsed collation has all paths" ); is( scalar $st->collation->relationships, 3, "Reparsed collation has new relationships" ); +# Now add a stemma, write to GraphML, and parse again. +my $stemma = $tradition->add_stemma( 'dotfile' => 't/data/florilegium.dot' ); +is( ref( $stemma ), 'Text::Tradition::Stemma', "Parsed dotfile into stemma" ); +is( $tradition->stemmata, 1, "Tradition now has the stemma" ); +$graphml = $c->as_graphml; +like( $graphml, qr/digraph/, "Digraph declaration exists in GraphML" ); + =end testing =cut sub as_graphml { - my( $self ) = @_; + my( $self, $options ) = @_; $self->calculate_ranks unless $self->_graphcalc_done; + my $start = $options->{'from'} + ? $self->reading( $options->{'from'} ) : $self->start; + my $end = $options->{'to'} + ? $self->reading( $options->{'to'} ) : $self->end; + if( $start->has_rank && $end->has_rank && $end->rank < $start->rank ) { + throw( 'Start node must be before end node' ); + } + # The readings need to be ranked for this to work. + $start = $self->start unless $start->has_rank; + $end = $self->end unless $end->has_rank; + my $rankoffset = 0; + unless( $start eq $self->start ) { + $rankoffset = $start->rank - 1; + } + my %use_readings; + # Some namespaces my $graphml_ns = 'http://graphml.graphdrawing.org/xmlns'; my $xsi_ns = 'http://www.w3.org/2001/XMLSchema-instance'; @@ -881,6 +960,7 @@ sub as_graphml { 'Str' => 'string', 'Int' => 'int', 'Bool' => 'boolean', + 'ReadingID' => 'string', 'RelationshipType' => 'string', 'RelationshipScope' => 'string', ); @@ -907,6 +987,8 @@ sub as_graphml { next unless $save_types{$attr->type_constraint->name}; $graph_attributes{$attr->name} = $save_types{$attr->type_constraint->name}; } + # Extra custom key for the tradition stemma(ta) + $graph_attributes{'stemmata'} = 'string'; foreach my $datum ( sort keys %graph_attributes ) { $graph_data_keys{$datum} = 'dg'.$gdi++; @@ -926,6 +1008,9 @@ sub as_graphml { next unless $save_types{$attr->type_constraint->name}; $reading_attributes{$attr->name} = $save_types{$attr->type_constraint->name}; } + # Extra custom key for the reading morphology + $reading_attributes{'lexemes'} = 'string'; + my %node_data_keys; my $ndi = 0; foreach my $datum ( sort keys %reading_attributes ) { @@ -962,21 +1047,31 @@ sub as_graphml { $key->setAttribute( 'id', $edge_data_keys{$datum} ); } - # Add the collation graph itself + # Add the collation graph itself. First, sanitize the name to a valid XML ID. + my $xmlidname = $self->tradition->name; + $xmlidname =~ s/(?!$xml10_namechar_rx)./_/g; + if( $xmlidname !~ /^$xml10_namestartchar_rx/ ) { + $xmlidname = '_'.$xmlidname; + } my $sgraph = $root->addNewChild( $graphml_ns, 'graph' ); $sgraph->setAttribute( 'edgedefault', 'directed' ); - $sgraph->setAttribute( 'id', $self->tradition->name ); + $sgraph->setAttribute( 'id', $xmlidname ); $sgraph->setAttribute( 'parse.edgeids', 'canonical' ); - $sgraph->setAttribute( 'parse.edges', scalar($self->paths) ); + $sgraph->setAttribute( 'parse.edges', 0 ); # fill in later $sgraph->setAttribute( 'parse.nodeids', 'canonical' ); - $sgraph->setAttribute( 'parse.nodes', scalar($self->readings) ); + $sgraph->setAttribute( 'parse.nodes', 0 ); # fill in later $sgraph->setAttribute( 'parse.order', 'nodesfirst' ); - # Collation attribute data + # Tradition/collation attribute data foreach my $datum ( keys %graph_attributes ) { my $value; if( $datum eq 'version' ) { - $value = '3.1'; + $value = '3.2'; + } elsif( $datum eq 'stemmata' ) { + my @stemstrs; + map { push( @stemstrs, $_->editable( {linesep => ''} ) ) } + $self->tradition->stemmata; + $value = join( "\n", @stemstrs ); } elsif( $gattr_from{$datum} eq 'Tradition' ) { $value = $self->tradition->$datum; } else { @@ -989,6 +1084,9 @@ sub as_graphml { my %node_hash; # Add our readings to the graph foreach my $n ( sort { $a->id cmp $b->id } $self->readings ) { + next if $n->has_rank && $n ne $self->start && $n ne $self->end && + ( $n->rank < $start->rank || $n->rank > $end->rank ); + $use_readings{$n->id} = 1; # Add to the main graph my $node_el = $sgraph->addNewChild( $graphml_ns, 'node' ); my $node_xmlid = 'n' . $node_ctr++; @@ -996,6 +1094,20 @@ sub as_graphml { $node_el->setAttribute( 'id', $node_xmlid ); foreach my $d ( keys %reading_attributes ) { my $nval = $n->$d; + # Custom serialization + if( $d eq 'lexemes' ) { + # If nval is a true value, we have lexemes so we need to + # serialize them. Otherwise set nval to undef so that the + # key is excluded from this reading. + $nval = $nval ? $n->_serialize_lexemes : undef; + } elsif( $d eq 'normal_form' && $n->normal_form eq $n->text ) { + $nval = undef; + } + if( $rankoffset && $d eq 'rank' && $n ne $self->start ) { + # Adjust the ranks within the subgraph. + $nval = $n eq $self->end ? $end->rank - $rankoffset + 1 + : $nval - $rankoffset; + } _add_graphml_data( $node_el, $node_data_keys{$d}, $nval ) if defined $nval; } @@ -1005,7 +1117,13 @@ sub as_graphml { my $edge_ctr = 0; foreach my $e ( sort { $a->[0] cmp $b->[0] } $self->sequence->edges() ) { # We add an edge in the graphml for every witness in $e. - foreach my $wit ( sort $self->path_witnesses( $e ) ) { + next unless( $use_readings{$e->[0]} || $use_readings{$e->[1]} ); + my @edge_wits = sort $self->path_witnesses( $e ); + $e->[0] = $self->start->id unless $use_readings{$e->[0]}; + $e->[1] = $self->end->id unless $use_readings{$e->[1]}; + # Skip any path from start to end; that witness is not in the subgraph. + next if ( $e->[0] eq $self->start->id && $e->[1] eq $self->end->id ); + foreach my $wit ( @edge_wits ) { my( $id, $from, $to ) = ( 'e'.$edge_ctr++, $node_hash{ $e->[0] }, $node_hash{ $e->[1] } ); @@ -1029,6 +1147,10 @@ sub as_graphml { } } + # Report the actual number of nodes and edges that went in + $sgraph->setAttribute( 'parse.edges', $edge_ctr ); + $sgraph->setAttribute( 'parse.nodes', $node_ctr ); + # Add the relationship graph to the XML map { delete $edge_data_keys{$_} } @path_attributes; $self->relations->_as_graphml( $graphml_ns, $root, \%node_hash, @@ -1057,7 +1179,7 @@ row per witness (or witness uncorrected.) sub as_csv { my( $self ) = @_; my $table = $self->alignment_table; - my $csv = Text::CSV_XS->new( { binary => 1, quote_null => 0 } ); + my $csv = Text::CSV->new( { binary => 1, quote_null => 0 } ); my @result; # Make the header row $csv->combine( map { $_->{'witness'} } @{$table->{'alignment'}} ); @@ -1303,7 +1425,7 @@ sub common_readings { return @common; } -=head2 path_text( $sigil, $mainsigil [, $start, $end ] ) +=head2 path_text( $sigil, [, $start, $end ] ) Returns the text of a witness (plus its backup, if we are using a layer) as stored in the collation. The text is returned as a string, where the @@ -1321,11 +1443,10 @@ sub path_text { my $pathtext = ''; my $last; foreach my $r ( @path ) { - if( $r->join_prior || !$last || $last->join_next ) { - $pathtext .= $r->text; - } else { - $pathtext .= ' ' . $r->text; - } + unless ( $r->join_prior || !$last || $last->join_next ) { + $pathtext .= ' '; + } + $pathtext .= $r->text; $last = $r; } return $pathtext; @@ -1365,11 +1486,16 @@ sub make_witness_path { my( $self, $wit ) = @_; my @chain = @{$wit->path}; my $sig = $wit->sigil; + # Add start and end if necessary + unshift( @chain, $self->start ) unless $chain[0] eq $self->start; + push( @chain, $self->end ) unless $chain[-1] eq $self->end; foreach my $idx ( 0 .. $#chain-1 ) { $self->add_path( $chain[$idx], $chain[$idx+1], $sig ); } if( $wit->is_layered ) { @chain = @{$wit->uncorrected_path}; + unshift( @chain, $self->start ) unless $chain[0] eq $self->start; + push( @chain, $self->end ) unless $chain[-1] eq $self->end; foreach my $idx( 0 .. $#chain-1 ) { my $source = $chain[$idx]; my $target = $chain[$idx+1]; @@ -1404,7 +1530,7 @@ ok( $c->has_cached_table, "Alignment table was cached" ); is( $c->alignment_table, $table, "Cached table returned upon second call" ); $c->calculate_ranks; is( $c->alignment_table, $table, "Cached table retained with no rank change" ); -$c->add_relationship( 'n9', 'n23', { 'type' => 'spelling' } ); +$c->add_relationship( 'n24', 'n23', { 'type' => 'spelling' } ); isnt( $c->alignment_table, $table, "Alignment table changed after relationship add" ); =end testing @@ -1415,58 +1541,20 @@ sub calculate_ranks { my $self = shift; # Save the existing ranks, in case we need to invalidate the cached SVG. my %existing_ranks; - # Walk a version of the graph where every node linked by a relationship - # edge is fundamentally the same node, and do a topological ranking on - # the nodes in this graph. - my $topo_graph = Graph->new(); - my %rel_containers; - my $rel_ctr = 0; - # Add the nodes - foreach my $r ( $self->readings ) { - next if exists $rel_containers{$r->id}; - my @rels = $r->related_readings( 'colocated' ); - if( @rels ) { - # Make a relationship container. - push( @rels, $r ); - my $rn = 'rel_container_' . $rel_ctr++; - $topo_graph->add_vertex( $rn ); - foreach( @rels ) { - $rel_containers{$_->id} = $rn; - } - } else { - # Add a new node to mirror the old node. - $rel_containers{$r->id} = $r->id; - $topo_graph->add_vertex( $r->id ); - } - } + map { $existing_ranks{$_} = $_->rank } $self->readings; + + # Do the rankings based on the relationship equivalence graph, starting + # with the start node. + my ( $node_ranks, $rank_nodes ) = $self->relations->equivalence_ranks(); - # Add the edges. - foreach my $r ( $self->readings ) { - $existing_ranks{$r} = $r->rank; - foreach my $n ( $self->sequence->successors( $r->id ) ) { - my( $tfrom, $tto ) = ( $rel_containers{$r->id}, - $rel_containers{$n} ); - # $DB::single = 1 unless $tfrom && $tto; - $topo_graph->add_edge( $tfrom, $tto ); - } - } - - # Now do the rankings, starting with the start node. - my $topo_start = $rel_containers{$self->start->id}; - my $node_ranks = { $topo_start => 0 }; - my @curr_origin = ( $topo_start ); - # A little iterative function. - while( @curr_origin ) { - @curr_origin = _assign_rank( $topo_graph, $node_ranks, @curr_origin ); - } # Transfer our rankings from the topological graph to the real one. foreach my $r ( $self->readings ) { - if( defined $node_ranks->{$rel_containers{$r->id}} ) { - $r->rank( $node_ranks->{$rel_containers{$r->id}} ); + if( defined $node_ranks->{$self->equivalence( $r->id )} ) { + $r->rank( $node_ranks->{$self->equivalence( $r->id )} ); } else { # Die. Find the last rank we calculated. - my @all_defined = sort { $node_ranks->{$rel_containers{$a->id}} - <=> $node_ranks->{$rel_containers{$b->id}} } + my @all_defined = sort { ( $node_ranks->{$self->equivalence( $a->id )}||-1 ) + <=> ( $node_ranks->{$self->equivalence( $b->id )}||-1 ) } $self->readings; my $last = pop @all_defined; throw( "Ranks not calculated after $last - do you have a cycle in the graph?" ); @@ -1488,41 +1576,6 @@ sub calculate_ranks { $self->_graphcalc_done(1); } -sub _assign_rank { - my( $graph, $node_ranks, @current_nodes ) = @_; - # Look at each of the children of @current_nodes. If all the child's - # parents have a rank, assign it the highest rank + 1 and add it to - # @next_nodes. Otherwise skip it; we will return when the highest-ranked - # parent gets a rank. - my @next_nodes; - foreach my $c ( @current_nodes ) { - warn "Current reading $c has no rank!" - unless exists $node_ranks->{$c}; - # print STDERR "Looking at child of node $c, rank " - # . $node_ranks->{$c} . "\n"; - foreach my $child ( $graph->successors( $c ) ) { - next if exists $node_ranks->{$child}; - my $highest_rank = -1; - my $skip = 0; - foreach my $parent ( $graph->predecessors( $child ) ) { - if( exists $node_ranks->{$parent} ) { - $highest_rank = $node_ranks->{$parent} - if $highest_rank <= $node_ranks->{$parent}; - } else { - $skip = 1; - last; - } - } - next if $skip; - my $c_rank = $highest_rank + 1; - # print STDERR "Assigning rank $c_rank to node $child \n"; - $node_ranks->{$child} = $c_rank; - push( @next_nodes, $child ); - } - } - return @next_nodes; -} - sub _clear_cache { my $self = shift; $self->wipe_svg if $self->has_cached_svg; @@ -1545,8 +1598,17 @@ sub flatten_ranks { next unless $rdg->has_rank; my $key = $rdg->rank . "||" . $rdg->text; if( exists $unique_rank_rdg{$key} ) { + # Make sure they don't have different grammatical forms + my $ur = $unique_rank_rdg{$key}; + if( $rdg->disambiguated && $ur->disambiguated ) { + my $rform = join( '//', map { $_->form->to_string } $rdg->lexemes ); + my $uform = join( '//', map { $_->form->to_string } $ur->lexemes ); + next unless $rform eq $uform; + } elsif( $rdg->disambiguated xor $ur->disambiguated ) { + next; + } # Combine! - # print STDERR "Combining readings at same rank: $key\n"; + #print STDERR "Combining readings at same rank: $key\n"; $changed = 1; $self->merge_readings( $unique_rank_rdg{$key}, $rdg ); # TODO see if this now makes a common point. @@ -1582,7 +1644,7 @@ my @common = $c->calculate_common_readings(); is( scalar @common, 8, "Found correct number of common readings" ); my @marked = sort $c->common_readings(); is( scalar @common, 8, "All common readings got marked as such" ); -my @expected = qw/ n1 n12 n16 n19 n20 n5 n6 n7 /; +my @expected = qw/ n1 n11 n16 n19 n20 n5 n6 n7 /; is_deeply( \@marked, \@expected, "Found correct list of common readings" ); =end testing @@ -1627,14 +1689,22 @@ original texts. sub text_from_paths { my $self = shift; foreach my $wit ( $self->tradition->witnesses ) { - my @text = split( /\s+/, - $self->reading_sequence( $self->start, $self->end, $wit->sigil ) ); + my @readings = $self->reading_sequence( $self->start, $self->end, $wit->sigil ); + my @text; + foreach my $r ( @readings ) { + next if $r->is_meta; + push( @text, $r->text ); + } $wit->text( \@text ); if( $wit->is_layered ) { - my @uctext = split( /\s+/, - $self->reading_sequence( $self->start, $self->end, - $wit->sigil.$self->ac_label ) ); - $wit->text( \@uctext ); + my @ucrdgs = $self->reading_sequence( $self->start, $self->end, + $wit->sigil.$self->ac_label ); + my @uctext; + foreach my $r ( @ucrdgs ) { + next if $r->is_meta; + push( @uctext, $r->text ); + } + $wit->layertext( \@uctext ); } } } @@ -1644,10 +1714,12 @@ sub text_from_paths { =head2 common_predecessor( $reading_a, $reading_b ) Find the last reading that occurs in sequence before both the given readings. +At the very least this should be $self->start. =head2 common_successor( $reading_a, $reading_b ) Find the first reading that occurs in sequence after both the given readings. +At the very least this should be $self->end. =begin testing @@ -1661,15 +1733,15 @@ my $t = Text::Tradition->new( ); my $c = $t->collation; -is( $c->common_predecessor( 'n9', 'n23' )->id, +is( $c->common_predecessor( 'n24', 'n23' )->id, 'n20', "Found correct common predecessor" ); -is( $c->common_successor( 'n9', 'n23' )->id, - '#END#', "Found correct common successor" ); +is( $c->common_successor( 'n24', 'n23' )->id, + '__END__', "Found correct common successor" ); is( $c->common_predecessor( 'n19', 'n17' )->id, 'n16', "Found correct common predecessor for readings on same path" ); -is( $c->common_successor( 'n21', 'n26' )->id, - '#END#', "Found correct common successor for readings on same path" ); +is( $c->common_successor( 'n21', 'n10' )->id, + '__END__', "Found correct common successor for readings on same path" ); =end testing @@ -1688,26 +1760,45 @@ sub common_successor { return $self->_common_in_path( $r1, $r2, 'successors' ); } + +# TODO think about how to do this without ranks... sub _common_in_path { my( $self, $r1, $r2, $dir ) = @_; - my $iter = $r1->rank > $r2->rank ? $r1->rank : $r2->rank; - $iter = $self->end->rank - $iter if $dir eq 'successors'; + my $iter = $self->end->rank; my @candidates; - my @last_checked = ( $r1, $r2 ); + my @last_r1 = ( $r1 ); + my @last_r2 = ( $r2 ); + # my %all_seen = ( $r1 => 'r1', $r2 => 'r2' ); my %all_seen; + # print STDERR "Finding common $dir for $r1, $r2\n"; while( !@candidates ) { - my @new_lc; - foreach my $lc ( @last_checked ) { + last unless $iter--; # Avoid looping infinitely + # Iterate separately down the graph from r1 and r2 + my( @new_lc1, @new_lc2 ); + foreach my $lc ( @last_r1 ) { + foreach my $p ( $lc->$dir ) { + if( $all_seen{$p->id} && $all_seen{$p->id} ne 'r1' ) { + # print STDERR "Path candidate $p from $lc\n"; + push( @candidates, $p ); + } elsif( !$all_seen{$p->id} ) { + $all_seen{$p->id} = 'r1'; + push( @new_lc1, $p ); + } + } + } + foreach my $lc ( @last_r2 ) { foreach my $p ( $lc->$dir ) { - if( $all_seen{$p->id} ) { + if( $all_seen{$p->id} && $all_seen{$p->id} ne 'r2' ) { + # print STDERR "Path candidate $p from $lc\n"; push( @candidates, $p ); - } else { - $all_seen{$p->id} = 1; - push( @new_lc, $p ); + } elsif( !$all_seen{$p->id} ) { + $all_seen{$p->id} = 'r2'; + push( @new_lc2, $p ); } } } - @last_checked = @new_lc; + @last_r1 = @new_lc1; + @last_r2 = @new_lc2; } my @answer = sort { $a->rank <=> $b->rank } @candidates; return $dir eq 'predecessors' ? pop( @answer ) : shift ( @answer );