X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Fpocket-devotee;h=64075c79113684a5407c2573fa58192120c047b1;hb=2202f9c5d5b3f0de999b50dc80f85d4ef3f2112f;hp=6046aa99a44fc0420ee0b95303e2afb90a87b636;hpb=1825555e0a311c63556e1309f577d1811ff4dfc3;p=debian-ctte.git

diff --git a/scripts/pocket-devotee b/scripts/pocket-devotee
index 6046aa9..64075c7 100755
--- a/scripts/pocket-devotee
+++ b/scripts/pocket-devotee
@@ -98,6 +98,8 @@ sub main {
     my %options;
     GetOptions(\%options,
                'option=s@',
+               'default_option|default-option!',
+               'quorum=i',
               );
     if (not exists $options{option} or not ref($options{option}) or
         @{$options{option}} < 2
@@ -106,14 +108,17 @@ sub main {
     }
     my @options;
     for my $option (@{$options{option}}) {
-        my ($key,$name,$majority) = split /:/,$option;
+        my ($key,$name,$majority) = $option =~ /^\s*([^:]+)\s*:\s*(.+?)\s*(?::(\d+))?$/;
         $majority //= 1;
         push @options,{key => $key,
                        name => $name,
                        majority => $majority,
                       };
     }
-    winner(options=>\@options);
+    winner(options=>\@options,
+           default_option => exists $options{default_option} ? $options{default_option} : 1,
+           quorum => exists $options{quorum} ? $options{quorum} : 2,
+          );
 }
 
 sub encode_base64{
@@ -134,6 +139,9 @@ sub winner {
                                           tally_fh => {type => HANDLE,
                                                        optional => 1,
                                                       },
+                                          default_option => {default => 1,
+                                                             type => BOOLEAN,
+                                                            },
                                          },
                                );
   # options is an array to keep it ordered
@@ -157,7 +165,7 @@ sub winner {
   }
 
   # The constitution defines the maximum value of K to be 5
-  my $K = 2; # Math::BigFloat->new($params{quorum});
+  my $K = $params{quorum};
 
   #   1. Given two options A and B, V(A,B) is the number of voters who
   #      prefer option A over option B.
@@ -176,6 +184,8 @@ sub winner {
   if (not defined $params{tally_fh}) {
       $params{tally_fh} = \*STDIN;
   }
+  # header been output?
+  my $header_output = 0;
 
   # This is where we get our input data from
   while (defined ($_ = $params{tally_fh}->getline)) {
@@ -208,7 +218,11 @@ sub winner {
           }
           $vote = '';
           for my $opt (@options) {
-              $vote .= exists $option_rank{$opt->{key}} ? $option_rank{$opt->{key}} : '-';
+              $vote .= exists $option_rank{$opt->{key}} ? $number_to_option{$option_rank{$opt->{key}}} : '-';
+          }
+          if (not $header_output) {
+              print {$RESULTS} "/--".join("",map {$_->{key}} @options)."\n";
+              $header_output = 1;
           }
           print {$RESULTS} "V: $vote $voter\n";
 
@@ -271,7 +285,7 @@ EOF
       printf {$RESULTS} "Option %s  ", $order_to_options{$row + 1}{key};
       for my $col (0..($max_choices - 1)) {
           if ($row == $col) {
-              printf {$RESULTS} "      ", $Beat_Matrix[$row][$col];
+              print {$RESULTS} "      ";
           } else {
               printf {$RESULTS} " % 4d ", $Beat_Matrix[$row][$col];
           }
@@ -293,25 +307,28 @@ EOM
   
   my %Drop = ();
 
-  foreach my $i (0..($max_choices - 2)) {
-      if ($K > $Beat_Matrix[$i][$max_choices - 1]) {
-          $Drop{$i}++;
-          print {$RESULTS} "Dropping Option", $order_to_options{$i + 1}{key}, 
-              " \"", $order_to_options{$i + 1}{name},
-              "\" because of Quorum\n";
-      } else {
-          print {$RESULTS} "Option ", $order_to_options{$i + 1}{key},
-              " Reached quorum: $Beat_Matrix[$i][$max_choices - 1] > $K\n";
+  if ($params{default_option}) {
+      foreach my $i (0..($max_choices - 2)) {
+          if ($K > $Beat_Matrix[$i][$max_choices - 1]) {
+              $Drop{$i}++;
+              print {$RESULTS} "Dropping Option ", $order_to_options{$i + 1}{key}, 
+                  " \"", $order_to_options{$i + 1}{name},
+                  "\" because of Quorum ($K > $Beat_Matrix[$i][$max_choices - 1])\n";
+          } else {
+              print {$RESULTS} "Option ", $order_to_options{$i + 1}{key},
+                  " Reached quorum: $Beat_Matrix[$i][$max_choices - 1] >= $K\n";
+          }
       }
+      print {$RESULTS} "\n\n";
   }
-  print {$RESULTS} "\n\n";
 
   # Record Majority
   my %Ratio = ();
 
 
   #   2. An option A defeats the default option D by a majority ratio N,
-  #   if V(A,D) is strictly greater than N * V(D,A).
+  #   if V(A,D) is greater or equal to N * V(D,A) and V(A,D) is strictly
+  #   greater than V(D,A).
   #   3. If a supermajority of S:1 is required for A, its majority ratio
   #   is S; otherwise, its majority ratio is 1.
   #  Any (non-default) option which does not defeat the default option
@@ -323,19 +340,21 @@ EOM
       my $ratio = 1.0 * $Beat_Matrix[$i][$max_choices - 1] /
           $Beat_Matrix[$max_choices - 1][$i];
       $Ratio{$i} = sprintf("%.2f", $ratio);
-      if ($ratio < $order_to_options{$i + 1}{majority}) {
+      if ($ratio < $order_to_options{$i + 1}{majority} and $Beat_Matrix[$i][$max_choices - 1] or $ratio <= 1) {
           # If the next line is commented out, we get a more verbose set of results
           $Drop{$i}++;
           print {$RESULTS} "Dropping Option ", $order_to_options{$i + 1}{key},
               " because of Majority. ($ratio)";
-          printf {$RESULTS} " %6.3f (%d/%d) < %d\n",
+          my $comparison_sign = $order_to_options{$i + 1}{majority} == 1 ? '<=' : '<';
+          printf {$RESULTS} " %6.3f (%d/%d) $comparison_sign %d\n",
               $ratio, $Beat_Matrix[$i][$max_choices - 1],
               $Beat_Matrix[$max_choices - 1][$i],
               $order_to_options{$i + 1}{majority};
       } else {
           print {$RESULTS} "Option ", $order_to_options{$i + 1}{key}, " passes Majority.";
           print {$RESULTS} "             ";
-          printf {$RESULTS} " %6.3f (%d/%d) >= %d\n",
+          my $comparison_sign = $order_to_options{$i + 1}{majority} == 1 ? '>' : '>=';
+          printf {$RESULTS} " %6.3f (%d/%d) $comparison_sign %d\n",
               $ratio, $Beat_Matrix[$i][$max_choices - 1],
               $Beat_Matrix[$max_choices - 1][$i],
               $order_to_options{$i + 1}{majority};