X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FText%2FTradition%2FStemma.pm;h=28a910944eb61b6e1d36fd4c2e1dce4822e496b6;hb=a7fb313395e449d44e91da2bb6a217451cae57ec;hp=23fbbcce79edca0c91e0a3b8053f6e46331d3862;hpb=e367f5c07b97362a0b60dba97fcc0ce944a4a08a;p=scpubgit%2Fstemmatology.git

diff --git a/lib/Text/Tradition/Stemma.pm b/lib/Text/Tradition/Stemma.pm
index 23fbbcc..28a9109 100644
--- a/lib/Text/Tradition/Stemma.pm
+++ b/lib/Text/Tradition/Stemma.pm
@@ -17,19 +17,12 @@ has collation => (
     required => 1,
     );  
 
-# TODO Think about making a new class for the graphs, which has apsp as a property.
 has graph => (
     is => 'rw',
     isa => 'Graph',
     predicate => 'has_graph',
     );
     
-has apsp => (
-    is => 'ro',
-    isa => 'Graph',
-    writer => '_save_apsp',
-    );
-    
 has distance_trees => (
     is => 'ro',
     isa => 'ArrayRef[Graph]',
@@ -37,12 +30,6 @@ has distance_trees => (
     predicate => 'has_distance_trees',
     );
     
-has distance_apsps => (
-    is => 'ro',
-    isa => 'ArrayRef[Graph]',
-    writer => '_save_distance_apsps',
-    );
-        
 sub BUILD {
     my( $self, $args ) = @_;
     # If we have been handed a dotfile, initialize it into a graph.
@@ -59,28 +46,6 @@ sub BUILD {
     }
 }
 
-# If we are saving a new graph, calculate its apsp values.
-after 'graph' => sub {
-    my( $self, $args ) = @_;
-    if( $args ) {
-        # We had a new graph.
-        my $undirected;
-        if( $self->graph->is_directed ) {
-            # Make an undirected version.
-            $undirected = Graph->new( 'undirected' => 1 );
-            foreach my $v ( $self->graph->vertices ) {
-                $undirected->add_vertex( $v );
-            }
-            foreach my $e ( $self->graph->edges ) {
-                $undirected->add_edge( @$e );
-            }
-        } else {
-            $undirected = $self->graph;
-        }
-        $self->_save_apsp( $undirected->APSP_Floyd_Warshall() );
-    }       
-};
-
 # Render the stemma as SVG.
 sub as_svg {
     my( $self, $opts ) = @_;
@@ -117,6 +82,13 @@ sub as_svg {
     return $svg;
 }
 
+sub witnesses {
+    my $self = shift;
+    my @wits = grep { $self->graph->get_vertex_attribute( $_, 'class' ) eq 'extant' }
+        $self->graph->vertices;
+    return @wits;
+}
+
 #### Methods for calculating phylogenetic trees ####
 
 before 'distance_trees' => sub {
@@ -130,12 +102,6 @@ before 'distance_trees' => sub {
             # Save the resulting trees
             my $trees = _parse_newick( $result );
             $self->_save_distance_trees( $trees );
-            # and calculate their APSP values.
-            my @apsps;
-            foreach my $t ( @$trees ) {
-                push( @apsps, $t->APSP_Floyd_Warshall() );
-            }
-            $self->_save_distance_apsps( \@apsps );
         } else {
             warn "Failed to calculate distance trees: $result";
         }
@@ -179,14 +145,25 @@ sub convert_characters {
     my %unique = ( '__UNDEF__' => 'X',
                    '#LACUNA#'  => '?',
                  );
+    my %count;
     my $ctr = 0;
     foreach my $word ( @$row ) {
         if( $word && !exists $unique{$word} ) {
             $unique{$word} = chr( 65 + $ctr );
             $ctr++;
         }
+        $count{$word}++ if $word;
     }
+    # Try to keep variants under 8 by lacunizing any singletons.
     if( scalar( keys %unique ) > 8 ) {
+		foreach my $word ( keys %count ) {
+			if( $count{$word} == 1 ) {
+				$unique{$word} = '?';
+			}
+		}
+    }
+    my %u = reverse %unique;
+    if( scalar( keys %u ) > 8 ) {
         warn "Have more than 8 variants on this location; phylip will break";
     }
     my @chars = map { $_ ? $unique{$_} : $unique{'__UNDEF__' } } @$row;