seems to work

[appendix-a6.git] / parse

diff --git a/parse b/parse
index 13fe2f23395fabb16bb0a9b15d3bc6496f9454ea..222c40f721734c22a72f91aec21474466bb81f0a 100755 (executable)
--- a/parse
+++ b/parse
@@ -12,7 +12,8 @@ binmode STDERR, 'encoding(UTF-8)';
 
 our @choices;
 our %choices;
-our @invotes;
+our @invotes_v;
+our @invotes_cc;
 our $defcho;
 our $quorum = 0;
 
@@ -37,7 +38,9 @@ while (<>) {
            $defcho = $cho;
        }
     } elsif (m/^V:\s+(\S+)\s+(\S.*)/) {
-       push @invotes, [ $1, $2 ];
+       push @invotes_v, [ $1, $2 ];
+    } elsif (m/^(\S+)\s*\:\:\s*/) {
+       push @invotes_cc, [ $1, "$'" ];
     } elsif (m/^quorum = ([0-9.]+)$/) {
        $quorum = $1+0.0;
     } else {
@@ -60,7 +63,47 @@ our @vab;
 
 print "\nPreference matrix\n";
 
-foreach my $iv (@invotes) {
+foreach my $iv (@invotes_cc) {
+    $_ = uc $iv->[1];
+    foreach my $chn (m/\b\w+\b/g) {
+       $choices{$chn} or addchoice($chn, Desc => "($chn from voter ballot)");
+    }
+}
+
+foreach my $iv (@invotes_cc) {
+    my ($voter) = $iv->[0];
+    $_ = uc $iv->[1];
+
+    s/\t/ /g;
+    s/\,/ /g;
+    while (s{\(([^()]+)\)}{
+        my $x = $1; $x =~ s/[ =]+/=/g; $x;
+    }ge) { }
+    s/[ =]*=[ =*]/=/g;
+    s/\s+/ /g;
+    print "# normalised $_ ($voter)\n";
+
+    my @ranks = (1000,) x @choices;
+    my $rank = 1;
+    foreach (split /\s+/) {
+       foreach (split /=/) {
+           my $cho = $choices{$_};
+           $cho or die "unknown option $_ ($voter)";
+           my $ix = $cho->{Index};
+           $ranks[$ix] = $rank;
+       }
+       $rank++;
+    }
+    my $vstr = join '', map {
+       $_ == 1000 ? "-" :
+       $_ < 10 ? (sprintf "%d", $_) :
+       $_ < 36 ? (chr(ord('A') + $_ - 10)) : die
+    } @ranks;
+    print "V: $vstr $voter\n";
+    push @invotes_v, [ $vstr, $voter ];
+}
+
+foreach my $iv (@invotes_v) {
     my ($votestr,$voter) = @$iv;
     eval {
        length $votestr eq @choices or die "wrong vote vector length";
@@ -164,7 +207,7 @@ foreach my $ia (chremain()) {
        next unless $vab > $vba;
        my $diff = $vab - $vba;
        print "defeat: $choices[$ia] beats $choices[$ib]",
-           " ($vab > $vba: $diff)\n";
+           " ($vab > $vba = +$diff)\n";
        $defeats->add_edge($choices[$ia],$choices[$ib]);
     }
 }
@@ -179,10 +222,10 @@ sub weaker ($$) {
     # A.6(7)(1)
     my ($def1,$def2) = @_;
     my ($ca,$cx) = @$def1;
-    my ($cb,$cy) = @$def1;
+    my ($cb,$cy) = @$def2;
     return 1 if chvab($ca, $cx) < chvab($cb, $cy);
     return 1 if chvab($ca, $cx) == chvab($cb, $cy)
-       && chvab($cx, $ca) > chvab($cy, $cb);
+              && chvab($cx, $ca) > chvab($cy, $cb);
     return 0;
 }
 
@@ -213,6 +256,8 @@ for (;;) {
        }
     }
 
+    print "set: ", (join " ", $schwartz->vertices()), "\n";
+
     print "\nDropping weakest defeats A.6(7)\n";
 
     our @weakest = ();
@@ -236,16 +281,16 @@ for (;;) {
     last unless @weakest;
 
     my $w = $weakest[0];
-    printf "weakest defeats %d > %d\n", 
+    printf "weakest defeats are %d > %d\n", 
         chvab($w->[0], $w->[1]),
        chvab($w->[1], $w->[0]);
     foreach my $weakest (@weakest) {
        my ($ca,$cb) = @$weakest;
-       print "weakest defeat $ca > $cb\n";
+       print "a weakest defeat is $ca > $cb\n";
        $defeats->delete_edge($ca,$cb);
     }
 
-    print "defeats within the Schwartz set, round again\n";
+    print "\nDefeats within the Schwartz set, go round again\n";
 }
 
 print "no defeats within the Schwartz set\n";