consolidate all duplicate CVRs #708
Conversation
artoonie
force-pushed
the
feature/issue-692_shared-tests
branch
2 times, most recently
from
977a128
to
15d2534
Compare
artoonie
force-pushed
the
feature/issue-692_shared-tests
branch
from
15d2534
to
a147699
Compare
artoonie
force-pushed
the
feature/issue-692_shared-tests
branch
from
a147699
to
7080eaf
Compare
artoonie
force-pushed
the
feature/issue-703_convert-to-cdf
branch
2 times, most recently
from
940d45d
to
b441466
Compare
# Conflicts: # src/main/java/network/brightspots/rcv/TabulatorSession.java # src/test/java/network/brightspots/rcv/TabulatorTests.java
.../rcv/test_data/minneapolis_multi_seat_threshold/minneapolis_multi_seat_threshold_config.json
Outdated
Show resolved
Hide resolved
.../resources/network/brightspots/rcv/test_data/skip_to_next_test/skip_to_next_test_config.json
Outdated
Show resolved
Hide resolved
...ots/rcv/test_data/test_set_2_overvote_skip_to_next/test_set_2_overvote_skip_to_next_cvr.xlsx
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Same question on this... wondering why this was around if it apparently wasn't being used?
There was a problem hiding this comment.
Response to all four comments:
The two unused files were duplicates, which is why the two unshared CVRs were moved to _shared.
In particular, ../_shared/skipped_ranking_cvr.xlsx == test_set_2_overvote_skip_to_next_cvr.xlsx and
../_shared/minneapolis_multi_seat_cvr.xlsx == ../minneapolis_multi_seat_threshold/minneapolis_multi_seat_cvr.xlsx.
It seems as though the XLSX CVRs are indeed never used -- they're not related to the CDF CVRs in any way I can discern. Of particular note, the candidate names in the XLSX are not the same as what's in the config.
To summarize:
- The files in
_sharedwere duplicate files, but - One of the duplicates was never used, so
- I've moved the files out of
_sharedand left their corresponding duplicates deleted.
There was a problem hiding this comment.
Good deal, thanks for examining this so closely!
artoonie
force-pushed
the
feature/issue-692_shared-tests
branch
from
b8270de
to
80ba4d8
Compare
| @@ -10,7 +10,7 @@ | |||
| "generateCdfJson" : false | |||
| }, | |||
| "cvrFileSources" : [ { | |||
| "filePath" : "skip_to_next_test_cvr.xlsx", | |||
| "filePath" : "skipped_ranking_cvr.xlsx", | |||
There was a problem hiding this comment.
Nit: Is it worth renaming this one? Have a slight preference to just revert these two files so the name stays aligned with the directory / config file naming.
| @@ -11,7 +11,7 @@ | |||
| }, | |||
| "cvrFileSources": [ | |||
| { | |||
| "filePath" : "minneapolis_multi_seat_threshold_cvr.xlsx", | |||
| "filePath" : "minneapolis_multi_seat_cvr.xlsx", | |||
There was a problem hiding this comment.
Nit: same question here -- can we just revert this and the file to stay aligned with directory name?
There was a problem hiding this comment.
Good deal, thanks for examining this so closely!
closes #692
Note: one of the original goals was to specifically get rid of the duplicate files in #650, but I opted to skip that: while most files are the same, one test removes the Precinct file, and the other doesn't, meaning the test sets aren't identical. I'm sure we could solve that with some added complexity, but I'm not sure that complexity is worth it.