X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FText%2FTradition%2FCollation%2FRelationshipStore.pm;h=4342bd98b79b209a991c37f034e8460a126a7095;hb=428bcf0bc79f77a7857b21ef881708faa792e33a;hp=253486d0243548e1f32ba00a1f90ae93f4b6e552;hpb=56772e8c48876c670c0cdb26451f4c59401795ef;p=scpubgit%2Fstemmatology.git diff --git a/lib/Text/Tradition/Collation/RelationshipStore.pm b/lib/Text/Tradition/Collation/RelationshipStore.pm index 253486d..4342bd9 100644 --- a/lib/Text/Tradition/Collation/RelationshipStore.pm +++ b/lib/Text/Tradition/Collation/RelationshipStore.pm @@ -196,18 +196,9 @@ sub create { } } - # Check to see if a nonlocal relationship is defined for the two readings - $rel = $self->scoped_relationship( $options->{'reading_a'}, - $options->{'reading_b'} ); - if( $rel && $rel->type eq $options->{'type'} ) { - return $rel; - } elsif( $rel ) { - throw( sprintf( "Relationship of type %s with scope %s already defined for readings %s and %s", $rel->type, $rel->scope, $options->{'reading_a'}, $options->{'reading_b'} ) ); - } else { - $rel = Text::Tradition::Collation::Relationship->new( $options ); - $self->add_scoped_relationship( $rel ) if $rel->nonlocal; - return $rel; - } + $rel = Text::Tradition::Collation::Relationship->new( $options ); + $self->add_scoped_relationship( $rel ) if $rel->nonlocal; + return $rel; } =head2 add_scoped_relationship( $rel ) @@ -241,8 +232,12 @@ between the two reading strings. Returns undef if there is no general relationsh sub scoped_relationship { my( $self, $rdga, $rdgb ) = @_; my( $first, $second ) = sort( $rdga, $rdgb ); + my( $lcfirst, $lcsecond ) = sort( lc( $rdga ), lc( $rdgb ) ); if( exists $self->scopedrels->{$first}->{$second} ) { return $self->scopedrels->{$first}->{$second}; + } elsif( exists $self->scopedrels->{$lcfirst}->{$lcsecond} ) { + my $rel = $self->scopedrels->{$lcfirst}->{$lcsecond}; + return $rel->type ne 'orthographic' ? $rel : undef; } else { return undef; } @@ -311,6 +306,16 @@ try { "Relationship link prevented for a meta reading" ); } +# Test 1.4: try to break a relationship near a meta reading +$c1->add_relationship( 'r7.6', 'r7.3', { type => 'orthographic' } ); +try { + $c1->del_relationship( 'r7.6', 'r7.7' ); + $c1->del_relationship( 'r7.6', 'r7.3' ); + ok( 1, "Relationship broken with a meta reading as neighbor" ); +} catch { + ok( 0, "Relationship deletion failed with a meta reading as neighbor" ); +} + # Test 2.1: try to equate nodes that are prevented with a real intermediate # equivalence my $t2; @@ -418,27 +423,21 @@ sub add_relationship { if( $options->{'scope'} ne 'local' ) { # Is there a relationship with this a & b already? # Case-insensitive for non-orthographics. - my $rdga = $options->{'type'} eq 'orthographic' - ? $options->{'reading_a'} : lc( $options->{'reading_a'} ); - my $rdgb = $options->{'type'} eq 'orthographic' - ? $options->{'reading_b'} : lc( $options->{'reading_b'} ); + my $rdga = $options->{'reading_a'}; + my $rdgb = $options->{'reading_b'}; my $otherrel = $self->scoped_relationship( $rdga, $rdgb ); if( $otherrel && $otherrel->type eq $options->{type} && $otherrel->scope eq $options->{scope} ) { - warn "Applying existing scoped relationship"; + warn "Applying existing scoped relationship for $rdga / $rdgb"; $relationship = $otherrel; + } elsif( $otherrel ) { + throw( "Conflicting scoped relationship for $rdga / $rdgb at $source / $target" ); } } $relationship = $self->create( $options ) unless $relationship; # Will throw on error } - # Find all the pairs for which we need to set the relationship. - my @vectors; - if( $relationship->colocated && $relationship->nonlocal && !$thispaironly ) { - push( @vectors, $self->_find_applicable( $relationship ) ); - } - # Now set the relationship(s). my @pairs_set; my $rel = $self->get_relationship( $source, $target ); @@ -461,19 +460,58 @@ sub add_relationship { $self->_set_relationship( $relationship, $source, $target ) unless $skip; push( @pairs_set, [ $source, $target ] ); - # Set any additional relationships that might be in @vectors. - foreach my $v ( @vectors ) { - next if $v->[0] eq $source && $v->[1] eq $target; - next if $v->[1] eq $source && $v->[0] eq $target; - my @added = $self->add_relationship( @$v, $relationship ); - push( @pairs_set, @added ); + # Find all the pairs for which we need to set the relationship. + if( $relationship->colocated && $relationship->nonlocal && !$thispaironly ) { + push( @pairs_set, $self->add_global_relationship( $relationship ) ); } - # Finally, restore whatever collations we can, and return. $self->_restore_collations( @$droppedcolls ); return @pairs_set; } +=head2 add_global_relationship( $options, $skipvector ) + +Adds the relationship specified wherever the relevant readings appear together +in the graph. Options as in add_relationship above. + +=cut + +sub add_global_relationship { + my( $self, $options ) = @_; + # First see if we are dealing with a relationship object already + my $relationship; + if( ref( $options ) eq 'Text::Tradition::Collation::Relationship' ) { + $relationship = $options; + } else { + # Then see if a scoped relationship already applies for the words. + my $scopedrel = $self->scoped_relationship( + $options->{reading_a}, $options->{reading_b} ); + $relationship = $scopedrel ? $scopedrel + : $self->create( $options ); + } + # Sanity checking + throw( "Relationship passed to add_global is not global" ) + unless $relationship->nonlocal; + throw( "Relationship passed to add_global is not a valid global type" ) + unless $relationship->colocated && $relationship->type ne 'collated'; + + # Apply the relationship wherever it is valid + my @pairs_set; + foreach my $v ( $self->_find_applicable( $relationship ) ) { + my $exists = $self->get_relationship( @$v ); + if( $exists && $exists->type ne 'collated' ) { + throw( "Found conflicting relationship at @$v" ) + unless $exists->type eq $relationship->type + && $exists->scope eq $relationship->scope; + } else { + my @added = $self->add_relationship( @$v, $relationship ); + push( @pairs_set, @added ); + } + } + return @pairs_set; +} + + =head2 del_scoped_relationship( $reading_a, $reading_b ) Returns the general (document-level or global) relationship that has been defined @@ -707,6 +745,9 @@ sub related_readings { # Backwards compat if( $filter eq 'colocated' ) { $filter = sub { $_[0]->colocated }; + } elsif( !ref( $filter ) ) { + my $type = $filter; + $filter = sub { $_[0]->type eq $type }; } my %found = ( $reading => 1 ); my $check = [ $reading ]; @@ -796,7 +837,6 @@ sub add_equivalence_edge { my( $self, $source, $target ) = @_; my $seq = $self->equivalence( $source ); my $teq = $self->equivalence( $target ); - return unless $seq && $teq; $self->equivalence_graph->add_edge( $seq, $teq ); } @@ -951,9 +991,11 @@ sub _break_equivalence { my $c = $self->collation; foreach my $rdg ( @$newmembers ) { foreach my $rp ( $c->sequence->predecessors( $rdg ) ) { + next unless $self->equivalence( $rp ); $self->equivalence_graph->add_edge( $self->equivalence( $rp ), $newgroup ); } foreach my $rs ( $c->sequence->successors( $rdg ) ) { + next unless $self->equivalence( $rs ); $self->equivalence_graph->add_edge( $newgroup, $self->equivalence( $rs ) ); } } @@ -962,9 +1004,11 @@ sub _break_equivalence { my( %old_pred, %old_succ ); foreach my $rdg ( @$oldmembers ) { foreach my $rp ( $c->sequence->predecessors( $rdg ) ) { + next unless $self->equivalence( $rp ); $old_pred{$self->equivalence( $rp )} = 1; } foreach my $rs ( $c->sequence->successors( $rdg ) ) { + next unless $self->equivalence( $rs ); $old_succ{$self->equivalence( $rs )} = 1; } } @@ -1020,6 +1064,7 @@ sub rebuild_equivalence { $self->_clear_equivalence; $self->_clear_eqreadings; + $self->collation->tradition->_init_done(0); # Add the readings foreach my $r ( $self->collation->readings ) { my $rid = $r->id; @@ -1040,6 +1085,7 @@ sub rebuild_equivalence { next unless $relobj && $relobj->colocated; $self->_make_equivalence( @$rel ); } + $self->collation->tradition->_init_done(1); } =head2 equivalence_ranks