X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FText%2FTradition%2FCollation%2FRelationshipStore.pm;h=aeb8b7f8e1302f52ad2b991201181b6e977d7e23;hb=cecbe56d2d40d98548a5d2a155fbf847ce0e7bbc;hp=bbfc50d35bd4f10186c30e5f411c23a023c528bb;hpb=10e4b1acc8fc6607456481c568da930983efac33;p=scpubgit%2Fstemmatology.git

diff --git a/lib/Text/Tradition/Collation/RelationshipStore.pm b/lib/Text/Tradition/Collation/RelationshipStore.pm
index bbfc50d..aeb8b7f 100644
--- a/lib/Text/Tradition/Collation/RelationshipStore.pm
+++ b/lib/Text/Tradition/Collation/RelationshipStore.pm
@@ -31,10 +31,10 @@ use_ok( 'Text::Tradition::Collation::RelationshipStore' );
 
 my $cxfile = 't/data/Collatex-16.xml';
 my $t = Text::Tradition->new( 
-    'name'  => 'inline', 
-    'input' => 'CollateX',
-    'file'  => $cxfile,
-    );
+	'name'  => 'inline', 
+	'input' => 'CollateX',
+	'file'  => $cxfile,
+	);
 my $c = $t->collation;
 
 my @v1 = $c->add_relationship( 'n21', 'n22', { 'type' => 'lexical' } );
@@ -260,10 +260,16 @@ add_relationship.
 
 =begin testing
 
+use Test::Warn;
 use Text::Tradition;
 use TryCatch;
 
-my $t1 = Text::Tradition->new( 'input' => 'Self', 'file' => 't/data/legendfrag.xml' );
+my $t1;
+warning_is {
+	$t1 = Text::Tradition->new( 'input' => 'Self', 'file' => 't/data/legendfrag.xml' );
+} 'DROPPING r14.2 -> r8.1: Cannot set relationship on a meta reading',
+	"Got expected relationship drop warning on parse";
+
 # Test 1.1: try to equate nodes that are prevented with an intermediate collation
 ok( $t1, "Parsed test fragment file" );
 my $c1 = $t1->collation;
@@ -305,9 +311,23 @@ 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 = Text::Tradition->new( 'input' => 'Self', 'file' => 't/data/legendfrag.xml' );
+my $t2;
+warning_is {
+	$t2 = Text::Tradition->new( 'input' => 'Self', 'file' => 't/data/legendfrag.xml' );
+} 'DROPPING r14.2 -> r8.1: Cannot set relationship on a meta reading',
+	"Got expected relationship drop warning on parse";
 my $c2 = $t2->collation;
 $c2->add_relationship( 'r9.2', 'r9.3', { 'type' => 'lexical' } );
 my $trel2 = $c2->get_relationship( 'r9.2', 'r9.3' );
@@ -564,7 +584,9 @@ sub relationship_valid {
     my( $self, $source, $target, $rel, $mustdrop ) = @_;
     $mustdrop = [] unless $mustdrop; # in case we were passed nothing
     my $c = $self->collation;
-    if ( $rel eq 'transposition' || $rel eq 'repetition' ) {
+    ## Assume validity is okay if we are initializing from scratch.
+    return ( 1, "initializing" ) unless $c->tradition->_initialized;
+        if ( $rel eq 'transposition' || $rel eq 'repetition' ) {
 		# Check that the two readings do (for a repetition) or do not (for
 		# a transposition) appear in the same witness.
 		# TODO this might be called before witness paths are set...
@@ -760,10 +782,12 @@ sub _remove_equivalence_node {
 	my $group = $self->equivalence( $node );
 	my $nodelist = $self->eqreadings( $group );
 	if( @$nodelist == 1 && $nodelist->[0] eq $node ) {
+		$self->equivalence_graph->delete_vertex( $group );
 		$self->remove_eqreadings( $group );
+		$self->remove_equivalence( $group );
 	} elsif( @$nodelist == 1 ) {
-		warn "DATA INCONSISTENCY in equivalence graph: " . $nodelist->[0] .
-			" in group that should have only $node";
+		throw( "DATA INCONSISTENCY in equivalence graph: " . $nodelist->[0] .
+			" in group that should have only $node" );
 	} else {
  		my @newlist = grep { $_ ne $node } @$nodelist;
 		$self->set_eqreadings( $group, \@newlist );
@@ -826,8 +850,8 @@ sub _make_equivalence {
 	}
 	$self->equivalence_graph->delete_vertex( $seq );
 	# TODO enable this after collation parsing is done
-# 	throw( "Graph got disconnected making $source / $target equivalence" )
-# 		if $self->_is_disconnected;
+	throw( "Graph got disconnected making $source / $target equivalence" )
+		if $self->_is_disconnected && $self->collation->tradition->_initialized;
 }
 
 =head2 test_equivalence
@@ -936,9 +960,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 ) );
 		}
 	}
@@ -947,9 +973,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;
 		}
 	}
@@ -964,8 +992,8 @@ sub _break_equivalence {
 		}
 	}
 	# TODO enable this after collation parsing is done
-# 	throw( "Graph got disconnected breaking $source / $target equivalence" )
-# 		if $self->_is_disconnected;
+	throw( "Graph got disconnected breaking $source / $target equivalence" )
+		if $self->_is_disconnected && $self->collation->tradition->_initialized;
 }
 
 sub _find_equiv_without {
@@ -1027,6 +1055,61 @@ sub rebuild_equivalence {
 	}
 }
 
+=head2 equivalence_ranks 
+
+Rank all vertices in the equivalence graph, and return a hash reference with
+vertex => rank mapping.
+
+=cut
+
+sub equivalence_ranks {
+	my $self = shift;
+	my $eqstart = $self->equivalence( $self->collation->start );
+	my $eqranks = { $eqstart => 0 };
+	my $rankeqs = { 0 => [ $eqstart ] };
+	my @curr_origin = ( $eqstart );
+    # A little iterative function.
+    while( @curr_origin ) {
+        @curr_origin = $self->_assign_rank( $eqranks, $rankeqs, @curr_origin );
+    }
+	return( $eqranks, $rankeqs );
+}
+
+sub _assign_rank {
+    my( $self, $node_ranks, $rank_nodes, @current_nodes ) = @_;
+    my $graph = $self->equivalence_graph;
+    # 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};
+        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 if $node_ranks;
+            push( @{$rank_nodes->{$c_rank}}, $child ) if $rank_nodes;
+            push( @next_nodes, $child );
+        }
+    }
+    return @next_nodes;
+}
+
 ### Output logic
 
 sub _as_graphml {