-
Notifications
You must be signed in to change notification settings - Fork 19
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
### New features: * Added support for converting Dominion JSON CVRs to generic .csv format (including precinct portions) (#404, #406, #407, #408, #415, #439) * Added multiSeatBottomsUpPercentageThreshold option (#403) * Added CLI option to convert Dominion CVR to generic .csv (#408) * New GUI menu and conversion options (can now convert to CDF and convert Dominion to generic via the GUI) (#408, #421) * Added Dominion Alaska CVR to sample_input folder ### Bug fixes: * Batch elimination now works properly with singleSeatContinueUntilTwoCandidatesRemain (#396) * In a multi-seat contest, if someone wins in the first round, we now automatically eliminate undeclared write-ins before we eliminate any other candidates; previously, we treated UWIs like a normal candidate, which meant we potentially eliminated other candidates with lower tallies first (#397) * If UWI exceeds the winning threshold in the initial count, we no longer mistakenly elect this candidate (#398) ### Backend updates: * Updated dependencies to latest version: JDK, JavaFX, Checkstyle google_checks.xml, Checkstyle plugin, org.openjfx.javafxplugin, org.beryx.jlink, org.apache.commons:commons-csv, org.apache.poi:poi-ooxml, com.fasterxml.jackson.core:jackson-* * Added special code to test configs to obviate the need to update the version with each increment (#426) * Updated tests and improved test coverage * Copyright update (#414) * Code cleanup
- Loading branch information
1 parent
994d322
commit 94bb749
Showing
99 changed files
with
91,038 additions
and
360 deletions.
There are no files selected for viewing
21 changes: 11 additions & 10 deletions
21
2013_minneapolis_mayor/2013_minneapolis_mayor_config.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 11 additions & 10 deletions
21
2013_minneapolis_mayor_scale/2013_minneapolis_mayor_scale_config.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 11 additions & 10 deletions
21
2013_minneapolis_park_bottoms_up/2013_minneapolis_park_bottoms_up_config.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 11 additions & 10 deletions
21
2013_minneapolis_park_hare/2013_minneapolis_park_hare_config.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 11 additions & 10 deletions
21
2013_minneapolis_park_sequential/2013_minneapolis_park_sequential_config.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 11 additions & 10 deletions
21
2015_portland_mayor_codes/2015_portland_mayor_codes_config.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 11 additions & 10 deletions
21
2017_minneapolis_mayor/2017_minneapolis_mayor_config.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 11 additions & 10 deletions
21
2018_maine_governor_primary/2018_maine_governor_primary_config.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 11 additions & 10 deletions
21
continue_tabulation_test/continue_tabulation_test_config.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
70 changes: 70 additions & 0 deletions
70
...wo_with_batch_elimination_test/continue_until_two_with_batch_elimination_test_config.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| { | ||
| "tabulatorVersion" : "TEST", | ||
| "outputSettings" : { | ||
| "contestName" : "Continue Until Two + Batch Elimination Test", | ||
| "outputDirectory" : "output", | ||
| "contestDate" : "", | ||
| "contestJurisdiction" : "", | ||
| "contestOffice" : "", | ||
| "tabulateByPrecinct" : false, | ||
| "generateCdfJson" : false | ||
| }, | ||
| "cvrFileSources" : [ { | ||
| "filePath" : "continue_until_two_with_batch_elimination_test_cvr.xlsx", | ||
| "firstVoteColumnIndex" : "2", | ||
| "firstVoteRowIndex" : "2", | ||
| "idColumnIndex" : "", | ||
| "precinctColumnIndex" : "", | ||
| "provider" : "" | ||
| } ], | ||
| "candidates" : [ { | ||
| "name" : "A", | ||
| "code" : "", | ||
| "excluded" : false | ||
| }, { | ||
| "name" : "B", | ||
| "code" : "", | ||
| "excluded" : false | ||
| }, { | ||
| "name" : "C", | ||
| "code" : "", | ||
| "excluded" : false | ||
| }, { | ||
| "name" : "D", | ||
| "code" : "", | ||
| "excluded" : false | ||
| }, { | ||
| "name" : "E", | ||
| "code" : "", | ||
| "excluded" : false | ||
| }, { | ||
| "name" : "F", | ||
| "code" : "", | ||
| "excluded" : false | ||
| }, { | ||
| "name" : "G", | ||
| "code" : "", | ||
| "excluded" : false | ||
| } ], | ||
| "rules" : { | ||
| "tiebreakMode" : "usePermutationInConfig", | ||
| "overvoteRule" : "exhaustImmediately", | ||
| "winnerElectionMode" : "singleSeatContinueUntilTwoCandidatesRemain", | ||
| "randomSeed" : "", | ||
| "numberOfWinners" : "1", | ||
| "multiSeatBottomsUpPercentageThreshold" : "", | ||
| "decimalPlacesForVoteArithmetic" : "4", | ||
| "minimumVoteThreshold" : "0", | ||
| "maxSkippedRanksAllowed" : "1", | ||
| "maxRankingsAllowed" : "max", | ||
| "nonIntegerWinningThreshold" : false, | ||
| "hareQuota" : false, | ||
| "batchElimination" : true, | ||
| "exhaustOnDuplicateCandidate" : false, | ||
| "treatBlankAsUndeclaredWriteIn" : false, | ||
| "overvoteLabel" : "", | ||
| "undervoteLabel" : "", | ||
| "undeclaredWriteInLabel" : "", | ||
| "rulesDescription" : "" | ||
| } | ||
| } |
Binary file added
BIN
+5.69 KB
...l_two_with_batch_elimination_test/continue_until_two_with_batch_elimination_test_cvr.xlsx
Binary file not shown.
Oops, something went wrong.