From f706d7423bf022544de0d1d999bd0d3680fd3880 Mon Sep 17 00:00:00 2001 From: RunasSudo Date: Fri, 6 Aug 2021 01:33:31 +1000 Subject: [PATCH] Fix interaction between --exclusion parcels_by_order and --min-threshold when excluding candidates with 0 votes --- src/stv/gregory.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/stv/gregory.rs b/src/stv/gregory.rs index fb0b699..3dacf10 100644 --- a/src/stv/gregory.rs +++ b/src/stv/gregory.rs @@ -510,9 +510,9 @@ where } ExclusionMethod::ParcelsByOrder => { // Exclude by parcel by order - if excluded_candidates.len() > 1 { + if excluded_candidates.len() > 1 && excluded_candidates.iter().any(|c| !state.candidates[c].parcels.is_empty()) { // TODO: We can probably support this actually - panic!("--exclusion parcels_by_order is incompatible with --bulk-exclude"); + panic!("--exclusion parcels_by_order is incompatible with multiple exclusions"); } let count_card = state.candidates.get_mut(excluded_candidates[0]).unwrap();