X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=appendix-a6.git;a=blobdiff_plain;f=compute;h=bd9ed7c6ab9e0b01d9a89f4cdcff95eed7ec6c07;hp=58b3587d69cc216827e8e7a1f23987f0aae51c60;hb=8e0de3a8a82d07d9428f292a755d15ff3e5996ee;hpb=19150655609ade77a0687da8afe2b14f871e49ff

diff --git a/compute b/compute
index 58b3587..bd9ed7c 100755
--- a/compute
+++ b/compute
@@ -203,7 +203,7 @@ foreach my $iv (@invotes_v) {
 	    my $vchr = $vs[$ix];
 	    if ($vchr eq '-') {
 		$vs[$ix] = 1000;
-	    } elsif ($vchr =~ m/[0-9a-z]/) {
+	    } elsif ($vchr =~ m/[0-9A-Z]/) {
 		$vs[$ix] = ord($vchr);
 	    } else {
 		die "bad vote char";
@@ -305,8 +305,10 @@ foreach my $ia (0..$#ch) {
 	    " ($vab > $vba = +$diff)\n";
 	$defeats->add_edge($choices[$ia],$choices[$ib]);
 	my $label = "$diff($vab:$vba)";
-	$label .= "\n". join ' ', @{ $vab[$ia][$ib] };
-	$label .= "\n/". join ' ', @{ $vab[$ib][$ia] };
+	if (@invotes_v < 10) {
+	    $label .= "\n". join ' ', @{ $vab[$ia][$ib] };
+	    $label .= "\n/". join ' ', @{ $vab[$ib][$ia] };
+	}
 	$defeats->set_edge_attribute($choices[$ia],$choices[$ib],
 				     label => $label);
     }
@@ -339,12 +341,12 @@ foreach my $ix (0..$#ch) {
 
 our $schwartz;
 
-for (;;) {
+for (my $dropiter = 1; ; $dropiter++) {
     # loop from A6(5)
 
     print "defeats graph: $defeats\n";
 
-    print "\nTransitive closure A.6(5)\n";
+    print "\nTransitive closure A.6(5) (iteration $dropiter)\n";
 
     my $tdefeats = $defeats->transitive_closure();
 
@@ -400,6 +402,11 @@ for (;;) {
 	my ($ca,$cb) = @$weakest;
 	print "a weakest defeat is $ca > $cb\n";
 	$defeats->delete_edge($ca,$cb);
+	my $label = $showg->get_edge_attribute($ca,$cb,'label');
+	$label .= "\ndropped - weakest in iter.$dropiter";
+	$showg->set_edge_attribute($ca,$cb,'label',$label);
+	$showg->set_edge_attribute($ca,$cb,'style','dotted');
+	$showg->set_edge_attribute($ca,$cb,'graphviz',{constraint=>0});
     }
 
     print "\nDefeats within the Schwartz set, go round again\n";
@@ -423,7 +430,7 @@ printf "    %-5s %s\n", $_, $choices{$_}{Desc}
 if (defined $gfile) {
     foreach my $cho (values %choices) {
 	my $chn = $choices[$cho->{Index}];
-	my $label = "\\N\n$cho->{Desc}";
+	my $label = "$chn\n$cho->{Desc}";
 	if ($cho->{Dropped}) {
 	    $label .= "\nDropped: $cho->{Dropped}";
 	}