From ae8b1c8989236af27ac983301f08b66c0fb3a378 Mon Sep 17 00:00:00 2001 From: Jay Robson Date: Sat, 3 May 2025 23:52:34 +1000 Subject: [PATCH] disabled party to candidate conversion --- src/counter.rs | 2 +- src/main.rs | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/counter.rs b/src/counter.rs index b86d235..f815bb0 100644 --- a/src/counter.rs +++ b/src/counter.rs @@ -13,7 +13,7 @@ impl Counter { let mut ballots = Vec::new(); for row in csv { - ballots.push(Ballot::parse(row?, &header)?.to_candidate_ballot(&header)); + ballots.push(Ballot::parse(row?, &header)?); } Ok(Counter { diff --git a/src/main.rs b/src/main.rs index cf189d0..078ddce 100644 --- a/src/main.rs +++ b/src/main.rs @@ -22,6 +22,7 @@ fn main() { let csv = quick_csv::Csv::from_file(csv_path).unwrap().flexible(true); let counter = Counter::new(csv).unwrap(); + eprintln!("Header: {:#?}", counter.header); eprintln!("Parties: {}", counter.header.parties.len()); eprintln!("Candidates: {}", counter.header.candidates.len()); @@ -93,9 +94,9 @@ fn main() { println!(); - eprintln!(" {index}:"); - eprintln!(" Best: {} ({score_best})", names[id_best]); - eprintln!(" Worst: {} ({score_worst})", names[id_worst]); + eprintln!(" - {index}:"); + eprintln!(" Best: {} ({score_best})", names[id_best]); + eprintln!(" Lost: {} ({score_worst})", names[id_worst]); } let winners = names.iter().enumerate().filter_map(|(index, name)| match running[index] {