### TODO Check these figures
if( $t ) {
- is( scalar $t->collation->readings, 313, "Collation has all readings" );
- is( scalar $t->collation->paths, 2877, "Collation has all paths" );
+ is( scalar $t->collation->readings, 311, "Collation has all readings" );
+ is( scalar $t->collation->paths, 361, "Collation has all paths" );
is( scalar $t->witnesses, 13, "Collation has all witnesses" );
}
}
}
} elsif( exists $opts->{'file'} ) {
- open( my $fh, $opts->{'file'} ) or die "Could not open input file " . $opts->{'file'};
+ open( my $fh, $opts->{'file'} )
+ or warn "Could not open input file " . $opts->{'file'};
+ binmode( $fh, ':utf8' );
while( my $row = $csv->getline( $fh ) ) {
push( @$alignment_table, $row );
}
}
}
-
# Collapse our lacunae into a single node and
# push the end node onto all paths.
$c->end->rank( scalar @$alignment_table );
my $last_rdg = shift @$p;
my $new_p = [ $last_rdg ];
foreach my $rdg ( @$p ) {
- if( $rdg->text eq '#LACUNA#' ) {
- # If we are in a lacuna already, drop this node.
- # Otherwise make a lacuna node and drop this node.
- unless( $last_rdg->is_lacuna ) {
- my $l = $c->add_lacuna( $rdg->name );
- $l->rank( $rdg->rank );
- push( @$new_p, $l );
- $last_rdg = $l;
- }
- $c->del_reading( $rdg );
- } else {
- # No lacuna, save the reading.
- push( @$new_p, $rdg );
- }
+ # Omit the reading if we are in a lacuna already.
+ next if $rdg->is_lacuna && $last_rdg->is_lacuna;
+ # Save the reading otherwise.
+ push( @$new_p, $rdg );
+ $last_rdg = $rdg;
}
push( @$new_p, $c->end );
$wit->path( $new_p );
$main_wit->uncorrected_path( $ac_wit->path );
$tradition->del_witness( $ac_wit );
}
-
+
# Join up the paths.
$c->make_witness_paths;
+ # Delete our unused lacuna nodes.
+ foreach my $rdg ( grep { $_->is_lacuna } $c->readings ) {
+ $c->del_reading( $rdg ) unless $c->reading_witnesses( $rdg );
+ }
}
sub make_nodes {
}
my $ctr = 1;
foreach my $w ( keys %unique ) {
- my $r = $collation->add_reading( "$index,$ctr" );
- $ctr++;
- $r->rank( $index );
- $r->text( $w );
+ my $rargs = {
+ 'id' => "$index,$ctr",
+ 'rank' => $index,
+ 'text' => $w,
+ };
+ $rargs->{'is_lacuna'} = 1 if $w eq '#LACUNA#';
+ my $r = $collation->add_reading( $rargs );
$unique{$w} = $r;
+ $ctr++;
}
return \%unique;
}