simplify conversion from names to candidates

BrightSpots · Jan 9, 2025 · 9a6f4a6 · 9a6f4a6
1 parent ac138db
commit 9a6f4a6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/src/main/java/network/brightspots/rcv/BaseCvrReader.java b/src/main/java/network/brightspots/rcv/BaseCvrReader.java
@@ -22,6 +22,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
 import javafx.util.Pair;
 import network.brightspots.rcv.RawContestConfig.Candidate;
 import network.brightspots.rcv.RawContestConfig.CvrSource;
@@ -118,15 +119,9 @@ public Map<Candidate, Integer> gatherUnknownCandidateCounts(
       }
     }
 
-    Map<Candidate, Integer> unrecognizedCandidateCounts = new HashMap<>();
-    for (Map.Entry<String, Integer> entry : unrecognizedNameCounts.entrySet()) {
-      String candidateName = entry.getKey();
-      int count = entry.getValue();
-      Candidate candidate = new Candidate(candidateName, null, false);
-      unrecognizedCandidateCounts.put(candidate, count);
-    }
-
-    return unrecognizedCandidateCounts;
+    // Change the map to use Candidate objects instead of names
+    return unrecognizedNameCounts.entrySet().stream()
+          .collect(Collectors.toMap(entry -> new Candidate(entry.getKey()), Map.Entry::getValue));
   }
 
   Set<Candidate> gatherUnknownCandidates(List<CastVoteRecord> castVoteRecords)

diff --git a/src/main/java/network/brightspots/rcv/RawContestConfig.java b/src/main/java/network/brightspots/rcv/RawContestConfig.java
@@ -300,6 +300,10 @@ public static class Candidate {
 
     Candidate() {}
 
+    Candidate(String name) {
+      this(name, null, false);
+    }
+
     Candidate(String name, String newlineSeparatedAliases, boolean excluded) {
       this.name.setValue(name);
       this.excluded.setValue(excluded);