Changeset 214

Timestamp:

04/17/09 15:32:47 (15 years ago)

Author:

nanardon

Message:

• more results function, support empty ballots in voices count

Location:

trunk

Files:

• lib/Vote/DB/Poll.pm (modified) (2 diffs)
• lib/Vote/DB/Poll/Results.pm (modified) (4 diffs)
• root/latex/poll_report.tt (modified) (1 diff)
• root/templates/includes/poll_results.tt (modified) (1 diff)
• t/10Vote_DB.t (modified) (2 diffs)

trunk/lib/Vote/DB/Poll.pm

@@ -513 +513 @@
 }
 
-sub voting_count {
-    my ($self) = @_;
-
-    my $sth = $self->db->prepare_cached(
-        q{
-        select count(*) from voting
-        where poll = ?
-        }
-    );
-    $sth->execute($self->voteid);
-    my $res = $sth->fetchrow_hashref;
-    $sth->finish;
-    $res->{count}
-}
-
-sub signing_count {
-    my ($self) = @_;
-
-    my $sth = $self->db->prepare_cached(
-        q{
-        select count(*) from signing join voting
-        on voting.key = signing.key where poll = ?
-        }
-    );
-
-    $sth->execute($self->voteid);
-    my $res = $sth->fetchrow_hashref;
-    $sth->finish;
-    $res->{count}
-}
-
 sub is_crypted {
     my ($self) = @_;
     return $self->info->{public_key} ? 1 : 0;
-}
-
-sub ballot_count {
-    my ($self) = @_;
-    return $self->is_crypted
-        ? $self->ballot_count_crypt
-        : $self->ballot_count_clear;
-}
-
-sub ballot_count_clear {
-    my ($self) = @_;
-
-    my $sth = $self->db->prepare_cached(
-        q{select count(*) from ballot where poll = ?}
-    );
-
-    $sth->execute($self->voteid);
-    my $res = $sth->fetchrow_hashref;
-    $sth->finish;
-    $res->{count}
-}
-
-sub ballot_count_crypt {
-    my ($self) = @_;
-
-    my $sth = $self->db->prepare_cached(
-        q{select count(*) from ballot_enc where poll = ?}
-    );
-
-    $sth->execute($self->voteid);
-    my $res = $sth->fetchrow_hashref;
-    $sth->finish;
-    $res->{count}
 }
 
@@ -890 +826 @@
     $privkey
 }
+
+#########
+# Count #
+#########
+
+sub ballot_count {
+    my ($self) = @_;
+    return $self->is_crypted
+        ? $self->ballot_count_crypt
+        : $self->ballot_count_clear;
+}
+
+sub ballot_count_clear {
+    my ($self) = @_;
+
+    my $sth = $self->db->prepare_cached(
+        q{select count(*) from ballot where poll = ?}
+    );
+
+    $sth->execute($self->voteid);
+    my $res = $sth->fetchrow_hashref;
+    $sth->finish;
+    $res->{count}
+}
+
+sub ballot_count_crypt {
+    my ($self) = @_;
+
+    my $sth = $self->db->prepare_cached(
+        q{select count(*) from ballot_enc where poll = ?}
+    );
+
+    $sth->execute($self->voteid);
+    my $res = $sth->fetchrow_hashref;
+    $sth->finish;
+    $res->{count}
+}
+
+sub voting_count {
+    my ($self) = @_;
+
+    my $sth = $self->db->prepare_cached(
+        q{
+        select count(*) from voting
+        where poll = ?
+        }
+    );
+    $sth->execute($self->voteid);
+    my $res = $sth->fetchrow_hashref;
+    $sth->finish;
+    $res->{count}
+}
+
+sub signing_count {
+    my ($self) = @_;
+
+    my $sth = $self->db->prepare_cached(
+        q{
+        select count(*) from signing join voting
+        on voting.key = signing.key where poll = ?
+        }
+    );
+
+    $sth->execute($self->voteid);
+    my $res = $sth->fetchrow_hashref;
+    $sth->finish;
+    $res->{count}
+}
+
+sub not_signing_count {
+    my ($self) = @_;
+    my $sth = $self->db->prepare_cached(
+        q{
+        select count(*) from voting where key
+        not in (select key from signing)
+        }
+    );
+
+    $sth->execute($self->voteid);
+    my $res = $sth->fetchrow_hashref;
+    $sth->finish;
+    $res->{count}
+}
+
 =head1 AUTHOR
 

trunk/lib/Vote/DB/Poll/Results.pm

@@ -27 +27 @@
 sub absolute_majority {
     my ($self) = @_;
-    my $ballot_count = $self->ballot_count_nonull;
+    my $ballot_count = $self->voices_ballot_count;
     return int($ballot_count / 2) + 1;
 }    
@@ -48 +48 @@
 }
 
-sub ballot_count_nonull {
+sub ballot_count_nonull {not_empty_ballot_count(@_)}
+
+sub voices_ballot_count {
+    my ($self) = @_;
+    return $self->not_empty_ballot_count +
+        ($self->info('empty_ballot_has_voice')
+            ? $self->empty_ballot_count
+            : 0);
+}
+
+
+sub empty_ballot_count {
+    my ($self) = @_;
+
+    my $sth = $self->db->prepare_cached(
+        q{
+        select count(*) from ballot where poll = ?
+        and id not in (select id from ballot_item) and
+        (invalid = 'false' or invalid is null)
+        }
+    );
+
+    $sth->execute($self->voteid);
+    my $res = $sth->fetchrow_hashref;
+    $sth->finish;
+    $res->{count}
+}
+
+sub not_empty_ballot_count {
     my ($self) = @_;
 
@@ -75 +103 @@
 }
 
+sub results {
+    my ($self) = @_;
+    $self->_results(
+        $self->info('empty_ballot_has_voice')
+        ? 0
+        : 1
+    );
+}
+
 sub _results {
     my ($self, $nonull) = @_;
@@ -85 +122 @@
         union
         select ballot.id, coalesce(corrected, ballot_map.to, value) as "value" from ballot
-        } . ($nonull ? '' : ' left ') . q{
-        join ballot_item
+        } . ($nonull ? '' : ' left ') . q{ join ballot_item
         on ballot.id = ballot_item.id 
         left join ballot_map on ballot.poll = ballot_map.poll and ballot_map.from = ballot_item.value

trunk/root/latex/poll_report.tt

@@ -48 +48 @@
 
 [%- IF poll.ballot_count_nonull -%]
-[%- FOREACH res = poll.results_nonull -%]
+[%- FOREACH res = poll.results -%]
 [%- IF res.count != loop.prev.count && loop.count > 0 -%]
 [%- mycount = loop.count -%]

trunk/root/templates/includes/poll_results.tt

@@ -26 +26 @@
 
 [% IF poll.ballot_count_nonull %]
-[% FOREACH res = poll.results_nonull %]
+[% FOREACH res = poll.results %]
 [% IF loop.first %]
 <p>Score:</p>

trunk/t/10Vote_DB.t

@@ -60 +60 @@
             a => { sbal => [ 'ch1' ] },
             b => { sbal => [ 'ch1', 'ch10' ] },
-            d => { sbal => [ 'ch1', 'ch2' ] },
+            d => { sbal => [ 'ch1', 'ch2', 'ch4' ] },
             f => {},
         },
-        test_count => 9,
+        test_count => 10,
         tests => sub {
             my ($r) = @_;
@@ -69 +69 @@
             is($r->absolute_majority, 2, "Can get absolute_majority");
             is($r->ballot_count, 4, "can get ballot count");
-            is($r->ballot_count_nonull, 3, "can get ballot count");
+            is($r->not_empty_ballot_count, 3, "can get ballot count");
+            is($r->empty_ballot_count, 1, "can get empty ballot count");
             is($r->voting_count, 6, "can get voting count");
             is($r->signing_count, 4, "can get signing count");
-            my $res = $r->results_nonull;
+            my $res = $r->results;
             is($res->[0]->{value}, 'ch1', "winner is ch1");
             is($res->[0]->{count}, 3, "winner has 3 voices");
-            is(@$res, 3, "count of winners");
-            is($res->[2]->{count}, 0, "last has 0 voices");
+            is(@$res, 4, "count of winners");
+            is($res->[3]->{count}, 0, "last has 0 voices");
+        }
+    },
+    {
+        poll => {
+            label => 'empty ballot count',
+            empty_ballot_has_voice => 1,
+        },
+        choices => [ qw(ch1 ch2 ch3) ],
+        voting => [ qw(a b c d e f) ],
+        ballot => {
+            a => { sbal => [ 'ch1' ] },
+            b => { sbal => [ 'ch1', 'ch2' ] },
+            d => { sbal => [ 'ch1', 'ch2' ] },
+            e => {},
+            f => {},
+        },
+        test_count => 10,
+        tests => sub {
+            my ($r) = @_;
+            is($r->absolute_majority, 3, "Can get absolute_majority");
+            is($r->ballot_count, 5, "can get ballot count");
+            is($r->not_empty_ballot_count, 3, "can get ballot count");
+            is($r->empty_ballot_count, 2, "can get empty ballot count");
+            is($r->voting_count, 6, "can get voting count");
+            is($r->signing_count, 5, "can get signing count");
+            my $res = $r->results;
+            is($res->[0]->{value}, 'ch1', "winner is ch1");
+            is($res->[0]->{count}, 3, "winner has 3 voices");
+            is(@$res, 4, "count of winners");
+            is($res->[3]->{count}, 0, "last has 0 voices");
         }
     },