Adjusting results with plumelib (#377)

.github/workflows/check-reproducibility.yml

@@ -47,7 +47,7 @@ jobs:
       uses: jlumbroso/free-disk-space@main
     - name: make check-merges-reproducibility
       run: |
-        head -n 151 results/combined/result.csv > temp.csv && mv temp.csv results/combined/result.csv
+        head -n 151 results/combined/result_raw.csv > temp.csv && mv temp.csv results/combined/result_raw.csv
         make check-merges-reproducibility
       env:
           GITHUB_TOKEN: ${{ secrets.TOKEN_GITHUB }}

Makefile

@@ -8,9 +8,9 @@ SH_SCRIPTS   = $(shell grep --exclude-dir=build --exclude-dir=repos --exclude-di
 BASH_SCRIPTS = $(shell grep --exclude-dir=build --exclude-dir=repos --exclude-dir=cache -r -l '^\#! \?\(/bin/\|/usr/bin/env \)bash' * | grep -v /.git/ | grep -v '~$$' | grep -v '\.tar$$' | grep -v gradlew)
 PYTHON_FILES = $(shell find .  -name '*.py' ! -path './repos/*' -not -path "./.workdir/*" -not -path "./cache*/*" | grep -v '/__pycache__/' | grep -v '/.git/' | grep -v gradlew | grep -v git-hires-merge)
 
-CSV_RESULTS_COMBINED = results/combined/result.csv
-CSV_RESULTS_GREATEST_HITS = results/greatest_hits/result.csv
-CSV_RESULTS_REAPER = results/reaper/result.csv
+CSV_RESULTS_COMBINED = results/combined/result_raw.csv
+CSV_RESULTS_GREATEST_HITS = results/greatest_hits/result_raw.csv
+CSV_RESULTS_REAPER = results/reaper/result_raw.csv
 CSV_RESULTS = $(CSV_RESULTS_COMBINED)
 
 NUM_PROCESSES = 0

README.md

@@ -71,15 +71,15 @@ make small-test
 This runs the entire code on two small repos.
 The output data appears in `results/small/`.
 
-* `results/small/result.csv`: the final result
+* `results/small/result_adjusted.csv`: the final result
 
 * `results/small/merges/` contains all the merges.
 
 * `results/small/merges_compared/` contains all merges and indicates whether the merge results are different and thus need to be analyzed.
 
 * `results/small/merges_tested/` contains all merges that have been tested.
 
-* `results/small/result.csv` contains the final result.
+* `results/small/result_adjusted.csv` contains the final result.
 
 ### Perform full analysis
 
@@ -97,7 +97,7 @@ To run the stack on all repos and also diff the merges' outputs:
 
 This will run the entire code on all the repos and automatically decompress the cache if `cache/` does not exist.
 All the output data can be found in `results/`.
-The final result is found in `results/result.csv`.
+The final result is found in `results/result_adjusted.csv`.
 Directory `results/merges` contains all the merges for each repo.
 Directory `results/merges_tested` contains all the merges that have been tested.
 

results/combined/defs.tex

@@ -22,7 +22,7 @@
 \def\combinedNumberofMergesWith2TriesUntilPass{514\xspace}
 \def\combinedNumberofMergesWith4TriesUntilPass{45\xspace}
 \def\combinedSporkOverOrtCorrect{512\xspace}
-\def\combinedSporkOverOrtIncorrect{487\xspace}
+\def\combinedSporkOverOrtIncorrect{486\xspace}
 \def\combinedMainBranchMerges{3524\xspace}
 \def\combinedMainBranchMergesPercent{59\xspace}
 \def\combinedOtherBranchMerges{2459\xspace}