BrightSpots · artoonie · Nov 6, 2024 · Sep 27, 2024 · Sep 28, 2024 · Sep 28, 2024
diff --git a/src/main/java/network/brightspots/rcv/ResultsWriter.java b/src/main/java/network/brightspots/rcv/ResultsWriter.java
@@ -280,26 +280,48 @@ void generateBySliceSummaryFiles(
         RoundTallies roundTallies = entry.getValue();
         TallyTransfers tallyTransfers = tallyTransfersBySlice.get(slice, sliceId);
         String sliceFileString = getFileStringForSlice(slice, sliceId, filenames);
-        String outputPath = getOutputFilePathFromInstance(
-            String.format("%s_summary", sliceFileString));
-        generateSummarySpreadsheet(roundTallies, candidateOrder, slice, sliceId, outputPath);
-        generateSummaryJson(roundTallies, tallyTransfers, slice, sliceId, outputPath);
+        String outputPathCsv = getOutputFilePathFromInstance(
+            String.format("%s_extended_summary", sliceFileString));
+        String outputPathJson = getOutputFilePathFromInstance(
+                String.format("%s_summary", sliceFileString));
+        generateSummaryExtendedCsv(roundTallies, candidateOrder, slice, sliceId, outputPathCsv);
+        generateSummaryJson(roundTallies, tallyTransfers, slice, sliceId, outputPathJson);
       }
     }
   }
 
+  private void generateSummaryExtendedCsv(
+          RoundTallies roundTallies,
+          List<String> candidateOrder,
+          TabulateBySlice slice,
+          String sliceId,
+          String outputPath) throws IOException {
+    generateSummaryCsvHelper(roundTallies, candidateOrder, slice, sliceId, outputPath, true);
+  }
+
+  private void generateSummaryCsv(
+          RoundTallies roundTallies,
+          List<String> candidateOrder,
+          TabulateBySlice slice,
+          String sliceId,
+          String outputPath) throws IOException {
+    generateSummaryCsvHelper(roundTallies, candidateOrder, slice, sliceId, outputPath, false);
+  }
+
   // create a summary spreadsheet .csv file
   // param: roundTallies is the round-by-count count of votes per candidate
   // param: candidateOrder is to allow a consistent ordering of candidates, including across slices
   // param: slice indicates which type of slice we're reporting results for (null means all)
   // param: sliceId indicates the specific slice ID we're reporting results for (null means all)
   // param: outputPath is the path to the output file, minus its extension
-  private void generateSummarySpreadsheet(
+  // param: extended include additional details in the output file?
+  private void generateSummaryCsvHelper(
           RoundTallies roundTallies,
           List<String> candidateOrder,
           TabulateBySlice slice,
           String sliceId,
-          String outputPath) throws IOException {
+          String outputPath,
+          boolean extended) throws IOException {
     // Check that all candidates are included in the candidate order
     Set<String> expectedCandidates = roundTallies.get(1).getCandidates();
     Set<String> providedCandidates = new HashSet<>(candidateOrder);
@@ -363,7 +385,7 @@ private void generateSummarySpreadsheet(
         } else {
           votePctDivisor = roundTallies.get(1).activeAndLockedInBallotSum();
         }
-        if (votePctDivisor != BigDecimal.ZERO) {
+        if (!votePctDivisor.equals(BigDecimal.ZERO)) {
           // Turn a decimal into a human-readable percentage (e.g. 0.1234 -> 12.34%)
           BigDecimal divDecimal = thisRoundTally.divide(votePctDivisor, MathContext.DECIMAL32);
           csvPrinter.print(divDecimal.scaleByPowerOfTen(4).intValue() / 100.0 + "%");
@@ -405,26 +427,28 @@ private void generateSummarySpreadsheet(
       csvPrinter.println();
     }
 
-    for (StatusForRound status : STATUSES_TO_PRINT) {
-      csvPrinter.print(status.getTitleCaseKey());
+    if (extended) {
+      for (StatusForRound status : STATUSES_TO_PRINT) {
+        csvPrinter.print(status.getTitleCaseKey());
 
-      for (int round = 1; round <= numRounds; round++) {
-        BigDecimal thisRoundInactive = roundTallies.get(round).getBallotStatusTally(status);
-        csvPrinter.print(thisRoundInactive);
+        for (int round = 1; round <= numRounds; round++) {
+          BigDecimal thisRoundInactive = roundTallies.get(round).getBallotStatusTally(status);
+          csvPrinter.print(thisRoundInactive);
 
-        // Don't display percentage of inactive ballots
-        csvPrinter.print("");
+          // Don't display percentage of inactive ballots
+          csvPrinter.print("");
 
-        // Do display transfer of inactive ballots
-        if (round != numRounds) {
-          BigDecimal nextRoundInactive = roundTallies.get(round + 1).getBallotStatusTally(status);
-          BigDecimal diff = nextRoundInactive.subtract(thisRoundInactive);
-          csvPrinter.print(diff);
-        } else {
-          csvPrinter.print(0);
+          // Do display transfer of inactive ballots
+          if (round != numRounds) {
+            BigDecimal nextRoundInactive = roundTallies.get(round + 1).getBallotStatusTally(status);
+            BigDecimal diff = nextRoundInactive.subtract(thisRoundInactive);
+            csvPrinter.print(diff);
+          } else {
+            csvPrinter.print(0);
+          }
         }
+        csvPrinter.println();
       }
-      csvPrinter.println();
     }
 
     csvPrinter.print("Inactive Ballots Total");
@@ -585,9 +609,11 @@ void generateOverallSummaryFiles(
       RoundTallies roundTallies,
       TallyTransfers tallyTransfers,
       List<String> candidateOrder) throws IOException {
-    String outputPath = getOutputFilePathFromInstance("summary");
-    generateSummarySpreadsheet(roundTallies, candidateOrder, null, null, outputPath);
-    generateSummaryJson(roundTallies, tallyTransfers, null, null, outputPath);
+    String outputPathSummary = getOutputFilePathFromInstance("summary");
+    String outputPathExtended = getOutputFilePathFromInstance("extended_summary");
+    generateSummaryExtendedCsv(roundTallies, candidateOrder, null, null, outputPathExtended);
+    generateSummaryCsv(roundTallies, candidateOrder, null, null, outputPathSummary);
+    generateSummaryJson(roundTallies, tallyTransfers, null, null, outputPathSummary);
   }
 
   // Write CastVoteRecords for the specified contest to the provided folder,

diff --git a/src/test/java/network/brightspots/rcv/TabulatorTests.java b/src/test/java/network/brightspots/rcv/TabulatorTests.java
@@ -18,9 +18,11 @@
 
 package network.brightspots.rcv;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
@@ -31,7 +33,6 @@
 import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.HashMap;
@@ -147,8 +148,8 @@ private static boolean compareLists(
 
   private static boolean fileCompareLineByLine(String path1, String path2) {
     boolean result = true;
-    try (BufferedReader br1 = new BufferedReader(new FileReader(path1, StandardCharsets.UTF_8));
-        BufferedReader br2 = new BufferedReader(new FileReader(path2, StandardCharsets.UTF_8))) {
+    try (BufferedReader br1 = new BufferedReader(new FileReader(path1, UTF_8));
+        BufferedReader br2 = new BufferedReader(new FileReader(path2, UTF_8))) {
       int currentLine = 1;
       int errorCount = 0;
 
@@ -232,12 +233,14 @@ private static void runTabulationTest(String stem, String expectedException,
       int numSlicedFilesChecked = 0;
       for (ContestConfig.TabulateBySlice slice : config.enabledSlices()) {
         for (String sliceName : session.loadSliceNamesFromCvrs(slice, config)) {
-          String outputType = ResultsWriter.sanitizeStringForOutput(
+          String outputTypeJson = ResultsWriter.sanitizeStringForOutput(
               String.format("%s_%s_summary", sliceName, slice.toLowerString()));
-          if (compareFiles(config, stem, outputType, ".json", timestampString, null, true)) {
+          String outputTypeCsv = ResultsWriter.sanitizeStringForOutput(
+                  String.format("%s_%s_extended_summary", sliceName, slice.toLowerString()));
+          if (compareFiles(config, stem, outputTypeJson, ".json", timestampString, null, true)) {
             numSlicedFilesChecked++;
           }
-          if (compareFiles(config, stem, outputType, ".csv", timestampString, null, true)) {
+          if (compareFiles(config, stem, outputTypeCsv, ".csv", timestampString, null, true)) {
             numSlicedFilesChecked++;
           }
         }
@@ -321,7 +324,8 @@ private static void cleanOutputFolder(TabulatorSession session) {
   private static void compareFiles(
       ContestConfig config, String stem, String timestampString, String sequentialId) {
     compareFiles(config, stem, "summary", ".json", timestampString, sequentialId, false);
-    compareFiles(config, stem, "summary", ".csv", timestampString, sequentialId, false);
+    compareFiles(config, stem, "extended_summary", ".csv", timestampString, sequentialId, false);
+    compareExtendedSummaryToSummary(config, timestampString, sequentialId);
     if (config.isGenerateCdfJsonEnabled()) {
       compareFiles(config, stem, "cvr_cdf", ".json", timestampString, sequentialId, false);
     }
@@ -365,6 +369,55 @@ private static boolean compareFiles(
     return didCompare;
   }
 
+  /**
+   * Rather than storing both the extended summary and non-extended summary files in git, we can
+   * directly check that the non-extended file is precisely what we expect: everything in the
+   * extended file except for the inactive ballot breakdown.
+   */
+  private static void compareExtendedSummaryToSummary(
+          ContestConfig config, String timestampString, String sequentialId) {
+    String summaryPath = ResultsWriter.getOutputFilePath(
+            config.getOutputDirectory(), "summary", timestampString, sequentialId)
+            + ".csv";
+    String extendedPath = ResultsWriter.getOutputFilePath(
+            config.getOutputDirectory(), "extended_summary", timestampString, sequentialId)
+            + ".csv";
+
+    try (BufferedReader brSummary = new BufferedReader(new FileReader(summaryPath, UTF_8));
+         BufferedReader brExtended = new BufferedReader(new FileReader(extendedPath, UTF_8))) {
+      while (true) {
+        String lineExtended = brExtended.readLine();
+        // If the extended file has reached its end, then the non-extended file must have too
+        if (lineExtended == null) {
+          assertNull(brSummary.readLine(), "Extended file is missing a line");
+          return;
+        }
+
+        // If the extended file should be excluded, continue without moving the file pointer
+        // in the non-extended file. For now, there's only one type of row excluded, and they
+        // happen to all start with "Inactive Ballots by"
+        if (lineExtended.startsWith("Inactive Ballots by")) {
+          continue;
+        }
+
+        // This line should be equal in both files. Ensure the line exists and they're equal
+        // in both files.
+        String lineSummary = brSummary.readLine();
+        assertNotNull(lineSummary, "Summary file is missing a line");
+        if (!lineSummary.equals(lineExtended)) {
+          fail("Line differes in extended vs non-extended CSV: \n%s\n%s".formatted(
+                  lineSummary, lineExtended));
+        }
+      }
+    } catch (FileNotFoundException exception) {
+      Logger.severe("File not found!\n%s", exception);
+      fail();
+    } catch (IOException exception) {
+      Logger.severe("Error reading file!\n%s", exception);
+      fail();
+    }
+  }
+
   @BeforeAll
   static void setup() {
     Logger.setup();

diff --git a/...INNEAPOLIS_W-13_P-09_precinct_summary.csv → ...S_W-13_P-09_precinct_extended_summary.csv b/...INNEAPOLIS_W-13_P-09_precinct_summary.csv → ...S_W-13_P-09_precinct_extended_summary.csv
diff --git a/...MINNEAPOLIS_W-1_P-01_precinct_summary.csv → ...IS_W-1_P-01_precinct_extended_summary.csv b/...MINNEAPOLIS_W-1_P-01_precinct_summary.csv → ...IS_W-1_P-01_precinct_extended_summary.csv
diff --git a/...13_minneapolis_mayor_expected_summary.csv → ...polis_mayor_expected_extended_summary.csv b/...13_minneapolis_mayor_expected_summary.csv → ...polis_mayor_expected_extended_summary.csv
diff --git a/...neapolis_mayor_scale_expected_summary.csv → ...mayor_scale_expected_extended_summary.csv b/...neapolis_mayor_scale_expected_summary.csv → ...mayor_scale_expected_extended_summary.csv
diff --git a/...013_minneapolis_park_expected_summary.csv → ...apolis_park_expected_extended_summary.csv b/...013_minneapolis_park_expected_summary.csv → ...apolis_park_expected_extended_summary.csv
diff --git a/...olis_park_bottoms_up_expected_summary.csv → ..._bottoms_up_expected_extended_summary.csv b/...olis_park_bottoms_up_expected_summary.csv → ..._bottoms_up_expected_extended_summary.csv
diff --git a/...inneapolis_park_hare_expected_summary.csv → ...s_park_hare_expected_extended_summary.csv b/...inneapolis_park_hare_expected_summary.csv → ...s_park_hare_expected_extended_summary.csv
diff --git a/...is_park_sequential_1_expected_summary.csv → ...equential_1_expected_extended_summary.csv b/...is_park_sequential_1_expected_summary.csv → ...equential_1_expected_extended_summary.csv
diff --git a/...is_park_sequential_2_expected_summary.csv → ...equential_2_expected_extended_summary.csv b/...is_park_sequential_2_expected_summary.csv → ...equential_2_expected_extended_summary.csv
diff --git a/...is_park_sequential_3_expected_summary.csv → ...equential_3_expected_extended_summary.csv b/...is_park_sequential_3_expected_summary.csv → ...equential_3_expected_extended_summary.csv
diff --git a/.../2015_portland_mayor_expected_summary.csv → ...tland_mayor_expected_extended_summary.csv b/.../2015_portland_mayor_expected_summary.csv → ...tland_mayor_expected_extended_summary.csv
diff --git a/...portland_mayor_codes_expected_summary.csv → ...mayor_codes_expected_extended_summary.csv b/...portland_mayor_codes_expected_summary.csv → ...mayor_codes_expected_extended_summary.csv
diff --git a/...INNEAPOLIS_W-13_P-13_precinct_summary.csv → ...S_W-13_P-13_precinct_extended_summary.csv b/...INNEAPOLIS_W-13_P-13_precinct_summary.csv → ...S_W-13_P-13_precinct_extended_summary.csv
diff --git a/...MINNEAPOLIS_W-1_P-01_precinct_summary.csv → ...IS_W-1_P-01_precinct_extended_summary.csv b/...MINNEAPOLIS_W-1_P-01_precinct_summary.csv → ...IS_W-1_P-01_precinct_extended_summary.csv
diff --git a/...17_minneapolis_mayor_expected_summary.csv → ...polis_mayor_expected_extended_summary.csv b/...17_minneapolis_mayor_expected_summary.csv → ...polis_mayor_expected_extended_summary.csv
diff --git a/...ine_governor_primary_expected_summary.csv → ...nor_primary_expected_extended_summary.csv b/...ine_governor_primary_expected_summary.csv → ...nor_primary_expected_extended_summary.csv
diff --git a/...son/aliases_cdf_json_expected_summary.csv → ...es_cdf_json_expected_extended_summary.csv b/...son/aliases_cdf_json_expected_summary.csv → ...es_cdf_json_expected_extended_summary.csv
diff --git a/...lsx/aliases_ess_xlsx_expected_summary.csv → ...es_ess_xlsx_expected_extended_summary.csv b/...lsx/aliases_ess_xlsx_expected_summary.csv → ...es_ess_xlsx_expected_extended_summary.csv
diff --git a/...ed_MINNEAPOLIS_W-1_P-02_batch_summary.csv → ...POLIS_W-1_P-02_batch_extended_summary.csv b/...ed_MINNEAPOLIS_W-1_P-02_batch_summary.csv → ...POLIS_W-1_P-02_batch_extended_summary.csv
diff --git a/...xample/batch_example_expected_summary.csv → ...tch_example_expected_extended_summary.csv b/...xample/batch_example_expected_summary.csv → ...tch_example_expected_extended_summary.csv
diff --git a/...allot_kansas_primary_expected_summary.csv → ...sas_primary_expected_extended_summary.csv b/...allot_kansas_primary_expected_summary.csv → ...sas_primary_expected_extended_summary.csv
diff --git a/...ot_with_inline_comma_expected_summary.csv → ...nline_comma_expected_extended_summary.csv b/...ot_with_inline_comma_expected_summary.csv → ...nline_comma_expected_extended_summary.csv
diff --git a/...inue_tabulation_test_expected_summary.csv → ...lation_test_expected_extended_summary.csv b/...inue_tabulation_test_expected_summary.csv → ...lation_test_expected_extended_summary.csv
diff --git a/...tch_elimination_test_expected_summary.csv → ...nation_test_expected_extended_summary.csv b/...tch_elimination_test_expected_summary.csv → ...nation_test_expected_extended_summary.csv
diff --git a/..._missing_header_test_expected_summary.csv → ...header_test_expected_extended_summary.csv b/..._missing_header_test_expected_summary.csv → ...header_test_expected_extended_summary.csv
diff --git a/...aska/dominion_alaska_expected_summary.csv → ...nion_alaska_expected_extended_summary.csv b/...aska/dominion_alaska_expected_summary.csv → ...nion_alaska_expected_extended_summary.csv
diff --git a/...nsas/dominion_kansas_expected_summary.csv → ...nion_kansas_expected_extended_summary.csv b/...nsas/dominion_kansas_expected_summary.csv → ...nion_kansas_expected_extended_summary.csv
diff --git a/.../dominion_multi_file_expected_summary.csv → ..._multi_file_expected_extended_summary.csv b/.../dominion_multi_file_expected_summary.csv → ..._multi_file_expected_extended_summary.csv
diff --git a/...ion_no_precinct_data_expected_summary.csv → ...ecinct_data_expected_extended_summary.csv b/...ion_no_precinct_data_expected_summary.csv → ...ecinct_data_expected_extended_summary.csv
diff --git a/...ing/dominion_wyoming_expected_summary.csv → ...ion_wyoming_expected_extended_summary.csv b/...ing/dominion_wyoming_expected_summary.csv → ...ion_wyoming_expected_extended_summary.csv
diff --git a/..._test/duplicate_test_expected_summary.csv → ...licate_test_expected_extended_summary.csv b/..._test/duplicate_test_expected_summary.csv → ...licate_test_expected_extended_summary.csv
diff --git a/...d_test/excluded_test_expected_summary.csv → ...cluded_test_expected_extended_summary.csv b/...d_test/excluded_test_expected_summary.csv → ...cluded_test_expected_extended_summary.csv
diff --git a/..._multiple_continuing_expected_summary.csv → ..._continuing_expected_extended_summary.csv b/..._multiple_continuing_expected_summary.csv → ..._continuing_expected_extended_summary.csv
diff --git a/...mines_threshold_test_expected_summary.csv → ...eshold_test_expected_extended_summary.csv b/...mines_threshold_test_expected_summary.csv → ...eshold_test_expected_extended_summary.csv
diff --git a/...hold_tiebreaker_test_expected_summary.csv → ...reaker_test_expected_extended_summary.csv b/...hold_tiebreaker_test_expected_summary.csv → ...reaker_test_expected_extended_summary.csv
diff --git a/...est/generic_csv_test_expected_summary.csv → ...ic_csv_test_expected_extended_summary.csv b/...est/generic_csv_test_expected_summary.csv → ...ic_csv_test_expected_extended_summary.csv
diff --git a/...ar_park_school_board_expected_summary.csv → ...chool_board_expected_extended_summary.csv b/...ar_park_school_board_expected_summary.csv → ...chool_board_expected_extended_summary.csv
diff --git a/...avis_county_officers_expected_summary.csv → ...ty_officers_expected_extended_summary.csv b/...avis_county_officers_expected_summary.csv → ...ty_officers_expected_extended_summary.csv
diff --git a/...nimum_threshold_test_expected_summary.csv → ...eshold_test_expected_extended_summary.csv b/...nimum_threshold_test_expected_summary.csv → ...eshold_test_expected_extended_summary.csv
diff --git a/...multi_seat_threshold_expected_summary.csv → ...t_threshold_expected_extended_summary.csv b/...multi_seat_threshold_expected_summary.csv → ...t_threshold_expected_extended_summary.csv
diff --git a/...reshold_expected_pc1_precinct_summary.csv → ...xpected_pc1_precinct_extended_summary.csv b/...reshold_expected_pc1_precinct_summary.csv → ...xpected_pc1_precinct_extended_summary.csv
diff --git a/...reshold_expected_pc2_precinct_summary.csv → ...xpected_pc2_precinct_extended_summary.csv b/...reshold_expected_pc2_precinct_summary.csv → ...xpected_pc2_precinct_extended_summary.csv
diff --git a/...INNEAPOLIS_W-13_P-13_precinct_summary.csv → ...S_W-13_P-13_precinct_extended_summary.csv b/...INNEAPOLIS_W-13_P-13_precinct_summary.csv → ...S_W-13_P-13_precinct_extended_summary.csv
diff --git a/...ing_precinct_example_expected_summary.csv → ...nct_example_expected_extended_summary.csv b/...ing_precinct_example_expected_summary.csv → ...nct_example_expected_extended_summary.csv
diff --git a/..._missing_precinct_id_precinct_summary.csv → ...precinct_id_precinct_extended_summary.csv b/..._missing_precinct_id_precinct_summary.csv → ...precinct_id_precinct_extended_summary.csv
diff --git a/...ners_than_candidates_expected_summary.csv → ..._candidates_expected_extended_summary.csv b/...ners_than_candidates_expected_summary.csv → ..._candidates_expected_extended_summary.csv
diff --git a/...ms_up_with_threshold_expected_summary.csv → ...h_threshold_expected_extended_summary.csv b/...ms_up_with_threshold_expected_summary.csv → ...h_threshold_expected_extended_summary.csv
diff --git a/.../multi_seat_uwi_test_expected_summary.csv → ...at_uwi_test_expected_extended_summary.csv b/.../multi_seat_uwi_test_expected_summary.csv → ...at_uwi_test_expected_extended_summary.csv
diff --git a/...cdf_2/nist_xml_cdf_2_expected_summary.csv → ...t_xml_cdf_2_expected_extended_summary.csv b/...cdf_2/nist_xml_cdf_2_expected_summary.csv → ...t_xml_cdf_2_expected_extended_summary.csv
diff --git a/...MINNEAPOLIS_W-1_P-02_precinct_summary.csv → ...IS_W-1_P-02_precinct_extended_summary.csv b/...MINNEAPOLIS_W-1_P-02_precinct_summary.csv → ...IS_W-1_P-02_precinct_extended_summary.csv
diff --git a/...ple/precinct_example_expected_summary.csv → ...nct_example_expected_extended_summary.csv b/...ple/precinct_example_expected_summary.csv → ...nct_example_expected_extended_summary.csv
diff --git a/...uential_with_batch_1_expected_summary.csv → ...ith_batch_1_expected_extended_summary.csv b/...uential_with_batch_1_expected_summary.csv → ...ith_batch_1_expected_extended_summary.csv
diff --git a/...uential_with_batch_2_expected_summary.csv → ...ith_batch_2_expected_extended_summary.csv b/...uential_with_batch_2_expected_summary.csv → ...ith_batch_2_expected_extended_summary.csv
diff --git a/...uential_with_batch_3_expected_summary.csv → ...ith_batch_3_expected_extended_summary.csv b/...uential_with_batch_3_expected_summary.csv → ...ith_batch_3_expected_extended_summary.csv
diff --git a/...continue_until_two_1_expected_summary.csv → ...until_two_1_expected_extended_summary.csv b/...continue_until_two_1_expected_summary.csv → ...until_two_1_expected_extended_summary.csv
diff --git a/...continue_until_two_2_expected_summary.csv → ...until_two_2_expected_extended_summary.csv b/...continue_until_two_2_expected_summary.csv → ...until_two_2_expected_extended_summary.csv
diff --git a/...continue_until_two_3_expected_summary.csv → ...until_two_3_expected_extended_summary.csv b/...continue_until_two_3_expected_summary.csv → ...until_two_3_expected_extended_summary.csv
diff --git a/...st/skip_to_next_test_expected_summary.csv → ...o_next_test_expected_extended_summary.csv b/...st/skip_to_next_test_expected_summary.csv → ...o_next_test_expected_extended_summary.csv
diff --git a/...abulation_early_test_expected_summary.csv → ..._early_test_expected_extended_summary.csv b/...abulation_early_test_expected_summary.csv → ..._early_test_expected_extended_summary.csv
diff --git a/...skipped_first_choice_expected_summary.csv → ...irst_choice_expected_extended_summary.csv b/...skipped_first_choice_expected_summary.csv → ...irst_choice_expected_extended_summary.csv
diff --git a/..._exhaust_at_overvote_expected_summary.csv → ...at_overvote_expected_extended_summary.csv b/..._exhaust_at_overvote_expected_summary.csv → ...at_overvote_expected_extended_summary.csv
diff --git a/...vervote_skip_to_next_expected_summary.csv → ...kip_to_next_expected_extended_summary.csv b/...vervote_skip_to_next_expected_summary.csv → ...kip_to_next_expected_extended_summary.csv
diff --git a/...ipped_choice_exhaust_expected_summary.csv → ...ice_exhaust_expected_extended_summary.csv b/...ipped_choice_exhaust_expected_summary.csv → ...ice_exhaust_expected_extended_summary.csv
diff --git a/..._skipped_choice_next_expected_summary.csv → ...choice_next_expected_extended_summary.csv b/..._skipped_choice_next_expected_summary.csv → ...choice_next_expected_extended_summary.csv
diff --git a/...ipped_choice_exhaust_expected_summary.csv → ...ice_exhaust_expected_extended_summary.csv b/...ipped_choice_exhaust_expected_summary.csv → ...ice_exhaust_expected_extended_summary.csv
diff --git a/..._6_duplicate_exhaust_expected_summary.csv → ...ate_exhaust_expected_extended_summary.csv b/..._6_duplicate_exhaust_expected_summary.csv → ...ate_exhaust_expected_extended_summary.csv
diff --git a/...plicate_skip_to_next_expected_summary.csv → ...kip_to_next_expected_extended_summary.csv b/...plicate_skip_to_next_expected_summary.csv → ...kip_to_next_expected_extended_summary.csv
diff --git a/...test_set_8_multi_cdf_expected_summary.csv → ...8_multi_cdf_expected_extended_summary.csv b/...test_set_8_multi_cdf_expected_summary.csv → ...8_multi_cdf_expected_extended_summary.csv
diff --git a/...one_winner_per_round_expected_summary.csv → ...r_per_round_expected_extended_summary.csv b/...one_winner_per_round_expected_summary.csv → ...r_per_round_expected_extended_summary.csv
diff --git a/...fractional_threshold_expected_summary.csv → ...l_threshold_expected_extended_summary.csv b/...fractional_threshold_expected_summary.csv → ...l_threshold_expected_extended_summary.csv
diff --git a/...nner_whole_threshold_expected_summary.csv → ...e_threshold_expected_extended_summary.csv b/...nner_whole_threshold_expected_summary.csv → ...e_threshold_expected_extended_summary.csv
diff --git a/...t_overvote_delimiter_expected_summary.csv → ...e_delimiter_expected_extended_summary.csv b/...t_overvote_delimiter_expected_summary.csv → ...e_delimiter_expected_extended_summary.csv
diff --git a/..._undeclared_write_in_expected_summary.csv → ...ed_write_in_expected_extended_summary.csv b/..._undeclared_write_in_expected_summary.csv → ...ed_write_in_expected_extended_summary.csv
diff --git a/...ate_permutation_test_expected_summary.csv → ...tation_test_expected_extended_summary.csv b/...ate_permutation_test_expected_summary.csv → ...tation_test_expected_extended_summary.csv
diff --git a/...nts_then_random_test_expected_summary.csv → ...random_test_expected_extended_summary.csv b/...nts_then_random_test_expected_summary.csv → ...random_test_expected_extended_summary.csv
diff --git a/...t/tiebreak_seed_test_expected_summary.csv → ...k_seed_test_expected_extended_summary.csv b/...t/tiebreak_seed_test_expected_summary.csv → ...k_seed_test_expected_extended_summary.csv
diff --git a/...ation_in_config_test_expected_summary.csv → ...config_test_expected_extended_summary.csv b/...ation_in_config_test_expected_summary.csv → ...config_test_expected_extended_summary.csv
diff --git a/...city_chief_of_police_expected_summary.csv → ...f_of_police_expected_extended_summary.csv b/...city_chief_of_police_expected_summary.csv → ...f_of_police_expected_extended_summary.csv
diff --git a/...xml_cdf_city_coroner_expected_summary.csv → ...ity_coroner_expected_extended_summary.csv b/...xml_cdf_city_coroner_expected_summary.csv → ...ity_coroner_expected_extended_summary.csv
diff --git a/..._city_council_member_expected_summary.csv → ...ncil_member_expected_extended_summary.csv b/..._city_council_member_expected_summary.csv → ...ncil_member_expected_extended_summary.csv
diff --git a/...n_xml_cdf_city_mayor_expected_summary.csv → ..._city_mayor_expected_extended_summary.csv b/...n_xml_cdf_city_mayor_expected_summary.csv → ..._city_mayor_expected_extended_summary.csv
diff --git a/...f_city_tax_collector_expected_summary.csv → ...x_collector_expected_extended_summary.csv b/...f_city_tax_collector_expected_summary.csv → ...x_collector_expected_extended_summary.csv
diff --git a/...l_cdf_county_coroner_expected_summary.csv → ...nty_coroner_expected_extended_summary.csv b/...l_cdf_county_coroner_expected_summary.csv → ...nty_coroner_expected_extended_summary.csv
diff --git a/...l_cdf_county_sheriff_expected_summary.csv → ...nty_sheriff_expected_extended_summary.csv b/...l_cdf_county_sheriff_expected_summary.csv → ...nty_sheriff_expected_extended_summary.csv
diff --git a/.../uwi_cannot_win_test_expected_summary.csv → ...ot_win_test_expected_extended_summary.csv b/.../uwi_cannot_win_test_expected_summary.csv → ...ot_win_test_expected_extended_summary.csv