Projects/OpenTally
Projects
/
OpenTally
14
0
Fork 0
Code Issues Pull Requests Activity

Implement --bulk-exclude and --defer-surpluses in web UI

This commit is contained in:
RunasSudo 2021-06-09 12:42:47 +10:00
parent 79f0f55942
commit 990704a56a
No known key found for this signature in database
GPG Key ID: 7234E476BF21C61A
3 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
html/index.html
View File

@ -164,11 +164,11 @@
d.p. d.p.
</label> </label>
</div> </div>
<!--<div class="col-12 subheading"> <div class="col-12 subheading">
Count optimisations: Count optimisations:
</div> </div>
<label class="col-6"> <label class="col-6">
<input type="checkbox" id="chkBulkElection" checked> <input type="checkbox" id="chkBulkElection" checked disabled>
Bulk election Bulk election
</label> </label>
<label class="col-6"> <label class="col-6">
@ -178,7 +178,7 @@
<label class="col-12"> <label class="col-12">
<input type="checkbox" id="chkDeferSurpluses"> <input type="checkbox" id="chkDeferSurpluses">
Defer surpluses Defer surpluses
</label>--> </label>
<div class="col-12 subheading"> <div class="col-12 subheading">
Rounding: Rounding:
</div> </div>

26
html/index.js
View File

@ -102,6 +102,8 @@ async function clickCount() {
document.getElementById('selSurplus').value, document.getElementById('selSurplus').value,
document.getElementById('selPapers').value == 'transferable', document.getElementById('selPapers').value == 'transferable',
document.getElementById('selExclusion').value, document.getElementById('selExclusion').value,
document.getElementById('chkBulkExclusion').checked,
document.getElementById('chkDeferSurpluses').checked,
parseInt(document.getElementById('txtPPDP').value), parseInt(document.getElementById('txtPPDP').value),
]; ];
@ -293,9 +295,9 @@ function changePreset() {
document.getElementById('selQuotaCriterion').value = 'geq'; document.getElementById('selQuotaCriterion').value = 'geq';
document.getElementById('selQuota').value = 'droop'; document.getElementById('selQuota').value = 'droop';
document.getElementById('selQuotaMode').value = 'static'; document.getElementById('selQuotaMode').value = 'static';
//document.getElementById('chkBulkElection').checked = true; document.getElementById('chkBulkElection').checked = true;
//document.getElementById('chkBulkExclusion').checked = false; document.getElementById('chkBulkExclusion').checked = false;
//document.getElementById('chkDeferSurpluses').checked = false; document.getElementById('chkDeferSurpluses').checked = false;
document.getElementById('selNumbers').value = 'fixed'; document.getElementById('selNumbers').value = 'fixed';
document.getElementById('txtDP').value = '5'; document.getElementById('txtDP').value = '5';
document.getElementById('txtPPDP').value = '2'; document.getElementById('txtPPDP').value = '2';
@ -313,9 +315,9 @@ function changePreset() {
document.getElementById('selQuotaCriterion').value = 'geq'; document.getElementById('selQuotaCriterion').value = 'geq';
document.getElementById('selQuota').value = 'droop'; document.getElementById('selQuota').value = 'droop';
document.getElementById('selQuotaMode').value = 'static'; document.getElementById('selQuotaMode').value = 'static';
//document.getElementById('chkBulkElection').checked = true; document.getElementById('chkBulkElection').checked = true;
//document.getElementById('chkBulkExclusion').checked = true; document.getElementById('chkBulkExclusion').checked = true;
//document.getElementById('chkDeferSurpluses').checked = false; document.getElementById('chkDeferSurpluses').checked = false;
document.getElementById('selNumbers').value = 'fixed'; document.getElementById('selNumbers').value = 'fixed';
document.getElementById('txtDP').value = '5'; document.getElementById('txtDP').value = '5';
document.getElementById('txtPPDP').value = '0'; document.getElementById('txtPPDP').value = '0';
@ -334,9 +336,9 @@ function changePreset() {
document.getElementById('selQuotaCriterion').value = 'geq'; document.getElementById('selQuotaCriterion').value = 'geq';
document.getElementById('selQuota').value = 'droop'; document.getElementById('selQuota').value = 'droop';
document.getElementById('selQuotaMode').value = 'static'; document.getElementById('selQuotaMode').value = 'static';
//document.getElementById('chkBulkElection').checked = true; document.getElementById('chkBulkElection').checked = true;
//document.getElementById('chkBulkExclusion').checked = false; document.getElementById('chkBulkExclusion').checked = false;
//document.getElementById('chkDeferSurpluses').checked = true; document.getElementById('chkDeferSurpluses').checked = true;
document.getElementById('selNumbers').value = 'fixed'; document.getElementById('selNumbers').value = 'fixed';
document.getElementById('txtDP').value = '5'; document.getElementById('txtDP').value = '5';
document.getElementById('txtPPDP').value = '3'; document.getElementById('txtPPDP').value = '3';
@ -357,9 +359,9 @@ function changePreset() {
document.getElementById('selQuotaCriterion').value = 'geq'; document.getElementById('selQuotaCriterion').value = 'geq';
document.getElementById('selQuota').value = 'droop_exact'; document.getElementById('selQuota').value = 'droop_exact';
document.getElementById('selQuotaMode').value = 'ers97'; document.getElementById('selQuotaMode').value = 'ers97';
//document.getElementById('chkBulkElection').checked = true; document.getElementById('chkBulkElection').checked = true;
//document.getElementById('chkBulkExclusion').checked = true; document.getElementById('chkBulkExclusion').checked = true;
//document.getElementById('chkDeferSurpluses').checked = true; document.getElementById('chkDeferSurpluses').checked = true;
document.getElementById('selNumbers').value = 'fixed'; document.getElementById('selNumbers').value = 'fixed';
document.getElementById('txtDP').value = '5'; document.getElementById('txtDP').value = '5';
document.getElementById('txtPPDP').value = '2'; document.getElementById('txtPPDP').value = '2';

4
src/stv/mod.rs
View File

@ -550,7 +550,7 @@ fn elect_meeting_quota<N: Number>(state: &mut CountState<N>, opts: &STVOptions)
} }
} }
fn can_defer_surpluses<N: Number>(state: &CountState<N>, opts: &STVOptions, has_surplus: &Vec<(&&Candidate, &CountCard<N>)>, total_surpluses: &N) -> bool fn can_defer_surpluses<N: Number>(state: &CountState<N>, opts: &STVOptions, total_surpluses: &N) -> bool
where where
for<'r> &'r N: ops::Sub<&'r N, Output=N> for<'r> &'r N: ops::Sub<&'r N, Output=N>
{ {
@ -593,7 +593,7 @@ where
if has_surplus.len() > 0 { if has_surplus.len() > 0 {
// Determine if surplues can be deferred // Determine if surplues can be deferred
if opts.defer_surpluses { if opts.defer_surpluses {
if can_defer_surpluses(state, opts, &has_surplus, &total_surpluses) { if can_defer_surpluses(state, opts, &total_surpluses) {
state.logger.log_literal(format!("Distribution of surpluses totalling {:.2} votes will be deferred.", total_surpluses)); state.logger.log_literal(format!("Distribution of surpluses totalling {:.2} votes will be deferred.", total_surpluses));
return false; return false;
} }