WIP

Author: stacktraceghost

backend/apportionment/src/candidate_nomination/mod.rs

@@ -1,20 +1,21 @@
 use crate::{
-    Fraction,
-    structs::{CandidateNumber, CandidateVotes, ListNumber},
+    CandidateVotesTrait, Fraction,
+    structs::{CandidateNumber, ListNumber},
 };
 
 /// Contains information about the chosen candidates and
 /// the candidate list ranking for a specific list.
 #[derive(Debug, PartialEq)]
-pub struct ListCandidateNomination {
+pub struct ListCandidateNomination<'a, T: CandidateVotesTrait> {
     /// List number for which this nomination applies
     pub list_number: ListNumber,
     /// The number of seats assigned to this group
     pub list_seats: u32,
     /// The list of chosen candidates via preferential votes, can be empty
-    pub preferential_candidate_nomination: Vec<CandidateVotes>,
+    // TODO: check lifetimes
+    pub preferential_candidate_nomination: Vec<&'a T>,
     /// The list of other chosen candidates, can be empty
-    pub other_candidate_nomination: Vec<CandidateVotes>,
+    pub other_candidate_nomination: Vec<&'a T>,
     /// The updated ranking of the whole candidate list, can be empty
     pub updated_candidate_ranking: Vec<CandidateNumber>,
 }
@@ -33,13 +34,13 @@ pub struct PreferenceThreshold {
 /// It also contains the preferential nomination of candidates, the remaining
 /// nomination of candidates and the final ranking of candidates for each list.
 #[derive(Debug, PartialEq)]
-pub struct CandidateNominationResult {
+pub struct CandidateNominationResult<'a, T: CandidateVotesTrait> {
     /// Preference threshold percentage and number of votes
     pub preference_threshold: PreferenceThreshold,
     /// List of chosen candidates
     pub chosen_candidates: Vec<Candidate>,
     /// List of chosen candidates and candidate list ranking per list
-    pub list_candidate_nomination: Vec<ListCandidateNomination>,
+    pub list_candidate_nomination: Vec<ListCandidateNomination<'a, T>>,
 }
 
 #[derive(Debug, PartialEq)]

backend/apportionment/src/candidate_nomination/structs.rs

@@ -9,14 +9,6 @@ macro_rules! int_newtype {
             }
         }
 
-        impl std::ops::Deref for $identifier {
-            type Target = u32;
-
-            fn deref(&self) -> &Self::Target {
-                &self.0
-            }
-        }
-
         impl std::fmt::Display for $identifier {
             fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
                 write!(f, "{}", self.0)
@@ -30,6 +22,18 @@ macro_rules! int_newtype {
                 Ok(Self::from(u32::try_from(value)?))
             }
         }
+
+        impl PartialEq<u32> for $identifier {
+            fn eq(&self, other: &u32) -> bool {
+                self.0 == *other
+            }
+        }
+
+        impl PartialEq<$identifier> for u32 {
+            fn eq(&self, other: &$identifier) -> bool {
+                *self == other.0
+            }
+        }
     };
 }
 

backend/apportionment/src/int_newtype_macro.rs

@@ -15,13 +15,15 @@ pub use self::{
 use self::{
     candidate_nomination::candidate_nomination,
     seat_assignment::seat_assignment,
-    structs::{ApportionmentOutput, CandidateNominationInput, SeatAssignmentInput},
+    structs::{ApportionmentOutput, as_candidate_nomination_input},
 };
 
-pub fn process(input: impl ApportionmentInput) -> Result<ApportionmentOutput, ApportionmentError> {
-    let seat_assignment = seat_assignment(SeatAssignmentInput::new(&input))?;
-    let candidate_nomination =
-        candidate_nomination(CandidateNominationInput::new(&input, &seat_assignment))?;
+pub fn process<T: ApportionmentInput>(
+    input: &T,
+) -> Result<ApportionmentOutput<'_, T::List>, ApportionmentError> {
+    let seat_assignment = seat_assignment(input)?;
+    let candidate_nomination_input = as_candidate_nomination_input(input, &seat_assignment);
+    let candidate_nomination = candidate_nomination::<T>(&candidate_nomination_input)?;
 
     Ok(ApportionmentOutput {
         seat_assignment,